cri 2.0.0 → 2.0.1

data/NEWS.md

@@ -1,8 +1,15 @@
 Cri News
 ========
 
-2.0
----
+2.0.1
+-----
+
+* Sorted ambiguous command names
+* Restored compatibility with Ruby 1.8.x
+
+
+2.0.0
+-----
 
 * Added DSL
 * Added support for nested commands

data/lib/cri.rb

@@ -17,7 +17,7 @@ module Cri
   end
 
   # The current Cri version.
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
   autoload 'Command',           'cri/command'
   autoload 'CommandDSL',        'cri/command_dsl'

data/lib/cri/command.rb

@@ -92,7 +92,7 @@ module Cri
       dsl = Cri::CommandDSL.new
       if string
         dsl.instance_eval(string)
-      elsif block.arity == 0
+      elsif [ -1, 0 ].include? block.arity
         dsl.instance_eval(&block)
       else
         block.call(dsl)
@@ -133,7 +133,7 @@ module Cri
     # @return [Cri::Command] The command itself
     def modify(&block)
       dsl = Cri::CommandDSL.new(self)
-      if block.arity == 0
+      if [ -1, 0 ].include? block.arity
         dsl.instance_eval(&block)
       else
         block.call(dsl)
@@ -170,7 +170,7 @@ module Cri
       # Execute DSL
       dsl = Cri::CommandDSL.new
       dsl.name name unless name.nil?
-      if block.arity == 0
+      if [ -1, 0 ].include? block.arity
         dsl.instance_eval(&block)
       else
         block.call(dsl)
@@ -218,7 +218,7 @@ module Cri
         exit 1
       elsif commands.size > 1
         $stderr.puts "#{self.name}: '#{name}' is ambiguous:"
-        $stderr.puts "  #{commands.map { |c| c.name }.join(' ') }"
+        $stderr.puts "  #{commands.map { |c| c.name }.sort.join(' ') }"
         exit 1
       else
         commands[0]

data/test/test_command.rb

@@ -24,7 +24,7 @@ class Cri::CommandTestCase < Cri::TestCase
 
         opts_strings = []
         opts.each_pair { |k,v| opts_strings << "#{k}=#{v}" }
-        $stdout.puts opts_strings.join(',')
+        $stdout.puts opts_strings.sort.join(',')
       end
     end
   end
@@ -115,7 +115,7 @@ class Cri::CommandTestCase < Cri::TestCase
       simple_cmd.run(%w(-c -b x))
     end
 
-    assert_equal [ 'Awesome moo!', '', 'ccc=true,bbb=x' ], lines(out)
+    assert_equal [ 'Awesome moo!', '', 'bbb=x,ccc=true' ], lines(out)
     assert_equal [], lines(err)
   end
 
@@ -189,7 +189,7 @@ class Cri::CommandTestCase < Cri::TestCase
     end
 
     assert_equal [ ], lines(out)
-    assert_equal [ "super: 's' is ambiguous:", "  sub sink" ], lines(err)
+    assert_equal [ "super: 's' is ambiguous:", "  sink sub" ], lines(err)
   end
 
   def test_invoke_nested_with_alias
@@ -211,7 +211,7 @@ class Cri::CommandTestCase < Cri::TestCase
   end
 
   def test_help_nested
-    help = nested_cmd.subcommands.to_a[0].help
+    help = nested_cmd.subcommands.find { |cmd| cmd.name == 'sub' }.help
 
     assert_match /^usage: super sub \[options\]/, help
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cri
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
-  version: 2.0.0
+  segments: 
+  - 2
+  - 0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -10,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-03 00:00:00 Z
+date: 2011-07-04 00:00:00 +02:00
+default_executable: 
 dependencies: []
 
 description: Cri allows building easy-to-use commandline interfaces with support for subcommands.
@@ -47,6 +53,7 @@ files:
 - test/test_option_parser.rb
 - cri.gemspec
 - .gemtest
+has_rdoc: true
 homepage: http://stoneship.org/software/cri/
 licenses: []
 
@@ -61,17 +68,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: a library for building easy-to-use commandline tools