pluto 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12c68dae2b3404d2b6bfb5e90d65988a817e05f0
-  data.tar.gz: 63865f5cb4df9d9fa5a6757bc68cdcb895efc732
+  metadata.gz: d9437823f2357e73015476b3e0c005000611492e
+  data.tar.gz: 15c76dcacafc77b5006133ea3ad5df5140fb9c93
 SHA512:
-  metadata.gz: a2c924baf3e216458ccf3ce8f4234a91a791d3c58f6759fff098681671da13ad07fa93011f7c3fa9c50c6688ce33e5054770f09075ad53df654d5767c023a366
-  data.tar.gz: 9bbb372a6a0804b804d4eebe3e12e71915d5a9d6d3d244c1fa4674b3c7bffcb05dd05c5ef5cb382b977c1c2f67a816b0c49fca72f4363e75435a8c281f45e6e0
+  metadata.gz: e627e8f0988c2ca5e66b2906eff459e16eb47e8d2aad2ec2540678c3780d547720a096cd85847e318ecf0ddcaf3ad27000c74f3ae7741a05ee43911b6e6e2d9a
+  data.tar.gz: e54c83e13d67b9cec8ad7d4be21ef94c458083f512de6eb0fafdd708fa896606de9439d2b961a9573592a8ec5ce95d476592459ee37ffd8020a321cefdf8cda6

data/lib/pluto/cli/main.rb

@@ -34,23 +34,34 @@ end
 ###########################
 
 
+def expand_config_args( args )
+  ## todo/check:  rename method?? e.g. check_config_args
+  ##              or  auto_complete_config_ars similar? why? why not??
 
+  if args.empty?      ## no args? args.length == 0
+    ['planet.ini']    #    add default planet.ini for convenience
+  else
+    args   # pass through as-is
+  end
+end
 
-## "global" options (switches/flags)
 
-desc '(Debug) Show debug messages'
-switch [:verbose, :debug], negatable: false
+
+## "global" options (switches/flags)
 
 
 ##  todo/check:
 ## use quiet (warn) and quieter (error) - why? why not?
 ##  use quiet for warn level (not error) as default - why? why not?
 
+desc 'Only show warnings, errors and fatal messages'
+switch [:q, :quiet, :w, :warn], negatable: false
+
 desc 'Only show errors and fatal messages'
-switch [:q, :quiet, :err, :error], negatable: false
+switch [:quieter, :err, :error], negatable: false
 
-desc 'Only show warnings, errors and fatal messages'
-switch [:w, :warn], negatable: false
+desc '(Debug) Show debug messages'
+switch [:verbose, :debug], negatable: false
 
 
 
@@ -142,8 +153,7 @@ command [:merge, :m] do |c|
   c.action do |g,o,args|
     logger.debug 'hello from merge command'
 
-    ## note: no more "magic" - remove expand_config_args!! - always pass in planet.ini or similar
-    ## args = expand_config_args( args )   # add missing .ini|.yml extension if missing or add default config (e.g. pluto.ini)
+    args = expand_config_args( args )   # if missing add default config (e.g. planet.ini)
 
     args.each do |arg|
       name    = File.basename( arg, '.*' )
@@ -193,8 +203,7 @@ command [:update, :up, :u] do |c|
   c.action do |g,o,args|
     logger.debug 'hello from update command'
 
-    ## note: no more "magic" - remove expand_config_args!! - always pass in planet.ini or similar
-    ## args = expand_config_args( args )   # add missing .ini|.yml extension if missing or add default config (e.g. pluto.ini)
+    args = expand_config_args( args )   # if missing add default config (e.g. planet.ini)
 
     args.each do |arg|
       name    = File.basename( arg, '.*' )
@@ -256,8 +265,7 @@ command [:build, :b] do |c|
   c.action do |g,o,args|
     logger.debug 'hello from build command'
 
-    ## note: no more "magic" - remove expand_config_args!! - always pass in planet.ini or similar
-    ## args = expand_config_args( args )   # add missing .ini|.yml extension if missing or add default config (e.g. pluto.ini)
+    args = expand_config_args( args )   # if missing add default config (e.g. planet.ini)
 
     args.each do |arg|
       name    = File.basename( arg, '.*' )
@@ -348,7 +356,7 @@ pre do |g,c,o,args|
     LogUtils::Logger.root.level = :debug
   elsif opts.warn?
     LogUtils::Logger.root.level = :warn
-  elsif opts.quiet?
+  elsif opts.error?
     LogUtils::Logger.root.level = :error
   else
     ## do nothing; keep :info level (default)

data/lib/pluto/cli/opts.rb

@@ -15,16 +15,16 @@ class Opts
     #    use a single (internal) variable for log level - why? why not?
 
     if options[:verbose] == true   ## debug level
-      @verbose = @warn = @quiet = true
+      @verbose = @warn = @error = true
     end
 
-    if options[:warn]    == true   ## warn level
-      @warn = @quiet = true
+    if options[:warn]    == true   ## warn level -- alias for quiet
+      @warn = @error = true
       @verbose = false
     end
 
-    if options[:quiet]   == true   ## error level (for now) - why? why not?
-      @quiet = true
+    if options[:error]   == true   ## error level  -- alias for quieter
+      @error = true
       @verbose = @warn = false
     end
 
@@ -60,16 +60,18 @@ class Opts
 
 
   ##  # note: always assumes true for now for verbose/quiet/warn; default is false
+  ##  todo: switch verbose to debug internally - why? why not?
   def verbose=(value)   @verbose = true;   end
   def verbose?()        @verbose || false; end
   def debug?()          @verbose || false; end   ## add debug? alias for verbose
 
   def warn=(value)      @warn = true;     end
   def warn?()           @warn || false;   end
+  def quiet?()          @warn || false;  end   ## add quiet? alias for warn
 
-  def quiet=(value)     @quiet = true;    end   ## use error/error? - why? why not?
-  def quiet?()          @quiet || false;  end
-  def error?()          @quiet || false;  end   ## add error? alias for quiet
+  def error=(value)     @error = true;    end
+  def error?()          @error || false;  end
+  def quieter?()        @error || false;  end   ## add quieter? alias for error
 
 
 

data/lib/pluto/cli/version.rb

@@ -4,7 +4,7 @@ module PlutoCli
 
   MAJOR = 1
   MINOR = 3
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluto
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-26 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pluto-models