commandeer 0.1.0 → 0.1.1

data/.gitignore

@@ -1,3 +1,4 @@
+.rbx
 test.rb
 Gemfile.lock
 .rvmrc

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx
+  - jruby
+env:
+  - ISOLATED=true
+script: "bundle exec rake test"

data/Gemfile

@@ -1 +1,2 @@
 source "http://rubygems.org"
+gemspec

data/commandeer.gemspec

@@ -14,4 +14,6 @@ Gem::Specification.new do |gem|
   gem.name          = "commandeer"
   gem.require_paths = ["lib"]
   gem.version       = Commandeer::VERSION
+  gem.add_development_dependency "rake", "~> 0.9.2.2"
+  gem.add_development_dependency "minitest", "~> 2.8.1"
 end

data/lib/commandeer.rb

@@ -1,5 +1,5 @@
 module Commandeer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   @commands = {}
 
@@ -42,15 +42,17 @@ module Commandeer
     if (args.size == 0) || (args[0] =~ /^-/)
       output = ''
       output << "Usage: #{@script_name} [command options] or [command subcommand options]\n\n"
-      @commands.each do |command, options|
-        next if (command==:klass || command==:parser)
-        output << "\t#{command}\t"
+      @commands.keys.sort.each do |c|
+        options = @commands[c]
+        next if (c==:klass || c==:parser)
+        output << "\t#{c}"
         unless options["subcommands"].nil?
-          output << "Subcommands:"
+          output << "\tSubcommands:"
           options["subcommands"].each do |sub, opts|
-            output << " #{sub}"
+            output << "\t #{sub}"
           end
         end
+        output << "\n"
       end
       puts output
       exit

data/test/helper.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "test")))
-gem 'minitest'
+gem 'minitest' if RUBY_VERSION =~ /1.9/
+
 require 'minitest/pride'
 require 'minitest/autorun'
 require 'commandeer'

data/test/helpers/multiple_commands.rb

@@ -0,0 +1,11 @@
+class CommandOne
+  include Commandeer
+
+  command "command_one"
+end
+
+class CommandTwo
+  include Commandeer
+
+  command "command_two"
+end

data/test/test_all_override.rb

@@ -33,7 +33,7 @@ class TestOverrideAll < MiniTest::Unit::TestCase
       rescue SystemExit
       end
     end
-    assert_match(out, /^.*Usage.*\n\n\t.*override\tSubcommands: random.*$/)
+    assert_match(out, /^.*Usage.*\n\n\t.*override\tSubcommands:\t random.*$/)
   end
 
   def test_output_override

data/test/test_multiple_commands.rb

@@ -0,0 +1,26 @@
+require "#{File.expand_path(File.join(File.dirname(__FILE__), "helper.rb"))}"
+
+class TestMultipleCommands < MiniTest::Unit::TestCase
+  def setup
+    require 'helpers/multiple_commands.rb'
+    @commands = Commandeer.commands
+  end
+
+  def test_has_all_commands
+    ["command_one", "command_two"].each do |c|
+      assert_includes(@commands.keys, c)
+    end
+  end
+
+  # To ensure top-level commands are new-lined
+  def test_format_output
+    out, err = capture_io do
+      begin
+        Commandeer.parse!('')
+      rescue SystemExit
+      end
+    end
+
+    assert_match(out, /^.*Usage:.*\n\n\tcommand_one*\n\tcommand_two\n.*$/)
+  end
+end

data/test/test_sub_of_real.rb

@@ -41,7 +41,7 @@ class TestSubOfRealCommand < MiniTest::Unit::TestCase
       rescue SystemExit
       end
     end
-    assert_match(out, /^.*Usage.*\n\n\t.*parent\tSubcommands: child.*$/)
+    assert_match(out, /^.*Usage.*\n\n\tparent\tSubcommands:\t child.*$/)
   end
 
   def test_output_parent

data/test/test_subcommand.rb

@@ -33,7 +33,7 @@ class TestSubCommand < MiniTest::Unit::TestCase
       rescue SystemExit
       end
     end
-    assert_match(out, /^.*Usage.*\n\n\t.*fakeparent\tSubcommands: bar.*$/)
+    assert_match(out, /^.*Usage.*\n\n\tfakeparent\tSubcommands:\t bar.*$/)
   end
 
   def test_output_fakeparent

metadata

@@ -1,29 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: commandeer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - John E. Vincent
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-05 00:00:00 Z
-dependencies: []
-
+date: 2011-12-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &10334400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+  type: :development
+  prerelease: false
+  version_requirements: *10334400
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &10384460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :development
+  prerelease: false
+  version_requirements: *10384460
 description: Class-based CLI utility
-email: 
+email:
 - lusis.org+github.com@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -33,41 +51,39 @@ files:
 - test/helper.rb
 - test/helpers/all_override.rb
 - test/helpers/command.rb
+- test/helpers/multiple_commands.rb
 - test/helpers/namespaced.rb
 - test/helpers/sub_of_real_command.rb
 - test/helpers/subcommand.rb
 - test/test_all_override.rb
 - test/test_command.rb
 - test/test_methods.rb
+- test/test_multiple_commands.rb
 - test/test_namespaced.rb
 - test/test_sub_of_real.rb
 - test/test_subcommand.rb
 homepage: https://github.com/lusis/commandeer
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Commandeer allows you to make any class a git style command or subcommand
 test_files: []
-