SOURCES: rails-sanity.patch - more fixes
aredridel
aredridel at pld-linux.org
Wed Mar 8 19:37:31 CET 2006
Author: aredridel Date: Wed Mar 8 18:37:31 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- more fixes
---- Files affected:
SOURCES:
rails-sanity.patch (1.10 -> 1.11)
---- Diffs:
================================================================
Index: SOURCES/rails-sanity.patch
diff -u SOURCES/rails-sanity.patch:1.10 SOURCES/rails-sanity.patch:1.11
--- SOURCES/rails-sanity.patch:1.10 Wed Mar 8 01:55:23 2006
+++ SOURCES/rails-sanity.patch Wed Mar 8 19:37:25 2006
@@ -375,3 +375,350 @@
require 'rails_generator/base'
require 'rails_generator/lookup'
+diff -ur rails-o/vendor/rails/railties/bin/rails rails/vendor/rails/railties/bin/rails
+--- rails-o/vendor/rails/railties/bin/rails 2006-03-07 17:53:45.000000000 -0700
++++ rails/vendor/rails/railties/bin/rails 2006-03-07 17:57:07.000000000 -0700
+@@ -12,11 +12,11 @@
+
+ Signal.trap("INT") { puts; exit }
+
+-require File.dirname(__FILE__) + '/../lib/rails_version'
++require 'railties/rails_version'
+ abort "Rails #{Rails::VERSION::STRING}" if %w(--version -v).include? ARGV.first
+
+-require File.dirname(__FILE__) + '/../lib/rails_generator'
++require 'railties/rails_generator'
+
+-require 'rails_generator/scripts/generate'
++require 'railties/rails_generator/scripts/generate'
+ Rails::Generator::Base.use_application_sources!
+ Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
+diff -ur rails-o/vendor/rails/railties/lib/rails_info.rb rails/vendor/rails/railties/lib/rails_info.rb
+--- rails-o/vendor/rails/railties/lib/rails_info.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/rails_info.rb 2006-03-07 17:57:31.000000000 -0700
+@@ -1,4 +1,4 @@
+-require 'rails_version'
++require 'railties/rails_version'
+
+ module Rails
+ module Info
+diff -ur rails-o/vendor/rails/railties/bin/about rails/vendor/rails/railties/bin/about
+--- rails-o/vendor/rails/railties/bin/about 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/about 2006-03-07 18:15:00.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../config/boot'
+-require 'commands/about'
+\ No newline at end of file
++require 'railties/commands/about'
+diff -ur rails-o/vendor/rails/railties/bin/breakpointer rails/vendor/rails/railties/bin/breakpointer
+--- rails-o/vendor/rails/railties/bin/breakpointer 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/breakpointer 2006-03-07 18:15:06.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../config/boot'
+-require 'commands/breakpointer'
+\ No newline at end of file
++require 'railties/commands/breakpointer'
+diff -ur rails-o/vendor/rails/railties/bin/console rails/vendor/rails/railties/bin/console
+--- rails-o/vendor/rails/railties/bin/console 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/console 2006-03-07 18:15:13.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../config/boot'
+-require 'commands/console'
+\ No newline at end of file
++require 'railties/commands/console'
+diff -ur rails-o/vendor/rails/railties/bin/destroy rails/vendor/rails/railties/bin/destroy
+--- rails-o/vendor/rails/railties/bin/destroy 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/destroy 2006-03-07 18:15:19.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../config/boot'
+-require 'commands/destroy'
+\ No newline at end of file
++require 'railties/commands/destroy'
+diff -ur rails-o/vendor/rails/railties/bin/generate rails/vendor/rails/railties/bin/generate
+--- rails-o/vendor/rails/railties/bin/generate 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/generate 2006-03-07 18:15:23.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../config/boot'
+-require 'commands/generate'
+\ No newline at end of file
++require 'railties/commands/generate'
+diff -ur rails-o/vendor/rails/railties/bin/performance/benchmarker rails/vendor/rails/railties/bin/performance/benchmarker
+--- rails-o/vendor/rails/railties/bin/performance/benchmarker 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/performance/benchmarker 2006-03-07 18:16:13.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../../config/boot'
+-require 'commands/performance/benchmarker'
++require 'railties/commands/performance/benchmarker'
+diff -ur rails-o/vendor/rails/railties/bin/performance/profiler rails/vendor/rails/railties/bin/performance/profiler
+--- rails-o/vendor/rails/railties/bin/performance/profiler 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/performance/profiler 2006-03-07 18:16:18.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../../config/boot'
+-require 'commands/performance/profiler'
++require 'railties/commands/performance/profiler'
+diff -ur rails-o/vendor/rails/railties/bin/plugin rails/vendor/rails/railties/bin/plugin
+--- rails-o/vendor/rails/railties/bin/plugin 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/plugin 2006-03-07 18:15:30.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../config/boot'
+-require 'commands/plugin'
+\ No newline at end of file
++require 'railties/commands/plugin'
+diff -ur rails-o/vendor/rails/railties/bin/process/reaper rails/vendor/rails/railties/bin/process/reaper
+--- rails-o/vendor/rails/railties/bin/process/reaper 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/process/reaper 2006-03-07 18:16:23.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../../config/boot'
+-require 'commands/process/reaper'
++require 'railties/commands/process/reaper'
+diff -ur rails-o/vendor/rails/railties/bin/process/spawner rails/vendor/rails/railties/bin/process/spawner
+--- rails-o/vendor/rails/railties/bin/process/spawner 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/process/spawner 2006-03-07 18:16:29.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../../config/boot'
+-require 'commands/process/spawner'
++require 'railties/commands/process/spawner'
+diff -ur rails-o/vendor/rails/railties/bin/process/spinner rails/vendor/rails/railties/bin/process/spinner
+--- rails-o/vendor/rails/railties/bin/process/spinner 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/process/spinner 2006-03-07 18:16:37.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../../config/boot'
+-require 'commands/process/spinner'
++require 'railties/commands/process/spinner'
+diff -ur rails-o/vendor/rails/railties/bin/runner rails/vendor/rails/railties/bin/runner
+--- rails-o/vendor/rails/railties/bin/runner 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/runner 2006-03-07 18:15:49.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../config/boot'
+-require 'commands/runner'
+\ No newline at end of file
++require 'railties/commands/runner'
+diff -ur rails-o/vendor/rails/railties/bin/server rails/vendor/rails/railties/bin/server
+--- rails-o/vendor/rails/railties/bin/server 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/server 2006-03-07 18:15:55.000000000 -0700
+@@ -1,3 +1,3 @@
+ #!/usr/bin/env ruby
+ require File.dirname(__FILE__) + '/../config/boot'
+-require 'commands/server'
+\ No newline at end of file
++require 'railties/commands/server'
+diff -ur rails-o/vendor/rails/railties/environments/boot.rb rails/vendor/rails/railties/environments/boot.rb
+--- rails-o/vendor/rails/railties/environments/boot.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/environments/boot.rb 2006-03-07 18:18:10.000000000 -0700
+@@ -12,8 +12,7 @@
+ if File.directory?("#{RAILS_ROOT}/vendor/rails")
+ require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+ else
+- require 'rubygems'
+- require 'initializer'
++ require 'railties/initializer'
+ end
+
+ Rails::Initializer.run(:set_load_path)
+diff -ur rails-o/vendor/rails/railties/lib/commands/about.rb rails/vendor/rails/railties/lib/commands/about.rb
+--- rails-o/vendor/rails/railties/lib/commands/about.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/commands/about.rb 2006-03-07 18:30:28.000000000 -0700
+@@ -1,2 +1,2 @@
+-require 'environment'
++require "#{RAILS_ROOT}/config/environment"
+ puts Rails::Info
+diff -ur rails-o/vendor/rails/railties/lib/commands/breakpointer.rb rails/vendor/rails/railties/lib/commands/breakpointer.rb
+--- rails-o/vendor/rails/railties/lib/commands/breakpointer.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/commands/breakpointer.rb 2006-03-07 18:31:00.000000000 -0700
+@@ -1 +1 @@
+-require 'breakpoint_client'
++require 'railties/breakpoint_client'
+diff -ur rails-o/vendor/rails/railties/lib/commands/destroy.rb rails/vendor/rails/railties/lib/commands/destroy.rb
+--- rails-o/vendor/rails/railties/lib/commands/destroy.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/commands/destroy.rb 2006-03-07 18:20:04.000000000 -0700
+@@ -1,6 +1,6 @@
+ require "#{RAILS_ROOT}/config/environment"
+-require 'rails_generator'
+-require 'rails_generator/scripts/destroy'
++require 'railties/rails_generator'
++require 'railties/rails_generator/scripts/destroy'
+
+ ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+ Rails::Generator::Scripts::Destroy.new.run(ARGV)
+diff -ur rails-o/vendor/rails/railties/lib/commands/generate.rb rails/vendor/rails/railties/lib/commands/generate.rb
+--- rails-o/vendor/rails/railties/lib/commands/generate.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/commands/generate.rb 2006-03-07 18:20:20.000000000 -0700
+@@ -1,6 +1,6 @@
+ require "#{RAILS_ROOT}/config/environment"
+-require 'rails_generator'
+-require 'rails_generator/scripts/generate'
++require 'railties/rails_generator'
++require 'railties/rails_generator/scripts/generate'
+
+ ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+ Rails::Generator::Scripts::Generate.new.run(ARGV)
+diff -ur rails-o/vendor/rails/railties/lib/commands/ncgi/listener rails/vendor/rails/railties/lib/commands/ncgi/listener
+--- rails-o/vendor/rails/railties/lib/commands/ncgi/listener 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/commands/ncgi/listener 2006-03-07 18:21:38.000000000 -0700
+@@ -2,7 +2,7 @@
+
+ require 'stringio'
+ require 'fileutils'
+-require 'fcgi_handler'
++require 'railties/fcgi_handler'
+
+ def message(s)
+ $stderr.puts "listener: #{s}" if ENV && ENV["DEBUG_GATEWAY"]
+@@ -83,4 +83,4 @@
+ socket_path = ARGV.shift
+ timeout = (ARGV.shift || 90).to_i
+
+-Listener.new(timeout, socket_path)
+\ No newline at end of file
++Listener.new(timeout, socket_path)
+diff -ur rails-o/vendor/rails/railties/lib/commands/server.rb rails/vendor/rails/railties/lib/commands/server.rb
+--- rails-o/vendor/rails/railties/lib/commands/server.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/commands/server.rb 2006-03-07 18:32:25.000000000 -0700
+@@ -1,7 +1,7 @@
+ require 'active_support'
+
+ begin
+- require_library_or_gem 'fcgi'
++ require 'fcgi'
+ rescue Exception
+ # FCGI not available
+ end
+@@ -25,4 +25,4 @@
+ puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
+ end
+
+-require "commands/servers/#{server}"
+\ No newline at end of file
++require "railties/commands/servers/#{server}"
+diff -ur rails-o/vendor/rails/railties/lib/commands/servers/lighttpd.rb rails/vendor/rails/railties/lib/commands/servers/lighttpd.rb
+--- rails-o/vendor/rails/railties/lib/commands/servers/lighttpd.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/commands/servers/lighttpd.rb 2006-03-07 18:22:22.000000000 -0700
+@@ -8,7 +8,7 @@
+ exit 1
+ end
+
+-require 'initializer'
++require 'railties/initializer'
+ configuration = Rails::Initializer.run(:initialize_logger).configuration
+
+ config_file = "#{RAILS_ROOT}/config/lighttpd.conf"
+diff -ur rails-o/vendor/rails/railties/lib/commands/servers/webrick.rb rails/vendor/rails/railties/lib/commands/servers/webrick.rb
+--- rails-o/vendor/rails/railties/lib/commands/servers/webrick.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/commands/servers/webrick.rb 2006-03-07 18:22:35.000000000 -0700
+@@ -50,7 +50,7 @@
+ RAILS_ENV.replace(OPTIONS[:environment]) if defined?(RAILS_ENV)
+
+ require RAILS_ROOT + "/config/environment"
+-require 'webrick_server'
++require 'railties/webrick_server'
+
+ OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)
+
+diff -ur rails-o/vendor/rails/railties/lib/commands/update.rb rails/vendor/rails/railties/lib/commands/update.rb
+--- rails-o/vendor/rails/railties/lib/commands/update.rb 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/commands/update.rb 2006-03-07 18:21:10.000000000 -0700
+@@ -1,4 +1,4 @@
+ require "#{RAILS_ROOT}/config/environment"
+-require 'rails_generator'
+-require 'rails_generator/scripts/update'
++require 'railties/rails_generator'
++require 'railties/rails_generator/scripts/update'
+ Rails::Generator::Scripts::Update.new.run(ARGV)
+diff -ur rails-o/vendor/rails/railties/lib/rails_generator.rb rails/vendor/rails/railties/lib/rails_generator.rb
+--- rails-o/vendor/rails/railties/lib/rails_generator.rb 2006-03-07 18:13:23.000000000 -0700
++++ rails/vendor/rails/railties/lib/rails_generator.rb 2006-03-07 18:37:22.000000000 -0700
+@@ -21,18 +21,15 @@
+ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #++
+
+-$:.unshift(File.dirname(__FILE__))
+-$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
+-
+ require 'active_support'
+
+-require 'rails_generator/base'
+-require 'rails_generator/lookup'
+-require 'rails_generator/commands'
++require 'railties/rails_generator/base'
++require 'railties/rails_generator/lookup'
++require 'railties/rails_generator/commands'
+
+ Rails::Generator::Base.send(:include, Rails::Generator::Lookup)
+ Rails::Generator::Base.send(:include, Rails::Generator::Commands)
+
+ # Set up a default logger for convenience.
+-require 'rails_generator/simple_logger'
++require 'railties/rails_generator/simple_logger'
+ Rails::Generator::Base.logger = Rails::Generator::SimpleLogger.new(STDOUT)
+diff -ur rails-o/vendor/rails/railties/lib/tasks/framework.rake rails/vendor/rails/railties/lib/tasks/framework.rake
+--- rails-o/vendor/rails/railties/lib/tasks/framework.rake 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/tasks/framework.rake 2006-03-07 18:42:08.000000000 -0700
+@@ -1,56 +1,3 @@
+-desc "Lock this application to the current gems (by unpacking them into vendor/rails)"
+-task :freeze_gems do
+- deps = %w(actionpack activerecord actionmailer activesupport actionwebservice)
+- require 'rubygems'
+-
+- rails = if version = ENV['VERSION']
+- Gem.cache.search('rails', "= #{version}").first
+- else
+- Gem.cache.search('rails').sort_by { |g| g.version }.last
+- end
+- version ||= rails.version
+-
+- unless rails
+- puts "No rails gem #{version} is installed. Do 'gem list rails' to see what you have available."
+- exit
+- end
+-
+- puts "Freezing to the gems for Rails #{rails.version}"
+- rm_rf "vendor/rails"
+- mkdir_p "vendor/rails"
+-
+- rails.dependencies.select { |g| deps.include? g.name }.each do |g|
+- system "cd vendor/rails; gem unpack -v '#{g.version_requirements}' #{g.name}; mv #{g.name}* #{g.name}"
+- end
+- system "cd vendor/rails; gem unpack -v '=#{version}' rails"
+-
+- FileUtils.mv(Dir.glob("vendor/rails/rails*").first, "vendor/rails/railties")
+-end
+-
+-desc "Lock this application to the Edge Rails (by exporting from Subversion). Defaults to svn HEAD; do 'rake freeze_edge REVISION=1234' to lock to a specific revision."
+-task :freeze_edge do
+- $verbose = false
+- `svn --version` rescue nil
+- unless !$?.nil? && $?.success?
+- $stderr.puts "ERROR: Must have subversion (svn) available in the PATH to lock this application to Edge Rails"
+- exit 1
+- end
+-
+- rm_rf "vendor/rails"
+- mkdir_p "vendor/rails"
+-
+- revision_switch = ENV['REVISION'] ? " -r #{ENV['REVISION']}" : ''
+- for framework in %w( railties actionpack activerecord actionmailer activesupport actionwebservice )
+- mkdir_p "vendor/rails/#{framework}"
+- system "svn export http://dev.rubyonrails.org/svn/rails/trunk/#{framework}/lib vendor/rails/#{framework}/lib #{revision_switch}"
+- end
+-end
+-
+-desc "Unlock this application from freeze of gems or edge and return to a fluid use of system gems"
+-task :unfreeze_rails do
+- rm_rf "vendor/rails"
+-end
+-
+ desc "Add new scripts to the application script/ directory"
+ task :add_new_scripts do
+ local_base = "script"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rails-sanity.patch?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list