Document the choice of the drive on Windows

* That way it's always perfectly synchronized with the action. In
  practice querying another repository sometimes returned a stale copy.
* Avoids an extra HTTPS request.
* The axios dependency is no longer needed.
* Makes it possible to tweak the versions available according to the platform.

.github/workflows/test.yml

@@ -14,12 +14,16 @@ jobs:
       matrix:
         os: [ ubuntu-16.04, ubuntu-18.04, macos-latest, windows-latest ]
         # Use various version syntaxes here for testing
-        ruby: [ .ruby-version, 2.3, ruby-2.4, 2.5, ruby-2.6.5, 2.7.0, jruby, truffleruby ]
+        ruby: [ .ruby-version, 2.3, ruby-2.4, 2.5, ruby-2.6.5, 2.7.0, jruby, truffleruby, rubinius ]
         exclude:
-        - os: windows-latest
-          ruby: jruby
         - os: windows-latest
           ruby: truffleruby
+        - os: ubuntu-16.04
+          ruby: rubinius
+        - os: macos-latest
+          ruby: rubinius
+        - os: windows-latest
+          ruby: rubinius
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
@@ -31,11 +35,10 @@ jobs:
       if: matrix.os == 'windows-latest' && !startsWith(matrix.ruby, '2.3')
     - name: OpenSSL version
       run: ruby -ropenssl -e 'puts OpenSSL::OPENSSL_LIBRARY_VERSION'
-      if: matrix.os == 'windows-latest'
     - name: OpenSSL test
       run: ruby -ropen-uri -e 'puts open(%{https://rubygems.org/}) { |f| f.read(1024) }'
     - name: C extension test
-      run: gem install json --no-document
+      run: gem install json:2.2.0 --no-document
     - name: Bundler version
       run: bundle --version
     - name: Bundler test

Gemfile

@@ -2,4 +2,4 @@
 source 'https://rubygems.org'
 
 gem "path"
-gem "json"
+gem "json", "2.2.0"

README.md

@@ -13,7 +13,8 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby:
 | ----------- | -------- |
 | Ruby | 2.3.0 - 2.3.8, 2.4.0 - 2.4.9, 2.5.0 - 2.5.7, 2.6.0 - 2.6.5, 2.7.0 |
 | JRuby | 9.2.9.0 |
-| TruffleRuby  | 19.3.0, 19.3.1 |
+| TruffleRuby | 19.3.0, 19.3.1 |
+| Rubinius | 4.13 |
 
 Note that Ruby 2.3 and the OpenSSL version it needs (1.0.2) are both end-of-life,
 which means Ruby 2.3 is unmaintained and considered insecure.
@@ -29,12 +30,12 @@ The action works for all [GitHub-hosted runners](https://help.github.com/en/acti
 | macOS   | `macos-latest` |
 | Windows | `windows-latest` |
 
-JRuby and TruffleRuby are not yet supported on `windows-latest`.
+Rubinius is only available on `ubuntu-latest`.
 
 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).  
