Merge branch 'master' of github.com:lifo/docrails

6 files changed, 19 insertions, 21 deletions

diff --git a/activeresource/Rakefile b/activeresource/Rakefile
index 9fa1f86914..829752516f 100644
--- a/activeresource/Rakefile
+++ b/activeresource/Rakefile
@@ -89,11 +89,11 @@ end
 
 # Publishing ------------------------------------------------------
 
-desc "Publish the beta gem"
-task :pgem => [:package] do
-  require 'rake/contrib/sshpublisher'
-  Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
+desc "Release to gemcutter"
+task :release => :package do
+  require 'rake/gemcutter'
+  Rake::Gemcutter::Tasks.new(spec).define
+  Rake::Task['gem:push'].invoke
 end
 
 desc "Publish the API documentation"
@@ -101,14 +101,3 @@ task :pdoc => [:rdoc] do
   require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ar", "doc").upload
 end
-
-desc "Publish the release files to RubyForge."
-task :release => [ :package ] do
-  `rubyforge login`
-
-  for ext in %w( gem tgz zip )
-    release_command = "rubyforge add_release #{PKG_NAME} #{PKG_NAME} 'REL #{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}"
-    puts release_command
-    system(release_command)
-  end
-end
diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec
index 8668761977..1722ebeb8e 100644
--- a/activeresource/activeresource.gemspec
+++ b/activeresource/activeresource.gemspec
@@ -1,9 +1,10 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'activeresource'
-  s.version     = '3.0.0.beta'
+  s.version     = '3.0.0.beta1'
   s.summary     = 'REST-model framework (part of Rails).'
   s.description = 'REST-model framework (part of Rails).'
+  s.required_ruby_version = '>= 1.8.7'
 
   s.author            = 'David Heinemeier Hansson'
   s.email             = 'david@loudthinking.com'
@@ -17,6 +18,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w( README )
   s.rdoc_options.concat ['--main',  'README']
 
-  s.add_dependency('activesupport', '= 3.0.0.beta')
-  s.add_dependency('activemodel',   '= 3.0.0.beta')
+  s.add_dependency('activesupport', '= 3.0.0.beta1')
+  s.add_dependency('activemodel',   '= 3.0.0.beta1')
 end
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb
index 952a0d3b5f..461fef5283 100644
--- a/activeresource/lib/active_resource/version.rb
+++ b/activeresource/lib/active_resource/version.rb
@@ -2,7 +2,7 @@ module ActiveResource
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = "0.beta"
+    TINY  = "0.beta1"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
index 2f43916521..1af535e811 100644
--- a/activeresource/test/abstract_unit.rb
+++ b/activeresource/test/abstract_unit.rb
@@ -4,6 +4,7 @@ require 'rubygems'
 require 'test/unit'
 require 'active_resource'
 require 'active_support'
+require 'active_support/test_case'
 
 $:.unshift "#{File.dirname(__FILE__)}/../test"
 require 'setter_trap'
diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb
index 91349b810a..0f10a0e4d7 100644
--- a/activeresource/test/cases/base_test.rb
+++ b/activeresource/test/cases/base_test.rb
@@ -5,6 +5,7 @@ require "fixtures/street_address"
 require "fixtures/beast"
 require "fixtures/proxy"
 require 'active_support/core_ext/hash/conversions'
+require 'mocha'
 
 class BaseTest < Test::Unit::TestCase
   def setup
@@ -98,10 +99,15 @@ class BaseTest < Test::Unit::TestCase
       mock.get    "/customers/1.xml",             {}, @luis
     end
 
+    @original_person_site = Person.site
     Person.user = nil
     Person.password = nil
   end
 
+  def teardown
+    Person.site = @original_person_site
+  end
+
   ########################################################################
   # Tests relating to setting up the API-connection configuration
   ########################################################################
diff --git a/activeresource/test/cases/subscriber_test.rb b/activeresource/test/cases/subscriber_test.rb
index 3556fbf7cb..fb890e86cb 100644
--- a/activeresource/test/cases/subscriber_test.rb
+++ b/activeresource/test/cases/subscriber_test.rb
@@ -2,6 +2,7 @@ require "abstract_unit"
 require "fixtures/person"
 require "rails/subscriber/test_helper"
 require "active_resource/railties/subscriber"
+require "active_support/core_ext/hash/conversions"
 
 class SubscriberTest < ActiveSupport::TestCase
   include Rails::Subscriber::TestHelper
@@ -24,7 +25,7 @@ class SubscriberTest < ActiveSupport::TestCase
     matz = Person.find(1)
     wait
     assert_equal 2, @logger.logged(:info).size
-    assert_equal "GET http://somewhere.else:80/people/1.xml", @logger.logged(:info)[0] 
+    assert_equal "GET http://37s.sunrise.i:3000/people/1.xml", @logger.logged(:info)[0]
     assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1]
   end
 end
\ No newline at end of file