shellopts 2.0.17 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd7911e579af4ddddd064399e7b456b45cef80dc3c6589e404ba5e32811bd6c
-  data.tar.gz: ea555ad68d0d6c43bad39a4e195e6661f72e1e43b6d3dbe647f4c8ff13d7eea3
+  metadata.gz: 43a4d96ef2927b72add380e17e0dad25b2004659491a5dc4adb36f3c9965c8c9
+  data.tar.gz: 507780f5ea40771db0ffbc4d0247b9f8f5d08044953dc0c387e92432c42879df
 SHA512:
-  metadata.gz: 453d3bd1e4354a56947623232f1fabcdc8d212a91d317ce16026c356c71c77ab53031e4e42d05242d0c04ce309ccd69fd75386d3d40705feac461f58d6a2c86b
-  data.tar.gz: 282655ab16154e1b50c25b6ddf8a07196a296f8a2bad4086cd78b8962a9003c22e1fb8dfbe2e339fc97973fef95b1cf9965a829bab23b2ad98f63df1aef8c009
+  metadata.gz: d57c4a7245f5c22b74c762d986b8a80ca331643a3f32f63421f08f412da01e3f6e21c76e0fe1921fa8337ad2cbc168e00bb9f722f3ebfc1fdb7468619169658d
+  data.tar.gz: 4ab7b06dd787db06af9ca0d70f6d44a26e251707badef5beecdb3bb719a3fc1bebf5357f00df2702589f4ea6960ebc6af83329adadc3e65bd2746e3dbb536fca

data/PROBLEMS

@@ -39,3 +39,14 @@ SPEC = %(
     mapping and grants are
 )
 
+###########################
+
+# If option is only defined on a subcommand, it doesn't flow before the subcommand. This should be legal:
+ 
+cmd -c sub
+
+# Only this is legal today
+
+cmd sub -c
+
+

data/lib/shellopts/grammar.rb

@@ -30,7 +30,7 @@ module ShellOpts
       def ancestors() parents.reverse end
 
       def inspect
-        "#{self.class}"
+        self.class.to_s
       end
 
     protected
@@ -241,7 +241,7 @@ module ShellOpts
       def [](key)
         case key
           when String; lookup(key.split("."))
-          when Symbol; lookup(key.to_s.sub(".", "!.").split(".").map(&:to_sym))
+          when Symbol; lookup(key.to_s.gsub(".", "!.").split(".").map(&:to_sym))
           when Array; lookup(key)
         else
           nil

data/lib/shellopts/program.rb

@@ -62,40 +62,28 @@ module ShellOpts
       object
     end
 
-    # Return command or option object if present, otherwise nil. Returns a
-    # possibly empty array of option objects if the option is repeatable
+    # Returns the command or option object identified by the UID if present and
+    # otherwise nil. Returns a possibly empty array of option objects if the
+    # option is repeatable. Raise an ArgumentError if the key doesn't exists
     #
-    # The key is the name or identifier of the object or any any option
-    # alias. Eg.  :f, '-f', :file, or '--file' are all usable as option keys
-    # and :cmd!  or 'cmd' as command keys
+    # The +key+ is the symbolic UID of the object. Eg. :command.option or
+    # :command.subcommand!
     #
-    def [](key)
-      case object = __grammar__[key]
-        when ::ShellOpts::Grammar::Command
-          object.ident == __subcommand__!.__ident__ ? __subcommand__! : nil
-        when ::ShellOpts::Grammar::Option
-          if object.repeatable?
-            __option_hash__[object.ident] || []
+    def [](uid)
+      __grammar__.key?(uid) or ::Kernel.raise ::ArgumentError, "'#{uid}' is not a valid UID"
+      idents = uid.to_s.gsub(/\./, "!.").split(/\./).map(&:to_sym)
+      idents.inject(self) { |cmd, ident|
+        case ident.to_s
+          when /!$/
+            return nil if cmd.__subcommand__ != ident
+            cmd = cmd.__subcommand__!
           else
-            __option_hash__[object.ident]
-          end
-        else
-          ::Kernel.raise ::ArgumentError, "Unknown command or option: '#{key}'"
-      end
+            opt = cmd.__option_hash__[ident]
+            opt.nil? && cmd.__grammar__[ident].repeatable? ? [] : opt
+        end
+      }
     end
 
-    # Return true if the given command or option is present
-    def key?(key)
-      case object = __grammar__[key]
-        when ::ShellOpts::Grammar::Command
-          object.ident == __subcommand__
-        when ::ShellOpts::Grammar::Option
-          __option_hash__.key?(object.ident)
-        else
-          ::Kernel.raise ::ArgumentError, "Unknown command or option: '#{key}'"
-      end
-    end
-      
     # Returns a hash of the given options if defined. Returns all options if no
     # options are given
     def to_h(*keys)
@@ -148,7 +136,7 @@ module ShellOpts
     #
     def supercommand!() __supercommand__ end
 
-    # UID of command/program
+    # UID of command/program (String)
     def __uid__() @__grammar__.uid end
 
     # Identfier including the exclamation mark (Symbol)

data/lib/shellopts/version.rb

@@ -1,3 +1,3 @@
 module ShellOpts
-  VERSION = "2.0.17"
+  VERSION = "2.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shellopts
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.18
 platform: ruby
 authors:
 - Claus Rasmussen