From c1785f32825431d30a5d826066d37dfb0403cd46 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 4 Feb 2010 18:28:45 -0800 Subject: Release using gemcutter gem:push tasks --- activeresource/Rakefile | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'activeresource') diff --git a/activeresource/Rakefile b/activeresource/Rakefile index 9fa1f86914..d1bac76517 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -4,6 +4,7 @@ require 'rake/testtask' require 'rake/rdoctask' require 'rake/packagetask' require 'rake/gempackagetask' +require 'rake/gemcutter' require File.join(File.dirname(__FILE__), 'lib', 'active_resource', 'version') @@ -89,26 +90,13 @@ 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'` -end +Rake::Gemcutter::Tasks(spec) + +desc "Release to gemcutter" +task :release => [:package, 'gem:push'] desc "Publish the API documentation" 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 -- cgit v1.2.3 From 7b81f5981fd6dfcede61a89da80b09a1650e2c02 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 4 Feb 2010 18:44:14 -0800 Subject: Fix task defines --- activeresource/Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activeresource') diff --git a/activeresource/Rakefile b/activeresource/Rakefile index d1bac76517..61804df40e 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -90,7 +90,7 @@ end # Publishing ------------------------------------------------------ -Rake::Gemcutter::Tasks(spec) +Rake::Gemcutter::Tasks.new(spec).define desc "Release to gemcutter" task :release => [:package, 'gem:push'] -- cgit v1.2.3 From 459ecaf95db12ec64e70c02f8ee58ddb1133021e Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 5 Feb 2010 00:03:03 -0800 Subject: Submarine the rake-gemcutter dep in Rakefiles --- activeresource/Rakefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'activeresource') diff --git a/activeresource/Rakefile b/activeresource/Rakefile index 61804df40e..829752516f 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -4,7 +4,6 @@ require 'rake/testtask' require 'rake/rdoctask' require 'rake/packagetask' require 'rake/gempackagetask' -require 'rake/gemcutter' require File.join(File.dirname(__FILE__), 'lib', 'active_resource', 'version') @@ -90,10 +89,12 @@ end # Publishing ------------------------------------------------------ -Rake::Gemcutter::Tasks.new(spec).define - desc "Release to gemcutter" -task :release => [:package, 'gem:push'] +task :release => :package do + require 'rake/gemcutter' + Rake::Gemcutter::Tasks.new(spec).define + Rake::Task['gem:push'].invoke +end desc "Publish the API documentation" task :pdoc => [:rdoc] do -- cgit v1.2.3 From c548e213658386f3a5b00097bc5b30bf3736e6b4 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 5 Feb 2010 09:24:12 -0800 Subject: Bump git versions to 3.0.0.beta1 since we've released --- activeresource/activeresource.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activeresource') diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec index 8668761977..51a381ccc8 100644 --- a/activeresource/activeresource.gemspec +++ b/activeresource/activeresource.gemspec @@ -1,7 +1,7 @@ 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).' @@ -17,6 +17,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 -- cgit v1.2.3 From a9620ab918b555fc963013e7f5417dbff4e87db3 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sun, 31 Jan 2010 18:54:48 -0200 Subject: method_missing errors on activeresource tests, mocha is not required there [#3825 state:committed] Signed-off-by: Jeremy Kemper --- activeresource/test/cases/base_test.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'activeresource') diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb index 91349b810a..e73701cad7 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 -- cgit v1.2.3 From 1d9d9d2d89a90a85f27a1909e3c435c070bc1b40 Mon Sep 17 00:00:00 2001 From: Prem Sichanugrist Date: Sat, 6 Feb 2010 21:36:46 +0700 Subject: Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' will be run correctly [#3879 status:resolved] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- activeresource/lib/active_resource/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activeresource') 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 -- cgit v1.2.3 From 5fe3dc4bf52eb315310a714c0fc1f627d47428fa Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Mon, 8 Feb 2010 15:30:10 +1100 Subject: Adding ruby version spec to all gemspec files to at least 1.8.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- activeresource/activeresource.gemspec | 1 + 1 file changed, 1 insertion(+) (limited to 'activeresource') diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec index 51a381ccc8..1722ebeb8e 100644 --- a/activeresource/activeresource.gemspec +++ b/activeresource/activeresource.gemspec @@ -4,6 +4,7 @@ Gem::Specification.new do |s| 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' -- cgit v1.2.3 From 6f247347a11c7f59c510dd3ff8ee94628bc1df8b Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Mon, 8 Feb 2010 12:30:59 -0800 Subject: Fix failing spec --- activeresource/test/cases/base_test.rb | 5 +++++ activeresource/test/cases/subscriber_test.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'activeresource') diff --git a/activeresource/test/cases/base_test.rb b/activeresource/test/cases/base_test.rb index e73701cad7..0f10a0e4d7 100644 --- a/activeresource/test/cases/base_test.rb +++ b/activeresource/test/cases/base_test.rb @@ -99,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 -- cgit v1.2.3 From 523002fe16366be69e830fd80bbd3d743d66fa16 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 10 Feb 2010 16:45:30 -0800 Subject: Fix isolated test fail due to missing mocha --- activeresource/test/abstract_unit.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'activeresource') 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' -- cgit v1.2.3