setup_script_generator 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7ec2b01a3c93e3cbb3e7e3deae689f7d88dd29b2d0893cb4f1d4e26c5ed344a
-  data.tar.gz: 8bdc8183621193b0f2eb0018f9df970392e85ce27bbdcbb1d7db754db13b630c
+  metadata.gz: 9fa313219d3d72070f83b76129dfa4d88b201e6711c7bf4da9ee88743a2e73f0
+  data.tar.gz: f71b035c63680fca762ad81752bf711b239d71f5c4211983a13368e4c5471e6e
 SHA512:
-  metadata.gz: 3c1e243b985514a855cd0ce26ad5e8547b3736fb97bf8e8e148aded638a7ce74bf88084c5c1b6911735332c65d0bc745de41d2925a3995a151419dd7798d6c67
-  data.tar.gz: b93238103f1eda0c4eee8ce39438eb617d63777065ed82ea16858b7e6ada05df2dd951b6372c036dba91ce5f07fc866860d5a47c622c54250d147dc97eda68c7
+  metadata.gz: 05f56f7fab52cb6925f0fe26ab6aa865a7b9e8eb1bffdc9bcc0f9c22730d5edbff03268f77e2401915ac0248265d4895c43f73e25cf98f34e867187de733ca5d
+  data.tar.gz: 36579d3cd1018b4d740d845b8ecdee0b4f2441c12fab9105f3303e15949fb891da913175f3c0fbe461c61402f34cb28ff6306b867aa6cff054e31ab64110ee87

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

@@ -5,11 +5,13 @@ provision-node() {
     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,20 +2,25 @@ 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
 
   ensure-ruby-development-libraries-installed
   ensure-ruby-installed
-  ensure-project-ruby-dependencies-installed
+
+  if [[ -f Gemfile ]]; then
+    ensure-project-ruby-dependencies-installed
+  fi
 }
 
 ensure-ruby-development-libraries-installed() {
@@ -48,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 "\
@@ -73,7 +72,7 @@ has-bundler() {
 ensure-project-ruby-dependencies-installed() {
   banner 'Installing Ruby dependencies'
 
-  if [[ $USE_BUNDLER_1 -eq 1 ]] && (! has-bundler || ! [[ $(bundle -v) =~ '^1\.' ]]); then
+  if [[ $USE_BUNDLER_1 -eq 1 ]] && (! has-bundler || ! [[ $(bundle -v) =~ '^Bundler version 1\.' ]]); then
     gem install bundler -v '~> 1.0'
   elif ! has-bundler; then
     gem install bundler

data/lib/setup_script_generator/version.rb

@@ -1,3 +1,3 @@
 module SetupScriptGenerator
-  VERSION = "0.2.5".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.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Elliot Winkler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-11-08 00:00:00.000000000 Z
 dependencies: []
 description:
 email: