rubygems-update 0.9.4 → 0.9.5

data/test/{test_command.rb → test_gem_command.rb}

@@ -6,26 +6,64 @@
 #++
 
 require 'test/unit'
-require 'test/mockgemui'
-
+require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems/command'
-require 'rubygems/command_manager'
-require 'rubygems/user_interaction'
 
-class Noop
-  def method_missing(sym, *args, &block)
-  end
+class Gem::Command
+  public :parser
 end
 
-class TestCommand < Test::Unit::TestCase
-  include Gem::DefaultUserInteraction
+class TestGemCommand < RubyGemTestCase
+
+  def setup
+    super
 
-  def setup 
     @xopt = nil
+
     Gem::Command.common_options.clear
-    Gem::Command.common_options <<  [ ['-x', '--exe', 'Execute'], lambda do @xopt = true end]
-    @cmd = Gem::Command.new("doit", "summary")
-    self.ui = Noop.new
+    Gem::Command.common_options <<  [
+      ['-x', '--exe', 'Execute'], lambda do |*a|
+        @xopt = true
+      end
+    ]
+
+    @cmd_name = 'doit'
+    @cmd = Gem::Command.new @cmd_name, 'summary'
+  end
+
+  def test_self_add_specific_extra_args
+    added_args = %w[--all]
+    @cmd.add_option '--all' do |v,o| end
+
+    Gem::Command.add_specific_extra_args @cmd_name, added_args
+
+    assert_equal added_args, Gem::Command.specific_extra_args(@cmd_name)
+
+    h = @cmd.add_extra_args []
+
+    assert_equal added_args, h
+  end
+
+  def test_self_add_specific_extra_args_unknown
+    added_args = %w[--definitely_not_there]
+
+    Gem::Command.add_specific_extra_args @cmd_name, added_args
+
+    assert_equal added_args, Gem::Command.specific_extra_args(@cmd_name)
+
+    h = @cmd.add_extra_args []
+
+    assert_equal [], h
+  end
+
+  def test_add_option_overlapping_common_and_local_options
+    @cmd.add_option('-x', '--zip', 'BAD!') do end
+    @cmd.add_option('-z', '--exe', 'BAD!') do end
+    @cmd.add_option('-x', '--exe', 'BAD!') do end
+
+    assert_match %r|-x, --zip|, @cmd.parser.to_s
+    assert_match %r|-z, --exe|, @cmd.parser.to_s
+    assert_no_match %r|-x, --exe|, @cmd.parser.to_s
   end
 
   def test_basic_accessors
@@ -34,85 +72,102 @@ class TestCommand < Test::Unit::TestCase
     assert_equal "summary", @cmd.summary
   end
 
-  def test_invoke
-    done = false
-    @cmd.when_invoked { done = true }
-    @cmd.invoke
-    assert done
+  def test_common_option_in_class
+    assert Array === Gem::Command.common_options
   end
 
-  def test_invoke_with_options
+  def test_defaults
     @cmd.add_option('-h', '--help [COMMAND]', 'Get help on COMMAND') do |value, options|
-      options[:help] = true
+      options[:help] = value
     end
-    @cmd.when_invoked do |opts|
-      assert opts[:help]
-      done = true
-      true
+
+    @cmd.defaults = { :help => true }
+
+    @cmd.when_invoked do |options|
+      assert options[:help], "Help options should default true"
     end
-    @cmd.invoke('-h')
+
+    use_ui @ui do
+      @cmd.invoke
+    end
+
+    assert_match %r|Usage: gem doit|, @ui.output
   end
 
-  def test_invoke_with_common_options
-    @cmd.when_invoked do true end
-    @cmd.invoke("-x")
-    assert @xopt, "Should have done xopt"
+  def test_invoke
+    done = false
+    @cmd.when_invoked { done = true }
+
+    use_ui @ui do
+      @cmd.invoke
+    end
+
+    assert done
   end
-  
+
   def test_invode_with_bad_options
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       @cmd.when_invoked do true end
-      ex = assert_raise(OptionParser::InvalidOption) { @cmd.invoke('-zzz') }
+
+      ex = assert_raise(OptionParser::InvalidOption) do
+        @cmd.invoke('-zzz')
+      end
+
       assert_match(/invalid option:/, ex.message)
     end
   end
 
-  def test_overlapping_common_and_local_options
-    use_ui(MockGemUi.new) do
-      @cmd.add_option('-x', '--zip', 'BAD!') do end
-      @cmd.add_option('-z', '--exe', 'BAD!') do end
-      @cmd.add_option('-x', '--exe', 'BAD!') do end
-      @cmd.when_invoked do |opts| false end
-      @cmd.invoke('-x')
-      md = ui.output =~ /Common.*-exe/m
-      assert ! @xopt, "Should not do xopt"
-      assert_nil md, "Should not have common options"
+  def test_invoke_with_common_options
+    @cmd.when_invoked do true end
+
+    use_ui @ui do
+      @cmd.invoke "-x"
     end
+
+    assert @xopt, "Should have done xopt"
   end
 
   # Returning false from the command handler invokes the usage output.
   def test_invoke_with_help
-    use_ui(MockGemUi.new) do
+    done = false
+
+    use_ui @ui do
       @cmd.add_option('-h', '--help [COMMAND]', 'Get help on COMMAND') do |value, options|
         options[:help] = true
+        done = true
       end
+
       @cmd.invoke('--help')
-      assert_match(/Usage/, ui.output)
-      assert_match(/gem doit/, ui.output)
-      assert_match(/\[options\]/, ui.output)
-      assert_match(/-h/, ui.output)
-      assert_match(/--help \[COMMAND\]/, ui.output)
-      assert_match(/Get help on COMMAND/, ui.output)
-      assert_match(/-x/, ui.output)
-      assert_match(/--exe/, ui.output)
-      assert_match(/Execute/, ui.output)
-      assert_match(/Common Options:/, ui.output)
+
+      assert done
     end
+
+    assert_match(/Usage/, @ui.output)
+    assert_match(/gem doit/, @ui.output)
+    assert_match(/\[options\]/, @ui.output)
+    assert_match(/-h/, @ui.output)
+    assert_match(/--help \[COMMAND\]/, @ui.output)
+    assert_match(/Get help on COMMAND/, @ui.output)
+    assert_match(/-x/, @ui.output)
+    assert_match(/--exe/, @ui.output)
+    assert_match(/Execute/, @ui.output)
+    assert_match(/Common Options:/, @ui.output)
   end
 
-  def test_defaults
+  def test_invoke_with_options
     @cmd.add_option('-h', '--help [COMMAND]', 'Get help on COMMAND') do |value, options|
-      options[:help] = value
+      options[:help] = true
     end
-    @cmd.defaults = { :help => true }
-    @cmd.when_invoked do |options|
-      assert options[:help], "Help options should default true"
+
+    @cmd.when_invoked do |opts|
+      assert opts[:help]
     end
-    @cmd.invoke 
-  end
 
-  def test_common_option_in_class
-    assert Array === Gem::Command.common_options
+    use_ui @ui do
+      @cmd.invoke '-h'
+    end
+
+    assert_match %r|Usage: gem doit|, @ui.output
   end
 
   def test_option_recognition
@@ -136,4 +191,6 @@ class TestCommand < Test::Unit::TestCase
     @cmd.handles?(args)
     assert_equal ['-h', 'command'], args
   end
+
 end
+

data/test/{test_parse_commands.rb → test_gem_command_manager.rb}

@@ -5,36 +5,59 @@
 #++
 
 require 'test/unit'
-$:.unshift '../lib'
-require 'rubygems'
-require 'test/mockgemui'
-Gem::manage_gems
+require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require 'rubygems/command_manager'
 
-class TestParseCommands < Test::Unit::TestCase
-  include Gem::DefaultUserInteraction
+class InterruptCommand < Gem::Command
+
+  def initialize
+    super('interrupt', 'Raises an Interrupt Exception', {})
+  end
+
+  def execute
+    raise Interrupt, "Interrupt exception"
+  end
+
+end
+
+class TestGemCommandManager < RubyGemTestCase
 
   def setup
+    super
+
     @command_manager = Gem::CommandManager.new
   end
 
-  def test_parsing_bad_options
-    use_ui(MockGemUi.new) do
+  def test_run_interrupt
+    use_ui @ui do
+      @command_manager.register_command :interrupt
+      assert_raises MockGemUi::TermError do
+        @command_manager.run 'interrupt'
+      end
+      assert_equal '', ui.output
+      assert_equal "ERROR:  Interrupted\n", ui.error
+    end
+  end
+
+  def test_process_args_bad_arg
+    use_ui @ui do
       assert_raises(MockGemUi::TermError) {
         @command_manager.process_args("--bad-arg")
       }
-      assert_match(/invalid option: --bad-arg/i, ui.error)
     end
+
+    assert_match(/invalid option: --bad-arg/i, @ui.error)
   end
 
-  def test_parsing_install_options
+  def test_process_args_install
     #capture all install options
-    use_ui(MockGemUi.new) do
+    use_ui @ui do
       check_options = nil
       @command_manager['install'].when_invoked do |options|
         check_options = options
         true
       end
