Merge pull request #90 from excid3/ruby-3.4.5

Add Ruby 3.4.5

Author: rafaelfranca

.github/workflows/publish-new-image-version.yaml

@@ -12,6 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         RUBY_VERSION:
+          - 3.4.5
           - 3.4.4
           - 3.4.3
           - 3.4.2

CONTRIBUTING.md

@@ -55,6 +55,8 @@ bin/add-ruby-version 3.4.5
 This script will:
 - Add the version to the build matrix in `.github/workflows/publish-new-image-version.yaml`
 - Update the default version in `features/src/ruby/devcontainer-feature.json` if the new version is newer
+- Bump the feature version (patch increment) when the default Ruby version changes
+- Update test files to use the new Ruby version
 - Maintain proper semantic version ordering
 - Prevent duplicate entries
 

bin/add-ruby-version

@@ -109,6 +109,42 @@ function updateDefaultInJson(newVersion, jsonFile) {
     }
 }
 
+function updateVersionInTestFile(newVersion, testFile) {
+    try {
+        const content = fs.readFileSync(testFile, 'utf8');
+
+        // Replace version in the test file using regex to find the version pattern
+        const versionRegex = /(\d+\.\d+\.\d+)/g;
+        const updatedContent = content.replace(versionRegex, newVersion);
+
+        fs.writeFileSync(testFile, updatedContent);
+        return true;
+    } catch (error) {
+        throw new Error(`Could not update test file ${testFile}: ${error.message}`);
+    }
+}
+
+function bumpFeatureVersion(jsonFile) {
+    try {
+        const content = fs.readFileSync(jsonFile, 'utf8');
+        const data = JSON.parse(content);
+
+        // Parse current version and increment patch version
+        const currentVersion = data.version;
+        const incrementedVersion = semver.inc(currentVersion, 'patch');
+
+        data.version = incrementedVersion;
+        fs.writeFileSync(jsonFile, JSON.stringify(data, null, 4) + '\n');
+
+        return {
+            oldVersion: currentVersion,
+            newVersion: incrementedVersion
+        };
+    } catch (error) {
+        throw new Error(`Could not bump feature version: ${error.message}`);
+    }
+}
+
 function main() {
     // Check command line arguments
     const args = process.argv.slice(2);
@@ -122,6 +158,10 @@ function main() {
     const newVersion = args[0];
     const yamlFile = '.github/workflows/publish-new-image-version.yaml';
     const jsonFile = 'features/src/ruby/devcontainer-feature.json';
+    const testFiles = [
+        'features/test/ruby/test.sh',
+        'features/test/ruby/with_rbenv.sh'
+    ];
 
     // Validate version format
     if (!validateVersionFormat(newVersion)) {
@@ -140,6 +180,14 @@ function main() {
         process.exit(1);
     }
 
+    // Check if test files exist
+    for (const testFile of testFiles) {
+        if (!fs.existsSync(testFile)) {
+            log(`${emoji.error} Error: ${testFile} not found`, 'red');
+            process.exit(1);
+        }
+    }
+
     try {
         // Check if version already exists
         if (versionExistsInYaml(newVersion, yamlFile)) {
@@ -170,13 +218,29 @@ function main() {
             log(`Updating default version in ${jsonFile}...`);
             updateDefaultInJson(newVersion, jsonFile);
             log(`${emoji.check} Updated default version to ${newVersion}`, 'green');
+
+            // Bump feature version when default changes
+            log('');
+            log(`${emoji.update} Bumping feature version...`, 'yellow');
+            const versionInfo = bumpFeatureVersion(jsonFile);
+            log(`${emoji.check} Feature version bumped from ${versionInfo.oldVersion} to ${versionInfo.newVersion}`, 'green');
+
             filesModified.push(jsonFile);
         } else {
             log('');
             log(`${emoji.info} New version ${newVersion} is not newer than current default ${currentDefault}`, 'cyan');
             log('Default version remains unchanged');
         }
 
+        // Update test files
+        log('');
+        log(`${emoji.edit} Updating test files...`, 'blue');
+        for (const testFile of testFiles) {
+            updateVersionInTestFile(newVersion, testFile);
+            log(`${emoji.check} Updated ${testFile}`, 'green');
+            filesModified.push(testFile);
+        }
+
         // Success message
         log('');
         log(`${emoji.party} Successfully added Ruby version ${newVersion}!`, 'green');

features/src/ruby/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
     "id": "ruby",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "name": "Ruby",
     "description": "Installs Ruby and a version manager (mise or rbenv) along with libraries needed to build Ruby.",
     "documentationURL": "https://github.com/rails/devcontainer/tree/main/features/src/ruby",
@@ -18,7 +18,7 @@
     "options": {
         "version": {
             "type": "string",
-            "default": "3.4.4",
+            "default": "3.4.5",
             "description": "The ruby version to be installed"
         },
         "versionManager": {

features/test/ruby/test.sh

@@ -8,6 +8,6 @@ check "mise is installed" bash -c "mise --version"
 check "mise init is sourced in the bashrc" bash -c "grep 'eval \"\$(~/.local/bin/mise activate bash)\"' $HOME/.bashrc"
 check "mise idiomatic version file is enabled for ruby" bash -c "mise settings | grep idiomatic_version_file_enable_tools | grep ruby"
 check "Ruby is installed with YJIT" bash -c "RUBY_YJIT_ENABLE=1 ruby -v | grep +YJIT"
-check "Ruby version is set to 3.4.4" bash -c "mise use -g ruby | grep 3.4.4"
+check "Ruby version is set to 3.4.5" bash -c "mise use -g ruby | grep 3.4.5"
 
 reportResults

features/test/ruby/with_rbenv.sh

@@ -9,6 +9,6 @@ check "rbenv is installed" bash -c "rbenv --version"
 check "ruby-build is installed" bash -c "ls -l $HOME/.rbenv/plugins/ruby-build | grep '\-> /usr/local/share/ruby-build'"
 eval "$(rbenv init -)"
 check "Ruby is installed with YJIT" bash -c "RUBY_YJIT_ENABLE=1 ruby -v | grep +YJIT"
-check "Ruby version is set to 3.4.4" bash -c "rbenv global | grep 3.4.4"
+check "Ruby version is set to 3.4.5" bash -c "rbenv global | grep 3.4.5"
 
 reportResults

package.json

@@ -7,5 +7,8 @@
     "semver": "^7.5.4",
     "@devcontainers/cli": "^0.56.0"
   },
+  "scripts": {
+    "test": "devcontainer features test"
+  },
   "private": true
 }