setup_script_generator 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fa313219d3d72070f83b76129dfa4d88b201e6711c7bf4da9ee88743a2e73f0
-  data.tar.gz: f71b035c63680fca762ad81752bf711b239d71f5c4211983a13368e4c5471e6e
+  metadata.gz: 8e4802f8dbb397d7c66f030b2228f5aa3b91fc1b7cf1a7a9ef494a776bb95fb0
+  data.tar.gz: 0ce91133243bf727d1d44a0fd9a946c164880f96f694904201254112a0e3a90c
 SHA512:
-  metadata.gz: 05f56f7fab52cb6925f0fe26ab6aa865a7b9e8eb1bffdc9bcc0f9c22730d5edbff03268f77e2401915ac0248265d4895c43f73e25cf98f34e867187de733ca5d
-  data.tar.gz: 36579d3cd1018b4d740d845b8ecdee0b4f2441c12fab9105f3303e15949fb891da913175f3c0fbe461c61402f34cb28ff6306b867aa6cff054e31ab64110ee87
+  metadata.gz: 2527b8c517f829b9840d74d62878f200338492579607b59e0409de5ced554f93580db629be9e2f0399b268ba72dfc1628b5f145eec96de3c3534cfe0adec53bd
+  data.tar.gz: c8ad9aaaaecc49b60839c348d85fe724a86c8197675d4b48b1b4fd8ff577f4cf50d0c3bddbe8fe23308fcc2b207523c63c927f5f1ef1e60b053c658af11b613f

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.1
+ruby 3.0.2

data/README.md

@@ -91,6 +91,6 @@ bin/setup
 
 ## Author/License
 
-Setup Script Generator is copyright © 2019-2020 Elliot Winkler
+Setup Script Generator is copyright © 2019-2021 Elliot Winkler
 (<elliot.winkler@gmail.com>)
 and is released under the [MIT license](LICENSE.txt).

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,3 +1,5 @@
+REQUIRED_NODE_VERSION=
+
 provision-node() {
   if [[ -f .tool-versions ]]; then
     REQUIRED_NODE_VERSION=$(cat .tool-versions | grep '^nodejs ' | sed -Ee 's/^nodejs (.+)$/\1/')
@@ -8,7 +10,7 @@ provision-node() {
   fi
 
   if [[ -z $REQUIRED_NODE_VERSION ]]; then
-    error "Could not determine required Node version for this project."
+    error 'Could not determine required Node version for this project.'
     print-wrapped "\
 Your project needs to include either a valid .tool-versions file with a 'nodejs'
 line or a valid .node-version or .nvimrc file."
@@ -49,17 +51,24 @@ When you're done, close and re-open this terminal tab and re-run this script."
 }
 
 ensure-project-node-dependencies-installed() {
-  banner 'Installing Node dependencies'
-
   if [[ -f package-lock.json ]]; then
+    banner 'Installing Node dependencies'
     npm install
   elif [[ -f yarn.lock ]]; then
+    if ! type yarn &>/dev/null; then
+      banner 'Installing Yarn 1'
+      npm install -g yarn
+    fi
+    banner 'Installing Node dependencies'
     yarn install
   else
     error "Sorry, I'm not sure how to install your dependencies."
     print-wrapped "\
-Are you missing a package.json? Have you run 'npm install' or 'yarn install'
-yet?"
+It doesn't look like you have a package-lock.json or yarn.lock in your project
+yet. I'm not sure which package manager you plan on using, so you'll need to run
+either \`npm install\` or \`yarn install\` once first. Additionally, if you want
+to use Yarn 2, then now is the time to switch to that. Then you can re-run this
+script."
     exit 1
   fi
 }

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

@@ -0,0 +1,6 @@
+provision-overmind() {
+  if ! has-executable overmind; then
+    banner "Installing Overmind"
+    install tmux overmind
+  fi
+}

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

@@ -0,0 +1,7 @@
+provision-rails() {
+  banner "Preparing database; removing old logs and tempfiles"
+  bin/rails db:prepare log:clear tmp:clear
+
+  banner "Restarting application server"
+  bin/rails restart
+}

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

@@ -1,3 +1,5 @@
+REQUIRED_RUBY_VERSION=
+
 provision-ruby() {
   USE_BUNDLER_1=0
 
@@ -53,6 +55,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 "\
@@ -73,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.3.0".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setup_script_generator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Elliot Winkler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -34,7 +34,9 @@ files:
 - lib/setup_script_generator/templates/provisions/elm.sh
 - lib/setup_script_generator/templates/provisions/heroku.sh
 - lib/setup_script_generator/templates/provisions/node.sh
+- lib/setup_script_generator/templates/provisions/overmind.sh
 - lib/setup_script_generator/templates/provisions/postgresql.sh
+- lib/setup_script_generator/templates/provisions/rails.sh
 - lib/setup_script_generator/templates/provisions/ruby.sh
 - lib/setup_script_generator/templates/provisions/sqlite3.sh
 - lib/setup_script_generator/templates/skeleton.sh.erb
@@ -63,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Generate setup scripts for your projects.