setup_script_generator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5d703195a149c493aa00489accde35403f43b065329538f7f684704967e9919
-  data.tar.gz: f1537ed8738aefdb030949dbebd709d819f8123d91536e69f40ff3bb0f9f1611
+  metadata.gz: ed17c40212f0857cadb91986f31f099511dd1cf6245db95581948ce267be3a6c
+  data.tar.gz: f867c2449067ceed2434b85214f038bc4b037a2fa351daf66917f7302ed408ed
 SHA512:
-  metadata.gz: 62604ff23a577ade8e56c1dd283023625438bb48badadd8d4cbb440aff0a7fddd1378e1f910ab0fab9058a05c97a4e41d273284e60bb9c018347b7e7d5ce76a5
-  data.tar.gz: 0a86ff442db9a9db3b74edd5b05ddfb4b9e3f7991d877cf3af5fb3da31cbbe779d945c2d98a231f63f3b9e164ead7185970126aeb5dbccaac61f23ec365502a8
+  metadata.gz: 5a44e7899c89b1dd04b8f1892b0593f97614d550bb34e2e6ee6b62cabca6e97b36e3013c9aec203e0c1794bf4b6679aa26279c45502b24cd7c1b68a02bd097bf
+  data.tar.gz: 602dedb74fb0fe247409905463325823e2b4f4bfc3d2898acf1a4d85abe7e7450844d6931eda9b19685a95d6683c176c57bdc81a6640cf0c2cc378a0d7f7e9d8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    setup_script_generator (0.2.1)
+    setup_script_generator (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/bin/setup

@@ -2,9 +2,32 @@
 
 set -euo pipefail
 
-something_already_printed=0
+### PROJECT SETUP ##############################################################
+
+# Feel free to add whatever functions or variables you want to add in this
+# section. You may also delete this section altogether if your project doesn't
+# need a custom setup.
+
+provision-project() {
+  # This function gets called automatically below.
+  # Feel free to remove these comments.
+  # If your project needs custom setup, then place that here.
+  true
+}
+
+### DON'T MODIFY ANYTHING BELOW THIS LINE! #####################################
+
+# This setup script was generated with setup_script_generator 0.2.1,
+# available on RubyGems.
+#
+# To regenerate this section, install the gem and run:
+#
+#     generate-setup
+#
 
-cd "$(dirname "$(dirname "$0")")"
+# --- SETUP --------------------------------------------------------------------
+
+something_already_printed=0
 
 determine-platform() {
   local uname=$(uname)
@@ -111,7 +134,7 @@ install() {
       sudo apt-get install -y "$package"
     fi
   elif has-executable yum; then
-    package="${yum_package:-$default_package}"
+    package="${rpm_package:-$default_package}"
 
     if [[ -n $package ]]; then
       sudo yum install -y "$package"
@@ -125,108 +148,40 @@ install() {
 check-for-package-manager() {
   local platform=$(determine-platform)
 
-  if [[ $platform == "linux" ]]; then
-    if ! has-executable apt-get; then
-      error "You don't seem to have a package manager installed."
-      print-wrapped "\
-The setup script assumes you're using Debian or a Debian-derived flavor of
-Linux (i.e. something with Apt). If this is not the case, then we would
-gladly take a PR fixing this!"
-      exit 1
-    fi
-  else
-    if ! has-executable brew; then
-      error "You don't seem to have Homebrew installed."
-      print-wrapped "\
-Follow the instructions here to do this:
-
-    http://brew.sh
-
-Then re-run this script."
-      exit 1
-    fi
-
-    # TODO: Check that OS X Command Line Tools are installed?
-  fi
-}
-
-install-development-libraries() {
-  install rpm=zlib-devel
-}
+  if [[ $platform == "linux" ]] && ! has-executable apt-get && ! has-executable yum; then
+    # TODO: Check if build-essential is installed on Debian?
+    # TODO: Check if 'Development Tools' group is installed on RedHat?
 
-provision-ruby() {
-  if [[ -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."
+    error "You don't seem to have a package manager installed."
     print-wrapped "\
-You'll need to create a .ruby-version file in your project before you can run
-this script.
-    "
+This setup script assumes you're using a flavor of Linux derived from Debian or
+RedHat (i.e. something with Apt or Yum). If this is not the case, then we would
+gladly take a PR fixing this!"
     exit 1
-  fi
-
-  install-ruby-development-library
-  ensure-ruby-installed
-  install-ruby-dependencies
-}
-
-install-ruby-development-library() {
-  install apt=ruby-dev rpm=ruby-devel
-}
+  elif [[ $platform == "mac" ]] && ! has-executable brew; then
+    # TODO: Check that OS X Command Line Tools are installed?
 
-ensure-ruby-installed() {
-  if has-executable rbenv; then
-    if ! (rbenv versions | grep $REQUIRED_RUBY_VERSION'\>' &>/dev/null); then
-      banner "Installing Ruby $REQUIRED_RUBY_VERSION with rbenv"
-      rbenv install --skip-existing "$REQUIRED_RUBY_VERSION"
-    fi
-  elif has-executable chruby-exec; then
-    PREFIX='' source /usr/local/share/chruby/chruby.sh
-    if ! (chruby '' | grep $REQUIRED_RUBY_VERSION'\>' &>/dev/null); then
-      if has-executable install-ruby; then
-      banner "Installing Ruby $REQUIRED_RUBY_VERSION with install-ruby"
-        install-ruby "$REQUIRED_RUBY_VERSION"
-      else
-        error "Please 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."
+    error "You don't seem to have Homebrew installed."
     print-wrapped "\
-We recommend using rbenv. You can find instructions to install it here:
-
-    https://github.com/rbenv/rbenv#installation
-
-Make sure to follow the instructions to configure your shell so that rbenv is
-automatically loaded.
-
-When you're done, open up a new terminal tab and re-run this script."
+Visit <https://brew.sh> and follow the instructions there, then re-run this
+script."
     exit 1
   fi
 }
 
-install-ruby-dependencies() {
-  banner 'Installing Ruby dependencies'
-  gem install bundler -v '~> 1.0' --conservative
-  bundle check || bundle install
-}
-
-run-provisions() {
-  provision-ruby
+install-development-libraries() {
+  install rpm=zlib-devel
 }
 
 setup() {
+  cd "$(dirname "$(dirname "$0")")"
   check-for-package-manager
   install-development-libraries
-  run-provisions
-  success "Done!"
+  provision-project
+  success "Setup complete!"
 }
 
+
+# --- FIN ----------------------------------------------------------------------
+
 setup

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

@@ -6,10 +6,10 @@
 # To regenerate this section, install the gem and run:
 #
 <% if provisions.any? -%>
-#     generate-setup <%= provisions.map { |p| "-p #{p.name}" }.join(" ") -%>
-<% else %>
+#     generate-setup <%= provisions.map { |p| "-p #{p.name}" }.join(" ") %>
+<% else -%>
 #     generate-setup
-<% end %>
+<% end -%>
 #
 
 # --- SETUP --------------------------------------------------------------------
@@ -121,7 +121,7 @@ install() {
       sudo apt-get install -y "$package"
     fi
   elif has-executable yum; then
-    package="${yum_package:-$default_package}"
+    package="${rpm_package:-$default_package}"
 
     if [[ -n $package ]]; then
       sudo yum install -y "$package"
@@ -135,28 +135,24 @@ install() {
 check-for-package-manager() {
   local platform=$(determine-platform)
 
-  if [[ $platform == "linux" ]]; then
-    if ! has-executable apt-get; then
-      error "You don't seem to have a package manager installed."
-      print-wrapped "\
-The setup script assumes you're using Debian or a Debian-derived flavor of
-Linux (i.e. something with Apt). If this is not the case, then we would
-gladly take a PR fixing this!"
-      exit 1
-    fi
-  else
-    if ! has-executable brew; then
-      error "You don't seem to have Homebrew installed."
-      print-wrapped "\
-Follow the instructions here to do this:
-
-    http://brew.sh
-
-Then re-run this script."
-      exit 1
-    fi
+  if [[ $platform == "linux" ]] && ! has-executable apt-get && ! has-executable yum; then
+    # TODO: Check if build-essential is installed on Debian?
+    # TODO: Check if 'Development Tools' group is installed on RedHat?
 
+    error "You don't seem to have a package manager installed."
+    print-wrapped "\
+This setup script assumes you're using a flavor of Linux derived from Debian or
+RedHat (i.e. something with Apt or Yum). If this is not the case, then we would
+gladly take a PR fixing this!"
+    exit 1
+  elif [[ $platform == "mac" ]] && ! has-executable brew; then
     # TODO: Check that OS X Command Line Tools are installed?
+
+    error "You don't seem to have Homebrew installed."
+    print-wrapped "\
+Visit <https://brew.sh> and follow the instructions there, then re-run this
+script."
+    exit 1
   fi
 }
 
@@ -172,8 +168,10 @@ setup() {
 <% if provisions.any? -%>
   run-provisions
 <% end -%>
-  provision-project
-  success "Done!"
+  if type provision-project &>/dev/null; then
+    provision-project
+  fi
+  success "Setup complete!"
 }
 
 <% provisions.each do |provision| -%>

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

@@ -1,23 +1,29 @@
 provision-node() {
-  if [[ -f .node-version ]]; then
+  if [[ -f .tool-versions ]]; then
+    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."
     print-wrapped "\
-You'll need to create a .node-version or .nvmrc file in your project before you
-can run this script.
-    "
+You'll need to create either a .tool-versions file or .nvmrc file in your
+project before you can run this script."
     exit 1
   fi
 
   ensure-node-installed
-  install-node-dependencies
+  ensure-project-node-dependencies-installed
 }
 
 ensure-node-installed() {
-  if has-executable nodenv; then
+  if has-executable asdf; then
+    if ! (asdf current nodejs | grep $REQUIRED_NODE_VERSION'\>' &>/dev/null); then
+      banner "Installing Node $REQUIRED_NODE_VERSION with asdf"
+      asdf install nodejs $REQUIRED_NODE_VERSION
+    fi
+  elif has-executable nodenv; then
     if ! (nodenv versions | grep $REQUIRED_NODE_VERSION'\>' &>/dev/null); then
       banner "Installing Node $REQUIRED_NODE_VERSION with nodenv"
       nodenv install --skip-existing "$REQUIRED_NODE_VERSION"
@@ -31,19 +37,16 @@ ensure-node-installed() {
   else
     error "You don't seem to have a Node manager installed."
     print-wrapped "\
-We recommend using nodenv. You can find instructions to install it here:
-
-    https://github.com/nodenv/nodenv#installation
+We recommend using asdf. You can find instructions to install it here:
 
-Make sure to follow the instructions to configure your shell so that nodenv is
-automatically loaded.
+    https://asdf-vm.com
 
-When you're done, open up a new terminal tab and re-run this script."
+When you're done, close and re-open this terminal tab and re-run this script."
     exit 1
   fi
 }
 
-install-node-dependencies() {
+ensure-project-node-dependencies-installed() {
   banner 'Installing Node dependencies'
 
   if [[ -f package-lock.json ]]; then
@@ -53,9 +56,8 @@ install-node-dependencies() {
   else
     error "Sorry, I'm not sure how to install your dependencies."
     print-wrapped "\
-You'll need to create a package-lock.json or yarn.lock file in your project
-before you can run this script.
-    "
+Are you missing a package.json? Have you run 'npm install' or 'yarn install'
+yet?"
     exit 1
   fi
 }

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

@@ -1,26 +1,37 @@
 provision-ruby() {
-  if [[ -f .ruby-version ]]; then
+  if [[ -f .tool-versions ]]; then
+    REQUIRED_RUBY_VERSION=$(cat .tool-versions | grep '^ruby ' | 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."
     print-wrapped "\
-You'll need to create a .ruby-version file in your project before you can run
-this script.
-    "
+You'll need to create either a .tool-versions file or .ruby-version file in your
+project before you can run this script."
     exit 1
   fi
 
-  install-ruby-development-library
+  ensure-ruby-development-libraries-installed
   ensure-ruby-installed
-  install-ruby-dependencies
+  ensure-project-ruby-dependencies-installed
 }
 
-install-ruby-development-library() {
-  install apt=ruby-dev rpm=ruby-devel
+ensure-ruby-development-libraries-installed() {
+  local platform=$(determine-platform)
+
+  if [[ $platform == "linux" ]]; then
+    banner "Installing Ruby development libraries"
+    install apt=ruby-dev rpm=ruby-devel
+  fi
 }
 
 ensure-ruby-installed() {
-  if has-executable rbenv; then
+  if has-executable asdf; then
+    if ! (asdf current ruby | grep $REQUIRED_RUBY_VERSION'\>' &>/dev/null); then
+      banner "Installing Ruby $REQUIRED_RUBY_VERSION with asdf"
+      asdf install ruby $REQUIRED_RUBY_VERSION
+    fi
+  elif has-executable rbenv; then
     if ! (rbenv versions | grep $REQUIRED_RUBY_VERSION'\>' &>/dev/null); then
       banner "Installing Ruby $REQUIRED_RUBY_VERSION with rbenv"
       rbenv install --skip-existing "$REQUIRED_RUBY_VERSION"
@@ -29,10 +40,10 @@ ensure-ruby-installed() {
     PREFIX='' source /usr/local/share/chruby/chruby.sh
     if ! (chruby '' | grep $REQUIRED_RUBY_VERSION'\>' &>/dev/null); then
       if has-executable install-ruby; then
-      banner "Installing Ruby $REQUIRED_RUBY_VERSION with install-ruby"
+        banner "Installing Ruby $REQUIRED_RUBY_VERSION with install-ruby"
         install-ruby "$REQUIRED_RUBY_VERSION"
       else
-        error "Please install Ruby $REQUIRED_RUBY_VERSION"
+        error "Please use chruby to install Ruby $REQUIRED_RUBY_VERSION!"
       fi
     fi
   elif has-executable rvm; then
@@ -44,20 +55,21 @@ ensure-ruby-installed() {
   else
     error "You don't seem to have a Ruby manager installed."
     print-wrapped "\
-We recommend using rbenv. You can find instructions to install it here:
-
-    https://github.com/rbenv/rbenv#installation
+We recommend using asdf. You can find instructions to install it here:
 
-Make sure to follow the instructions to configure your shell so that rbenv is
-automatically loaded.
+    https://asdf-vm.com
 
-When you're done, open up a new terminal tab and re-run this script."
+When you're done, close and re-open this terminal tab and re-run this script."
     exit 1
   fi
 }
 
-install-ruby-dependencies() {
+ensure-project-ruby-dependencies-installed() {
   banner 'Installing Ruby dependencies'
-  gem install bundler -v '~> 1.0' --conservative
+
+  if [[ $USE_BUNDLER_1 ]]; then
+    gem install bundler -v '~> 1.0' --conservative
+  fi
+
   bundle check || bundle install
 }

data/lib/setup_script_generator/version.rb

@@ -1,3 +1,3 @@
 module SetupScriptGenerator
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setup_script_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Elliot Winkler
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: 
+description:
 email:
 - elliot.winkler@gmail.com
 executables:
@@ -76,7 +76,7 @@ metadata:
   homepage_uri: https://github.com/mcmire/setup_script_generator
   source_code_uri: https://github.com/mcmire/setup_script_generator
   changelog_uri: https://github.com/mcmire/setup_script_generator/tree/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,8 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Generate setup scripts for your projects.
 test_files: []