nub 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 252475d41897431fae67e7f7c9b613db0ce9fc59c7bbf83dd67cec52b5f9611b
-  data.tar.gz: 382e539ad717e3a0830f4070112085ff568ebb1db18e32b3f06f0eeaa3165439
+  metadata.gz: 289eea77b83026e03f76830c0ef68782f44fdb34237b4077e4a747e44a18e11b
+  data.tar.gz: f3605f50a0555a2cd8f5f452739a863fd421c07ecffa8bcfedd8548975eaaad6
 SHA512:
-  metadata.gz: 22f5da62845e4cd9a2aac1dc726c6c5c30ee854dd20999b177ad9db412bd7343bafc09de0ccf309fbf1548a75d557a68a39510be3de030e479db080ec53ffbee
-  data.tar.gz: 668f01238e0e8501965b45b5ea1beac2fbac9981e0dbae79233ca43af08036d39b8f4832d413de499890334adae07695e2da9eb1f8c818bb119cade426b82ad7
+  metadata.gz: 0d003170c0aa05f00626d9587b666c0b66923ff4ad20401db1d39d18f7dc0f143bfbd438433f71890485e8b44ccabe3bb497cfcdd74d383fa6cb6853cc842b87
+  data.tar.gz: 41a27d08399b97a8af5da53acfd63f1b62f7137d143c46cdd783a2947126dbc37d48060ff01b5a4aade8b97c82b3d72b9534b58bd68123fff4134f60ed6cb6e3

data/lib/nub/commander.rb

@@ -194,14 +194,50 @@ class Commander
         @cmds[ARGV.shift.to_sym] = {}
         cmd_names.reject!{|x| x == cmd.name}
 
-        # Collect command options
-        opts = ARGV.take_while{|x| !cmd_names.include?(x) }
-        ARGV.shift(opts.size)
+        # Command options as defined in configuration
         cmd_pos_opts = cmd.opts.select{|x| x.key.nil? }
         cmd_named_opts = cmd.opts.select{|x| !x.key.nil? }
+
+        # Collect command options from args to compare against
+        opts = ARGV.take_while{|x| !cmd_names.include?(x) }
+        ARGV.shift(opts.size)
+
+        # All positional options are required. If they are not given then check for the 'chained
+        # command expression' case for positional options in the next command that satisfy the
+        # previous command's requirements and so on and so forth.
+        if opts.size == 0 && (cmd_pos_opts.any? || cmd_named_opts.any?{|x| x.required})
+          i = 0
+          while (i += 1) < ARGV.size do
+            opts = ARGV[i..-1].take_while{|x| !cmd_names.include?(x) }
+            break if opts.any? 
+          end
+
+          # Check that the chained command options at least match types and size
+          if opts.any?
+            cmd_required = cmd.opts.select{|x| x.key.nil? || x.required}
+            other = @config.find{|x| x.name == ARGV[i-1]}
+            other_required = other.opts.select{|x| x.key.nil? || x.required}
+
+            !puts("Error: chained commands must have equal numbers of required optiosn".colorize(:red)) && !puts(cmd.help) and
+              exit if cmd_required.size != other_required.size
+            cmd_required.each_with_index{|x,i|
+              !puts("Error: chained command options are not type consistent".colorize(:red)) && !puts(cmd.help) and
+                exit if x.type != other_required[i].type || x.key != other_required[i].key
+            }
+          end
+        end
+
+        # Check that all positional options were given
         !puts("Error: positional option required".colorize(:red)) && !puts(cmd.help) and
           exit if opts.size < cmd_pos_opts.size
 
+        # Check that all required named options where given
+        named_opts = opts.select{|x| x.start_with?('-')}
+        cmd_named_opts.select{|x| x.required}.each{|x|
+          !puts("Error: required option #{x.key} not given".colorize(:red)) && !puts(cmd.help) and
+            exit if !named_opts.find{|y| y.start_with?(x.short) || y.start_with?(x.long)}
+        }
+
         # Process command options
         pos = -1
         loop {

metadata

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