setup_script_generator 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b641747f34456dd34dc4b20a778afaac326a434768343287cab7feef3c89bee
-  data.tar.gz: '0893528542d93ea1d8dd8b8905e16ef0bc5e9de41097ed9e42a6c93232c8f33c'
+  metadata.gz: a5d703195a149c493aa00489accde35403f43b065329538f7f684704967e9919
+  data.tar.gz: f1537ed8738aefdb030949dbebd709d819f8123d91536e69f40ff3bb0f9f1611
 SHA512:
-  metadata.gz: e926f73fa6112f27a9670df108b60475bad4cc95494d81684ea80819d9296fb18d6d033dd1c878b3a0a4f59032fe2ea8c4705c8a01a39119a2f0d2395d8543c4
-  data.tar.gz: 0e554f39ce7ffa60271700978a7ccd69065e66194aec4766d991f2acfa8d6696ea202490913fdb02d9e10bcf4588390963683dcfeda037e36bb87c5b5a608526
+  metadata.gz: 62604ff23a577ade8e56c1dd283023625438bb48badadd8d4cbb440aff0a7fddd1378e1f910ab0fab9058a05c97a4e41d273284e60bb9c018347b7e7d5ce76a5
+  data.tar.gz: 0a86ff442db9a9db3b74edd5b05ddfb4b9e3f7991d877cf3af5fb3da31cbbe779d945c2d98a231f63f3b9e164ead7185970126aeb5dbccaac61f23ec365502a8

data/Gemfile.lock

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

data/lib/setup_script_generator/cli.rb

@@ -63,7 +63,7 @@ module SetupScriptGenerator
 
     def option_parser
       @_option_parser ||= OptionParser.new do |parser|
-        parser.banner = "#{$0} [OPTIONS] OUTPUT_FILE"
+        parser.banner = "#{$0} OUTPUT_FILE [OPTIONS]"
 
         parser.on(
           "-p",
@@ -75,12 +75,22 @@ module SetupScriptGenerator
           provision_names << provision_name
         end
 
-        parser.on("-n", "--dry-run", "Outputs the generated script instead of writing to the file.") do
+        parser.on(
+          "-n",
+          "--dry-run",
+          "Outputs the generated script instead of writing to the file."
+        ) do
           @dry_run = true
         end
 
-        parser.on("-l", "--list-provisions", "Lists the available provisions.") do
-          stdout.puts "Here are the provisions you can specify with --provision NAME:"
+        parser.on(
+          "-l",
+          "--list-provisions",
+          "Lists the available provisions."
+        ) do
+          stdout.puts(
+            "Here are the provisions you can specify with --provision NAME:"
+          )
 
           valid_provision_names.sort.each do |provision_name|
             stdout.puts "* #{provision_name}"
@@ -89,6 +99,16 @@ module SetupScriptGenerator
           exit
         end
 
+        parser.on(
+          "-v",
+          "--version",
+          "Lists the version of setup_script_generator associated with this " +
+          "executable."
+        ) do
+          puts "generate-setup version #{SetupScriptGenerator::VERSION}"
+          exit
+        end
+
         parser.on("-h", "--help", "You're looking at it!") do
           puts parser
           exit

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

@@ -1,10 +1,12 @@
 ### PROJECT SETUP ##############################################################
 
 # Feel free to add whatever functions or variables you want to add in this
-# section.
+# 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
 }

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

@@ -6,11 +6,13 @@
 # To regenerate this section, install the gem and run:
 #
 <% if provisions.any? -%>
-#     generate-setup \
-<%= provisions.map { |p| "#       -p #{p}" }.join(" \\\n") -%>
-<% else -%>
+#     generate-setup <%= provisions.map { |p| "-p #{p.name}" }.join(" ") -%>
+<% else %>
 #     generate-setup
-<% end -%>
+<% end %>
+#
+
+# --- SETUP --------------------------------------------------------------------
 
 something_already_printed=0
 
@@ -162,19 +164,6 @@ install-development-libraries() {
   install rpm=zlib-devel
 }
 
-<% provisions.each do |provision| -%>
-<%= provision.code -%>
-
-<% end -%>
-<% if provisions.any? -%>
-run-provisions() {
-<% provisions.each do |provision| -%>
-  provision-<%= provision.name %>
-<% end -%>
-  provision-project
-}
-
-<% end -%>
 setup() {
   cd "$(dirname "$(dirname "$0")")"
   check-for-package-manager
@@ -187,4 +176,24 @@ setup() {
   success "Done!"
 }
 
+<% provisions.each do |provision| -%>
+# --- <%= provision.name.upcase %> <%= '-' * (73 - provision.name.length) %>
+
+<%= provision.code -%>
+
+<% end -%>
+<% if provisions.any? -%>
+run-provisions() {
+<% provisions.each do |provision| -%>
+  provision-<%= provision.name %>
+<% end -%>
+
+  if type provision-project &>/dev/null; then
+    provision-project
+  fi
+}
+<% end -%>
+
+# --- FIN ----------------------------------------------------------------------
+
 setup

data/lib/setup_script_generator/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: setup_script_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Elliot Winkler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler