diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-02 23:46:00 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-02 23:46:00 -0200 |
| commit | d002826e54415a340e55fdbf363d005faebf8fc5 (patch) | |
| tree | 431146dfb0b15c4507fd49bb7d6f18bd40ccf839 /activeresource | |
| parent | 9ba83cce0318fa5051764f4a16c286adf30169e2 (diff) | |
| parent | 14370e1aab6ddfb5b86cf50bd7e5abcebae0684c (diff) | |
| download | rails-d002826e54415a340e55fdbf363d005faebf8fc5.tar.gz rails-d002826e54415a340e55fdbf363d005faebf8fc5.tar.bz2 rails-d002826e54415a340e55fdbf363d005faebf8fc5.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/Rakefile | 10 | ||||
| -rw-r--r-- | activeresource/test/abstract_unit.rb | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/activeresource/Rakefile b/activeresource/Rakefile index c87345e3b5..834d4c0c59 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -62,8 +62,6 @@ spec = eval(File.read('activeresource.gemspec')) Rake::GemPackageTask.new(spec) do |p| p.gem_spec = spec - p.need_tar = true - p.need_zip = true end task :lines do @@ -80,10 +78,10 @@ task :lines do codelines += 1 end puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}" - + total_lines += lines total_codelines += codelines - + lines, codelines = 0, 0 end @@ -94,14 +92,14 @@ end # Publishing ------------------------------------------------------ desc "Publish the beta gem" -task :pgem => [:package] do +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 desc "Publish the API documentation" -task :pdoc => [:rdoc] do +task :pdoc => [:rdoc] do require 'rake/contrib/sshpublisher' Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/ar", "doc").upload end diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 6a33040243..ee12f785b5 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -1,9 +1,15 @@ +root = File.expand_path('../../..', __FILE__) +begin + require "#{root}/vendor/gems/environment" +rescue LoadError + $:.unshift("#{root}/activesupport/lib") + $:.unshift("#{root}/activeresource/lib") +end + require 'rubygems' require 'test/unit' require 'active_support' require 'active_support/test_case' - -$:.unshift "#{File.dirname(__FILE__)}/../lib" require 'active_resource' $:.unshift "#{File.dirname(__FILE__)}/../test" |