Add support for Ruby 2.2

* Use Ruby 2.2.6 from RubyInstaller on Windows since there is no more
  recent release of Ruby 2.2.

.github/workflows/test.yml

@@ -14,10 +14,12 @@ 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, rubinius ]
+        ruby: [ .ruby-version, 2.2, 2.3, 2.7.0, ruby-head, jruby, truffleruby, truffleruby-head, rubinius ]
         exclude:
         - os: windows-latest
           ruby: truffleruby
+        - os: windows-latest
+          ruby: truffleruby-head
         - os: ubuntu-16.04
           ruby: rubinius
         - os: macos-latest
@@ -32,17 +34,18 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
     - run: ruby --version
     - run: ridk version
-      if: matrix.os == 'windows-latest' && !startsWith(matrix.ruby, '2.3')
+      if: matrix.os == 'windows-latest' && !startsWith(matrix.ruby, '2.3') && !startsWith(matrix.ruby, '2.2')
+    - name: Subprocess test
+      run: ruby test_subprocess.rb
     - 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(1024) }'
     - name: C extension test
       run: gem install json:2.2.0 --no-document
-    - name: Bundler version
+    - run: bundle --version
-      run: bundle --version
+    - run: bundle install
-    - name: Bundler test
+    - run: bundle exec rake --version
-      run: bundle install
 
   lint:
     runs-on: ubuntu-latest

Gemfile

@@ -1,5 +1,6 @@
 # Used for testing
 source 'https://rubygems.org'
 
+gem "rake"
 gem "path"
 gem "json", "2.2.0"

README.md

@@ -1,24 +1,30 @@
-# use-ruby-action
+# setup-ruby
+
+Note: this action used to be at `eregon/use-ruby-action` and was moved to the `ruby` organization.
 
 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 the `PATH`.
 No extra packages need to be installed.
 
+Compared to [actions/setup-ruby](https://github.com/actions/setup-ruby),
+this actions supports many more versions and features.
+
 ### Supported Versions
 
 This action currently supports these versions of MRI, JRuby and TruffleRuby:
 
 | Interpreter | Versions |
 | ----------- | -------- |
-| 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 |
+| Ruby | 2.2, 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, head |
 | JRuby | 9.2.9.0 |
-| TruffleRuby | 19.3.0, 19.3.1 |
+| TruffleRuby | 19.3.0, 19.3.1, head |
-| Rubinius | 4.13 |
+| Rubinius | 4.14 |
 
-Note that Ruby 2.3 and the OpenSSL version it needs (1.0.2) are both end-of-life,
+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.
+which means Ruby ≤ 2.3 is unmaintained and considered insecure.
 On Windows, Ruby 2.4 uses OpenSSL 1.0.2, which is no longer maintained.
+Ruby 2.2 resolves to 2.2.6 on Windows (last build from RubyInstaller) and 2.2.10 otherwise.
 
 ### Supported Platforms
 
@@ -32,9 +38,10 @@ The action works for all [GitHub-hosted runners](https://help.github.com/en/acti
 
 Rubinius is only available on `ubuntu-latest`.
 
-The prebuilt rubies are generated by [eregon/ruby-install-builder](https://github.com/eregon/ruby-install-builder)
+The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder)
-and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).  
+and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2).
-The full list of available Ruby versions can be seen in [ruby-install-builder-versions.js](ruby-install-builder-versions.js)
+`ruby-head` is generated by [ruby-dev-builder](https://github.com/ruby/ruby-dev-builder) and `truffleruby-head` is generated by [truffleruby-dev-builder](https://github.com/ruby/truffleruby-dev-builder).
+The full list of available Ruby versions can be seen in [ruby-builder-versions.js](ruby-builder-versions.js)
 for Ubuntu and macOS and in [windows-versions.js](windows-versions.js) for Windows.
 
 ## Usage
@@ -49,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: eregon/use-ruby-action@v1
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: 2.6
     - run: ruby -v
@@ -72,7 +79,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - uses: eregon/use-ruby-action@v1
+    - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - run: ruby -v
@@ -127,5 +134,6 @@ This follows the [recommendations](https://github.com/actions/toolkit/blob/maste
 
 ## Credits
 
+The current maintainer of this action is @eregon.
 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.

action.yml

@@ -7,6 +7,7 @@ branding:
 inputs:
   ruby-version:
     description: 'Engine and version to use, see the syntax in the README. Reads from .ruby-version if unset.'
+    required: false
     default: '.ruby-version'
 outputs:
   ruby-prefix:

generate-windows-versions.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'yaml'
 require 'json'
 
+min_version = '2.2.6'
 url = 'https://raw.githubusercontent.com/oneclick/rubyinstaller.org-website/master/_data/downloads.yaml'
 entries = YAML.load(Net::HTTP.get(URI(url)), symbolize_names: true)
 
@@ -18,10 +19,12 @@ versions = entries.select { |entry|
 }.sort_by { |version, entry|
   version
 }.select { |version, entry|
-  version >= "2.3"
+  Gem::Version.new(version) >= Gem::Version.new(min_version)
 }.map { |version, entry|
   [version, entry[:href]]
 }.to_h
 
+versions['head'] = 'https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z'
+
 js = "export const versions = #{JSON.pretty_generate(versions)}\n"
 File.write 'windows-versions.js', js

index.js

@@ -11,7 +11,7 @@ async function run() {
     if (platform === 'windows-latest' && engine !== 'jruby') {
       installer = require('./windows')
     } else {
-      installer = require('./ruby-install-builder')
+      installer = require('./ruby-builder')
     }
 
     const engineVersions = installer.getAvailableVersions(platform, engine)
@@ -51,13 +51,13 @@ function validateRubyEngineAndVersion(platform, engineVersions, engine, version)
 
   if (!engineVersions.includes(version)) {
     const latestToFirstVersion = engineVersions.slice().reverse()
-    const found = latestToFirstVersion.find(v => v.startsWith(version))
+    const found = latestToFirstVersion.find(v => v !== 'head' && v.startsWith(version))
     if (found) {
       version = found
     } else {
       throw new Error(`Unknown version ${version} for ${engine} on ${platform}
         available versions for ${engine} on ${platform}: ${engineVersions.join(', ')}
-        File an issue at https://github.com/eregon/use-ruby-action/issues if would like support for a new version`)
+        File an issue at https://github.com/ruby/setup-ruby/issues if would like support for a new version`)
     }
   }
 

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "use-ruby-action",
+  "name": "setup-ruby",
   "version": "0.1.0",
   "description": "Download a prebuilt Ruby and add it to the PATH in 5 seconds",
   "main": "index.js",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/eregon/use-ruby-action.git"
+    "url": "git+https://github.com/ruby/setup-ruby.git"
   },
   "keywords": [
     "GitHub",
@@ -19,14 +19,15 @@
   "author": "Benoit Daloze",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/eregon/use-ruby-action/issues"
+    "url": "https://github.com/ruby/setup-ruby/issues"
   },
-  "homepage": "https://github.com/eregon/use-ruby-action",
+  "homepage": "https://github.com/ruby/setup-ruby",
   "dependencies": {
     "@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-builder-versions.js

@@ -1,23 +1,26 @@
 export function getVersions(platform) {
   const versions = {
     "ruby": [
+      "2.2.10",
       "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"
+      "2.7.0",
+      "head"
     ],
     "jruby": [
       "9.2.9.0"
     ],
     "truffleruby": [
-      "19.3.0", "19.3.1"
+      "19.3.0", "19.3.1",
+      "head"
     ]
   }
 
   if (platform === 'ubuntu-18.04') {
     versions['rubinius'] = [
-      "4.13"
+      "4.14"
     ]
   }
 

ruby-builder.js

@@ -0,0 +1,57 @@
+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 rubyBuilderVersions = require('./ruby-builder-versions')
+const axios = require('axios')
+
+const builderReleaseTag = 'builds-no-warn'
+const releasesURL = 'https://github.com/ruby/ruby-builder/releases'
+
+export function getAvailableVersions(platform, engine) {
+  return rubyBuilderVersions.getVersions(platform)[engine]
+}
+
+export async function install(platform, ruby) {
+  const rubyPrefix = await downloadAndExtract(platform, ruby)
+
+  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 = path.join(os.homedir(), '.rubies')
+  await io.mkdirP(rubiesDir)
+
+  const url = await getDownloadURL(platform, ruby)
+  console.log(url)
+
+  const downloadPath = await tc.downloadTool(url)
+  await tc.extractTar(downloadPath, rubiesDir)
+
+  return path.join(rubiesDir, ruby)
+}
+
+async function getDownloadURL(platform, ruby) {
+  if (ruby.endsWith('-head')) {
+    return getLatestHeadBuildURL(platform, ruby)
+  } else {
+    return `${releasesURL}/download/${builderReleaseTag}/${ruby}-${platform}.tar.gz`
+  }
+}
+
+async function getLatestHeadBuildURL(platform, ruby) {
+  const engine = ruby.split('-')[0]
+  const repository = `ruby/${engine}-dev-builder`
+  const metadataURL = `https://raw.githubusercontent.com/${repository}/metadata/latest_build.tag`
+  const releasesURL = `https://github.com/${repository}/releases/download`
+
+  const response = await axios.get(metadataURL)
+  const tag = response.data.trim()
+  return `${releasesURL}/${tag}/${ruby}-${platform}.tar.gz`
+}

ruby-install-builder.js

@@ -1,37 +0,0 @@
-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 rubyBuilderVersions = require('./ruby-install-builder-versions')
-
-const builderReleaseTag = 'builds-newer-openssl'
-const releasesURL = 'https://github.com/eregon/ruby-install-builder/releases'
-
-export function getAvailableVersions(platform, engine) {
-  return rubyBuilderVersions.getVersions(platform)[engine]
-}
-
-export async function install(platform, ruby) {
-  const rubyPrefix = await downloadAndExtract(platform, ruby)
-
-  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 = path.join(os.homedir(), '.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 path.join(rubiesDir, ruby)
-}

test_subprocess.rb

@@ -0,0 +1,13 @@
+require 'rbconfig'
+require 'stringio'
+
+puts "CPPFLAGS: #{RbConfig::CONFIG["CPPFLAGS"]}"
+
+$stderr = StringIO.new
+begin
+  system RbConfig.ruby, "-e", "p :OK"
+  out = $stderr.string
+ensure
+  $stderr = STDERR
+end
+abort out unless out.empty?

windows-versions.js

@@ -1,4 +1,5 @@
 export const versions = {
+  "2.2.6": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.2.6-x64-mingw32.7z",
   "2.3.0": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.3.0-x64-mingw32.7z",
   "2.3.1": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.3.1-x64-mingw32.7z",
   "2.3.3": "https://dl.bintray.com/oneclick/rubyinstaller/ruby-2.3.3-x64-mingw32.7z",
@@ -22,5 +23,6 @@ export const versions = {
   "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"
+  "2.7.0": "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.0-1/rubyinstaller-2.7.0-1-x64.7z",
+  "head": "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-head-x64.7z"
 }

windows.js

@@ -25,7 +25,7 @@ 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
+  // Extract to SSD, see https://github.com/ruby/setup-ruby/pull/14
   const drive = (process.env['GITHUB_WORKSPACE'] || 'C')[0]
 
   const downloadPath = await tc.downloadTool(url)
@@ -36,7 +36,7 @@ export async function install(platform, ruby) {
   const newPath = setupPath(msys2, rubyPrefix)
   core.exportVariable('PATH', newPath)
 
-  if (version.startsWith('2.3')) {
+  if (version.startsWith('2.2') || version.startsWith('2.3')) {
     core.exportVariable('SSL_CERT_FILE', `${hostedRuby}\\ssl\\cert.pem`)
   }
 

yarn.lock

@@ -108,6 +108,13 @@ 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.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
+  integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+  dependencies:
+    follow-redirects "1.5.10"
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -180,6 +187,13 @@ 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"
@@ -367,6 +381,13 @@ 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"
@@ -557,6 +578,11 @@ 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"