commander 4.0.0 → 4.0.1

data/History.rdoc

@@ -1,4 +1,10 @@
 
+4.0.1 / 2010-01-14
+==================
+
+  * Fixed commander when using JRuby
+  * Fixed template; should require "commander/import"
+
 === 4.0.0 / 2009-10-10
 
 * Changed; Aliased #when_called as #action [#9]

data/Manifest

@@ -20,13 +20,13 @@ lib/commander/help_formatters/terminal_compact.rb
 lib/commander/help_formatters/terminal_compact/command_help.erb
 lib/commander/help_formatters/terminal_compact/help.erb
 lib/commander/import.rb
+lib/commander/platform.rb
 lib/commander/runner.rb
 lib/commander/user_interaction.rb
 lib/commander/version.rb
 spec/command_spec.rb
 spec/core_ext/array_spec.rb
 spec/core_ext/object_spec.rb
-spec/help_formatters/base_spec.rb
 spec/help_formatters/terminal_spec.rb
 spec/runner_spec.rb
 spec/spec.opts

data/bin/commander

@@ -24,7 +24,7 @@ command :init do |c|
           #!/usr/bin/env ruby
           
           require 'rubygems'
-          require 'commander'
+          require 'commander/import'
           require '#{name}'
           
           program :version, #{name.capitalize}::VERSION

data/commander.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{commander}
-  s.version = "4.0.0"
+  s.version = "4.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-10-10}
+  s.date = %q{2010-01-14}
   s.default_executable = %q{commander}
   s.description = %q{The complete solution for Ruby command-line executables}
   s.email = %q{tj@vision-media.ca}
   s.executables = ["commander"]
