setup_script_generator 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4379891f48bbc0eb854a07195331ea38069bf8757808cf07882aff97c419a29c
-  data.tar.gz: 355658991af90bc45354433fe5c0b4afb32b15cbc0db6916ec54515d8d94f4e6
+  metadata.gz: 5fd5e83995916e6bf77222292688adcd991ad378dffe7fd9ec0e6a578239f03c
+  data.tar.gz: 0465dd858b92c3541770b3e2bf545be75d0fad94ba7edb31cce1884c4f04cbc9
 SHA512:
-  metadata.gz: 396e36d2da122281011f4a12ad962f97d01f5bcff85598ca00f74a89c01f81a839d1eeb4a5491f5d5827078767ec7a0bbdab84e4ba8b264088aed8b338405c20
-  data.tar.gz: c0da9ecdb57e0292bf4c6cbd08f13820eabba6acf1e8774b04ec75322d346ae0adcf753bc72c585f5756ea4678bd09462faaa6a045604e9a8ca70f87ea0afcd9
+  metadata.gz: 3e61eab9c4e26823ce01571414712837241d3a7a81d0ff87bf456120b80545e131313597187325487336d5ea58b0e9c06a3d15164a627d18bcb8fd04e2737656
+  data.tar.gz: 9c567c47b33f8da7f7934a780a29efad0f03fc582609f86c06e8ff699a6d7d4e0a0e1a97411585b97ee3d4221b4345fa7be4fea03137dec84b41f44afea28ec0

data/bin/setup

@@ -17,7 +17,7 @@ provision-project() {
 
 ### DON'T MODIFY ANYTHING BELOW THIS LINE! #####################################
 
-# This setup script was generated with setup_script_generator 0.2.3,
+# This setup script was generated with setup_script_generator 0.4.0,
 # available on RubyGems.
 #
 # To regenerate this section, install the gem and run:
@@ -190,20 +190,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() {
@@ -237,10 +242,9 @@ ensure-ruby-installed() {
       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
+    if ! (rvm list | grep $REQUIRED_RUBY_VERSION'\>' &>/dev/null); then
+      banner "Installing Ruby $REQUIRED_RUBY_VERSION with rvm"
+      rvm install $REQUIRED_RUBY_VERSION
     fi
   else
     error "You don't seem to have a Ruby manager installed."
@@ -261,8 +265,8 @@ has-bundler() {
 ensure-project-ruby-dependencies-installed() {
   banner 'Installing Ruby dependencies'
 
-  if [[ $USE_BUNDLER_1 -eq 1 ]] && (! has-bundler || [[ $(bundle -v) =~ '^1\.' ]]); then
-    gem install bundler -v '~> 1.0'
+  if [[ $USE_BUNDLER_1 -eq 1 ]] && (! has-bundler || ! [[ $(bundle -v) =~ '^Bundler version 1\.' ]]); then
+    gem install bundler:'~> 1.0'
   elif ! has-bundler; then
     gem install bundler
   fi
@@ -272,10 +276,6 @@ ensure-project-ruby-dependencies-installed() {
 
 run-provisions() {
   provision-ruby
-
-  if type provision-project &>/dev/null; then
-    provision-project
-  fi
 }
 
 # --- FIN ----------------------------------------------------------------------

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

@@ -53,6 +53,11 @@ 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
+    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.3.1".freeze
+  VERSION = "0.4.0".freeze
 end

metadata

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