Try to trigger CI on push to branches but not to tags

* Running CI on tag is redundant with the branch push.
* Do not build on pushes to v1 as CI already ran on the master commit before.

.github/workflows/test.yml

@@ -1,5 +1,12 @@
 name: Test this action
-on: [push]
+on:
+  push:
+    branches-ignore:
+    - v1
+    tags-ignore:
+    - '*'
+    paths-ignore:
+    - README.md
 jobs:
   test:
     strategy:
@@ -24,13 +31,15 @@ jobs:
     - run: ruby --version
     - run: ridk version
       if: matrix.os == 'windows-latest'
+    - name: OpenSSL version
+      run: ruby -ropenssl -e 'puts OpenSSL::OPENSSL_LIBRARY_VERSION'
     - name: OpenSSL test
-      run: ruby -ropen-uri -e 'puts open(%{https://rubygems.org/}) { |f| f.read(2014) }'
+      run: ruby -ropen-uri -e 'puts open(%{https://rubygems.org/}) { |f| f.read(1024) }'
     - name: C extension test
       run: gem install json --no-document
-    - name: Check that Bundler is installed
+    - name: Bundler version
       run: bundle --version
-    - name: Check that Bundler works
+    - name: Bundler test
       run: bundle install
 
   lint:

README.md

@@ -1,8 +1,8 @@
-# use-ruby
+# use-ruby-action
 
-This action downloads a prebuilt ruby and adds it to `$PATH`.
+This action downloads a prebuilt ruby and adds it to the `PATH`.
 
-It is very efficient and takes about 5 seconds to download, extract and add the given Ruby to `$PATH`.
+It is very efficient and takes about 5 seconds to download, extract and add the given Ruby to the `PATH`.
 No extra packages need to be installed.
 
 ### Supported Versions
@@ -15,11 +15,7 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 | JRuby | 9.2.9.0 |
 | TruffleRuby  | 19.3.0, 19.3.1 |
 
