setup_script_generator 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f533df76844601ae39ebb9eab3238e8b46b6742873708248d6a8a79ad8588c7f
-  data.tar.gz: 16e7dfb71bdd2d2fac79c7619803a8d49edfcc2c4766bf12e6b17c3842c8dce1
+  metadata.gz: 9fa313219d3d72070f83b76129dfa4d88b201e6711c7bf4da9ee88743a2e73f0
+  data.tar.gz: f71b035c63680fca762ad81752bf711b239d71f5c4211983a13368e4c5471e6e
 SHA512:
-  metadata.gz: d2b177f2ff9d47025a20168f54fa105f023071af4472695b52bf32db120e68a83a79f2f0bfe34bd7cc4dd78ededf7f9707f21692ad92cec4925a4e993790722c
-  data.tar.gz: 6059f84fd4d3899d7fa1b9e71d911fdba91b2af0e027e57850621556f8fc3dc2f5a7791ec0f70d52d6e2a406d60aac375839988067047368149b4a6e830a087f
+  metadata.gz: 05f56f7fab52cb6925f0fe26ab6aa865a7b9e8eb1bffdc9bcc0f9c22730d5edbff03268f77e2401915ac0248265d4895c43f73e25cf98f34e867187de733ca5d
+  data.tar.gz: 36579d3cd1018b4d740d845b8ecdee0b4f2441c12fab9105f3303e15949fb891da913175f3c0fbe461c61402f34cb28ff6306b867aa6cff054e31ab64110ee87

data/lib/setup_script_generator/templates/provisions/node.sh

@@ -1,27 +1,17 @@
-read-required-node-version-for-asdf() {
-  (cat .tool-versions | grep '^nodejs ' | sed -Ee 's/^nodejs (.+)$/\1/') || \
-    echo ''
-}
-
 provision-node() {
   if [[ -f .tool-versions ]]; then
-    REQUIRED_NODE_VERSION=$(read-required-node-version-for-asdf)
-
-    if [[ -z $REQUIRED_NODE_VERSION ]]; then
-      error "Could not read required Node version."
-      print-wrapped "\
-Please check that .tool-versions is correct before re-running this script."
-      exit 1
-    fi
+    REQUIRED_NODE_VERSION=$(cat .tool-versions | grep '^nodejs ' | sed -Ee 's/^nodejs (.+)$/\1/')
   elif [[ -f .node-version ]]; then
     REQUIRED_NODE_VERSION=$(cat .node-version)
   elif [[ -f .nvmrc ]]; then
     REQUIRED_NODE_VERSION=$(cat .nvmrc)
-  else
-    error "You don't seem to have a Node version set in your project."
+  fi
+
+  if [[ -z $REQUIRED_NODE_VERSION ]]; then
+    error "Could not determine required Node version for this project."
     print-wrapped "\
-You'll need to create either a .tool-versions file or .nvmrc file in your
-project before you can run this script."
+Your project needs to include either a valid .tool-versions file with a 'nodejs'
+line or a valid .node-version or .nvimrc file."
     exit 1
   fi
 

data/lib/setup_script_generator/templates/provisions/ruby.sh

@@ -2,14 +2,16 @@ provision-ruby() {
   USE_BUNDLER_1=0
 
   if [[ -f .tool-versions ]]; then
-    REQUIRED_RUBY_VERSION=$(cat .tool-versions | grep '^ruby ' | sed -Ee 's/^ruby (.+)$/\1/')
+    REQUIRED_RUBY_VERSION=$(cat .tool-versions | grep '^ruby ' | head -n 1 | sed -Ee 's/^ruby (.+)$/\1/')
   elif [[ -f .ruby-version ]]; then
-    REQUIRED_RUBY_VERSION=$(cat .ruby-version)
-  else
-    error "You don't seem to have a Ruby version set in your project."
+    REQUIRED_RUBY_VERSION=$(cat .ruby-version | head -n 1 | sed -Ee 's/^ruby-([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)$/\1/')
+  fi
+
+  if [[ -z $REQUIRED_RUBY_VERSION ]]; then
+    error "Could not determine required Ruby version for this project."
     print-wrapped "\
-You'll need to create either a .tool-versions file or .ruby-version file in your
-project before you can run this script."
+Your project needs to include either a valid .tool-versions file with a 'ruby'
+line or a valid .ruby-version file."
     exit 1
   fi
 
@@ -51,12 +53,6 @@ ensure-ruby-installed() {
         error "Please use chruby to install Ruby $REQUIRED_RUBY_VERSION!"
       fi
     fi
-  elif has-executable rvm; then
-    if ! (rvm list | grep $required_ruby_version'\>' &>/dev/null); then
-      banner "Installing Ruby $required_ruby_version with rvm"
-      rvm install $required_ruby_version
-      rvm use $required_ruby_version
-    fi
   else
     error "You don't seem to have a Ruby manager installed."
     print-wrapped "\

data/lib/setup_script_generator/version.rb

@@ -1,3 +1,3 @@
 module SetupScriptGenerator
-  VERSION = "0.2.9".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setup_script_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Elliot Winkler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2020-11-08 00:00:00.000000000 Z
 dependencies: []
 description:
 email: