setup_script_generator 0.2.4 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7abbab871c8809934382abcaded81af412afe8a30837dbbb9337d48e8eb0fb02
-  data.tar.gz: 9b220d798bac841e9436822710fc55f131b284b660cbbad30cd03f3ffb5ca71b
+  metadata.gz: f533df76844601ae39ebb9eab3238e8b46b6742873708248d6a8a79ad8588c7f
+  data.tar.gz: 16e7dfb71bdd2d2fac79c7619803a8d49edfcc2c4766bf12e6b17c3842c8dce1
 SHA512:
-  metadata.gz: b04ff789fdf36f3914d30a3bb1dd37881d637b4566d850a3c5aa681cbdd4570f6f9b11146f4d12b6bf415a026ea93bde4d6ff16e57108c71f3ac25da3ef57385
-  data.tar.gz: 314df7615aa78a2cb4e9881c876e0b1669658bc92f2d9ad5d20c5fbf99ae1fd459688f4daf2a1b8e203c4ce3402d0c5c132c1e39155815abbc34fd1abd14a67e
+  metadata.gz: d2b177f2ff9d47025a20168f54fa105f023071af4472695b52bf32db120e68a83a79f2f0bfe34bd7cc4dd78ededf7f9707f21692ad92cec4925a4e993790722c
+  data.tar.gz: 6059f84fd4d3899d7fa1b9e71d911fdba91b2af0e027e57850621556f8fc3dc2f5a7791ec0f70d52d6e2a406d60aac375839988067047368149b4a6e830a087f

data/lib/setup_script_generator/templates/non-customizable-section.sh.erb

@@ -185,10 +185,6 @@ run-provisions() {
 <% provisions.each do |provision| -%>
   provision-<%= provision.name %>
 <% end -%>
-
-  if type provision-project &>/dev/null; then
-    provision-project
-  fi
 }
 <% end -%>
 

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

@@ -1,6 +1,18 @@
+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=$(cat .tool-versions | grep '^nodejs ' | sed -Ee 's/^nodejs (.+)$/\1/')
+    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
   elif [[ -f .node-version ]]; then
     REQUIRED_NODE_VERSION=$(cat .node-version)
   elif [[ -f .nvmrc ]]; then

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

@@ -15,7 +15,10 @@ project before you can run this script."
 
   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() {
@@ -73,7 +76,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.4".freeze
+  VERSION = "0.2.9".freeze
 end

metadata

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