cri 2.4.0 → 2.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWExM2ZhMjgwODJmMmVhMGU5ZTg2YTQzN2EwYTgwYjI2NzM3MzRhYw==
+    NmEyNjRhYjcyOTg2MzdiNWM1MDA5OWJiYTM0ZWNiMGIzYWM1ZjAxNw==
   data.tar.gz: !binary |-
-    NTJjOWQ4ZDZjOGEzZmUzMDg4ZGQ4NzIyMWQ4NDQ5MTcyZjI4NWNkOA==
-!binary "U0hBNTEy":
+    MGUyZjJjNjdkMGY2ZjAxYWZjYzdjMzgzMTAzOWZiMzgwZWYzYTkzOA==
+SHA512:
   metadata.gz: !binary |-
-    YjU3YTNjYWMyZDI3ZTM5Y2FkMGY1NDQ4YTcxYWU1YWNlYmEwNDg1YWE2ODhi
-    OGNhZjdiOGMyZGQ2MzUwOWZjMmQxNDVjYjAyYWM3ZTFhYjE4NzEwNzUzYjk4
-    N2RlMDdkM2IzYWU4MGRhNDExMTFkZmY5NWYzYWNhNmM1OTgzMGE=
+    MjhlMjE2ODU5OTNiODMxZTY4ZGFlMzA3YjM0OGY3MDRiYmI2MzUwMjNhMTY1
+    YmY2YTZkODk2NGEyNjYwMmZiOTM0ZjQ2ZDQ3YWE5NDIxMWNkZGZhY2UzNjVk
+    MmJmNDI0ZjYwMDQ5ODYyNzE4N2QwNjQ3NzVlMTJmZmZlZTFlODg=
   data.tar.gz: !binary |-
-    NjUzMWY0NjY2ZTU5ZmE3ZGZjMWMzMjQ0OGE2ZGRlMzFkOTE4NTIyODcwNDU4
-    MTkyZGRlMjNmNmY1MzVmMmJlNzVhZmQ0N2E2ZmYyMjcxYmU2M2NhYzVhMWU2
-    MmI1ZGQyNWQ0NjU1ZmU0NDEzNjdhMjA0ZTEwMjFkYTM4YTQ0MDg=
+    OGZjNzRmYzk5ZmYzMmVhZDlhOTcyM2IzOGY2OTZhOWQ5YmFmMzdjODZmYzk2
+    MjhmMDkzOTQ3Yjc2Mzc4MjExMTg4ZjU4ZTM5N2YzNTgwZWViMTgxZTdjZjJl
+    NTYxYWJjOGE5ZDM2MWY3NzQ2M2FjYWU0NjEyNGY3YmZmOGQ5MmI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cri (2.4.0)
+    cri (2.4.1)
       colored (>= 1.2)
 
 GEM

data/NEWS.md

@@ -1,6 +1,12 @@
 Cri News
 ========
 
