Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Make the rakefile tasks that set up a new project aware of switchtower

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2028 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 6050dfc46b8ec70913d73e154926b9878c8f83c4 1 parent 72f50e6
@jamis jamis authored
View
2  railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make the rake tasks (like fresh_rails_without_docs_using_links) aware of switchtower
+
* Added -w flag to ps in process/reaper #1934 [Scott Barron]
* Add integration with SwitchTower (rake tasks, default deploy.rb recipe)
View
4 railties/Rakefile
@@ -33,9 +33,9 @@ TEST_DIRS = %w( fixtures unit functional mocks mocks/development mocks/test )
LOG_FILES = %w( server.log development.log test.log production.log )
HTML_FILES = %w( 404.html 500.html index.html robots.txt favicon.ico javascripts/prototype.js javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js )
-BIN_FILES = %w( generate destroy breakpointer console server update runner profiler benchmarker process/reaper process/spinner process/spawner )
+BIN_FILES = %w( generate destroy breakpointer console server update runner profiler benchmarker process/reaper process/spinner process/spawner switchtower )
-VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
+VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties switchtower )
desc "Generates a fresh Rails package with documentation"
View
15 railties/bin/switchtower
@@ -1,4 +1,15 @@
#!/usr/local/bin/ruby
-if not system "switchtower #{ARGV.join(" ")}"
- abort "Could not execute switchtower. Is it installed?"
+
+VENDOR = File.dirname(__FILE__) + "/../vendor"
+
+$:.unshift "#{VENDOR}/switchtower/lib"
+
+if File.directory?("#{VENDOR}/rails/switchtower")
+ $:.unshift "#{VENDOR}/rails/switchtower/lib"
+ load "#{VENDOR}/rails/switchtower/bin/switchtower"
+elsif File.directory?("#{VENDOR}/switchtower")
+ $:.unshift "#{VENDOR}/switchtower/lib"
+ load "#{VENDOR}/switchtower/bin/switchtower"
+elsif not system "switchtower #{ARGV.join(" ")}"
+ raise "could not locate switchtower to execute it"
end
Please sign in to comment.
Something went wrong with that request. Please try again.