SOURCES: rails-sanity.patch - patch for 0.13.0
aredridel
aredridel at pld-linux.org
Sat Jul 9 23:20:31 CEST 2005
Author: aredridel Date: Sat Jul 9 21:20:31 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- patch for 0.13.0
---- Files affected:
SOURCES:
rails-sanity.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/rails-sanity.patch
diff -u SOURCES/rails-sanity.patch:1.5 SOURCES/rails-sanity.patch:1.6
--- SOURCES/rails-sanity.patch:1.5 Sat May 7 07:34:17 2005
+++ SOURCES/rails-sanity.patch Sat Jul 9 23:20:26 2005
@@ -1,24 +1,24 @@
-diff -ur o-rails/vendor/rails/railties/bin/breakpointer rails/vendor/rails/railties/bin/breakpointer
---- o-rails/vendor/rails/railties/bin/breakpointer 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/bin/breakpointer 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/bin/breakpointer rails/vendor/rails/railties/bin/breakpointer
+--- rails-o/vendor/rails/railties/bin/breakpointer 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/bin/breakpointer 2005-07-09 15:11:51.000000000 -0600
@@ -1,3 +1,2 @@
-#!/usr/local/bin/ruby
-$LOAD_PATH << File.dirname(__FILE__) + '/../vendor/railties/lib'
-require 'breakpoint_client'
+#!/usr/bin/ruby
+require 'railties/breakpoint_client'
-diff -ur o-rails/vendor/rails/railties/bin/console rails/vendor/rails/railties/bin/console
---- o-rails/vendor/rails/railties/bin/console 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/bin/console 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/bin/console rails/vendor/rails/railties/bin/console
+--- rails-o/vendor/rails/railties/bin/console 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/bin/console 2005-07-09 15:11:51.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/ruby
irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
require 'optparse'
-diff -ur o-rails/vendor/rails/railties/bin/destroy rails/vendor/rails/railties/bin/destroy
---- o-rails/vendor/rails/railties/bin/destroy 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/bin/destroy 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/bin/destroy rails/vendor/rails/railties/bin/destroy
+--- rails-o/vendor/rails/railties/bin/destroy 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/bin/destroy 2005-07-09 15:11:51.000000000 -0600
@@ -1,7 +1,7 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/ruby
@@ -30,9 +30,9 @@
ARGV.shift if ['--help', '-h'].include?(ARGV[0])
Rails::Generator::Scripts::Destroy.new.run(ARGV)
-diff -ur o-rails/vendor/rails/railties/bin/generate rails/vendor/rails/railties/bin/generate
---- o-rails/vendor/rails/railties/bin/generate 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/bin/generate 2005-04-20 20:36:33.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/bin/generate rails/vendor/rails/railties/bin/generate
+--- rails-o/vendor/rails/railties/bin/generate 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/bin/generate 2005-07-09 15:11:51.000000000 -0600
@@ -1,7 +1,14 @@
-#!/usr/local/bin/ruby
-require File.dirname(__FILE__) + '/../config/environment'
@@ -52,25 +52,25 @@
ARGV.shift if ['--help', '-h'].include?(ARGV[0])
Rails::Generator::Scripts::Generate.new.run(ARGV)
-diff -ur o-rails/vendor/rails/railties/bin/rails rails/vendor/rails/railties/bin/rails
---- o-rails/vendor/rails/railties/bin/rails 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/bin/rails 2005-04-20 20:36:15.000000000 -0600
-@@ -1,6 +1,8 @@
+diff -ur rails-o/vendor/rails/railties/bin/rails rails/vendor/rails/railties/bin/rails
+--- rails-o/vendor/rails/railties/bin/rails 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/bin/rails 2005-07-09 15:14:33.000000000 -0600
+@@ -1,8 +1,9 @@
+#!/usr/bin/ruby
-+
abort "Rails requires Ruby 1.8.2" if RUBY_VERSION < "1.8.2"
+ Signal.trap("INT") { puts; exit }
+
-require File.dirname(__FILE__) + '/../lib/rails_generator'
-require 'rails_generator/scripts/generate'
+require 'railties/rails_generator'
+require 'railties/rails_generator/scripts/generate'
Rails::Generator::Base.use_application_sources!
--Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
-\ No newline at end of file
-+Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
-diff -ur o-rails/vendor/rails/railties/bin/server rails/vendor/rails/railties/bin/server
---- o-rails/vendor/rails/railties/bin/server 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/bin/server 2005-04-20 20:36:15.000000000 -0600
+ Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
+Only in rails/vendor/rails/railties/bin: rails~
+diff -ur rails-o/vendor/rails/railties/bin/server rails/vendor/rails/railties/bin/server
+--- rails-o/vendor/rails/railties/bin/server 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/bin/server 2005-07-09 15:11:51.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/ruby
@@ -86,9 +86,9 @@
OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)
-diff -ur o-rails/vendor/rails/railties/bin/update rails/vendor/rails/railties/bin/update
---- o-rails/vendor/rails/railties/bin/update 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/bin/update 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/bin/update rails/vendor/rails/railties/bin/update
+--- rails-o/vendor/rails/railties/bin/update 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/bin/update 2005-07-09 15:11:51.000000000 -0600
@@ -1,5 +1,5 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/ruby
@@ -98,34 +98,26 @@
+require 'railties/rails_generator'
+require 'railties/rails_generator/scripts/update'
Rails::Generator::Scripts::Update.new.run(ARGV)
-diff -ur o-rails/vendor/rails/railties/dispatches/dispatch.fcgi rails/vendor/rails/railties/dispatches/dispatch.fcgi
---- o-rails/vendor/rails/railties/dispatches/dispatch.fcgi 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/dispatches/dispatch.fcgi 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/dispatches/dispatch.fcgi rails/vendor/rails/railties/dispatches/dispatch.fcgi
+--- rails-o/vendor/rails/railties/dispatches/dispatch.fcgi 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/dispatches/dispatch.fcgi 2005-07-09 15:11:51.000000000 -0600
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/ruby
+ #
+ # You may specify the path to the FastCGI crash log (a log of unhandled
+ # exceptions which forced the FastCGI instance to exit, great for debugging)
+@@ -19,6 +19,6 @@
+ # RailsFCGIHandler.process! '/var/log/myapp_fcgi_crash.log'
+ #
+ require File.dirname(__FILE__) + "/../config/environment"
+-require 'fcgi_handler'
++require 'railties/fcgi_handler'
- def dispatcher_error(path,e,msg="")
- error_message =
-@@ -10,7 +10,7 @@
-
- begin
- require File.dirname(__FILE__) + "/../config/environment"
-- require 'dispatcher'
-+ require 'railties/dispatcher'
- require 'fcgi'
-
- log_file_path = "#{RAILS_ROOT}/log/fastcgi.crash.log"
-@@ -24,4 +24,4 @@
- end
- rescue Object => fcgi_error
- dispatcher_error(log_file_path, fcgi_error, "FCGI process #{$$} killed by this error\n")
--end
-\ No newline at end of file
-+end
-diff -ur o-rails/vendor/rails/railties/dispatches/dispatch.rb rails/vendor/rails/railties/dispatches/dispatch.rb
---- o-rails/vendor/rails/railties/dispatches/dispatch.rb 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/dispatches/dispatch.rb 2005-04-20 20:36:15.000000000 -0600
+ RailsFCGIHandler.process!
+diff -ur rails-o/vendor/rails/railties/dispatches/dispatch.rb rails/vendor/rails/railties/dispatches/dispatch.rb
+--- rails-o/vendor/rails/railties/dispatches/dispatch.rb 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/dispatches/dispatch.rb 2005-07-09 15:11:51.000000000 -0600
@@ -1,10 +1,8 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/ruby
@@ -141,9 +133,9 @@
-Dispatcher.dispatch
\ No newline at end of file
+Dispatcher.dispatch
-diff -ur o-rails/vendor/rails/railties/environments/environment.rb rails/vendor/rails/railties/environments/environment.rb
---- o-rails/vendor/rails/railties/environments/environment.rb 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/environments/environment.rb 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/environments/environment.rb rails/vendor/rails/railties/environments/environment.rb
+--- rails-o/vendor/rails/railties/environments/environment.rb 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/environments/environment.rb 2005-07-09 15:11:51.000000000 -0600
@@ -33,8 +33,6 @@
ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
@@ -153,9 +145,9 @@
require 'active_support'
require 'active_record'
require 'action_controller'
-diff -ur o-rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb
---- o-rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+--- rails-o/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb 2005-07-09 15:11:51.000000000 -0600
@@ -4,7 +4,7 @@
DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
Config::CONFIG['ruby_install_name'])
@@ -176,29 +168,12 @@
@@ -24,7 +25,6 @@
# Root
m.file "fresh_rakefile", "Rakefile"
- m.file "README", "README"
-- m.file "CHANGELOG", "CHANGELOG"
+ m.file "README", "README"
+- m.file "CHANGELOG", "CHANGELOG"
# Application
- m.template "helpers/application.rb", "app/controllers/application.rb"
-@@ -43,14 +43,10 @@
- m.file "environments/test.rb", "config/environments/test.rb"
-
- # Scripts
-- %w(console console_sandbox destroy generate server runner benchmarker profiler).each do |file|
-+ %w(console console_sandbox destroy server runner benchmarker profiler).each do |file|
- m.file "bin/#{file}", "script/#{file}", script_options
- end
-- if options[:gem]
-- m.file "bin/breakpointer_for_gem", "script/breakpointer", script_options
-- else
-- m.file "bin/breakpointer", "script/breakpointer", script_options
-- end
-+ m.file "bin/breakpointer", "script/breakpointer", script_options
-
- # Dispatches
- m.file "dispatches/dispatch.rb", "public/dispatch.rb", script_options
-@@ -87,9 +83,6 @@
+ m.template "helpers/application.rb", "app/controllers/application.rb"
+@@ -91,9 +91,6 @@
opt.separator 'Options:'
opt.on("--ruby [#{DEFAULT_SHEBANG}]",
"Path to the Ruby binary of your choice.") { |options[:shebang]| }
@@ -208,9 +183,9 @@
end
-diff -ur o-rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE
---- o-rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE
+--- rails-o/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE 2005-07-09 15:11:51.000000000 -0600
@@ -7,10 +7,3 @@
This generates a skeletal Rails installation in ~/Code/Ruby/weblog.
@@ -222,9 +197,9 @@
- actionmailer directories in the vendor directory. A popular way to track
- the bleeding edge of Rails development is to checkout from source control
- directly to the vendor directory. See http://dev.rubyonrails.com
-diff -ur o-rails/vendor/rails/railties/lib/rails_generator/lookup.rb rails/vendor/rails/railties/lib/rails_generator/lookup.rb
---- o-rails/vendor/rails/railties/lib/rails_generator/lookup.rb 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/lookup.rb 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/lib/rails_generator/lookup.rb rails/vendor/rails/railties/lib/rails_generator/lookup.rb
+--- rails-o/vendor/rails/railties/lib/rails_generator/lookup.rb 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/lib/rails_generator/lookup.rb 2005-07-09 15:11:51.000000000 -0600
@@ -94,8 +94,7 @@
# generating in the context of a Rails application, so search
# RAILS_ROOT/script/generators.
@@ -262,9 +237,9 @@
-
end
end
-diff -ur o-rails/vendor/rails/railties/lib/rails_generator/scripts.rb rails/vendor/rails/railties/lib/rails_generator/scripts.rb
---- o-rails/vendor/rails/railties/lib/rails_generator/scripts.rb 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/scripts.rb 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/lib/rails_generator/scripts.rb rails/vendor/rails/railties/lib/rails_generator/scripts.rb
+--- rails-o/vendor/rails/railties/lib/rails_generator/scripts.rb 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/lib/rails_generator/scripts.rb 2005-07-09 15:11:51.000000000 -0600
@@ -67,12 +67,6 @@
usage << <<end_blurb
3. Run generate with no arguments for usage information
@@ -278,9 +253,9 @@
end_blurb
return usage
end
-diff -ur o-rails/vendor/rails/railties/lib/rails_generator.rb rails/vendor/rails/railties/lib/rails_generator.rb
---- o-rails/vendor/rails/railties/lib/rails_generator.rb 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator.rb 2005-04-20 20:36:15.000000000 -0600
+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 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/lib/rails_generator.rb 2005-07-09 15:11:51.000000000 -0600
@@ -24,12 +24,7 @@
$:.unshift(File.dirname(__FILE__))
$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
@@ -295,9 +270,9 @@
require 'rails_generator/base'
require 'rails_generator/lookup'
-diff -ur o-rails/vendor/rails/railties/Rakefile rails/vendor/rails/railties/Rakefile
---- o-rails/vendor/rails/railties/Rakefile 2005-04-19 17:12:49.000000000 -0600
-+++ rails/vendor/rails/railties/Rakefile 2005-04-20 20:36:15.000000000 -0600
+diff -ur rails-o/vendor/rails/railties/Rakefile rails/vendor/rails/railties/Rakefile
+--- rails-o/vendor/rails/railties/Rakefile 2005-07-06 11:53:13.000000000 -0600
++++ rails/vendor/rails/railties/Rakefile 2005-07-09 15:11:51.000000000 -0600
@@ -1,7 +1,6 @@
require 'rake'
require 'rake/testtask'
@@ -316,7 +291,7 @@
desc "Generates a fresh Rails package without documentation (faster)"
task :fresh_rails_without_docs => [ :clean, :make_dir_structure, :initialize_file_stubs, :copy_vendor_libraries, :copy_ties_content ]
-@@ -157,7 +153,6 @@
+@@ -169,7 +165,6 @@
task :copy_rootfiles do
cp "fresh_rakefile", "#{PKG_DESTINATION}/Rakefile"
cp "README", "#{PKG_DESTINATION}/README"
@@ -324,7 +299,7 @@
end
task :copy_test_helpers do
-@@ -208,14 +203,6 @@
+@@ -220,14 +215,6 @@
# Generate GEM ----------------------------------------------------------------------------
@@ -339,7 +314,7 @@
PKG_FILES = FileList[
'[a-zA-Z]*',
'bin/**/*',
-@@ -228,161 +215,3 @@
+@@ -240,161 +227,3 @@
'html/**/*',
'lib/**/*'
]
@@ -354,11 +329,11 @@
- EOF
-
- s.add_dependency('rake', '>= 0.5.3')
-- s.add_dependency('activesupport', '= 1.0.4' + PKG_BUILD)
-- s.add_dependency('activerecord', '= 1.10.1' + PKG_BUILD)
-- s.add_dependency('actionpack', '= 1.8.1' + PKG_BUILD)
-- s.add_dependency('actionmailer', '= 0.9.1' + PKG_BUILD)
-- s.add_dependency('actionwebservice', '= 0.7.1' + PKG_BUILD)
+- s.add_dependency('activesupport', '= 1.1.0' + PKG_BUILD)
+- s.add_dependency('activerecord', '= 1.11.0' + PKG_BUILD)
+- s.add_dependency('actionpack', '= 1.9.0' + PKG_BUILD)
+- s.add_dependency('actionmailer', '= 1.0.0' + PKG_BUILD)
+- s.add_dependency('actionwebservice', '= 0.8.0' + PKG_BUILD)
-
- s.rdoc_options << '--exclude' << '.'
- s.has_rdoc = false
@@ -383,8 +358,8 @@
-# Publishing -------------------------------------------------------
-desc "Publish the API documentation"
-task :pgem => [:gem] do
-- Rake::SshFilePublisher.new("davidhh at wrath.rubyonrails.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-- `ssh davidhh at wrath.rubyonrails.com './gemupdate.sh'`
+- Rake::SshFilePublisher.new("davidhh at wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+- `ssh davidhh at wrath.rubyonrails.org './gemupdate.sh'`
-end
-
-desc "Publish the release files to RubyForge."
@@ -501,4 +476,3 @@
- end
- end
-end
-\ No newline at end of file
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rails-sanity.patch?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list