+2.4.1
+-----
+
+* Fixed ordering of option groups on Ruby 1.8.x (#14, #15)
+* Fixed ordering of commands when --verbose is passed (#16, #18)
+
 2.4.0
 -----
 

data/cri.gemspec

@@ -9,13 +9,14 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://stoneship.org/software/cri/' # TODO CREATE A WEB SITE YOU SILLY PERSON
   s.summary     = 'a library for building easy-to-use commandline tools'
   s.description = 'Cri allows building easy-to-use commandline interfaces with support for subcommands.'
+  s.license     = 'MIT'
 
   s.author = 'Denis Defreyne'
   s.email  = 'denis.defreyne@stoneship.org'
 
   s.files              = Dir['[A-Z]*'] +
                          Dir['{lib,test}/**/*'] +
-                         [ 'cri.gemspec', '.gemtest' ]
+                         [ 'cri.gemspec' ]
   s.require_paths      = [ 'lib' ]
 
   s.add_dependency('colored', '>= 1.2')
@@ -25,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('yard')
 
   s.rdoc_options     = [ '--main', 'README.md' ]
-  s.extra_rdoc_files = [ 'ChangeLog', 'LICENSE', 'README.md', 'NEWS.md' ]
+  s.extra_rdoc_files = [ 'LICENSE', 'README.md', 'NEWS.md' ]
 end

data/lib/cri/command.rb

@@ -90,7 +90,9 @@ module Cri
     # context with the command DSL as its parameter. If the block has no
     # parameters, the block will be executed in the context of the DSL.
     #
-    # @param [String, nil] The string containing the command’s definition
+    # @param [String, nil] string The command definition as a string
+    #
+    # @param [String, nil] filename The filename corresponding to the string parameter (only useful if a string is given)
     #
     # @return [Cri::Command] The newly defined command
     def self.define(string=nil, filename=nil, &block)
@@ -336,32 +338,25 @@ module Cri
         text << (self.supercommand ? 'subcommands' : 'commands').formatted_as_title
         text << "\n"
 
-        visible_cmds, invisible_cmds = self.subcommands.partition { |c| !c.hidden? }
-
-        commands_for_length = is_verbose ? self.subcommands : visible_cmds
-        length = commands_for_length.map { |c| c.name.formatted_as_command.size }.max
+        shown_subcommands = self.subcommands.select { |c| !c.hidden? || is_verbose }
+        length = shown_subcommands.map { |c| c.name.formatted_as_command.size }.max
 
-        # Visible
-        visible_cmds.sort_by { |cmd| cmd.name }.each do |cmd|
+        # Command
+        shown_subcommands.sort_by { |cmd| cmd.name }.each do |cmd|
           text << sprintf("    %-#{length+4}s %s\n",
             cmd.name.formatted_as_command,
             cmd.summary)
         end
 
-        # Invisible
-        if is_verbose
-          invisible_cmds.sort_by { |cmd| cmd.name }.each do |cmd|
-            text << sprintf("    %-#{length+4}s %s\n",
-              cmd.name.formatted_as_command,
-              cmd.summary)
-          end
-        else
-          case invisible_cmds.size
+        # Hidden notice
+        if !is_verbose
+          diff = self.subcommands.size - shown_subcommands.size
+          case diff
           when 0
           when 1
-            text << "    (1 hidden command ommitted; show it with --verbose)\n"
+            text << "    (1 hidden command omitted; show it with --verbose)\n"
           else
-            text << "    (#{invisible_cmds.size} hidden commands ommitted; show them with --verbose)\n"
+            text << "    (#{diff} hidden commands omitted; show them with --verbose)\n"
           end
         end
       end
@@ -372,7 +367,8 @@ module Cri
         groups["options for #{self.supercommand.name}"] = self.supercommand.global_option_definitions
       end
       length = groups.values.inject(&:+).map { |o| o[:long].to_s.size }.max
-      groups.each_pair do |name, defs|
+      groups.keys.sort.each do |name|
+        defs = groups[name]
         unless defs.empty?
           text << "\n"
           text << "#{name}".formatted_as_title

data/lib/cri/version.rb

@@ -1,6 +1,6 @@
 module Cri
 
   # The current Cri version.
-  VERSION = '2.4.0'
+  VERSION = '2.4.1'
 
 end

data/test/test_command.rb

@@ -276,6 +276,12 @@ class Cri::CommandTestCase < Cri::TestCase
     assert_match(/^\e\[33m    -s           \e\[0mshort$/, help)
   end
 
+  def test_help_with_multiple_groups
+    help = nested_cmd.subcommands.find { |cmd| cmd.name == 'sub' }.help
+
+    assert_match(/OPTIONS.*OPTIONS FOR SUPER/m,  help)
+  end
+
   def test_modify_with_block_argument
     cmd = Cri::Command.define do |c|
       c.name 'build'
@@ -369,18 +375,25 @@ class Cri::CommandTestCase < Cri::TestCase
       c.be_hidden
     end
 
-    refute cmd.help.include?('hidden commands ommitted')
-    assert cmd.help.include?('hidden command ommitted')
+    refute cmd.help.include?('hidden commands omitted')
+    assert cmd.help.include?('hidden command omitted')
     refute cmd.help.include?('old-and-deprecated')
 
-    refute cmd.help(:verbose => true).include?('hidden commands ommitted')
-    refute cmd.help(:verbose => true).include?('hidden command ommitted')
+    refute cmd.help(:verbose => true).include?('hidden commands omitted')
+    refute cmd.help(:verbose => true).include?('hidden command omitted')
     assert cmd.help(:verbose => true).include?('old-and-deprecated')
   end
 
   def test_hidden_commands_multiple
     cmd    = nested_cmd
 
+    subcmd = simple_cmd
+    cmd.add_command subcmd
+    subcmd.modify do |c|
+      c.name    'first'
+      c.summary 'does stuff first'
+    end
+
     subcmd = simple_cmd
     cmd.add_command subcmd
     subcmd.modify do |c|
@@ -397,15 +410,18 @@ class Cri::CommandTestCase < Cri::TestCase
       c.be_hidden
     end
 
-    assert cmd.help.include?('hidden commands ommitted')
-    refute cmd.help.include?('hidden command ommitted')
+    assert cmd.help.include?('hidden commands omitted')
+    refute cmd.help.include?('hidden command omitted')
     refute cmd.help.include?('old-and-deprecated')
     refute cmd.help.include?('ancient-and-deprecated')
 
-    refute cmd.help(:verbose => true).include?('hidden commands ommitted')
-    refute cmd.help(:verbose => true).include?('hidden command ommitted')
+    refute cmd.help(:verbose => true).include?('hidden commands omitted')
+    refute cmd.help(:verbose => true).include?('hidden command omitted')
     assert cmd.help(:verbose => true).include?('old-and-deprecated')
     assert cmd.help(:verbose => true).include?('ancient-and-deprecated')
+
+    pattern = /ancient-and-deprecated.*first.*old-and-deprecated/m
+    assert_match(pattern, cmd.help(:verbose => true))
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cri
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -72,12 +72,10 @@ email: denis.defreyne@stoneship.org
 executables: []
 extensions: []
 extra_rdoc_files:
-- ChangeLog
 - LICENSE
 - README.md
 - NEWS.md
 files:
-- ChangeLog
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -103,9 +101,9 @@ files:
 - test/test_core_ext.rb
 - test/test_option_parser.rb
 - cri.gemspec
-- .gemtest
 homepage: http://stoneship.org/software/cri/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -125,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: a library for building easy-to-use commandline tools