autoargs 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4904378daa3039b791b8631f164adbc182f3c5a
-  data.tar.gz: 2731046da2d3e254361f1a4f88337f790afc612d
+  metadata.gz: b692c49b540de544d7f3d738aa3187acf9b15026
+  data.tar.gz: ff8053961c2f3cedd9a0f16fa24feb7b422eb859
 SHA512:
-  metadata.gz: 719b82c31a0028421217aa024c2408132f32aa1f89ee25314c570d969a364630b3835b48fee0c58d01c30ce7a41f26df1341c40a8d646b5fd51d06326b45ff3a
-  data.tar.gz: 0524db0755ffc9473352329221343ec42235da886172a531787a052293fe6182af5338e296cca25330505c6ea02e5638fd0c106202cfa5ff898afc2055cf5414
+  metadata.gz: 8f9213af79aa58eac52516eaff977e3dac62825637db6df82f2a2b41cc821ba6d5568367e02c03f455f099fa0fa2b3c9375822385ec2b4648e803353caec6f40
+  data.tar.gz: 22baba0e680bf8ca688e811709cb6d0ee0a0674c5a0fbabecb8de49fbf528c110b2a1ccb22ae868529122031daaa3f0fc90ab4fab070c53f28dd7fe4d9680d37

data/lib/autoargs/version.rb

@@ -1,3 +1,3 @@
 module Autoargs
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/autoargs.rb

@@ -31,28 +31,41 @@ module Autoargs
                     .map do |arg| [arg.children[0], arg.children[1].children[0]] end
             ]
 
+            usage = [[caller_file],
+                args.map do |arg| "<" + arg.to_s + ">" end,
+                optargs.map do |optarg| "[" + optarg[:name].to_s + "=" + optarg[:default].inspect + "]" end,
+                kwoptargs.map do |name, default| "[--" + name.to_s + " " + default.inspect + "]" end
+            ].flatten(1).join(" ")
+
             argv_args = ARGV[0 ... args.length]
             argv_optargs = ARGV[args.length ... args.length + optargs.length]
             argv_kwoptargs = Hash[
                 (ARGV[args.length + optargs.length .. -1] || [])
                     .each_slice(2)
                     .map do |name_with_prefix, value|
-                        abort("Expected argument " + name_with_prefix + " to start with --.") unless name_with_prefix.start_with?("--")
-                        name = name_with_prefix[2 .. -1]
-                        abort(name + " is not an option.") unless kwoptargs.has_key?(name.to_sym)
-                        [name.to_sym, value]
+                        begin
+                            raise "Expected argument " + name_with_prefix + " to start with --." unless name_with_prefix.start_with?("--")
+                            raise "Expected value for argument " + name_with_prefix if value.nil?
+                            name = name_with_prefix[2 .. -1]
+                            raise name + " is not an option." unless kwoptargs.has_key?(name.to_sym)
+                            [name.to_sym, value]
+                        rescue Exception => e
+                            puts(e.message)
+                            puts
+                            puts(usage)
+                            abort
+                        end
                     end
             ]
 
-            if argv_args.length < args.length
-                abort([[caller_file],
-                    args.map do |arg| "<" + arg.to_s + ">" end,
-                    optargs.map do |optarg| "[" + optarg[:name].to_s + "=" + optarg[:default].inspect + "]" end,
-                    kwoptargs.map do |name, default| "[--" + name.to_s + " " + default.inspect + "]" end
-                ].flatten(1).join(" "))
-            end
+            abort(usage) if argv_args.length < args.length
 
-            method.call(*ARGV.slice(0, args.length + optargs.length), **argv_kwoptargs)
+            positionals = ARGV.slice(0, args.length + optargs.length)
+            if argv_kwoptargs.keys.length != 0
+                method.call(*positionals, **argv_kwoptargs)
+            else
+                method.call(*positionals)
+            end
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoargs
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chris Wendt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser