From 6a4d4460ea2569d3bb54e1e75fad945c361cbc9b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 24 Aug 2005 09:22:20 +0000 Subject: [PATCH] Made SwitchTower conform to the other Rakefiles in terms of PKG description and beta gems pushing git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2045 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- pushgems.rb | 4 ++-- railties/Rakefile | 1 + switchtower/Rakefile | 15 ++++++++++++--- switchtower/switchtower.gemspec | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/pushgems.rb b/pushgems.rb index 5fa2241909..16475e1e22 100755 --- a/pushgems.rb +++ b/pushgems.rb @@ -1,10 +1,10 @@ #!/usr/local/bin/ruby unless ARGV.first == "no_build" - build_number = `svn log -q -rhead http://dev.rubyonrails.org/svn/rails`.scan(/r([0-9]*)/).first.first.to_i + build_number = "1962" end -%w( actionwebservice actionmailer actionpack activerecord railties activesupport).each do |pkg| +%w( actionwebservice actionmailer actionpack activerecord railties activesupport switchtower ).each do |pkg| puts "Pushing: #{pkg} (#{build_number})" if build_number `cd #{pkg} && rm -rf pkg && PKG_BUILD=#{build_number} rake pgem && cd ..` diff --git a/railties/Rakefile b/railties/Rakefile index 9e50149a1d..b0c32a2982 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -267,6 +267,7 @@ spec = Gem::Specification.new do |s| s.add_dependency('actionpack', '= 1.9.1' + PKG_BUILD) s.add_dependency('actionmailer', '= 1.0.1' + PKG_BUILD) s.add_dependency('actionwebservice', '= 0.8.1' + PKG_BUILD) + s.add_dependency('switchtower', '= 0.8.0' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' s.has_rdoc = false diff --git a/switchtower/Rakefile b/switchtower/Rakefile index 69ac03c9a0..7a4e2c6351 100644 --- a/switchtower/Rakefile +++ b/switchtower/Rakefile @@ -2,11 +2,14 @@ require 'rake' require 'rake/testtask' require 'rake/rdoctask' require 'rake/gempackagetask' +require 'rake/contrib/rubyforgepublisher' require "./lib/switchtower/version" -SOFTWARE_NAME = "switchtower" -SOFTWARE_VERSION = SwitchTower::Version::STRING +PKG_NAME = "switchtower" +PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' +PKG_VERSION = SwitchTower::Version::STRING + PKG_BUILD +PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" desc "Default task" task :default => [ :test ] @@ -19,7 +22,7 @@ Rake::TestTask.new do |t| t.verbose = true end -GEM_SPEC = eval(File.read("#{File.dirname(__FILE__)}/#{SOFTWARE_NAME}.gemspec")) +GEM_SPEC = eval(File.read("#{File.dirname(__FILE__)}/#{PKG_NAME}.gemspec")) Rake::GemPackageTask.new(GEM_SPEC) do |p| p.gem_spec = GEM_SPEC @@ -36,3 +39,9 @@ Rake::RDocTask.new do |rdoc| rdoc.rdoc_files.include 'lib/**/*.rb' rdoc.template = "jamis" end + +desc "Publish the beta gem" +task :pgem => [:package] do + Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload + `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'` +end \ No newline at end of file diff --git a/switchtower/switchtower.gemspec b/switchtower/switchtower.gemspec index 1371a67493..679153aeb0 100644 --- a/switchtower/switchtower.gemspec +++ b/switchtower/switchtower.gemspec @@ -3,7 +3,7 @@ require './lib/switchtower/version' Gem::Specification.new do |s| s.name = 'switchtower' - s.version = SwitchTower::Version::STRING + s.version = PKG_VERSION s.platform = Gem::Platform::RUBY s.summary = <<-DESC.strip.gsub(/\n/, " ") SwitchTower is a framework and utility for executing commands in parallel