-      
+
       #check defaults
       @command_manager.process_args("install")
       assert_equal false, check_options[:test]
@@ -42,9 +65,9 @@ class TestParseCommands < Test::Unit::TestCase
       assert_equal false, check_options[:force]
       assert_equal :both, check_options[:domain]
       assert_equal true, check_options[:wrappers]
-      assert_equal "> 0", check_options[:version]
+      assert_equal Gem::Requirement.default, check_options[:version]
       assert_equal Gem.dir, check_options[:install_dir]
-      
+
       #check settings
       check_options = nil
       @command_manager.process_args(
@@ -54,53 +77,53 @@ class TestParseCommands < Test::Unit::TestCase
       assert_equal true, check_options[:force]
       assert_equal :local, check_options[:domain]
       assert_equal false, check_options[:wrappers]
-      assert_equal '3.0', check_options[:version]
+      assert_equal Gem::Requirement.new('3.0'), check_options[:version]
       assert_equal Dir.pwd, check_options[:install_dir]
-      
+
       #check remote domain
       check_options = nil
       @command_manager.process_args("install --remote")
       assert_equal :remote, check_options[:domain]
-      
+
       #check both domain
       check_options = nil
       @command_manager.process_args("install --both")
       assert_equal :both, check_options[:domain]
-      
+
       #check both domain
       check_options = nil
       @command_manager.process_args("install --both")
       assert_equal :both, check_options[:domain]
     end
   end
-  
-  def test_parsing_uninstall_options
+
+  def test_process_args_uninstall
     #capture all uninstall options
     check_options = nil
     @command_manager['uninstall'].when_invoked do |options|
       check_options = options
       true
     end
-    
+
     #check defaults
     @command_manager.process_args("uninstall")
-    assert_equal "> 0", check_options[:version]
+    assert_equal Gem::Requirement.default, check_options[:version]
 
     #check settings
     check_options = nil
     @command_manager.process_args("uninstall foobar --version 3.0")
     assert_equal "foobar", check_options[:args].first
-    assert_equal "3.0", check_options[:version]
+    assert_equal Gem::Requirement.new('3.0'), check_options[:version]
   end
 
-  def test_parsing_check_options
+  def test_process_args_check
     #capture all check options
     check_options = nil
     @command_manager['check'].when_invoked do |options|
       check_options = options
       true
     end
-    
+
     #check defaults
     @command_manager.process_args("check")
     assert_equal false, check_options[:verify]
@@ -112,39 +135,39 @@ class TestParseCommands < Test::Unit::TestCase
     assert_equal "foobar", check_options[:verify]
     assert_equal true, check_options[:alien]
   end
-    
-  def test_parsing_build_options
+
+  def test_process_args_build
     #capture all build options
     check_options = nil
     @command_manager['build'].when_invoked do |options|
       check_options = options
       true
     end
-    
+
     #check defaults
     @command_manager.process_args("build")
     #NOTE: Currently no defaults
-    
+
     #check settings
     check_options = nil
     @command_manager.process_args("build foobar.rb")
     assert_equal 'foobar.rb', check_options[:args].first
   end
-  
-  def test_parsing_query_options
+
+  def test_process_args_query
     #capture all query options
     check_options = nil
     @command_manager['query'].when_invoked do |options|
       check_options = options
       true
     end
-    
+
     #check defaults
     @command_manager.process_args("query")
     assert_equal(/.*/, check_options[:name])
     assert_equal :local, check_options[:domain]
     assert_equal false, check_options[:details]
-    
+
     #check settings
     check_options = nil
     @command_manager.process_args("query --name foobar --local --details")
@@ -161,20 +184,20 @@ class TestParseCommands < Test::Unit::TestCase
     check_options = nil
     @command_manager.process_args("query --both")
     assert_equal :both, check_options[:domain]
-  end  
-  
-  def test_parsing_update_options
+  end
+
+  def test_process_args_update
     #capture all update options
     check_options = nil
     @command_manager['update'].when_invoked do |options|
       check_options = options
       true
     end
-    
+
     #check defaults
     @command_manager.process_args("update")
     assert_equal true, check_options[:generate_rdoc]
-    
+
     #check settings
     check_options = nil
     @command_manager.process_args("update --force --test --rdoc --install-dir .")
@@ -182,6 +205,7 @@ class TestParseCommands < Test::Unit::TestCase
     assert_equal true, check_options[:generate_rdoc]
     assert_equal true, check_options[:force]
     assert_equal Dir.pwd, check_options[:install_dir]
-  end 
-  
+  end
+
 end
+