-The recommended way to refer to these versions is:
-`2.3`, `2.4`, `2.5`, `2.6`, `2.7`, `jruby`, `truffleruby`.  
-That way, the latest compatible release is used, which contains the most bug fixes.
-
-See https://github.com/eregon/ruby-install-builder/blob/metadata/versions.json
+See [versions.json](https://github.com/eregon/ruby-install-builder/blob/metadata/versions.json)
 for the always up-to-date list of available Ruby versions.
 
 Note that Ruby 2.3 and the OpenSSL version it needs (1.0.2) are both end-of-life,
@@ -28,13 +24,18 @@ On Windows, Ruby 2.4 uses OpenSSL 1.0.2, which is no longer maintained.
 
 ### Supported Platforms
 
-The action works for all GitHub-hosted runners:
-`ubuntu-16.04`, `ubuntu-18.04`, `macos-latest` and `windows-latest`.
+The action works for all [GitHub-hosted runners](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners).
+
+| Operating System | Versions |
+| ----------- | -------- |
+| Ubuntu  | `ubuntu-latest` (= `ubuntu-18.04`), `ubuntu-16.04` |
+| macOS   | `macos-latest` |
+| Windows | `windows-latest` |
 
 Ruby 2.3, JRuby and TruffleRuby are not yet supported on `windows-latest`.
 
-The prebuilt rubies are generated by https://github.com/eregon/ruby-install-builder
-and on Windows by https://github.com/oneclick/rubyinstaller2.
+The prebuilt rubies are generated by [eregon/ruby-install-builder](https://github.com/eregon/ruby-install-builder)
+and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).
 
 ## Usage
 
@@ -48,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: eregon/use-ruby-action@master
+    - uses: eregon/use-ruby-action@v1
       with:
         ruby-version: 2.6
     - run: ruby -v
@@ -71,7 +72,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - uses: eregon/use-ruby-action@master
+    - uses: eregon/use-ruby-action@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - run: ruby -v
@@ -119,6 +120,11 @@ Make sure to include `use-ruby` in the `key` to avoid conflicting with previous
 
 * This action currently only works with GitHub-hosted runners, not private runners.
 
+## Versioning
+
+This action follows semantic versioning with a moving `v1` branch.
+This follows the [recommendations](https://github.com/actions/toolkit/blob/master/docs/action-versioning.md) of GitHub Actions.
+
 ## Credits
 
 Most of the Windows logic is from https://github.com/MSP-Greg/actions-ruby by MSP-Greg.

action.yml

@@ -1,5 +1,5 @@
 name: 'Setup Ruby, JRuby and TruffleRuby'
-description: 'Download a prebuilt Ruby and add it to $PATH in 5 seconds'
+description: 'Download a prebuilt Ruby and add it to the PATH in 5 seconds'
 author: 'Benoit Daloze'
 branding:
   color: red

dist/index.js

@@ -1382,56 +1382,30 @@ module.exports = require("os");
 const os = __webpack_require__(87)
 const fs = __webpack_require__(747)
 const core = __webpack_require__(470)
-const io = __webpack_require__(1)
-const tc = __webpack_require__(533)
-const axios = __webpack_require__(53)
-const windows = __webpack_require__(664)
-
-const releasesURL = 'https://github.com/eregon/ruby-install-builder/releases'
-const metadataURL = 'https://raw.githubusercontent.com/eregon/ruby-install-builder/metadata'
 
 async function run() {
   try {
     const platform = getVirtualEnvironmentName()
-    const ruby = await getRubyEngineAndVersion(core.getInput('ruby-version'))
-
-    let rubyPrefix
+    let installer
     if (platform === 'windows-latest') {
-      rubyPrefix = await windows.downloadExtractAndSetPATH(ruby)
+      installer = __webpack_require__(826)
     } else {
-      if (ruby.startsWith('jruby')) {
-        // Workaround for https://github.com/actions/virtual-environments/issues/242
-        core.exportVariable('CLASSPATH', '')
-      }
-      rubyPrefix = await downloadAndExtract(platform, ruby)
-      core.addPath(`${rubyPrefix}/bin`)
+      installer = __webpack_require__(442)
     }
+
+    const input = core.getInput('ruby-version')
+    const [engine, version] = parseRubyEngineAndVersion(input)
+    const engineVersions = await installer.getAvailableVersions(engine)
+    const ruby = validateRubyEngineAndVersion(engineVersions, input, engine, version)
+
+    const rubyPrefix = await installer.install(platform, ruby)
     core.setOutput('ruby-prefix', rubyPrefix)
   } catch (error) {
     core.setFailed(error.message)
   }
 }
 
-async function downloadAndExtract(platform, ruby) {
-  const rubiesDir = `${process.env.HOME}/.rubies`
-  await io.mkdirP(rubiesDir)
-
-  const tag = await getLatestReleaseTag()
-  const url = `${releasesURL}/download/${tag}/${ruby}-${platform}.tar.gz`
-  console.log(url)
-
-  const downloadPath = await tc.downloadTool(url)
-  await tc.extractTar(downloadPath, rubiesDir)
-
-  return `${rubiesDir}/${ruby}`
-}
-
-async function getLatestReleaseTag() {
-  const response = await axios.get(`${metadataURL}/latest_release.tag`)
-  return response.data.trim()
-}
-
-async function getRubyEngineAndVersion(rubyVersion) {
+function parseRubyEngineAndVersion(rubyVersion) {
   if (rubyVersion === '.ruby-version') { // Read from .ruby-version
     rubyVersion = fs.readFileSync('.ruby-version', 'utf8').trim()
     console.log(`Using ${rubyVersion} as input from file .ruby-version`)
@@ -1448,11 +1422,12 @@ async function getRubyEngineAndVersion(rubyVersion) {
     [engine, version] = rubyVersion.split('-', 2)
   }
 
-  const response = await axios.get(`${metadataURL}/versions.json`)
-  const stableVersions = response.data
-  const engineVersions = stableVersions[engine]
+  return [engine, version]
+}
+
+function validateRubyEngineAndVersion(engineVersions, input, engine, version) {
   if (!engineVersions) {
-    throw new Error(`Unknown engine ${engine} (input: ${rubyVersion})`)
+    throw new Error(`Unknown engine ${engine} (input: ${input})`)
   }
 
   if (!engineVersions.includes(version)) {
@@ -1462,9 +1437,9 @@ async function getRubyEngineAndVersion(rubyVersion) {
       version = found
     } else {
       throw new Error(`Unknown version ${version} for ${engine}
-        input: ${rubyVersion}
+        input: ${input}
         available versions for ${engine}: ${engineVersions.join(', ')}
-        File an issue at https://github.com/eregon/ruby-install-builder/issues if would like support for a new version`)
+        File an issue at https://github.com/eregon/use-ruby-action/issues if would like support for a new version`)
     }
   }
 
@@ -1473,11 +1448,11 @@ async function getRubyEngineAndVersion(rubyVersion) {
 
 function getVirtualEnvironmentName() {
   const platform = os.platform()
-  if (platform == 'linux') {
+  if (platform === 'linux') {
     return `ubuntu-${findUbuntuVersion()}`
-  } else if (platform == 'darwin') {
+  } else if (platform === 'darwin') {
     return 'macos-latest'
-  } else if (platform == 'win32') {
+  } else if (platform === 'win32') {
     return 'windows-latest'
   } else {
     throw new Error(`Unknown platform ${platform}`)
@@ -4865,6 +4840,50 @@ function escape(s) {
 }
 //# sourceMappingURL=command.js.map
 
+/***/ }),
+
+/***/ 442:
+/***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAvailableVersions", function() { return getAvailableVersions; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "install", function() { return install; });
+const core = __webpack_require__(470)
+const io = __webpack_require__(1)
+const tc = __webpack_require__(533)
+const axios = __webpack_require__(53)
+
+const builderReleaseTag = 'builds-newer-openssl'
+const releasesURL = 'https://github.com/eregon/ruby-install-builder/releases'
+const metadataURL = 'https://raw.githubusercontent.com/eregon/ruby-install-builder/metadata'
+
+async function getAvailableVersions(engine) {
+  const response = await axios.get(`${metadataURL}/versions.json`)
+  const versions = response.data
+  return versions[engine]
+}
+
+async function install(platform, ruby) {
+  const rubyPrefix = await downloadAndExtract(platform, ruby)
+  core.addPath(`${rubyPrefix}/bin`)
+  return rubyPrefix
+}
+
+async function downloadAndExtract(platform, ruby) {
+  const rubiesDir = `${process.env.HOME}/.rubies`
+  await io.mkdirP(rubiesDir)
+
+  const url = `${releasesURL}/download/${builderReleaseTag}/${ruby}-${platform}.tar.gz`
+  console.log(url)
+
+  const downloadPath = await tc.downloadTool(url)
+  await tc.extractTar(downloadPath, rubiesDir)
+
+  return `${rubiesDir}/${ruby}`
+}
+
+
 /***/ }),
 
 /***/ 470:
@@ -5067,6 +5086,42 @@ function getState(name) {
 exports.getState = getState;
 //# sourceMappingURL=core.js.map
 
+/***/ }),
+
+/***/ 494:
+/***/ (function(module, __unusedexports, __webpack_require__) {
+
+var rng = __webpack_require__(139);
+var bytesToUuid = __webpack_require__(722);
+
+function v4(options, buf, offset) {
+  var i = buf && offset || 0;
+
+  if (typeof(options) == 'string') {
+    buf = options === 'binary' ? new Array(16) : null;
+    options = null;
+  }
+  options = options || {};
+
+  var rnds = options.random || (options.rng || rng)();
+
+  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+  rnds[6] = (rnds[6] & 0x0f) | 0x40;
+  rnds[8] = (rnds[8] & 0x3f) | 0x80;
+
+  // Copy bytes to buffer, if provided
+  if (buf) {
+    for (var ii = 0; ii < 16; ++ii) {
+      buf[i + ii] = rnds[ii];
+    }
+  }
+
+  return buf || bytesToUuid(rnds);
+}
+
+module.exports = v4;
+
+
 /***/ }),
 
 /***/ 529:
@@ -5197,7 +5252,7 @@ const os = __webpack_require__(87);
 const path = __webpack_require__(622);
 const httpm = __webpack_require__(874);
 const semver = __webpack_require__(280);
-const uuidV4 = __webpack_require__(826);
+const uuidV4 = __webpack_require__(494);
 const exec_1 = __webpack_require__(986);
 const assert_1 = __webpack_require__(357);
 class HTTPError extends Error {
@@ -5618,6 +5673,39 @@ function _evaluateVersions(versions, versionSpec) {
 }
 //# sourceMappingURL=tool-cache.js.map
 
+/***/ }),
+
+/***/ 538:
+/***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "versions", function() { return versions; });
+const versions = {
+  "2.4.1": "https://github.com/oneclick/rubyinstaller2/releases/download/2.4.1-2/rubyinstaller-2.4.1-2-x64.7z",
+  "2.4.2": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.2-2/rubyinstaller-2.4.2-2-x64.7z",
+  "2.4.3": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.3-2/rubyinstaller-2.4.3-2-x64.7z",
+  "2.4.4": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.4-2/rubyinstaller-2.4.4-2-x64.7z",
+  "2.4.5": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.5-1/rubyinstaller-2.4.5-1-x64.7z",
+  "2.4.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.6-1/rubyinstaller-2.4.6-1-x64.7z",
+  "2.4.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.7-1/rubyinstaller-2.4.7-1-x64.7z",
+  "2.4.9": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.9-1/rubyinstaller-2.4.9-1-x64.7z",
+  "2.5.0": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.0-2/rubyinstaller-2.5.0-2-x64.7z",
+  "2.5.1": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.1-2/rubyinstaller-2.5.1-2-x64.7z",
+  "2.5.3": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.3-1/rubyinstaller-2.5.3-1-x64.7z",
+  "2.5.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.5-1/rubyinstaller-2.5.5-1-x64.7z",
+  "2.5.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.6-1/rubyinstaller-2.5.6-1-x64.7z",
+  "2.5.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.7-1/rubyinstaller-2.5.7-1-x64.7z",
+  "2.6.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.0-1/rubyinstaller-2.6.0-1-x64.7z",
+  "2.6.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.1-1/rubyinstaller-2.6.1-1-x64.7z",
+  "2.6.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.2-1/rubyinstaller-2.6.2-1-x64.7z",
+  "2.6.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.3-1/rubyinstaller-2.6.3-1-x64.7z",
+  "2.6.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-2.6.4-1-x64.7z",
+  "2.6.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-2.6.5-1-x64.7z",
+  "2.7.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x64.7z"
+}
+
+
 /***/ }),
 
 /***/ 549:
@@ -6461,84 +6549,6 @@ function plural(ms, n, name) {
 }
 
 
-/***/ }),
-
-/***/ 664:
-/***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "downloadExtractAndSetPATH", function() { return downloadExtractAndSetPATH; });
-// Most of this logic is from
-// https://github.com/MSP-Greg/actions-ruby/blob/master/lib/main.js
-
-const fs = __webpack_require__(747)
-const core = __webpack_require__(470)
-const exec = __webpack_require__(986)
-const tc = __webpack_require__(533)
-
-const releasesURL = 'https://github.com/oneclick/rubyinstaller2/releases'
-
-async function downloadExtractAndSetPATH(ruby) {
-  const version = ruby.split('-', 2)[1]
-  if (!ruby.startsWith('ruby-') || version.startsWith('2.3')) {
-    throw new Error(`Only ruby >= 2.4 is supported on Windows currently (input: ${ruby})`)
-  }
-  const tag = `RubyInstaller-${version}-1`
-  const base = `${tag.toLowerCase()}-x64`
-
-  const url = `${releasesURL}/download/${tag}/${base}.7z`
-  console.log(url)
-
-  const downloadPath = await tc.downloadTool(url)
-  await exec.exec(`7z x ${downloadPath} -xr!${base}\\share\\doc -oC:\\`)
-  const rubyPrefix = `C:\\${base}`
-
-  const msys2 = await linkMSYS2()
-  const newPath = setupPath(msys2, rubyPrefix)
-  core.exportVariable('PATH', newPath)
-
-  if (!fs.existsSync(`${rubyPrefix}\\bin\\bundle.cmd`)) {
-    await exec.exec(`${rubyPrefix}\\bin\\gem install bundler -v "~> 1" --no-document`)
-  }
-
-  return rubyPrefix
-}
-
-async function linkMSYS2() {
-  const toolCacheVersions = tc.findAllVersions('Ruby')
-  toolCacheVersions.sort()
-  if (toolCacheVersions.length == 0) {
-    throw new Error('Could not find MSYS2 in the toolcache')
-  }
-  const latestVersion = toolCacheVersions.slice(-1)[0]
-  const latestHostedRuby = tc.find('Ruby', latestVersion)
-
-  const hostedMSYS2 = `${latestHostedRuby}\\msys64`
-  const msys2 = 'C:\\msys64'
-  await exec.exec(`cmd /c mklink /D ${msys2} ${hostedMSYS2}`)
-  return msys2
-}
-
-function setupPath(msys2, rubyPrefix) {
-  let path = process.env['PATH'].split(';')
-
-  // Remove conflicting dev tools from PATH
-  path = path.filter(e => !e.match(/\b(Chocolatey|CMake|mingw64|OpenSSL|Strawberry)\b/))
-
-  // Remove default Ruby in PATH
-  path = path.filter(e => !e.match(/\bRuby\b/))
-
-  // Add MSYS2 in PATH
-  path.unshift(`${msys2}\\mingw64\\bin`, `${msys2}\\usr\\bin`)
-
-  // Add the downloaded Ruby in PATH
-  path.unshift(`${rubyPrefix}\\bin`)
-
-  return path.join(';')
-}
-
-
 /***/ }),
 
 /***/ 669:
