coulis 0.2.5 → 0.2.6

data/lib/coulis.rb

@@ -49,7 +49,7 @@ class Coulis
         help.each do |l|
           args = l.scan(/(\-{1,2}[\w\-]+)[\W]/)
           unless args.empty?
-            args.each{|a| @_safe_args << a.to_s}
+            args.each{|a| @_safe_args << a[0].to_s}
           end
         end
       end
@@ -103,7 +103,7 @@ class Coulis
     definition = self.class._definitions[argname.to_sym] || argumentize(argname)
 
     result = @args.find{|a| a[0].to_s == definition.to_s}
-    return if result.nil? 
+    return if result.nil?
 
     value = result[1]
     return nil if value.nil?
@@ -172,7 +172,7 @@ class Coulis
     #puts "m: #{m}, args: #{args.inspect}, definition: #{definition.inspect}"
     arg_name = argumentize(m)
 
-    if args.to_s.empty?
+    if args.size == 0
       insert_arg [ definition || arg_name ]
       return self
     end
@@ -219,7 +219,7 @@ class Coulis
     end
 
     if arg_to_find = opts[:before] || opts[:after]
-      found = @args.find{|a| 
+      found = @args.find{|a|
         a[0] == (self.class._definitions[arg_to_find.to_sym] || arg_to_find)
       }
 

data/test/coulis_test.rb

@@ -1,3 +1,4 @@
+$LOAD_PATH << "."
 require "test/unit"
 require "coulis"
 
@@ -65,25 +66,25 @@ class SimpleCliTest < Test::Unit::TestCase
 
   def test_argument_added
     ls = Ls.options { all }
-    assert true, ls.args[0] == "-a"
+    assert ls.args[0][0] == "-a"
   end
 
   def test_not_defined_short_argument
     ls = Ls.options { g }
     assert_equal 1, ls.args.size
-    assert_equal "-g", ls.args.to_s
+    assert_equal "-g", ls.args[0][0]
   end
-  
+
   def test_not_defined_long_argument
     ls = Ls.options { color }
     assert_equal 1, ls.args.size
-    assert_equal "--color", ls.args.to_s
+    assert_equal "--color", ls.args[0][0]
   end
 
   def test_not_defined_long_argument_with_underscore
     ls = Ls.options { color_test }
     assert_equal 1, ls.args.size
-    assert_equal "--color-test", ls.args.to_s
+    assert_equal "--color-test", ls.args[0][0]
   end
 
   def test_no_double_dash_option
@@ -152,14 +153,14 @@ class SimpleCliTest < Test::Unit::TestCase
     ls = Ls.options { full }.exec
 
     assert_instance_of String, ls
-    assert true, ls.size > 0
+    assert ls.size > 0
   end
 
   def test_exec_with_block
     ls = Ls.options { full }
     process = ls.exec do |out|
       assert_instance_of String, out
-      assert true, out.size > 0
+      assert out.size > 0
     end
 
     assert_instance_of Process::Status, process
@@ -185,7 +186,7 @@ class SimpleCliTest < Test::Unit::TestCase
       res << out
     end
 
-    assert true, res.size > 0
+    assert res.size > 0
   end
 
   def test_parse_output
@@ -193,18 +194,18 @@ class SimpleCliTest < Test::Unit::TestCase
       @args = ["google.com"]
     }.exec do |ips|
       assert_instance_of Array, ips
-      assert true, ips.size > 1
+      assert ips.size > 1
     end
   end
 
   def test_success_event
     process = Ls.options {
       all
-    }.on_success {|out| 
+    }.on_success {|out|
       assert_instance_of Process::Status, $?
       assert_equal 0, $?.exitstatus
       assert_instance_of String, out
-    }.exec {|out| 
+    }.exec {|out|
       assert_instance_of String, out
     }
   end
@@ -216,7 +217,7 @@ class SimpleCliTest < Test::Unit::TestCase
       assert_instance_of Process::Status, $?
       assert_equal 1, $?.exitstatus
       assert_instance_of String, out
-    }.exec {|out| 
+    }.exec {|out|
       assert_instance_of String, out
     }
   end
@@ -324,7 +325,7 @@ class SimpleCliTest < Test::Unit::TestCase
 
   def test_safe_mode_is_off_if_help_parsing_issue
     FFMpeg._safe_args = nil
-    FFMpeg._help = "ffmpeg help broken"
+    FFMpeg._help = ["ffmpeg help broken"]
     FFMpeg._safe_mode
 
     ffmpeg = FFMpeg.options {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coulis
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Bruno Celeste
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-04 00:00:00 Z
+date: 2013-11-02 00:00:00 Z
 dependencies: []
 
 description: Simple but powerful CLI Wrapper
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.28
 signing_key: 
 specification_version: 3
 summary: A simple CLI Wrapper