SOURCES: rails-sanity.patch - up for 1.0.0
aredridel
aredridel at pld-linux.org
Wed Mar 8 01:55:28 CET 2006
Author: aredridel Date: Wed Mar 8 00:55:28 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up for 1.0.0
---- Files affected:
SOURCES:
rails-sanity.patch (1.9 -> 1.10)
---- Diffs:
================================================================
Index: SOURCES/rails-sanity.patch
diff -u SOURCES/rails-sanity.patch:1.9 SOURCES/rails-sanity.patch:1.10
--- SOURCES/rails-sanity.patch:1.9 Tue Oct 25 20:32:54 2005
+++ SOURCES/rails-sanity.patch Wed Mar 8 01:55:23 2006
@@ -1,224 +1,6 @@
-diff -ur rails-o/vendor/rails/railties/bin/breakpointer rails/vendor/rails/railties/bin/breakpointer
---- rails-o/vendor/rails/railties/bin/breakpointer 2005-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/bin/breakpointer 2005-10-25 11:49:47.000000000 -0600
-@@ -1,3 +1,3 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/ruby
- require File.dirname(__FILE__) + '/../config/boot'
--require 'commands/breakpointer'
-\ No newline at end of file
-+require '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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/bin/console 2005-10-25 11:51:30.000000000 -0600
-@@ -1,3 +1,3 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/ruby
- require File.dirname(__FILE__) + '/../config/boot'
--require 'commands/console'
-\ No newline at end of file
-+require '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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/bin/destroy 2005-10-25 11:52:14.000000000 -0600
-@@ -1,3 +1,3 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/ruby
- require File.dirname(__FILE__) + '/../config/boot'
--require 'commands/destroy'
-\ No newline at end of file
-+require '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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/bin/generate 2005-10-25 11:53:15.000000000 -0600
-@@ -1,3 +1,3 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/ruby
- require File.dirname(__FILE__) + '/../config/boot'
--require 'commands/generate'
-\ No newline at end of file
-+require 'commands/generate'
-diff -ur rails-o/vendor/rails/railties/bin/rails rails/vendor/rails/railties/bin/rails
---- rails-o/vendor/rails/railties/bin/rails 2005-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/bin/rails 2005-10-25 11:45:36.000000000 -0600
-@@ -1,3 +1,4 @@
-+#!/usr/bin/ruby
- min_release = "1.8.2 (2004-12-25)"
- ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
- if ruby_release < min_release
-diff -ur rails-o/vendor/rails/railties/bin/server rails/vendor/rails/railties/bin/server
---- rails-o/vendor/rails/railties/bin/server 2005-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/bin/server 2005-10-25 11:55:30.000000000 -0600
-@@ -1,3 +1,3 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/ruby
- require File.dirname(__FILE__) + '/../config/boot'
--require 'commands/server'
-\ No newline at end of file
-+require 'commands/server'
-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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/dispatches/dispatch.fcgi 2005-10-25 11:45:38.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'
-
- 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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/dispatches/dispatch.rb 2005-10-25 11:45:38.000000000 -0600
-@@ -1,10 +1,8 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/ruby
-
- require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
-
--# If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:
--# "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired
--require "dispatcher"
-+require "railties/dispatcher"
-
- ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
--Dispatcher.dispatch
-\ No newline at end of file
-+Dispatcher.dispatch
-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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb 2005-10-25 12:00:34.000000000 -0600
-@@ -4,7 +4,7 @@
- DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
- Config::CONFIG['ruby_install_name'])
-
-- default_options :gem => true, :shebang => DEFAULT_SHEBANG
-+ default_options :gem => false, :shebang => DEFAULT_SHEBANG
- mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
-
- def initialize(runtime_args, runtime_options = {})
-@@ -17,6 +17,7 @@
-
- def manifest
- script_options = { :chmod => 0755, :shebang => options[:shebang] }
-+ @source_root = '/usr/share/rails'
-
- record do |m|
- # Root directory and all subdirectories.
-@@ -26,7 +27,6 @@
- # Root
- m.file "fresh_rakefile", "Rakefile"
- m.file "README", "README"
-- m.file "CHANGELOG", "CHANGELOG"
-
- # Application
- m.template "helpers/application.rb", "app/controllers/application.rb"
-@@ -94,9 +94,6 @@
- opt.separator 'Options:'
- opt.on("--ruby [#{DEFAULT_SHEBANG}]",
- "Path to the Ruby binary of your choice.") { |options[:shebang]| }
-- opt.on("--without-gems",
-- "Don't use the Rails gems for your app.",
-- "WARNING: see note below.") { |options[:gem]| }
- end
-
-
-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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE 2005-10-25 11:45:38.000000000 -0600
-@@ -7,10 +7,3 @@
-
- This generates a skeletal Rails installation in ~/Code/Ruby/weblog.
- See the README in the newly created application to get going.
--
--WARNING:
-- Only specify --without-gems if you did not use gems to install Rails.
-- Your application will expect to find activerecord, actionpack, and
-- 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 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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/lookup.rb 2005-10-25 11:45:38.000000000 -0600
-@@ -94,8 +94,7 @@
- # generating in the context of a Rails application, so search
- # RAILS_ROOT/generators.
- # 2. User home directory. Search ~/.rails/generators.
-- # 3. RubyGems. Search for gems named *_generator.
-- # 4. Builtins. Model, controller, mailer, scaffold.
-+ # 3. Builtins. Model, controller, mailer, scaffold.
- def use_component_sources!
- reset_sources
- sources << PathSource.new(:app, "#{::RAILS_ROOT}/lib/generators") if defined? ::RAILS_ROOT
-@@ -181,26 +180,5 @@
- end
- end
- end
--
--
-- # GemSource hits the mines to quarry for generators. The latest versions
-- # of gems named *_generator are selected.
-- class GemSource < Source
-- def initialize
-- super :RubyGems
-- end
--
-- # Yield latest versions of generator gems.
-- def each
-- Gem::cache.search(/_generator$/).inject({}) { |latest, gem|
-- hem = latest[gem.name]
-- latest[gem.name] = gem if hem.nil? or gem.version > hem.version
-- latest
-- }.values.each { |gem|
-- yield Spec.new(gem.name.sub(/_generator$/, ''), gem.full_gem_path, label)
-- }
-- end
-- end
--
- end
- end
-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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/scripts.rb 2005-10-25 11:45:38.000000000 -0600
-@@ -67,12 +67,6 @@
- usage << <<end_blurb
- 3. Run generate with no arguments for usage information
- #{$0} login
--
--Generator gems are also available:
-- 1. gem list generator -s http://gems.rubyonrails.org
-- 2. gem install login_generator -s http://gems.rubyonrails.org
-- 3. #{$0} login
--
- end_blurb
- return usage
- end
-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-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator.rb 2005-10-25 11:45:38.000000000 -0600
-@@ -24,12 +24,7 @@
- $:.unshift(File.dirname(__FILE__))
- $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
-
--begin
-- require 'active_support'
--rescue LoadError
-- require 'rubygems'
-- require_gem 'activesupport'
--end
-+require 'active_support'
-
- require 'rails_generator/base'
- require 'rails_generator/lookup'
diff -ur rails-o/vendor/rails/railties/Rakefile rails/vendor/rails/railties/Rakefile
---- rails-o/vendor/rails/railties/Rakefile 2005-10-19 12:15:58.000000000 -0600
-+++ rails/vendor/rails/railties/Rakefile 2005-10-25 11:49:09.000000000 -0600
+--- rails-o/vendor/rails/railties/Rakefile 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/Rakefile 2006-03-07 17:39:11.000000000 -0700
@@ -1,7 +1,6 @@
require 'rake'
require 'rake/testtask'
@@ -227,7 +9,7 @@
require 'rake/contrib/rubyforgepublisher'
require 'date'
-@@ -46,9 +45,6 @@
+@@ -45,9 +44,6 @@
desc "Generates a fresh Rails package with documentation"
task :fresh_rails => [ :clean, :make_dir_structure, :initialize_file_stubs, :copy_vendor_libraries, :copy_ties_content, :generate_documentation ]
@@ -237,7 +19,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 ]
-@@ -183,7 +179,6 @@
+@@ -182,7 +178,6 @@
task :copy_rootfiles do
cp "fresh_rakefile", "#{PKG_DESTINATION}/Rakefile"
cp "README", "#{PKG_DESTINATION}/README"
@@ -245,7 +27,7 @@
end
task :copy_test_helpers do
-@@ -241,182 +236,3 @@
+@@ -240,183 +235,3 @@
rdoc.rdoc_files.include('lib/rails_generator/*.rb')
rdoc.rdoc_files.include('lib/commands/**/*.rb')
}
@@ -261,6 +43,7 @@
-PKG_FILES = FileList[
- '[a-zA-Z]*',
- 'bin/**/*',
+- 'builtin/**/*',
- 'configs/**/*',
- 'doc/**/*',
- 'dispatches/**/*',
@@ -281,11 +64,11 @@
- EOF
-
- s.add_dependency('rake', '>= 0.6.2')
-- s.add_dependency('activesupport', '= 1.2.1' + PKG_BUILD)
-- s.add_dependency('activerecord', '= 1.12.1' + PKG_BUILD)
-- s.add_dependency('actionpack', '= 1.10.1' + PKG_BUILD)
-- s.add_dependency('actionmailer', '= 1.1.1' + PKG_BUILD)
-- s.add_dependency('actionwebservice', '= 0.9.1' + PKG_BUILD)
+- s.add_dependency('activesupport', '= 1.2.5' + PKG_BUILD)
+- s.add_dependency('activerecord', '= 1.13.2' + PKG_BUILD)
+- s.add_dependency('actionpack', '= 1.11.2' + PKG_BUILD)
+- s.add_dependency('actionmailer', '= 1.1.5' + PKG_BUILD)
+- s.add_dependency('actionwebservice', '= 1.0.0' + PKG_BUILD)
-
- s.rdoc_options << '--exclude' << '.'
- s.has_rdoc = false
@@ -428,3 +211,167 @@
- end
- end
-end
+Only in rails/vendor/rails/railties: Rakefile.rej~
+Only in rails/vendor/rails/railties: Rakefile~
+diff -ur rails-o/vendor/rails/railties/bin/rails rails/vendor/rails/railties/bin/rails
+--- rails-o/vendor/rails/railties/bin/rails 2005-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/bin/rails 2006-03-07 17:34:24.000000000 -0700
+@@ -1,3 +1,4 @@
++#!/usr/bin/ruby
+ min_release = "1.8.2 (2004-12-25)"
+ ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
+ if ruby_release < min_release
+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-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/dispatches/dispatch.fcgi 2006-03-07 17:34:24.000000000 -0700
+@@ -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'
+
+ 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-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/dispatches/dispatch.rb 2006-03-07 17:34:24.000000000 -0700
+@@ -1,10 +1,8 @@
+-#!/usr/local/bin/ruby
++#!/usr/bin/ruby
+
+ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+
+-# If you're using RubyGems and mod_ruby, this require should be changed to an absolute path one, like:
+-# "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired
+-require "dispatcher"
++require "railties/dispatcher"
+
+ ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
+-Dispatcher.dispatch
+\ No newline at end of file
++Dispatcher.dispatch
+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-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE 2006-03-07 17:34:24.000000000 -0700
+@@ -7,10 +7,3 @@
+
+ This generates a skeletal Rails installation in ~/Code/Ruby/weblog.
+ See the README in the newly created application to get going.
+-
+-WARNING:
+- Only specify --without-gems if you did not use gems to install Rails.
+- Your application will expect to find activerecord, actionpack, and
+- 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 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-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb 2006-03-07 17:36:45.000000000 -0700
+@@ -4,7 +4,7 @@
+ DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
+ Config::CONFIG['ruby_install_name'])
+
+- default_options :gem => true, :shebang => DEFAULT_SHEBANG
++ default_options :gem => false, :shebang => DEFAULT_SHEBANG
+ mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
+
+ def initialize(runtime_args, runtime_options = {})
+@@ -18,6 +18,7 @@
+ def manifest
+ script_options = { :chmod => 0755 }
+ dispatcher_options = { :chmod => 0755, :shebang => options[:shebang] }
++ @source_root = '/usr/share/rails'
+
+ record do |m|
+ # Root directory and all subdirectories.
+@@ -93,9 +94,6 @@
+ opt.separator 'Options:'
+ opt.on("--ruby [#{DEFAULT_SHEBANG}]",
+ "Path to the Ruby binary of your choice.") { |options[:shebang]| }
+- opt.on("--without-gems",
+- "Don't use the Rails gems for your app.",
+- "WARNING: see note below.") { |options[:gem]| }
+ end
+
+
+Only in rails/vendor/rails/railties/lib/rails_generator/generators/applications/app: app_generator.rb~
+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-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/rails_generator/lookup.rb 2006-03-07 17:34:24.000000000 -0700
+@@ -94,8 +94,7 @@
+ # generating in the context of a Rails application, so search
+ # RAILS_ROOT/generators.
+ # 2. User home directory. Search ~/.rails/generators.
+- # 3. RubyGems. Search for gems named *_generator.
+- # 4. Builtins. Model, controller, mailer, scaffold.
++ # 3. Builtins. Model, controller, mailer, scaffold.
+ def use_component_sources!
+ reset_sources
+ if defined? ::RAILS_ROOT
+@@ -185,26 +184,5 @@
+ end
+ end
+ end
+-
+-
+- # GemSource hits the mines to quarry for generators. The latest versions
+- # of gems named *_generator are selected.
+- class GemSource < Source
+- def initialize
+- super :RubyGems
+- end
+-
+- # Yield latest versions of generator gems.
+- def each
+- Gem::cache.search(/_generator$/).inject({}) { |latest, gem|
+- hem = latest[gem.name]
+- latest[gem.name] = gem if hem.nil? or gem.version > hem.version
+- latest
+- }.values.each { |gem|
+- yield Spec.new(gem.name.sub(/_generator$/, ''), gem.full_gem_path, label)
+- }
+- end
+- end
+-
+ end
+ end
+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-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/rails_generator/scripts.rb 2006-03-07 17:37:43.000000000 -0700
+@@ -68,11 +68,6 @@
+ 3. Run generate with no arguments for usage information
+ #{$0} login
+
+-Generator gems are also available:
+- 1. gem search -r generator
+- 2. gem install login_generator
+- 3. #{$0} login
+-
+ end_blurb
+ return usage
+ end
+Only in rails/vendor/rails/railties/lib/rails_generator: scripts.rb.rej~
+Only in rails/vendor/rails/railties/lib/rails_generator: scripts.rb~
+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-12-13 12:20:09.000000000 -0700
++++ rails/vendor/rails/railties/lib/rails_generator.rb 2006-03-07 17:34:24.000000000 -0700
+@@ -24,12 +24,7 @@
+ $:.unshift(File.dirname(__FILE__))
+ $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
+
+-begin
+- require 'active_support'
+-rescue LoadError
+- require 'rubygems'
+- require_gem 'activesupport'
+-end
++require 'active_support'
+
+ require 'rails_generator/base'
+ require 'rails_generator/lookup'
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rails-sanity.patch?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list