-  s.extra_rdoc_files = ["README.rdoc", "bin/commander", "lib/commander.rb", "lib/commander/blank.rb", "lib/commander/command.rb", "lib/commander/core_ext.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/object.rb", "lib/commander/delegates.rb", "lib/commander/help_formatters.rb", "lib/commander/help_formatters/base.rb", "lib/commander/help_formatters/terminal.rb", "lib/commander/help_formatters/terminal/command_help.erb", "lib/commander/help_formatters/terminal/help.erb", "lib/commander/help_formatters/terminal_compact.rb", "lib/commander/help_formatters/terminal_compact/command_help.erb", "lib/commander/help_formatters/terminal_compact/help.erb", "lib/commander/import.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "tasks/docs.rake", "tasks/gemspec.rake"]
-  s.files = ["History.rdoc", "Manifest", "README.rdoc", "Rakefile", "bin/commander", "commander.gemspec", "lib/commander.rb", "lib/commander/blank.rb", "lib/commander/command.rb", "lib/commander/core_ext.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/object.rb", "lib/commander/delegates.rb", "lib/commander/help_formatters.rb", "lib/commander/help_formatters/base.rb", "lib/commander/help_formatters/terminal.rb", "lib/commander/help_formatters/terminal/command_help.erb", "lib/commander/help_formatters/terminal/help.erb", "lib/commander/help_formatters/terminal_compact.rb", "lib/commander/help_formatters/terminal_compact/command_help.erb", "lib/commander/help_formatters/terminal_compact/help.erb", "lib/commander/import.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "spec/command_spec.rb", "spec/core_ext/array_spec.rb", "spec/core_ext/object_spec.rb", "spec/help_formatters/base_spec.rb", "spec/help_formatters/terminal_spec.rb", "spec/runner_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/ui_spec.rb", "tasks/docs.rake", "tasks/gemspec.rake"]
+  s.extra_rdoc_files = ["README.rdoc", "bin/commander", "lib/commander.rb", "lib/commander/blank.rb", "lib/commander/command.rb", "lib/commander/core_ext.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/object.rb", "lib/commander/delegates.rb", "lib/commander/help_formatters.rb", "lib/commander/help_formatters/base.rb", "lib/commander/help_formatters/terminal.rb", "lib/commander/help_formatters/terminal/command_help.erb", "lib/commander/help_formatters/terminal/help.erb", "lib/commander/help_formatters/terminal_compact.rb", "lib/commander/help_formatters/terminal_compact/command_help.erb", "lib/commander/help_formatters/terminal_compact/help.erb", "lib/commander/import.rb", "lib/commander/platform.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "tasks/docs.rake", "tasks/gemspec.rake"]
+  s.files = ["History.rdoc", "Manifest", "README.rdoc", "Rakefile", "bin/commander", "commander.gemspec", "lib/commander.rb", "lib/commander/blank.rb", "lib/commander/command.rb", "lib/commander/core_ext.rb", "lib/commander/core_ext/array.rb", "lib/commander/core_ext/object.rb", "lib/commander/delegates.rb", "lib/commander/help_formatters.rb", "lib/commander/help_formatters/base.rb", "lib/commander/help_formatters/terminal.rb", "lib/commander/help_formatters/terminal/command_help.erb", "lib/commander/help_formatters/terminal/help.erb", "lib/commander/help_formatters/terminal_compact.rb", "lib/commander/help_formatters/terminal_compact/command_help.erb", "lib/commander/help_formatters/terminal_compact/help.erb", "lib/commander/import.rb", "lib/commander/platform.rb", "lib/commander/runner.rb", "lib/commander/user_interaction.rb", "lib/commander/version.rb", "spec/command_spec.rb", "spec/core_ext/array_spec.rb", "spec/core_ext/object_spec.rb", "spec/help_formatters/terminal_spec.rb", "spec/runner_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/ui_spec.rb", "tasks/docs.rake", "tasks/gemspec.rake"]
   s.homepage = %q{http://visionmedia.github.com/commander}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Commander", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/commander.rb

@@ -29,3 +29,4 @@ require 'commander/core_ext'
 require 'commander/runner'
 require 'commander/command'
 require 'commander/help_formatters'
+require 'commander/platform'

data/lib/commander/platform.rb

@@ -0,0 +1,8 @@
+
+module Commander
+  module Platform
+    def self.jruby?
+      defined? RUBY_ENGINE && RUBY_ENGINE=='jruby'
+    end
+  end
+end

data/lib/commander/user_interaction.rb

@@ -192,6 +192,7 @@ module Commander
     
     def enable_paging
       return unless $stdout.tty?
+      return if Platform::jruby? # Fork is not supported by JRuby
       read, write = IO.pipe
 
       if Kernel.fork
@@ -208,7 +209,7 @@ module Commander
         return
       end
     end
-    
+
     ##
     # Output progress while iterating _arr_.
     #

data/lib/commander/version.rb

@@ -1,4 +1,4 @@
 
 module Commander
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/spec/runner_spec.rb

@@ -2,12 +2,11 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Commander do
-  
-	before :each do
-	  $stderr = StringIO.new
+  before :each do
+    $stderr = StringIO.new
     mock_terminal
-	  create_test_command
-	end
+    create_test_command
+  end
 	
   describe "#program" do
     it "should set / get program information" do
@@ -130,6 +129,7 @@ describe Commander do
   
   describe "--trace" do
     it "should display pretty errors by default" do
+      pending("JRuby's Kernel.abort implementation is not testable") if Commander::Platform::jruby?
       lambda {
         new_command_runner 'foo' do
           command(:foo) { |c| c.when_called { raise 'cookies!' } }
@@ -160,6 +160,7 @@ describe Commander do
   
   describe "with invalid options" do
     it "should output an invalid option message" do
+      pending("JRuby's Kernel.abort implementation is not testable") if Commander::Platform::jruby?
       lambda {
         run('test', '--invalid-option')  
       }.should raise_error(SystemExit, /invalid option: --invalid-option/)
@@ -168,6 +169,7 @@ describe Commander do
   
   describe "with invalid command passed" do
     it "should output an invalid command message" do
+      pending("JRuby's Kernel.abort implementation is not testable") if Commander::Platform::jruby?
       lambda {
         run('foo')  
       }.should raise_error(SystemExit, /invalid command. Use --help for more information/)
@@ -176,6 +178,7 @@ describe Commander do
   
   describe "with invalid command passed to help" do
     it "should output an invalid command message" do
+      pending("JRuby's Kernel.abort implementation is not testable") if Commander::Platform::jruby?
       lambda {
         run('help', 'does_not_exist')
       }.should raise_error(SystemExit, /invalid command. Use --help for more information/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: commander
 version: !ruby/object:Gem::Version 
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 -07:00
+date: 2010-01-14 00:00:00 -08:00
 default_executable: commander
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ extra_rdoc_files:
 - lib/commander/help_formatters/terminal_compact/command_help.erb
 - lib/commander/help_formatters/terminal_compact/help.erb
 - lib/commander/import.rb
+- lib/commander/platform.rb
 - lib/commander/runner.rb
 - lib/commander/user_interaction.rb
 - lib/commander/version.rb
@@ -75,13 +76,13 @@ files:
 - lib/commander/help_formatters/terminal_compact/command_help.erb
 - lib/commander/help_formatters/terminal_compact/help.erb
 - lib/commander/import.rb
+- lib/commander/platform.rb
 - lib/commander/runner.rb
 - lib/commander/user_interaction.rb
 - lib/commander/version.rb
 - spec/command_spec.rb
 - spec/core_ext/array_spec.rb
 - spec/core_ext/object_spec.rb
-- spec/help_formatters/base_spec.rb
 - spec/help_formatters/terminal_spec.rb
 - spec/runner_spec.rb
 - spec/spec.opts

data/spec/help_formatters/base_spec.rb

@@ -1,26 +0,0 @@
-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Commander::HelpFormatter do
-  
-  before :each do
-    mock_terminal
-  end
-  
-  it "should display global help using --help switch" do
-    run('--help').should == "Implement global help here\n"
-  end
-  
-  it "should display global help using help command" do
-    run('help').should == "Implement global help here\n"
-  end
-  
-  it "should display command help" do
-    run('help', 'test').should == "Implement help for test here\n"
-  end
-  
-  it "should display command help using --help switch" do
-    run('--help', 'test').should == "Implement help for test here\n"
-  end
-      
-end