rubycom 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDhjYTIwMGM1YWNmMjc3NWI0ZWY2NTM5NDY1NGM3MjliYTA4MTA2MA==
+    YmZkNDU1NjY2ZGU2MmM0ZGE4OTEyNTkwYTBkMzVhMjhiYWIzOWVhNA==
   data.tar.gz: !binary |-
-    NmU3YjBkMjYwYTg5ZTY5MjQ1NjBiNDE3ZDNkMWNhY2QyMDYyNDJlZA==
+    NWI4NWMxNjJiN2RhZTA2MWJiNjZhZjZiNTVhMmMzMTMwMWRkN2FkYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmRmOThjZDFjYjRlZTNkMGFjYzViYzQ0M2M2ZGM5Y2U1NDlhNzEzOTFjYTcy
-    NDk0OTRmZDQ3ZjQ5M2JjY2E0ZGU2MzA4NjIyOWIyODIyMDg3ZGM1MTVhOGUy
-    ZTk3MzhhYTQzY2FjMDk1NGNlY2NiN2FjOWE4NTY2NDA5OWQ1YTA=
+    MjI1NjA5YjZiMDdhNzQ3M2YzNjVmYTYwYWQyMjMxZmIzZDYwZmMyNWMwM2Jm
+    MjAwNTQ3NDI0NjMzOWVjMGUzNDAyZjVjZDVjZmZkNzk3MjM5YzJlY2M3NDU3
+    NzhlNjI2NzNlNjQ4ZTZkYjljNjQ2ZDVmZGE3YjJlNWUxNmI3NDc=
   data.tar.gz: !binary |-
-    NGZmOTU5MDUyMjFmOGI2OTEzODdjY2Q5MTlmYTA1MDE1ZGI0OTE1ZTFmM2Vm
-    MDU3Mjg3NTYwOWVlOWNkOTk1MmFkZDU1ZTE3N2Q0OTkyNGUwNTg5Mzc0NmVj
-    NjJiNjc4ZDU4ODZhMjMzNzM3MjMzY2JkZjJkZTk1ZDZiYjIzYjU=
+    MjUwMmNmYjVjMDc0ZDI2YzE5MzMyYTY0ZDNmNmJiOTdkZDQ4YTVlMGE0Yjlj
+    YTRkOTM5ZTM3NTQyNjcxNGE2ZTY0ODAyYTNmZjFmN2JiNGJkYTFmYjQ3YjVi
+    Yzk0YjFkMWIxNGViNDlmNDUzNWM4ODdjNWE0MDE1ZmY0ZjczOTQ=

data/Rakefile

@@ -1,4 +1,3 @@
-require "#{File.expand_path(File.dirname(__FILE__))}/lib/rubycom/version.rb"
 require 'yard'
 
 task :default => [:package]
@@ -14,7 +13,9 @@ task :test do
   test_files = Dir.glob("**/test/*/test_*.rb")
   test_files.each { |test_case|
     ruby test_case rescue SystemExit
-    if $?.exitstatus != 0; raise "Error during test phase\n Test: #{test_case}\n Error: #{$!}\n#{$@}" unless $!.nil? end
+    if $?.exitstatus != 0;
+      raise "Error during test phase\n Test: #{test_case}\n Error: #{$!}\n#{$@}" unless $!.nil?
+    end
   }
 end
 
@@ -29,9 +30,36 @@ task :package => [:clean, :test, :yard] do
 end
 
 task :install => :package do
+  load "#{File.expand_path(File.dirname(__FILE__))}/lib/rubycom/version.rb"
   system("gem install #{File.expand_path(File.dirname(__FILE__))}/rubycom-#{Rubycom::VERSION}.gem")
 end
 
-task :release => :package do
-  system("gem push #{File.expand_path(File.dirname(__FILE__))}/rubycom-#{Rubycom::VERSION}.gem")
+task :version_set, [:version] do |t, args|
+  version_file = <<-END.gsub(/^ {4}/, '')
+    module Rubycom
+      VERSION = "#{args[:version]}"
+    end
+  END
+  puts "Writing version file:\n #{version_file}"
+  File.open("#{File.expand_path(File.dirname(__FILE__))}/lib/rubycom/version.rb", 'w+') { |file|
+    file.write(version_file)
+  }
+  file_text = File.read("#{File.expand_path(File.dirname(__FILE__))}/lib/rubycom/version.rb")
+  raise "Could not update version file" if file_text != version_file
+end
+
+task :release, [:version] => [:version_set, :package] do |t, args|
+  system("git clean -f")
+  system("git add .")
+  system("git commit -m\"Version to #{args[:version]}\"")
+  if $?.exitstatus == 0
+    system("git tag -a v#{args[:version]} -m\"Version #{args[:version]} Release\"")
+    if $?.exitstatus == 0
+      system("git push origin master --tags")
+      if $?.exitstatus == 0
+        load "#{File.expand_path(File.dirname(__FILE__))}/lib/rubycom/version.rb"
+        system("gem push #{File.expand_path(File.dirname(__FILE__))}/rubycom-#{Rubycom::VERSION}.gem")
+      end
+    end
+  end
 end

data/lib/rubycom.rb

@@ -152,9 +152,14 @@ module Rubycom
         raise CLIError, "No argument available for #{param_sym}" if sorted_args[:rubycom_non_opt_arg].nil? || sorted_args[:rubycom_non_opt_arg].length == 0
         Hash[param_sym, sorted_args[:rubycom_non_opt_arg].shift]
       elsif def_hash[:type] == :opt
-        Hash[param_sym, ((sorted_args[param_sym]) ? sorted_args[param_sym] : ((sorted_args[:rubycom_non_opt_arg].shift || parameters[param_sym][:default]) rescue parameters[param_sym][:default]))]
+        if sorted_args[param_sym].nil?
+          arg = (sorted_args[:rubycom_non_opt_arg].nil? || sorted_args[:rubycom_non_opt_arg].empty?) ? parameters[param_sym][:default] : sorted_args[:rubycom_non_opt_arg].shift
+        else
+          arg = sorted_args[param_sym]
+        end
+        Hash[param_sym, arg]
       elsif def_hash[:type] == :rest
-        ret = Hash[param_sym, ((sorted_args[param_sym]) ? sorted_args[param_sym] : sorted_args[:rubycom_non_opt_arg])]
+        ret = Hash[param_sym, ((!sorted_args[param_sym].nil?) ? sorted_args[param_sym] : sorted_args[:rubycom_non_opt_arg])]
         sorted_args[:rubycom_non_opt_arg] = []
         ret
       end

data/lib/rubycom/version.rb

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

data/test/rubycom/test_rubycom.rb

@@ -708,8 +708,8 @@ class TestRubycom < Test::Unit::TestCase
   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"
+    args = "testing_arg \"[test1, test2]\" -test_opt='testing_option' \"{a: 'test_hsh_arg'}\" -test_bool=true some other args"
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={"a"=>"test_hsh_arg"} test_bool=true test_rest=["some", "other", "args"]'+"\n"
     result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
     assert_equal(expected, result)
   end
@@ -718,7 +718,7 @@ class TestRubycom < Test::Unit::TestCase
     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"
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={"a"=>"test_hsh_arg"} test_bool=some test_rest=["other", "args"]'+"\n"
     result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
     assert_equal(expected, result)
   end
@@ -726,8 +726,8 @@ class TestRubycom < Test::Unit::TestCase
   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"
+    args = 'testing_arg "[test1,test2]" -test_opt="testing_option" "{a: "test_hsh_arg"}" -test_bool=false some other args'
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={"a"=>"test_hsh_arg"} test_bool=false test_rest=["some", "other", "args"]'+"\n"
     result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
     assert_equal(expected, result)
   end
@@ -735,8 +735,8 @@ class TestRubycom < Test::Unit::TestCase
   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"
+    args = 'testing_arg "[ test1 ,  test2 ]" -test_opt="testing_option" "{ a:    "test_hsh_arg" }" -test_bool=false some other args'
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={"a"=>"test_hsh_arg"} test_bool=false test_rest=["some", "other", "args"]'+"\n"
     result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
     assert_equal(expected, result)
   end
@@ -744,8 +744,17 @@ class TestRubycom < Test::Unit::TestCase
   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"
+    args = 'testing_arg "[ test1 ,  test2 ]" -test_opt="testing_option" "{ :a =>    "test_hsh_arg" }" false some other args'
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={ :a =>    test_hsh_arg } test_bool=false 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_no_rest
+    mod = "util_test_module.rb"
+    command = "test_command_mixed_options"
+    args = "testing_arg \"[test1, test2]\" -test_opt='testing_option' \"{a: 'test_hsh_arg'}\""
+    expected = 'test_arg=testing_arg test_arr=["test1", "test2"] test_opt=testing_option test_hsh={"a"=>"test_hsh_arg"} test_bool=true test_rest=[]'+"\n"
     result = %x(ruby #{File.expand_path(File.dirname(__FILE__))}/#{mod} #{command} #{args})
     assert_equal(expected, result)
   end

data/test/rubycom/util_test_module.rb

@@ -104,8 +104,8 @@ module UtilTestModule
   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}"
+  def self.test_command_mixed_options(test_arg, test_arr=[], test_opt='test_opt_arg', test_hsh={}, test_bool=true, *test_rest)
+    "test_arg=#{test_arg} test_arr=#{test_arr} test_opt=#{test_opt} test_hsh=#{test_hsh} test_bool=#{test_bool} test_rest=#{test_rest}"
   end
 
   include Rubycom

metadata

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