setup_script_generator 0.2.8 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 601c0cdc2725d9bb4557d9ae22d51b8ecd3fd4fb3aa282ebfe7d42bea5d871db
-  data.tar.gz: 3442120d303cdb1427df26b3d8cc48e993121695074f2ea650f0689fad3d248d
+  metadata.gz: 414b35d4fd8fcc955edbd48c07adf9cb6a58b1268ab535a4b19793efc95ddb6c
+  data.tar.gz: 6fb7d8ca9db2ccdeb09a977e8aaf29ff61621c60541ea50913511bd6cfcad3de
 SHA512:
-  metadata.gz: e5539f8aa1b762dd23db56f0892bc9dae2c0fc70bb1361c4b85d06d1f88b7df971b8c72883ffc3730a27d9b4c0f5242369223ac2334e74175181d05e3bc1cccc
-  data.tar.gz: d3b68a13f76ee2e214d7492aea1f807f9634146079c46f855aa5b0ee123c25a101b82392352877aaca3e0847c135c68687f2cfbd05e704dedc219e17136d753e
+  metadata.gz: '0962104490d7df6439779e62e9dd7e417d087d34ec4cd52857075bcfe6fd0ab0b337178e4354ae8c9fdad93fcdabcf7df999c676de6fe713728f499393034f21'
+  data.tar.gz: 9fde5cadf9262ff46f34e2a479d8a9e02106a0f857fb18c84f5046072da15bdd9c7d726a815be46e563a4cc29a8ef1473d9201b9efd035e4fecf939e8e0caa6e

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.1,
 # available on RubyGems.
 #
 # To regenerate this section, install the gem and run:
@@ -186,24 +186,31 @@ setup() {
 
 # --- RUBY ---------------------------------------------------------------------
 
+REQUIRED_RUBY_VERSION=
+
 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 +244,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 +267,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 +278,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/node.sh

@@ -1,27 +1,19 @@
-read-required-node-version-for-asdf() {
-  (cat .tool-versions | grep '^nodejs ' | sed -Ee 's/^nodejs (.+)$/\1/') || \
-    echo ''
-}
+REQUIRED_NODE_VERSION=
 
 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

@@ -1,21 +1,28 @@
+REQUIRED_RUBY_VERSION=
+
 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() {
@@ -49,10 +56,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."
@@ -74,7 +80,7 @@ ensure-project-ruby-dependencies-installed() {
   banner 'Installing Ruby dependencies'
 
   if [[ $USE_BUNDLER_1 -eq 1 ]] && (! has-bundler || ! [[ $(bundle -v) =~ '^Bundler version 1\.' ]]); then
-    gem install bundler -v '~> 1.0'
+    gem install bundler:'~> 1.0'
   elif ! has-bundler; then
     gem install bundler
   fi

data/lib/setup_script_generator/version.rb

@@ -1,3 +1,3 @@
 module SetupScriptGenerator
-  VERSION = "0.2.8".freeze
+  VERSION = "0.4.1".freeze
 end

metadata

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