-The full list of available Ruby versions can be seen at [versions.json](https://github.com/eregon/ruby-install-builder/blob/metadata/versions.json)
+The full list of available Ruby versions can be seen in [ruby-install-builder-versions.js](ruby-install-builder-versions.js)
-for Ubuntu and macOS and at [ruby-installer-versions.js](https://github.com/eregon/use-ruby-action/blob/master/ruby-installer-versions.js) for Windows.
+for Ubuntu and macOS and in [windows-versions.js](windows-versions.js) for Windows.
 
 ## Usage
 
@@ -102,7 +103,7 @@ You can cache the installed gems with these two steps:
         key: bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/Gemfile.lock') }}
         restore-keys: |
           bundle-use-ruby-${{ matrix.os }}-${{ matrix.ruby }}-
-    - name: Bundle install
+    - name: bundle install
       run: |
         bundle config path vendor/bundle
         bundle install --jobs 4 --retry 3
@@ -112,7 +113,7 @@ When using a single job with a Ruby version, replace `${{ matrix.ruby }}` with t
 When using `.ruby-version`, replace `${{ matrix.ruby }}` with `${{ hashFiles('.ruby-version') }}`.
 
 This uses the [cache action](https://github.com/actions/cache).
-The code above is a more complete version of the [Ruby - Gem example](https://github.com/actions/cache/blob/master/examples.md#ruby---gem).
+The code above is a more complete version of the [Ruby - Bundler example](https://github.com/actions/cache/blob/master/examples.md#ruby---bundler).
 Make sure to include `use-ruby` in the `key` to avoid conflicting with previous caches.
 
 ## Limitations
@@ -127,3 +128,4 @@ This follows the [recommendations](https://github.com/actions/toolkit/blob/maste
 ## Credits
 
 Most of the Windows logic is from https://github.com/MSP-Greg/actions-ruby by MSP-Greg.
+Many thanks to MSP-Greg and Lars Kanis for the help with Ruby Installer.

generate-ruby-installer-versions.rb

@@ -24,4 +24,4 @@ versions = entries.select { |entry|
 }.to_h
 
 js = "export const versions = #{JSON.pretty_generate(versions)}\n"
-File.write 'ruby-installer-versions.js', js
+File.write 'windows-versions.js', js

index.js

@@ -5,17 +5,17 @@ const core = require('@actions/core')
 async function run() {
   try {
     const platform = getVirtualEnvironmentName()
+    const [engine, version] = parseRubyEngineAndVersion(core.getInput('ruby-version'))
+
     let installer
-    if (platform === 'windows-latest') {
+    if (platform === 'windows-latest' && engine !== 'jruby') {
       installer = require('./windows')
     } else {
       installer = require('./ruby-install-builder')
     }
 
-    const input = core.getInput('ruby-version')
+    const engineVersions = installer.getAvailableVersions(platform, engine)
-    const [engine, version] = parseRubyEngineAndVersion(input)
+    const ruby = validateRubyEngineAndVersion(platform, engineVersions, engine, version)
-    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)
@@ -44,9 +44,9 @@ function parseRubyEngineAndVersion(rubyVersion) {
   return [engine, version]
 }
 
-function validateRubyEngineAndVersion(engineVersions, input, engine, version) {
+function validateRubyEngineAndVersion(platform, engineVersions, engine, version) {
   if (!engineVersions) {
-    throw new Error(`Unknown engine ${engine} (input: ${input})`)
+    throw new Error(`Unknown engine ${engine} on ${platform}`)
   }
 
   if (!engineVersions.includes(version)) {
@@ -55,9 +55,8 @@ function validateRubyEngineAndVersion(engineVersions, input, engine, version) {
     if (found) {
       version = found
     } else {
-      throw new Error(`Unknown version ${version} for ${engine}
+      throw new Error(`Unknown version ${version} for ${engine} on ${platform}
-        input: ${input}
+        available versions for ${engine} on ${platform}: ${engineVersions.join(', ')}
-        available versions for ${engine}: ${engineVersions.join(', ')}
         File an issue at https://github.com/eregon/use-ruby-action/issues if would like support for a new version`)
     }
   }

package.json

@@ -26,8 +26,7 @@
     "@actions/core": "^1.1.1",
     "@actions/exec": "^1.0.1",
     "@actions/io": "^1.0.1",
-    "@actions/tool-cache": "^1.1.2",
+    "@actions/tool-cache": "^1.1.2"
-    "axios": "^0.19.0"
   },
   "devDependencies": {
     "@zeit/ncc": "^0.20.5",

ruby-install-builder-versions.js

@@ -0,0 +1,25 @@
+export function getVersions(platform) {
+  const versions = {
+    "ruby": [
+      "2.3.0", "2.3.1", "2.3.2", "2.3.3", "2.3.4", "2.3.5", "2.3.6", "2.3.7", "2.3.8",
+      "2.4.0", "2.4.1", "2.4.2", "2.4.3", "2.4.4", "2.4.5", "2.4.6", "2.4.7", "2.4.9",
+      "2.5.0", "2.5.1", "2.5.2", "2.5.3", "2.5.4", "2.5.5", "2.5.6", "2.5.7",
+      "2.6.0", "2.6.1", "2.6.2", "2.6.3", "2.6.4", "2.6.5",
+      "2.7.0"
+    ],
+    "jruby": [
+      "9.2.9.0"
+    ],
+    "truffleruby": [
+      "19.3.0", "19.3.1"
+    ]
+  }
+
+  if (platform === 'ubuntu-18.04') {
+    versions['rubinius'] = [
+      "4.13"
+    ]
+  }
+
+  return versions
+}

ruby-install-builder.js

@@ -1,26 +1,30 @@
+const os = require('os')
+const path = require('path')
 const core = require('@actions/core')
 const io = require('@actions/io')
 const tc = require('@actions/tool-cache')
-const axios = require('axios')
+const rubyBuilderVersions = require('./ruby-install-builder-versions')
 
 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) {
+export function getAvailableVersions(platform, engine) {
-  const response = await axios.get(`${metadataURL}/versions.json`)
+  return rubyBuilderVersions.getVersions(platform)[engine]
-  const versions = response.data
-  return versions[engine]
 }
 
 export async function install(platform, ruby) {
   const rubyPrefix = await downloadAndExtract(platform, ruby)
-  core.addPath(`${rubyPrefix}/bin`)
+
+  core.addPath(path.join(rubyPrefix, 'bin'))
+  if (ruby.startsWith('rubinius')) {
+    core.addPath(path.join(rubyPrefix, 'gems', 'bin'))
+  }
+
   return rubyPrefix
 }
 
 async function downloadAndExtract(platform, ruby) {
-  const rubiesDir = `${process.env.HOME}/.rubies`
+  const rubiesDir = path.join(os.homedir(), '.rubies')
   await io.mkdirP(rubiesDir)
 
   const url = `${releasesURL}/download/${builderReleaseTag}/${ruby}-${platform}.tar.gz`
@@ -29,5 +33,5 @@ async function downloadAndExtract(platform, ruby) {
   const downloadPath = await tc.downloadTool(url)
   await tc.extractTar(downloadPath, rubiesDir)
 
-  return `${rubiesDir}/${ruby}`
+  return path.join(rubiesDir, ruby)
 }

windows.js

@@ -5,9 +5,9 @@ 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 rubyInstallerVersions = require('./windows-versions').versions
 
-export async function getAvailableVersions(engine) {
+export function getAvailableVersions(platform, engine) {
   if (engine === 'ruby') {
     return Object.keys(rubyInstallerVersions)
   } else {
@@ -25,9 +25,12 @@ export async function install(platform, ruby) {
   }
   const base = url.slice(url.lastIndexOf('/') + 1, url.length - '.7z'.length)
 
+  // Extract to SSD, see https://github.com/eregon/use-ruby-action/pull/14
+  const drive = (process.env['GITHUB_WORKSPACE'] || 'C')[0]
+
   const downloadPath = await tc.downloadTool(url)
-  await exec.exec(`7z x ${downloadPath} -xr!${base}\\share\\doc -oC:\\`)
+  await exec.exec(`7z x ${downloadPath} -xr!${base}\\share\\doc -o${drive}:\\`)
-  const rubyPrefix = `C:\\${base}`
+  const rubyPrefix = `${drive}:\\${base}`
 
   const [hostedRuby, msys2] = await linkMSYS2()
   const newPath = setupPath(msys2, rubyPrefix)

yarn.lock

@@ -108,14 +108,6 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-axios@^0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"
-  integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==
-  dependencies:
-    follow-redirects "1.5.10"
-    is-buffer "^2.0.2"
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -188,13 +180,6 @@ cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-debug@=3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
 debug@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -382,13 +367,6 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
   integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
 
-follow-redirects@1.5.10:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -487,11 +465,6 @@ inquirer@^7.0.0:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-is-buffer@^2.0.2:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
-
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -584,11 +557,6 @@ mkdirp@^0.5.1:
   dependencies:
     minimist "0.0.8"
 
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
 ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"