kommand 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e728a399b1bbe6ae3294871c2f3186f6e866c675
-  data.tar.gz: 692bbc295236b95010345f8638aae5ed036506f4
+  metadata.gz: 9d5b05ccf5a4e09c7056dec6cd72d62e5134c30d
+  data.tar.gz: 654cec67411b5d2c44b01d3937beb5491c0ee331
 SHA512:
-  metadata.gz: 2fb412fdc3e080cbc595c7c455fcba65fb68cef6de77c5c7f58b7f45228552cdfeabf2f95a7591b082f8eef4fd94136278ed9eb69edb2ce1655f18396bf84e4f
-  data.tar.gz: 841eb474194955c825122df2a6d97871563f456403c9e0bd60e3f1bf90b6e4cfca50411f378b6f8133b8db8067f6ccaaf82ab37c834d98097ce69fd604cc003d
+  metadata.gz: 83ac028e2305ebe6c59545c53a7393eb6b80baf43e11c83e475bf995f3bc5c4eed3174880db926160000898a15b67595aaf5b439b8b9d617f7d22afef8667728
+  data.tar.gz: 6dd15c9de3386c659d85f4dc750df61f393e50918f02b7f9f9fe00d3704be5b1adc033215dff8678cd27cffaca139e03565fa773e76f4eed452b8da254fa48a1

data/lib/kommand/scripts/argument.rb

@@ -9,17 +9,40 @@ module Kommand
       end
 
       def key
-        @keys.is_a?(Array) ? @keys[0] : @keys
+        if unnamed?
+          value
+        else
+          @keys.is_a?(Array) ? @keys[0] : @keys
+        end
       end
 
       def keys
-        @keys.is_a?(Array) ? @keys : [@keys]
+        if unnamed?
+          [value]
+        else
+          @keys.is_a?(Array) ? @keys : [@keys]
+        end
       end
 
       def name
         keys.sort { |a,b| a.length <=> b.length }.last.gsub(/^--/, '')
       end
 
+      # is this an unnamed argument?
+      def unnamed?
+        @keys == nil
+      end
+
+      # is this argument valid?
+      def valid?
+        !((validate? && !@valid.include?(val)) && (!val.nil? && !val.empty?))
+      end
+
+      # should this argument validate?
+      def validate?
+        !@valid.nil?
+      end
+
       protected
 
       def initialize(keys, *args)

data/lib/kommand/scripts/arguments.rb

@@ -1,7 +1,29 @@
 module Kommand
   module Scripts
     class Arguments < Array
-      
+
+      def named
+        args = self.class.new
+        args.concat(select { |arg| !arg.unnamed? })
+      end
+
+      def unnamed
+        args = self.class.new
+        args.concat(select { |arg| arg.unnamed? })
+      end
+
+      def arg(key)
+        named.select { |arg| arg.name.to_s == key.to_s }.first
+      end
+
+      def arg?(key)
+        !arg(key).nil?
+      end
+
+      def get(key)
+        arg?(key) ? arg(key).value : nil
+      end
+
       def to_s
         map do |arg|
           #if arg.valid.nil? || arg.valid.empty?

data/lib/kommand/scripts/script.rb

@@ -55,21 +55,32 @@ module Kommand
           arguments
         end
 
+        # reset arguments to the provided args
         def set_arguments(*args)
           @arguments = Arguments.new
           add_arguments(*args)
         end
 
+        # add arguments to existing args
         def add_arguments(*args)
           @arguments ||= Arguments.new
           args.each_with_index do |arg,a|
             argk, argv = *parse_arg(arg)
             
+            # if the argument is not a known flag, is not a valid argument and the last argument was
+            # a known flag, this must be a value for the last argument
             if !argument_flag?(arg) && !valid_argument?(argk) && (a > 0 && argument_flag?(args[a-1]))
               @arguments.last.value = arg
               next
             end
 
+            # swap key/val to create an unnamed arg - if next argument is a valid flag we must be
+            # a standalone argument
+            if a < args.length && (argv.nil? || argv.empty?) && !Commands::exists?(arg) && valid_argument?(args[a+1])
+              argv = argk
+              argk = nil
+            end
+
             raise InvalidArgument, "Invalid Argument: #{arg}" if validate_arguments? && !valid_argument?(argk)
             @arguments << argument_object(argk)
             @arguments.last.value = argv unless argv.empty?
@@ -79,7 +90,7 @@ module Kommand
 
         def parse_arg(arg)
           arga = arg.split("=")
-          [arga.slice!(0), arga.join("=")]
+          [arga.slice!(0), arga.join("=")] # rejoin with '=' in case there was an '=' in the passed value
         end
         
         def valid_argument?(key)

data/lib/kommand/version.rb

@@ -1,3 +1,3 @@
 module Kommand
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kommand
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mark Rebec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport