Compare commits

..
1 Commits
Author SHA1 Message Date
Benoit Daloze 81be0938f7 Add an exported setupRuby() function which can be called from other actions
* Inputs are passed as simple object properties.
* It is recommended to expose the same inputs for other actions.
* See #58 and #33.
2020-06-06 13:52:42 +02:00
2 changed files with 41 additions and 16 deletions
Generated Vendored
+21 -8
View File
@@ -969,6 +969,7 @@ module.exports = require("os");
"use strict"; "use strict";
__webpack_require__.r(__webpack_exports__); __webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "run", function() { return run; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "run", function() { return run; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setupRuby", function() { return setupRuby; });
const os = __webpack_require__(87) const os = __webpack_require__(87)
const fs = __webpack_require__(747) const fs = __webpack_require__(747)
const path = __webpack_require__(622) const path = __webpack_require__(622)
@@ -976,19 +977,31 @@ const core = __webpack_require__(470)
const exec = __webpack_require__(986) const exec = __webpack_require__(986)
const common = __webpack_require__(239) const common = __webpack_require__(239)
const inputDefaults = {
'ruby-version': 'default',
'bundler': 'default',
'working-directory': '.',
}
async function run() { async function run() {
try { try {
await main() const options = {}
for (const key in inputDefaults) {
options[key] = core.getInput(key)
}
await setupRuby(options)
} catch (error) { } catch (error) {
core.setFailed(error.message) core.setFailed(error.message)
} }
} }
async function main() { async function setupRuby(options) {
process.chdir(core.getInput('working-directory')) const inputs = { ...inputDefaults, ...options }
process.chdir(inputs['working-directory'])
const platform = common.getVirtualEnvironmentName() const platform = common.getVirtualEnvironmentName()
const [engine, parsedVersion] = parseRubyEngineAndVersion(core.getInput('ruby-version')) const [engine, parsedVersion] = parseRubyEngineAndVersion(inputs['ruby-version'])
let installer let installer
if (platform === 'windows-latest' && engine !== 'jruby') { if (platform === 'windows-latest' && engine !== 'jruby') {
@@ -1006,9 +1019,9 @@ async function main() {
setupPath(newPathEntries) setupPath(newPathEntries)
if (core.getInput('bundler') !== 'none') { if (inputs['bundler'] !== 'none') {
await common.measure('Installing Bundler', async () => await common.measure('Installing Bundler', async () =>
installBundler(platform, rubyPrefix, engine, version)) installBundler(inputs['bundler'], platform, rubyPrefix, engine, version))
} }
core.setOutput('ruby-prefix', rubyPrefix) core.setOutput('ruby-prefix', rubyPrefix)
@@ -1113,8 +1126,8 @@ function readBundledWithFromGemfileLock() {
return null return null
} }
async function installBundler(platform, rubyPrefix, engine, rubyVersion) { async function installBundler(bundlerVersionInput, platform, rubyPrefix, engine, rubyVersion) {
var bundlerVersion = core.getInput('bundler') var bundlerVersion = bundlerVersionInput
if (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock') { if (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock') {
bundlerVersion = readBundledWithFromGemfileLock() bundlerVersion = readBundledWithFromGemfileLock()
+20 -8
View File
@@ -5,19 +5,31 @@ const core = require('@actions/core')
const exec = require('@actions/exec') const exec = require('@actions/exec')
const common = require('./common') const common = require('./common')
const inputDefaults = {
'ruby-version': 'default',
'bundler': 'default',
'working-directory': '.',
}
export async function run() { export async function run() {
try { try {
await main() const options = {}
for (const key in inputDefaults) {
options[key] = core.getInput(key)
}
await setupRuby(options)
} catch (error) { } catch (error) {
core.setFailed(error.message) core.setFailed(error.message)
} }
} }
async function main() { export async function setupRuby(options) {
process.chdir(core.getInput('working-directory')) const inputs = { ...inputDefaults, ...options }
process.chdir(inputs['working-directory'])
const platform = common.getVirtualEnvironmentName() const platform = common.getVirtualEnvironmentName()
const [engine, parsedVersion] = parseRubyEngineAndVersion(core.getInput('ruby-version')) const [engine, parsedVersion] = parseRubyEngineAndVersion(inputs['ruby-version'])
let installer let installer
if (platform === 'windows-latest' && engine !== 'jruby') { if (platform === 'windows-latest' && engine !== 'jruby') {
@@ -35,9 +47,9 @@ async function main() {
setupPath(newPathEntries) setupPath(newPathEntries)
if (core.getInput('bundler') !== 'none') { if (inputs['bundler'] !== 'none') {
await common.measure('Installing Bundler', async () => await common.measure('Installing Bundler', async () =>
installBundler(platform, rubyPrefix, engine, version)) installBundler(inputs['bundler'], platform, rubyPrefix, engine, version))
} }
core.setOutput('ruby-prefix', rubyPrefix) core.setOutput('ruby-prefix', rubyPrefix)
@@ -142,8 +154,8 @@ function readBundledWithFromGemfileLock() {
return null return null
} }
async function installBundler(platform, rubyPrefix, engine, rubyVersion) { async function installBundler(bundlerVersionInput, platform, rubyPrefix, engine, rubyVersion) {
var bundlerVersion = core.getInput('bundler') var bundlerVersion = bundlerVersionInput
if (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock') { if (bundlerVersion === 'default' || bundlerVersion === 'Gemfile.lock') {
bundlerVersion = readBundledWithFromGemfileLock() bundlerVersion = readBundledWithFromGemfileLock()