@@ -7747,37 +7757,86 @@ module.exports = function mergeConfig(config1, config2) {
 /***/ }),
 
 /***/ 826:
-/***/ (function(module, __unusedexports, __webpack_require__) {
+/***/ (function(__unusedmodule, __webpack_exports__, __webpack_require__) {
 
-var rng = __webpack_require__(139);
-var bytesToUuid = __webpack_require__(722);
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAvailableVersions", function() { return getAvailableVersions; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "install", function() { return install; });
+// Most of this logic is from
+// https://github.com/MSP-Greg/actions-ruby/blob/master/lib/main.js
 
-function v4(options, buf, offset) {
-  var i = buf && offset || 0;
+const fs = __webpack_require__(747)
+const core = __webpack_require__(470)
+const exec = __webpack_require__(986)
+const tc = __webpack_require__(533)
+const rubyInstallerVersions = __webpack_require__(538).versions
 
-  if (typeof(options) == 'string') {
-    buf = options === 'binary' ? new Array(16) : null;
-    options = null;
+async function getAvailableVersions(engine) {
+  if (engine === 'ruby') {
+    return Object.keys(rubyInstallerVersions)
+  } else {
+    return undefined
   }
-  options = options || {};
-
-  var rnds = options.random || (options.rng || rng)();
-
-  // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
-  rnds[6] = (rnds[6] & 0x0f) | 0x40;
-  rnds[8] = (rnds[8] & 0x3f) | 0x80;
-
-  // Copy bytes to buffer, if provided
-  if (buf) {
-    for (var ii = 0; ii < 16; ++ii) {
-      buf[i + ii] = rnds[ii];
-    }
-  }
-
-  return buf || bytesToUuid(rnds);
 }
 
-module.exports = v4;
+async function install(platform, ruby) {
+  const version = ruby.split('-', 2)[1]
+  const url = rubyInstallerVersions[version]
+  console.log(url)
+
+  if (!url.endsWith('.7z')) {
+    throw new Error('URL should end in .7z')
+  }
+  const base = url.slice(url.lastIndexOf('/') + 1, url.length - '.7z'.length)
+
+  const downloadPath = await tc.downloadTool(url)
+  await exec.exec(`7z x ${downloadPath} -xr!${base}\\share\\doc -oC:\\`)
+  const rubyPrefix = `C:\\${base}`
+
+  const msys2 = await linkMSYS2()
+  const newPath = setupPath(msys2, rubyPrefix)
+  core.exportVariable('PATH', newPath)
+
+  if (!fs.existsSync(`${rubyPrefix}\\bin\\bundle.cmd`)) {
+    await exec.exec(`${rubyPrefix}\\bin\\gem install bundler -v "~> 1" --no-document`)
+  }
+
+  return rubyPrefix
+}
+
+async function linkMSYS2() {
+  const toolCacheVersions = tc.findAllVersions('Ruby')
+  toolCacheVersions.sort()
+  if (toolCacheVersions.length === 0) {
+    throw new Error('Could not find MSYS2 in the toolcache')
+  }
+  const latestVersion = toolCacheVersions.slice(-1)[0]
+  const latestHostedRuby = tc.find('Ruby', latestVersion)
+
+  const hostedMSYS2 = `${latestHostedRuby}\\msys64`
+  const msys2 = 'C:\\msys64'
+  await exec.exec(`cmd /c mklink /D ${msys2} ${hostedMSYS2}`)
+  return msys2
+}
+
+function setupPath(msys2, rubyPrefix) {
+  let path = process.env['PATH'].split(';')
+
+  // Remove conflicting dev tools from PATH
+  path = path.filter(e => !e.match(/\b(Chocolatey|CMake|mingw64|OpenSSL|Strawberry)\b/))
+
+  // Remove default Ruby in PATH
+  path = path.filter(e => !e.match(/\bRuby\b/))
+
+  // Add MSYS2 in PATH
+  path.unshift(`${msys2}\\mingw64\\bin`, `${msys2}\\usr\\bin`)
+
+  // Add the downloaded Ruby in PATH
+  path.unshift(`${rubyPrefix}\\bin`)
+
+  return path.join(';')
+}
 
 
 /***/ }),

generate-ruby-installer-versions.rb

@@ -0,0 +1,27 @@
+require 'net/http'
+require 'yaml'
+require 'json'
+
+url = 'https://raw.githubusercontent.com/oneclick/rubyinstaller.org-website/master/_data/downloads.yaml'
+entries = YAML.load(Net::HTTP.get(URI(url)), symbolize_names: true)
+
+versions = entries.select { |entry|
+  entry[:filetype] == 'rubyinstaller7z' and
+  entry[:name].include?('(x64)')
+}.group_by { |entry|
+  entry[:name][/Ruby (\d+\.\d+\.\d+)/, 1]
+}.map { |version, builds|
+  unless builds.sort_by { |build| build[:name] } == builds.reverse
+    raise "not sorted as expected for #{version}"
+  end
+  [version, builds.first]
+}.sort_by { |version, entry|
+  version
+}.select { |version, entry|
+  version >= "2.4"
+}.map { |version, entry|
+  [version, entry[:href]]
+}.to_h
+
+js = "export const versions = #{JSON.pretty_generate(versions)}\n"
+File.write 'ruby-installer-versions.js', js

index.js

@@ -1,56 +1,30 @@
 const os = require('os')
 const fs = require('fs')
 const core = require('@actions/core')
-const io = require('@actions/io')
-const tc = require('@actions/tool-cache')
-const axios = require('axios')
-const windows = require('./windows')
-
-const releasesURL = 'https://github.com/eregon/ruby-install-builder/releases'
-const metadataURL = 'https://raw.githubusercontent.com/eregon/ruby-install-builder/metadata'
 
 async function run() {
   try {
     const platform = getVirtualEnvironmentName()
-    const ruby = await getRubyEngineAndVersion(core.getInput('ruby-version'))
-
-    let rubyPrefix
+    let installer
     if (platform === 'windows-latest') {
-      rubyPrefix = await windows.downloadExtractAndSetPATH(ruby)
+      installer = require('./windows')
     } else {
-      if (ruby.startsWith('jruby')) {
-        // Workaround for https://github.com/actions/virtual-environments/issues/242
-        core.exportVariable('CLASSPATH', '')
-      }
-      rubyPrefix = await downloadAndExtract(platform, ruby)
-      core.addPath(`${rubyPrefix}/bin`)
+      installer = require('./ruby-install-builder')
     }
+
+    const input = core.getInput('ruby-version')
+    const [engine, version] = parseRubyEngineAndVersion(input)
+    const engineVersions = await installer.getAvailableVersions(engine)
+    const ruby = validateRubyEngineAndVersion(engineVersions, input, engine, version)
+
+    const rubyPrefix = await installer.install(platform, ruby)
     core.setOutput('ruby-prefix', rubyPrefix)
   } catch (error) {
     core.setFailed(error.message)
   }
 }
 
-async function downloadAndExtract(platform, ruby) {
-  const rubiesDir = `${process.env.HOME}/.rubies`
-  await io.mkdirP(rubiesDir)
-
-  const tag = await getLatestReleaseTag()
-  const url = `${releasesURL}/download/${tag}/${ruby}-${platform}.tar.gz`
-  console.log(url)
-
-  const downloadPath = await tc.downloadTool(url)
-  await tc.extractTar(downloadPath, rubiesDir)
-
-  return `${rubiesDir}/${ruby}`
-}
-
-async function getLatestReleaseTag() {
-  const response = await axios.get(`${metadataURL}/latest_release.tag`)
-  return response.data.trim()
-}
-
-async function getRubyEngineAndVersion(rubyVersion) {
+function parseRubyEngineAndVersion(rubyVersion) {
   if (rubyVersion === '.ruby-version') { // Read from .ruby-version
     rubyVersion = fs.readFileSync('.ruby-version', 'utf8').trim()
     console.log(`Using ${rubyVersion} as input from file .ruby-version`)
@@ -67,11 +41,12 @@ async function getRubyEngineAndVersion(rubyVersion) {
     [engine, version] = rubyVersion.split('-', 2)
   }
 
-  const response = await axios.get(`${metadataURL}/versions.json`)
-  const stableVersions = response.data
-  const engineVersions = stableVersions[engine]
+  return [engine, version]
+}
+
+function validateRubyEngineAndVersion(engineVersions, input, engine, version) {
   if (!engineVersions) {
-    throw new Error(`Unknown engine ${engine} (input: ${rubyVersion})`)
+    throw new Error(`Unknown engine ${engine} (input: ${input})`)
   }
 
   if (!engineVersions.includes(version)) {
@@ -81,9 +56,9 @@ async function getRubyEngineAndVersion(rubyVersion) {
       version = found
     } else {
       throw new Error(`Unknown version ${version} for ${engine}
-        input: ${rubyVersion}
+        input: ${input}
         available versions for ${engine}: ${engineVersions.join(', ')}
-        File an issue at https://github.com/eregon/ruby-install-builder/issues if would like support for a new version`)
+        File an issue at https://github.com/eregon/use-ruby-action/issues if would like support for a new version`)
     }
   }
 
@@ -92,11 +67,11 @@ async function getRubyEngineAndVersion(rubyVersion) {
 
 function getVirtualEnvironmentName() {
   const platform = os.platform()
-  if (platform == 'linux') {
+  if (platform === 'linux') {
     return `ubuntu-${findUbuntuVersion()}`
-  } else if (platform == 'darwin') {
+  } else if (platform === 'darwin') {
     return 'macos-latest'
-  } else if (platform == 'win32') {
+  } else if (platform === 'win32') {
     return 'windows-latest'
   } else {
     throw new Error(`Unknown platform ${platform}`)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "use-ruby-action",
   "version": "0.1.0",
-  "description": "Download a prebuilt ruby and add it to $PATH",
+  "description": "Download a prebuilt Ruby and add it to the PATH in 5 seconds",
   "main": "index.js",
   "scripts": {
     "lint": "eslint *.js",
@@ -24,6 +24,7 @@
   "homepage": "https://github.com/eregon/use-ruby-action",
   "dependencies": {
     "@actions/core": "^1.1.1",
+    "@actions/exec": "^1.0.1",
     "@actions/io": "^1.0.1",
     "@actions/tool-cache": "^1.1.2",
     "axios": "^0.19.0"

ruby-install-builder.js

@@ -0,0 +1,33 @@
+const core = require('@actions/core')
+const io = require('@actions/io')
+const tc = require('@actions/tool-cache')
+const axios = require('axios')
+
+const builderReleaseTag = 'builds-newer-openssl'
+const releasesURL = 'https://github.com/eregon/ruby-install-builder/releases'
+const metadataURL = 'https://raw.githubusercontent.com/eregon/ruby-install-builder/metadata'
+
+export async function getAvailableVersions(engine) {
+  const response = await axios.get(`${metadataURL}/versions.json`)
+  const versions = response.data
+  return versions[engine]
+}
+
+export async function install(platform, ruby) {
+  const rubyPrefix = await downloadAndExtract(platform, ruby)
+  core.addPath(`${rubyPrefix}/bin`)
+  return rubyPrefix
+}
+
+async function downloadAndExtract(platform, ruby) {
+  const rubiesDir = `${process.env.HOME}/.rubies`
+  await io.mkdirP(rubiesDir)
+
+  const url = `${releasesURL}/download/${builderReleaseTag}/${ruby}-${platform}.tar.gz`
+  console.log(url)
+
+  const downloadPath = await tc.downloadTool(url)
+  await tc.extractTar(downloadPath, rubiesDir)
+
+  return `${rubiesDir}/${ruby}`
+}

ruby-installer-versions.js

@@ -0,0 +1,23 @@
+export const versions = {
+  "2.4.1": "https://github.com/oneclick/rubyinstaller2/releases/download/2.4.1-2/rubyinstaller-2.4.1-2-x64.7z",
+  "2.4.2": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.2-2/rubyinstaller-2.4.2-2-x64.7z",
+  "2.4.3": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.3-2/rubyinstaller-2.4.3-2-x64.7z",
+  "2.4.4": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.4-2/rubyinstaller-2.4.4-2-x64.7z",
+  "2.4.5": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.4.5-1/rubyinstaller-2.4.5-1-x64.7z",
+  "2.4.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.6-1/rubyinstaller-2.4.6-1-x64.7z",
+  "2.4.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.7-1/rubyinstaller-2.4.7-1-x64.7z",
+  "2.4.9": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.4.9-1/rubyinstaller-2.4.9-1-x64.7z",
+  "2.5.0": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.0-2/rubyinstaller-2.5.0-2-x64.7z",
+  "2.5.1": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.1-2/rubyinstaller-2.5.1-2-x64.7z",
+  "2.5.3": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-2.5.3-1/rubyinstaller-2.5.3-1-x64.7z",
+  "2.5.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.5-1/rubyinstaller-2.5.5-1-x64.7z",
+  "2.5.6": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.6-1/rubyinstaller-2.5.6-1-x64.7z",
+  "2.5.7": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.5.7-1/rubyinstaller-2.5.7-1-x64.7z",
+  "2.6.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.0-1/rubyinstaller-2.6.0-1-x64.7z",
+  "2.6.1": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.1-1/rubyinstaller-2.6.1-1-x64.7z",
+  "2.6.2": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.2-1/rubyinstaller-2.6.2-1-x64.7z",
+  "2.6.3": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.3-1/rubyinstaller-2.6.3-1-x64.7z",
+  "2.6.4": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.4-1/rubyinstaller-2.6.4-1-x64.7z",
+  "2.6.5": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.5-1/rubyinstaller-2.6.5-1-x64.7z",
+  "2.7.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x64.7z"
+}

windows.js

@@ -5,20 +5,26 @@ const fs = require('fs')
 const core = require('@actions/core')
 const exec = require('@actions/exec')
 const tc = require('@actions/tool-cache')
+const rubyInstallerVersions = require('./ruby-installer-versions').versions
 
-const releasesURL = 'https://github.com/oneclick/rubyinstaller2/releases'
-
-export async function downloadExtractAndSetPATH(ruby) {
-  const version = ruby.split('-', 2)[1]
-  if (!ruby.startsWith('ruby-') || version.startsWith('2.3')) {
-    throw new Error(`Only ruby >= 2.4 is supported on Windows currently (input: ${ruby})`)
+export async function getAvailableVersions(engine) {
+  if (engine === 'ruby') {
+    return Object.keys(rubyInstallerVersions)
+  } else {
+    return undefined
   }
-  const tag = `RubyInstaller-${version}-1`
-  const base = `${tag.toLowerCase()}-x64`
+}
 
-  const url = `${releasesURL}/download/${tag}/${base}.7z`
+export async function install(platform, ruby) {
+  const version = ruby.split('-', 2)[1]
+  const url = rubyInstallerVersions[version]
   console.log(url)
 
+  if (!url.endsWith('.7z')) {
+    throw new Error('URL should end in .7z')
+  }
+  const base = url.slice(url.lastIndexOf('/') + 1, url.length - '.7z'.length)
+
   const downloadPath = await tc.downloadTool(url)
   await exec.exec(`7z x ${downloadPath} -xr!${base}\\share\\doc -oC:\\`)
   const rubyPrefix = `C:\\${base}`
@@ -37,7 +43,7 @@ export async function downloadExtractAndSetPATH(ruby) {
 async function linkMSYS2() {
   const toolCacheVersions = tc.findAllVersions('Ruby')
   toolCacheVersions.sort()
-  if (toolCacheVersions.length == 0) {
+  if (toolCacheVersions.length === 0) {
     throw new Error('Could not find MSYS2 in the toolcache')
   }
   const latestVersion = toolCacheVersions.slice(-1)[0]