rubycom 0.2.3 → 0.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzIyZGNiNTNlZGYwNTllMDcwOTFhNzE5YjMyMTE2M2YxZWFiNzM5MA==
+    ZDhjYTIwMGM1YWNmMjc3NWI0ZWY2NTM5NDY1NGM3MjliYTA4MTA2MA==
   data.tar.gz: !binary |-
-    YmI0MWUwNWVkMzExYjUyNjVjOGMwNWVjYzE5ZTNhZDFhMTg4Yjk4OA==
+    NmU3YjBkMjYwYTg5ZTY5MjQ1NjBiNDE3ZDNkMWNhY2QyMDYyNDJlZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Njc2YzE2YTBkNDNkN2FkZGI4MTZhNWIyNzVkNzdjYjE2YTg5ZDcyYmE1MTg0
-    Y2RkMTg1YzY2Yzg2N2M4NTMzY2QzN2Y1MDQ1N2JkZGU2NzhjYWQ0ZWYwMmRk
-    YjkyYTg2MTVlNzA3ZmRkZGZjMmExZDIwMmVmNTliMmMxM2JlMzA=
+    NmRmOThjZDFjYjRlZTNkMGFjYzViYzQ0M2M2ZGM5Y2U1NDlhNzEzOTFjYTcy
+    NDk0OTRmZDQ3ZjQ5M2JjY2E0ZGU2MzA4NjIyOWIyODIyMDg3ZGM1MTVhOGUy
+    ZTk3MzhhYTQzY2FjMDk1NGNlY2NiN2FjOWE4NTY2NDA5OWQ1YTA=
   data.tar.gz: !binary |-
-    M2EzNTAwODE5OTdjYzNmNjYxYzc0YjRmZjRlMjU4NGVhNTE3YjI4MzZiNGFh
-    ZWVkNDBlY2YxYmRjYzMxNGRiZWYwNzhlMzE2NzE0MmQwMjlkNDhmZjU2ZGQw
-    Y2M5Mjg2MjM1OWIwYjE0OWI3OTVmMjBiYmU4OGE3MWU2M2JmNjI=
+    NGZmOTU5MDUyMjFmOGI2OTEzODdjY2Q5MTlmYTA1MDE1ZGI0OTE1ZTFmM2Vm
+    MDU3Mjg3NTYwOWVlOWNkOTk1MmFkZDU1ZTE3N2Q0OTkyNGUwNTg5Mzc0NmVj
+    NjJiNjc4ZDU4ODZhMjMzNzM3MjMzY2JkZjJkZTk1ZDZiYjIzYjU=

data/lib/rubycom.rb

@@ -108,7 +108,13 @@ module Rubycom
         raise CLIError, "No public method found for symbol: #{command.to_sym}" if method.nil?
         param_defs = self.get_param_definitions(method)
         args = self.parse_arguments(param_defs, arguments)
-        (arguments.nil? || arguments.empty?) ? method.call : method.call(*method.parameters.map { |arr| args[arr[1]]}.flatten)
+        flatten = false
+        params = method.parameters.map { |arr| flatten = true if arr[0]==:rest; args[arr[1]]}
+        if flatten
+          rest_arr = params.delete_at(-1)
+          rest_arr.each{|arg| params << arg}
+        end
+        (arguments.nil? || arguments.empty?) ? method.call : method.call(*params)
       end
     rescue CLIError => e
       $stderr.puts e
@@ -128,18 +134,19 @@ module Rubycom
   def self.parse_arguments(parameters={}, arguments=[])
     raise CLIError, 'parameters may not be nil' if parameters.nil?
     raise CLIError, 'arguments may not be nil' if arguments.nil?
-    types = parameters.values.group_by { |hsh| hsh[:type] }.map { |type, defs_arr| Hash[type, defs_arr.length] }.reduce(&:merge) || {}
-    raise CLIError, "Wrong number of arguments. Expected at least #{types[:req]}, received #{arguments.length}" if arguments.length < (types[:req]||0)
-    raise CLIError, "Wrong number of arguments. Expected at most #{(types[:req]||0) + (types[:opt]||0)}, received #{arguments.length}" if types[:rest].nil? && (arguments.length > ((types[:req]||0) + (types[:opt]||0)))
-
     sorted_args = arguments.map { |arg|
       Rubycom.parse_arg(arg)
     }.group_by { |hsh|
       hsh.keys.first
     }.map { |key, arr|
-      (key == :rubycom_non_opt_arg) ? Hash[key, arr.map { |hsh| hsh.values }.flatten] : Hash[key, arr.map { |hsh| hsh.values.first }.reduce(&:merge)]
+      (key == :rubycom_non_opt_arg) ? Hash[key, arr.map { |hsh| hsh.values }.flatten(1)] : Hash[key, arr.map { |hsh| hsh.values.first }.reduce(&:merge)]
     }.reduce(&:merge) || {}
 
+    sorted_arg_count = sorted_args.map{|key,val| val}.flatten(1).length
+    types = parameters.values.group_by { |hsh| hsh[:type] }.map { |type, defs_arr| Hash[type, defs_arr.length] }.reduce(&:merge) || {}
+    raise CLIError, "Wrong number of arguments. Expected at least #{types[:req]}, received #{sorted_arg_count}" if sorted_arg_count < (types[:req]||0)
+    raise CLIError, "Wrong number of arguments. Expected at most #{(types[:req]||0) + (types[:opt]||0)}, received #{sorted_arg_count}" if types[:rest].nil? && (sorted_arg_count > ((types[:req]||0) + (types[:opt]||0)))
+
     parameters.map { |param_sym, def_hash|
       if def_hash[:type] == :req
         raise CLIError, "No argument available for #{param_sym}" if sorted_args[:rubycom_non_opt_arg].nil? || sorted_args[:rubycom_non_opt_arg].length == 0
@@ -170,7 +177,12 @@ module Rubycom
       }
       Hash[k, v]
     else
-      Hash[:rubycom_non_opt_arg, (YAML.load("#{arg}") rescue "#{arg}")]
+      begin
+        parsed_arg = YAML.load("#{arg}")
+      rescue Exception
+        parsed_arg = "#{arg}"
+      end
+      Hash[:rubycom_non_opt_arg, parsed_arg]
     end
   end
 

data/lib/rubycom/version.rb

@@ -1,3 +1,3 @@
 module Rubycom
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/test/rubycom/test_rubycom.rb

@@ -69,8 +69,9 @@ class TestRubycom < Test::Unit::TestCase
   def test_get_command_summary
     base = UtilTestModule
     command_name = 'test_command_with_options'
+    expected = "test_command_with_options - A test_command with an optional argument\n"
     result = Rubycom.get_command_summary(base, command_name)
-    assert_equal("test_command_with_options - A test_command with an optional argument\n".gsub(/\n|\r|\s/, ''), result.gsub(/\n|\r|\s/, ''))
+    assert_equal(expected.gsub(/\n|\r|\s/, ''), result.gsub(/\n|\r|\s/, ''))
   end
 
   def test_get_command_summary_no_command
@@ -128,6 +129,7 @@ class TestRubycom < Test::Unit::TestCase
     test_command_arg_false      -  A test_command with a Boolean argument
     test_command_arg_arr        -  A test_command with an array argument
     test_command_arg_hash       -  A test_command with an Hash argument
+    test_command_mixed_options  -  A test_command with several mixed options
 
     END
     assert_equal(expected.gsub(/\n|\r|\s/, ''), result.gsub(/\n|\r|\s/, ''))
@@ -165,6 +167,7 @@ class TestRubycom < Test::Unit::TestCase
     test_command_arg_false      -  A test_command with a Boolean argument
     test_command_arg_arr        -  A test_command with an array argument
     test_command_arg_hash       -  A test_command with an Hash argument
+    test_command_mixed_options  -  A test_command with several mixed options
     END
     assert_equal(expected.gsub(/\n|\r|\s/, ''), result.gsub(/\n|\r|\s/, ''))
   end
@@ -182,10 +185,11 @@ class TestRubycom < Test::Unit::TestCase
   end
 
   def test_get_top_level_commands
-    test_command_list = [:test_command, :test_command_no_docs, :test_command_with_arg, :test_command_arg_named_arg, :test_command_with_args, :test_command_with_options,
-                         :test_command_all_options, :test_command_options_arr, :test_command_with_return,
-                         :test_command_arg_timestamp, :test_command_arg_false, :test_command_arg_arr,
-                         :test_command_arg_hash]
+    test_command_list = [:test_command, :test_command_no_docs, :test_command_with_arg, :test_command_arg_named_arg,
+                         :test_command_with_args, :test_command_with_options, :test_command_all_options,
+                         :test_command_options_arr, :test_command_with_return, :test_command_arg_timestamp,
+                         :test_command_arg_false, :test_command_arg_arr, :test_command_arg_hash,
+                         :test_command_mixed_options]
     result_command_list = Rubycom.get_top_level_commands(UtilTestModule)
     assert_equal(test_command_list.length, result_command_list.length)
     test_command_list.each { |sym|
@@ -414,6 +418,7 @@ class TestRubycom < Test::Unit::TestCase
     test_command_arg_false      -  A test_command with a Boolean argument
     test_command_arg_arr        -  A test_command with an array argument
     test_command_arg_hash       -  A test_command with an Hash argument
+    test_command_mixed_options  -  A test_command with several mixed options
     END
     expected_out = expected
     assert_equal(expected.gsub(/\n|\r|\s/, ''), result.gsub(/\n|\r|\s/, ''))
@@ -700,4 +705,49 @@ class TestRubycom < Test::Unit::TestCase
     $stderr = o_stderr
   end
 
+  def test_full_run_mixed_args
+    mod = "util_test_module.rb"
+    command = "test_command_mixed_options"
+    args = "testing_arg \"[test1, test2]\" -test_opt='testing_option' \"{a: 'test_hsh_arg'}\" some other args"
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={"a"=>"test_hsh_arg"} test_rest=["some", "other", "args"]'+"\n"
+    result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
+    assert_equal(expected, result)
+  end
+
+  def test_full_run_mixed_args_solid_arr
+    mod = "util_test_module.rb"
+    command = "test_command_mixed_options"
+    args = "testing_arg [test1,test2] -test_opt='testing_option' \"{a: 'test_hsh_arg'}\" some other args"
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={"a"=>"test_hsh_arg"} test_rest=["some", "other", "args"]'+"\n"
+    result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
+    assert_equal(expected, result)
+  end
+
+  def test_full_run_mixed_args_quoted_solid_arr
+    mod = "util_test_module.rb"
+    command = "test_command_mixed_options"
+    args = 'testing_arg "[test1,test2]" -test_opt="testing_option" "{a: "test_hsh_arg"}" some other args'
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={"a"=>"test_hsh_arg"} test_rest=["some", "other", "args"]'+"\n"
+    result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
+    assert_equal(expected, result)
+  end
+
+  def test_full_run_mixed_args_odd_sp
+    mod = "util_test_module.rb"
+    command = "test_command_mixed_options"
+    args = 'testing_arg "[ test1 ,  test2 ]" -test_opt="testing_option" "{ a:    "test_hsh_arg" }" some other args'
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={"a"=>"test_hsh_arg"} test_rest=["some", "other", "args"]'+"\n"
+    result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
+    assert_equal(expected, result)
+  end
+
+  def test_full_run_mixed_args_hash_rocket
+    mod = "util_test_module.rb"
+    command = "test_command_mixed_options"
+    args = 'testing_arg "[ test1 ,  test2 ]" -test_opt="testing_option" "{ :a =>    "test_hsh_arg" }" some other args'
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={ :a =>    test_hsh_arg } test_rest=["some", "other", "args"]'+"\n"
+    result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
+    assert_equal(expected, result)
+  end
+
 end

data/test/rubycom/util_test_module.rb

@@ -103,5 +103,10 @@ module UtilTestModule
     test_hash
   end
 
+  # A test_command with several mixed options
+  def self.test_command_mixed_options(test_arg, test_arr=[], test_opt='test_opt_arg', test_hsh={}, *test_rest)
+    "test_arg=#{test_arg} test_arr=#{test_arr} test_opt=#{test_opt} test_hsh=#{test_hsh} test_rest=#{test_rest}"
+  end
+
   include Rubycom
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycom
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Danny Purcell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler