nub 0.0.53 → 0.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af6ff1743615a43ecb53bb050e0f763b9f4974d24beeeb6e53607509c53719a3
-  data.tar.gz: fbb637f9cb425e29c38a2cab27d0ba60f49c66831077a9150ae4a96d8b3945af
+  metadata.gz: 00de24079eb9ea5d62262d9453e4bb8745a004fec49d0c300bd8b01a430e4589
+  data.tar.gz: f1c7b1a86cb4637a80b48814193305b2c7a27fb50a46b7ac35ff22cb952e1b52
 SHA512:
-  metadata.gz: 5195e80a5f024b57e4eaf6d667d3dc6e168c1933fa91b998d9781dd7f67c3c5020c941801685faf9a41c761a4c833f0ca330b79bf9fa96d4fc1ecfd86dd919fa
-  data.tar.gz: 19bc728c493e1500accf09a4d40eb57db3f117428b6508466a295f70985dbd1cd854f9edc444c2550bb1f48a00199d6dd16e70b939fcd777e64493fb9db7ffe9
+  metadata.gz: 3b86079c3a02cf90b74d9db8ff3240f9d261c4ab5671af4d068e76686a45ac50682265d69bb04eb82aaee3e9c49739afe76462a19a3a08c139a03edbde992585
+  data.tar.gz: 2093bb7ee390f121324b39ab66beb74f8a8fd5c7baa45ff9671a26459e785f937203e03d80c278d744b4340db2fe27e242d9322d893e112f7198c15c596902b1

data/README.md

@@ -38,25 +38,23 @@ have their own help to display their usage and available options.
 
 ### Commands <a name="commands"></a>
 Commands are defined via configuration as key words that trigger different branches of functionality
-for the application. Each command may have zero or more options that modify how this behaveior is
-invoked. Whenever more than one command is used in the command line expression the expression is
-interpreted as being a ***chained command expression***. Chained command expressions are executed
-left to right, such that you can execute the ***clean*** command then the ***build*** command or
-more in a single command line expression. Each command in a chained command expression may have its
-own specific options (those coming after the command but before the next command) or if options are
-omitted the required options from the next command will be used. The chained command options syntax
-allows one to have a cleaner multi-command line expression with reusable options. Options are said
-to apply in a chained command syntax when they are of the same type and position in the positional
-case or same type and name in the named case.
+for the application. Each command may have zero or more sub commands, each of which follow the same 
+rules in a recursive fashion. Each command may have zero or more options that modify how this 
+behavior is invoked. Whenever more than one command is used in the command line expression the 
+expression is interpreted as being a ***chained command expression***. Chained command expressions 
+are executed left to right, such that you can execute the ***clean*** command then the ***build*** 
+command or more in a single command line expression. Each command in a chained command expression 
+may have its own specific options (those coming after the command but before the next command) or if 
+options are omitted the required options from the next command will be used. The chained command 
+options syntax allows one to have a cleaner multi-command line expression with reusable options. 
+Options are said to apply in a chained command syntax when they are of the same type and position in 
+the positional case or same type and name in the named case.
 
 ***Global*** options are options that are added with the ***add_global*** function and will show up
 set in the command results using the ***:global*** symbol. Global positional options must be given
 before any other commands but global named options may appear anywhere in the command line
 expression.
 
-***Shared*** options are options that are added with the command ***add_shared*** function. They
-should be added before any commands are added. They are added to each command as an explicit option.
-
 ***Commander.new*** must be run from the app's executable file for it to pick up the app's filename
 properly.
 

data/lib/nub/commander.rb

@@ -34,7 +34,6 @@ class Option
   attr_reader(:type)
   attr_accessor(:allowed)
   attr_accessor(:required)
-  attr_accessor(:shared)
 
   # Create a new option instance
   # @param key [String] option short hand, long hand and hint e.g. -s|--skip=COMPONENTS
@@ -47,13 +46,12 @@ class Option
     @long = nil
     @short = nil
     @desc = desc
-    @shared = false
     @allowed = allowed || []
     @required = required || false
 
     # Parse the key into its components (short hand, long hand, and hint)
     #https://bneijt.nl/pr/ruby-regular-expressions/
-    # Valid forms to look for with chars [a-zA-Z0-9-_=|] 
+    # Valid forms to look for with chars [a-zA-Z0-9-_=|]
     # --help, --help=HINT, -h|--help, -h|--help=HINT
     Log.die("invalid option key #{key}") if key && (key.count('=') > 1 or key.count('|') > 1 or !key[/[^\w\-=|]/].nil? or
       key[/(^--[a-zA-Z0-9\-_]+$)|(^--[a-zA-Z\-_]+=\w+$)|(^-[a-zA-Z]\|--[a-zA-Z0-9\-_]+$)|(^-[a-zA-Z]\|--[a-zA-Z0-9\-_]+=\w+$)/].nil?)
@@ -89,7 +87,7 @@ class Commander
   attr_reader(:banner)
   attr_accessor(:cmds)
 
-  Command = Struct.new(:name, :desc, :opts, :help)
+  Command = Struct.new(:name, :desc, :nodes, :help)
 
   # Initialize the commands for your application
   # @param app [String] application name e.g. reduce
@@ -114,9 +112,6 @@ class Commander
     # Configuration - ordered list of commands
     @config = []
 
-    # List of options that will be added to all commands
-    @shared = []
-
     # Configure default global options
     add_global(Option.new('-h|--help', 'Print command/options help'))
   end
@@ -134,46 +129,39 @@ class Commander
   # Add a command to the command list
   # @param cmd [String] name of the command
   # @param desc [String] description of the command
-  # @param opts [List] list of command options
-  def add(cmd, desc, options:[])
+  # @param nodes [List] list of command nodes (i.e. options or commands)
+  def add(cmd, desc, nodes:[])
     Log.die("'global' is a reserved command name") if cmd == 'global'
-    Log.die("'shared' is a reserved command name") if cmd == 'shared'
     Log.die("'#{cmd}' already exists") if @config.any?{|x| x.name == cmd}
-    Log.die("'help' is a reserved option name") if options.any?{|x| !x.key.nil? && x.key.include?('help')}
+    Log.die("'help' is a reserved option name") if nodes.any?{|x| x.class == Option && !x.key.nil? && x.key.include?('help')}
+    Log.die("command names must be pure lowercase letters") if cmd =~ /[^a-z]/
 
-    # Add shared options
-    @shared.each{|x| options.unshift(x)}
+    # Validate sub command key words
+    validate_sub_cmd = ->(sub_cmd){
+      Log.die("'global' is a reserved command name") if sub_cmd.name == 'global'
+      Log.die("'help' is a reserved option name") if sub_cmd.nodes.any?{|x| x.class == Option && !x.key.nil? && x.key.include?('help')}
+      Log.die("command names must be pure lowercase letters") if sub_cmd.name =~ /[^a-z]/
+      sub_cmd.nodes.select{|x| x.class != Option}.each{|x| validate_sub_cmd.(x)}
+    }
+    nodes.select{|x| x.class != Option}.each{|x| validate_sub_cmd.(x)}
 
-    cmd = add_cmd(cmd, desc, options)
-    @config << cmd
+    @config << add_cmd(cmd, desc, nodes)
   end
 
   # Add global options (any option coming before all commands)
   # @param option/s [Array/Option] array or single option/s
   def add_global(options)
-    options = [options] if options.class == Option
+    options = [options] if options.class != Array
+    Log.die("only options are allowed as globals") if options.any?{|x| x.class != Option}
 
     # Aggregate global options
     if (global = @config.find{|x| x.name == 'global'})
-      global.opts.each{|x| options << x}
+      global.nodes.each{|x| options << x}
       @config.reject!{|x| x.name == 'global'}
     end
     @config << add_cmd('global', 'Global options:', options)
   end
 
-  # Add shared option (options that are added to all commands)
-  # @param option/s [Array/Option] array or single option/s
-  def add_shared(options)
-    options = [options] if options.class == Option
-    options.each{|x|
-      Log.die("duplicate shared option '#{x.desc}' given") if @shared
-        .any?{|y| y.key == x.key && y.desc == x.desc && y.type == x.type}
-      x.shared = true
-      x.required = true
-      @shared << x
-    }
-  end
-
   # Returns banner string
   # @return [String] the app's banner
   def banner
@@ -206,7 +194,7 @@ class Commander
 
     # Set help if nothing was given
     ARGV.clear and ARGV << '-h' if ARGV.empty?
-    
+
     # Process command options
     #---------------------------------------------------------------------------
     order_globals!
@@ -221,7 +209,7 @@ class Commander
         # Collect command options from args to compare against
         opts = ARGV.take_while{|x| !cmd_names.include?(x) }
         ARGV.shift(opts.size)
- 
+
         # Handle help upfront before anything else
         if opts.any?{|x| m = match_named(x, cmd); m.hit? && m.sym == :help }
           !puts(help) and exit if cmd.name == 'global'
@@ -229,8 +217,8 @@ class Commander
         end
 
         # Check that all required options were given
-        cmd_pos_opts = cmd.opts.select{|x| x.key.nil? }
-        cmd_named_opts = cmd.opts.select{|x| !x.key.nil? }
+        cmd_pos_opts = cmd.nodes.select{|x| x.key.nil? }
+        cmd_named_opts = cmd.nodes.select{|x| !x.key.nil? }
 
         !puts("Error: positional option required!".colorize(:red)) && !puts(cmd.help) and
           exit if opts.select{|x| !x.start_with?('-')}.size < cmd_pos_opts.select{|x| x.required}.size
@@ -278,18 +266,12 @@ class Commander
           # --------------------------------------------------------------------
           !puts("Error: unknown named option '#{opt}' given!".colorize(:red)) && !puts(cmd.help) and exit if !sym
           @cmds[cmd.name.to_sym][sym] = value
-          if cmd_opt.shared
-            sym = "shared#{pos}".to_sym if cmd_opt.key.nil?
-            @cmds[:shared] = {} if !@cmds.key?(:shared)
-            @cmds[:shared][sym] = value
-          end
         }
       end
     }
 
-    # Ensure specials (global, shared) are always set
+    # Ensure specials (global) are always set
     @cmds[:global] = {} if !@cmds[:global]
-    @cmds[:shared] = {} if !@cmds[:shared]
 
     # Ensure all options were consumed
     Log.die("invalid options #{ARGV}") if ARGV.any?
@@ -353,13 +335,13 @@ class Commander
     args = ARGV[0..-1]
     results = {}
     cmd_names = @config.map{|x| x.name }
-    
+
     chained = []
     while args.any? do
       if !(cmd = @config.find{|x| x.name == args.first}).nil?
         results[args.shift] = []                            # Add the command to the results
         cmd_names.reject!{|x| x == cmd.name}                # Remove command from possible commands
-        cmd_required = cmd.opts.select{|x| x.required}
+        cmd_required = cmd.nodes.select{|x| x.required}
 
         # Collect command options from args to compare against
         opts = args.take_while{|x| !cmd_names.include?(x)}
@@ -369,20 +351,22 @@ class Commander
         results[cmd.name].concat(opts) and next if cmd.name == 'global'
 
         # Chained case is when no options are given but some are required
-        if opts.size == 0 && cmd.opts.any?{|x| x.required}
+        if opts.size == 0 && cmd.nodes.any?{|x| x.required}
           chained << cmd
         else
+          # Add cmd with options
           results[cmd.name].concat(opts)
 
+          # Check chained cmds against current cmd
           chained.each{|x|
-            other_required = x.opts.select{|x| x.required}
-            !puts("Error: chained commands must have equal numbers of required options!".colorize(:red)) && !puts(x.help) and
-              exit if cmd_required.size != other_required.size
-            cmd_required.each_with_index{|y,i|
+            other_required = x.nodes.select{|x| x.required}
+            !puts("Error: chained commands must satisfy required options!".colorize(:red)) && !puts(x.help) and
+              exit if cmd_required.size < other_required.size
+            other_required.each_with_index{|y,i|
               !puts("Error: chained command options are not type consistent!".colorize(:red)) && !puts(x.help) and
-                exit if y.type != other_required[i].type || y.key != other_required[i].key
+                exit if y.type != cmd_required[i].type || y.key != cmd_required[i].key
             }
-            results[x.name].concat(opts)
+            results[x.name].concat(opts.take(other_required.size))
           }
         end
       end
@@ -398,7 +382,7 @@ class Commander
   # @return [OptionMatch]] struct with some helper functions
   def match_named(opt, cmd)
     match = OptionMatch.new(opt)
-    cmd_named_opts = cmd.opts.select{|x| !x.key.nil? }
+    cmd_named_opts = cmd.nodes.select{|x| !x.key.nil? }
 
     if opt.start_with?('-')
       short = opt[@short_regex, 1]
@@ -450,25 +434,26 @@ class Commander
   # Add a command to the command list
   # @param cmd [String] name of the command
   # @param desc [String] description of the command
-  # @param opts [List] list of command options
+  # @param nodes [List] list of command nodes (i.e. options or commands)
   # @return [Command] new command
-  def add_cmd(cmd, desc, options)
-    Log.die("command names must be pure lowercase letters") if cmd =~ /[^a-z]/
+  def add_cmd(cmd, desc, nodes)
+    #nodes.select{|x| x.class != Option}.each{|x| validate_sub_cmd.(x)}
 
     # Build help for command
+    #---------------------------------------------------------------------------
     app = @app || @app_default
     help = "#{desc}\n"
     help += "\nUsage: ./#{app} #{cmd} [options]\n" if cmd != 'global'
     help = "#{banner}\n#{help}" if @app && cmd != 'global'
 
     # Add help option if not global command
-    options << @config.find{|x| x.name == 'global'}.opts.find{|x| x.long == '--help'} if cmd != 'global'
+    nodes << @config.find{|x| x.name == 'global'}.nodes.find{|x| x.long == '--help'} if cmd != 'global'
 
     # Add positional options first
-    sorted_options = options.select{|x| x.key.nil?}
-    sorted_options += options.select{|x| !x.key.nil?}.sort{|x,y| x.key <=> y.key}
+    sorted_options = nodes.select{|x| x.key.nil?}
+    sorted_options += nodes.select{|x| !x.key.nil?}.sort{|x,y| x.key <=> y.key}
     positional_index = -1
-    sorted_options.each{|x| 
+    sorted_options.each{|x|
       required = x.required ? ", Required" : ""
       allowed = x.allowed.empty? ? "" : " (#{x.allowed * ','})"
       positional_index += 1 if x.key.nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nub
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.54
 platform: ruby
 authors:
 - Patrick Crummett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize