Preparing for 0.4.0.pre release

rubygems · Feb 10, 2010 · 243d85c · 243d85c
1 parent aa0080e
commit 243d85c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 25 deletions.
diff --git a/gem/Rakefile b/gem/Rakefile
@@ -21,7 +21,7 @@ begin
     gem.authors = ["Nick Quaranto"]
     gem.files = FileList["lib/rubygems_plugin.rb",
                          "lib/gemcutter.rb",
-                         "lib/commands/*",
+                         "lib/rubygems/commands/*",
                          "test/*_helper.rb",
                          "test/*_test.rb",
                          "MIT-LICENSE",
@@ -39,8 +39,8 @@ begin
 
            Thanks for installing Gemcutter! You can now run:
 
-    gem push          publish your gems for the world to use and enjoy
-    gem owner         allow/disallow others to push to your gems
+    gem push          merged into RubyGems 1.3.6
+    gem owner         merged into RubyGems 1.3.6
     gem webhook       register urls to be pinged when gems are pushed
 
 ========================================================================

diff --git a/gem/gemcutter.gemspec b/gem/gemcutter.gemspec
@@ -5,26 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gemcutter}
-  s.version = "0.3.0"
+  s.version = "0.4.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6.pre.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Quaranto"]
-  s.date = %q{2010-01-05}
+  s.date = %q{2010-02-10}
   s.description = %q{Adds several commands to RubyGems for managing gems and more on Gemcutter.org.}
   s.email = %q{nick@quaran.to}
   s.files = [
     "MIT-LICENSE",
      "Rakefile",
-     "lib/commands/abstract_command.rb",
-     "lib/commands/migrate.rb",
-     "lib/commands/owner.rb",
-     "lib/commands/push.rb",
-     "lib/commands/tumble.rb",
-     "lib/commands/webhook.rb",
+     "lib/gemcutter.rb",
+     "lib/rubygems/commands/migrate.rb",
+     "lib/rubygems/commands/tumble.rb",
+     "lib/rubygems/commands/webhook.rb",
      "lib/rubygems_plugin.rb",
-     "test/abstract_command_test.rb",
-     "test/command_helper.rb",
-     "test/push_command_test.rb",
      "test/webhook_command_test.rb"
   ]
   s.homepage = %q{http://gemcutter.org}
@@ -33,16 +28,16 @@ Gem::Specification.new do |s|
 
            Thanks for installing Gemcutter! You can now run:
 
-    gem push          publish your gems for the world to use and enjoy
-    gem owner         allow/disallow others to push to your gems
+    gem push          merged into RubyGems 1.3.6
+    gem owner         merged into RubyGems 1.3.6
     gem webhook       register urls to be pinged when gems are pushed
 
 ========================================================================
 
 }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6.pre.1}
   s.summary = %q{Commands to interact with gemcutter.org}
 
   if s.respond_to? :specification_version then

diff --git a/gem/lib/gemcutter.rb b/gem/lib/gemcutter.rb
@@ -1,3 +1,6 @@
+require 'rubygems/command_manager'
+
 %w[migrate tumble webhook].each do |command|
+  require "rubygems/commands/#{command}"
   Gem::CommandManager.instance.register_command command.to_sym
 end
diff --git a/gem/lib/commands/migrate.rb → gem/lib/rubygems/commands/migrate.rb b/gem/lib/commands/migrate.rb → gem/lib/rubygems/commands/migrate.rb
diff --git a/gem/lib/commands/tumble.rb → gem/lib/rubygems/commands/tumble.rb b/gem/lib/commands/tumble.rb → gem/lib/rubygems/commands/tumble.rb
diff --git a/gem/lib/commands/webhook.rb → gem/lib/rubygems/commands/webhook.rb b/gem/lib/commands/webhook.rb → gem/lib/rubygems/commands/webhook.rb
diff --git a/gem/lib/rubygems_plugin.rb b/gem/lib/rubygems_plugin.rb
@@ -1,2 +1 @@
-require 'rubygems/command_manager'
-require File.join(File.dirname(__FILE__), 'gemcutter')
+require File.join(File.dirname(__FILE__), 'gemcutter')
diff --git a/gem/test/helper.rb b/gem/test/helper.rb
@@ -14,11 +14,6 @@
 
 WebMock.disable_net_connect!
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), ".."))
-%w[migrate tumble webhook].each do |command|
-  require "commands/#{command}"
-end
-
 class CommandTest < ActiveSupport::TestCase
   include RR::Adapters::TestUnit unless include?(RR::Adapters::TestUnit)
   include WebMock