+ Merged hoe/gemcutter into hoe/package. Distinction doesn't make sense.

[git-p4: depot-paths = "//src/hoe/dev/": change = 15092]

Author: zenspider

Manifest.txt

@@ -14,7 +14,6 @@ lib/hoe/deps.rb
 lib/hoe/flay.rb
 lib/hoe/flog.rb
 lib/hoe/gem_prelude_sucks.rb
-lib/hoe/gemcutter.rb
 lib/hoe/git.rb
 lib/hoe/inline.rb
 lib/hoe/newb.rb
@@ -35,7 +34,6 @@ template/lib/file_name.rb.erb
 template/test/test_file_name.rb.erb
 test/test_hoe.rb
 test/test_hoe_debug.rb
-test/test_hoe_gemcutter.rb
 test/test_hoe_package.rb
 test/test_hoe_publish.rb
 test/test_hoe_test.rb

lib/hoe.rb

@@ -90,7 +90,7 @@ class Hoe
   VERSION = "4.6.1"
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
-               :publish, :gemcutter, :signing, :test]
+               :publish, :signing, :test]
 
   @bad_plugins = []
 

lib/hoe/gemcutter.rb

@@ -18,6 +18,10 @@
 # release::            Package and upload the release.
 
 module Hoe::Package
+  include Rake::DSL if defined?(Rake::DSL)
+
+  Hoe::DEFAULT_CONFIG["otp_command"] = false
+
   ##
   # Optional: Should package create a tarball? [default: true]
 
@@ -80,6 +84,16 @@ def define_package_tasks
       abort "Versions don't match: %s vs %s" % [v, version] if v != version
       abort "Versions don't match %s: %s vs %s" % [history_file, v, c] if v != c
     end
+
+    desc "Push gem to package."
+    task :release_to_rubygems => [:clean, :package, :release_sanity] do
+      pkg   = "pkg/#{spec.name}-#{spec.version}"
+      gems  = Dir["#{pkg}*.gem"]
+
+      gem_push gems
+    end
+
+    task :release_to => :release_to_rubygems
   end
 
   ##
@@ -121,4 +135,19 @@ def prerelease_version # :nodoc:
       (Gem::VERSION < "1.4"  and pre !~ /^[a-z]+(\.\d+)?$/) or
       (Gem::VERSION >= "1.4" and pre !~ /^[a-z]+(\.?\d+)?$/)
   end
+
+  ##
+  # Push gems to server.
+
+  def gem_push gems
+    with_config do |config, _|
+      otp_command = config["otp_command"]
+
+      ENV["GEM_HOST_OTP_CODE"] = `#{otp_command}`.chomp if otp_command
+    end
+
+    gems.each do |g|
+      sh Gem.ruby, "-S", "gem", "push", g
+    end
+  end
 end

lib/hoe/package.rb

@@ -1,7 +1,6 @@
 require "minitest/autorun"
 require "hoe"
-
-Hoe.load_plugins
+require_relative "../lib/hoe/package.rb"
 
 class TestHoePackage < Minitest::Test
   def setup
@@ -23,6 +22,10 @@ def setup
       end
 
       attr_reader :spec
+
+      def with_config
+        yield({ "otp_command" => "echo my_otp_code"}, "~/.hoerc")
+      end
     end
   end
 
@@ -31,6 +34,55 @@ def teardown
     ENV["PRERELEASE"] = @orig_PRERELEASE
   end
 
+  def assert_task name, *deps
+    dep = Rake::Task[name]
+    assert dep
+    prereqs = dep.prerequisites.map(&:to_sym)
+    deps.each do |dep|
+      # not asserting existence of tasks because they might be in other plugins
+      assert_includes prereqs, dep.to_sym
+    end
+  end
+
+  def test_package_tasks_defined
+    @tester.define_package_tasks
+
+    assert_task :gem, :clean
+    assert_task :install_gem, :clean, :package, :check_extra_deps
+    assert_task :postrelease
+    assert_task :prerelease
+    assert_task :release, :prerelease, :release_to, :postrelease
+    assert_task :release_sanity
+    assert_task :release_to
+    assert_task :release_to, :release_to_rubygems
+    assert_task :release_to_rubygems, :clean, :package, :release_sanity
+  end
+
+  def save_env
+    orig_env = ENV.to_h
+    yield
+  ensure
+    ENV.replace orig_env
+  end
+
+  def test_gem_push
+    def @tester.sh *cmd_args
+      @cmd_args = cmd_args
+    end
+
+    def @tester.cmd_args
+      @cmd_args
+    end
+
+    save_env do
+      @tester.gem_push %w[pkg/blah-123.gem]
+
+      exp = %W[#{Gem.ruby} -S gem push pkg/blah-123.gem]
+      assert_equal exp, @tester.cmd_args
+      assert_equal "my_otp_code", ENV["GEM_HOST_OTP_CODE"]
+    end
+  end
+
   def test_prerelease_version_pre
     ENV["PRE"] = "pre.0"