hoodoo 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcb6260d51d3dd934b17047fa2db6abe3b9dc25f7f95f81be5bd0af5035ff019
-  data.tar.gz: 97f48231ab533c2aec1557679007d7ea95f5e10c0aeb262cc8a1c84d2bf611ae
+  metadata.gz: 27c91b7d6239a85430ddf6e2cb47e0461775375e6f4b1969c6bbbf9017a41243
+  data.tar.gz: 3808aceb6a8474d1c456d25b38aa5a280df7c6da547747f1a54cce3b57bbe1ab
 SHA512:
-  metadata.gz: 30633c2155b09f06ac6d75c53aef460b4c04b426019a11eb9bb08040ece7586295b875ec8f3034c87e3e4a80945c1ebd0514444f2437bccef3049cbf5b616080
-  data.tar.gz: f12b6ba55fd0ad9a8f7f66e1e6924a98cbbba2eed5999cf8b14a6810c15529bff0eaf5d2fe472b5d757e15bd5877baba9724e88caab2af846a2e6394b3ecd2ae
+  metadata.gz: 35bea308563fef3c91d9f5f015942b3a03a198a299a18f754079d8ed1319cfc7da10165deee81d356064bcf1f479e5d20958807b9a7f90a998a3d288291d25b0
+  data.tar.gz: 072047f7dc3c8deccb4a034de3bd793149909e99107455125313ae92f4ce85b059cf90b11ad3587af4b85a86c2199f235180f592b54bded4891ebc97a0802f4e

data/bin/hoodoo

@@ -2,4 +2,4 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'hoodoo/generator'
 
-exit Hoodoo::Generator.instance.run!(ARGV)
+exit Hoodoo::Generator.instance.run!

data/lib/hoodoo/generator.rb

@@ -11,6 +11,7 @@
 require 'singleton'
 require 'fileutils'
 require 'pathname'
+require 'getoptlong'
 
 module Hoodoo
 
@@ -36,26 +37,58 @@ module Hoodoo
     #
     NAME_REGEX = /^[a-zA-Z01-9_-]{2,30}$/
 
-    # Run the +hoodoo+ command implementation.
+    # Run the +hoodoo+ command implementation. Command line options are
+    # taken from the Ruby ARGV constant.
     #
-    # +args+:: Array of command line arguments, excluding the +hoodoo+
-    #          command itself (so, just any extra arguments passed in).
-    #
-    def run!( args )
-      return show_usage if args_empty?(args)
+    def run!
+      git  = nil
+      path = nil
+
+      return show_usage() if ARGV.length < 1
+      name = ARGV.shift() if ARGV.first[ 0 ] != '-'
+
+      opts = GetoptLong.new(
+        [ '--help',    '-h',       GetoptLong::NO_ARGUMENT       ],
+        [ '--version', '-v', '-V', GetoptLong::NO_ARGUMENT       ],
+        [ '--path',    '-p',       GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--from',    '-f',       GetoptLong::REQUIRED_ARGUMENT ],
+        [ '--git',     '-g',       GetoptLong::REQUIRED_ARGUMENT ],
+      )
+
+      silence_stream( $stderr ) do
+        begin
+          opts.each do | opt, arg |
+            case opt
+              when '--help'
+                return show_usage()
+              when '--version'
+                return show_version()
+              when '--path'
+                path = arg
+              when '--from', '--git'
+                git = arg
+            end
+          end
+
+        rescue GetoptLong::InvalidOption, GetoptLong::MissingArgument => e
+          return usage_and_warning( e.message )
+
+        end
+      end
+
+      unless path.nil? || git.nil?
+        return usage_and_warning( 'Use the --path OR --from arguments, but not both' )
+      end
 
-      name = args.first
+      git ||= 'git@github.com:LoyaltyNZ/service_shell.git'
 
-      return show_usage   if name == '-h' || name == '--help' || name.nil? || name.empty?
-      return show_version if name == '-v' || name == '--version'
+      name = ARGV.shift() if name.nil?
+      return show_usage() if name.nil?
 
+      return usage_and_warning( "Unexpected extra arguments were given" ) if ARGV.count > 0
       return usage_and_warning( "SERVICE_NAME must match #{ NAME_REGEX.inspect }" ) if naughty_name?( name )
       return usage_and_warning( "'#{ name }' already exists" ) if File.exist?( "./#{ name }" )
 
-      path  = args[ 2 ] if args[ 1 ] == '--path'
-      git   = args[ 2 ] if args[ 1 ] == '--from'
-      git ||= 'git@github.com:LoyaltyNZ/service_shell.git'
-
       return create_service( name, git, path )
     end
 
@@ -143,7 +176,7 @@ module Hoodoo
       puts
       puts "Creates a service shell at the PWD, customised with the given service name."
       puts
-      puts "  hoodoo <service-name> [--from <git-repository> | --path <full-pathname>]"
+      puts "  hoodoo <service-name> [--from <git-repository> OR --path <full-pathname>]"
       puts
       puts "For example:"
       puts
@@ -151,7 +184,8 @@ module Hoodoo
       puts "  hoodoo service_person  --from git@github.com:YOURNAME/service_shell_fork.git"
       puts "  hoodoo service_product --path /path/to/local/service/shell/container"
       puts
-      puts "See also:"
+      puts "The '--from' option is aliased as '--git'. All options have single letter"
+      puts "equivalents. See also:"
       puts
       puts "  hoodoo --help    shows this help"
       puts "  hoodoo --version shows the require-able gem version"
@@ -171,9 +205,27 @@ module Hoodoo
     end
 
     def usage_and_warning( warning )
-      puts "WARNING: #{warning}"
       puts
-      show_usage
+      puts "-" * 80
+      puts "WARNING: #{warning}"
+      puts "-" * 80
+
+      return show_usage()
+    end
+
+    def silence_stream( stream, &block )
+      begin
+        old_stream = stream.dup
+        stream.reopen( File::NULL )
+        stream.sync = true
+
+        yield
+
+      ensure
+        stream.reopen( old_stream )
+        old_stream.close
+
+      end
     end
   end
 end

data/lib/hoodoo/version.rb

@@ -12,11 +12,11 @@ module Hoodoo
   # The Hoodoo gem version. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 
   # The Hoodoo gem date. If this changes, be sure to re-run
   # <tt>bundle install</tt> or <tt>bundle update</tt>.
   #
-  DATE = '2017-11-03'
+  DATE = '2017-11-07'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Opinionated APIs