SOURCES: rails-sanity.patch - up for 0.14.1

aredridel aredridel at pld-linux.org
Tue Oct 25 20:24:43 CEST 2005


Author: aredridel                    Date: Tue Oct 25 18:24:43 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 0.14.1

---- Files affected:
SOURCES:
   rails-sanity.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SOURCES/rails-sanity.patch
diff -u SOURCES/rails-sanity.patch:1.7 SOURCES/rails-sanity.patch:1.8
--- SOURCES/rails-sanity.patch:1.7	Mon Jul 11 17:11:26 2005
+++ SOURCES/rails-sanity.patch	Tue Oct 25 20:24:38 2005
@@ -1,111 +1,64 @@
 diff -ur rails-o/vendor/rails/railties/bin/breakpointer rails/vendor/rails/railties/bin/breakpointer
---- rails-o/vendor/rails/railties/bin/breakpointer	2005-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/bin/breakpointer	2005-07-11 09:08:10.000000000 -0600
-@@ -1,3 +1,2 @@
+--- 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
--$LOAD_PATH << File.dirname(__FILE__) + '/../vendor/railties/lib'
--require 'breakpoint_client'
 +#!/usr/bin/ruby
-+require 'railties/breakpoint_client'
+ 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-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/bin/console	2005-07-11 09:08:10.000000000 -0600
-@@ -1,4 +1,4 @@
+--- 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
- irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
- 
- require 'optparse'
+ 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-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/bin/destroy	2005-07-11 09:08:10.000000000 -0600
-@@ -1,7 +1,7 @@
+--- 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/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)
+ 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-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/bin/generate	2005-07-11 09:08:10.000000000 -0600
-@@ -1,7 +1,14 @@
+--- 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
--require File.dirname(__FILE__) + '/../config/environment'
--require 'rails_generator'
--require 'rails_generator/scripts/generate'
 +#!/usr/bin/ruby
-+
-+begin
-+	require './config/environment'
-+rescue LoadError => e
-+	STDERR << "You must run this script from the root of your rails app"
-+	STDERR << "and you must have a valid config/environment"
-+end
-+
-+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)
+ 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-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/bin/rails	2005-07-11 09:10:46.000000000 -0600
+--- 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
-@@ -11,7 +12,7 @@
- 
- 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')
-Only in rails/vendor/rails/railties/bin: rails~
-Only in rails/vendor/rails/railties/bin: rails.orig
-Only in rails/vendor/rails/railties/bin: rails.rej
 diff -ur rails-o/vendor/rails/railties/bin/server rails/vendor/rails/railties/bin/server
---- rails-o/vendor/rails/railties/bin/server	2005-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/bin/server	2005-07-11 09:08:10.000000000 -0600
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/ruby
-+#!/usr/bin/ruby
- 
- require 'webrick'
- require 'optparse'
-@@ -40,7 +40,7 @@
- 
- ENV["RAILS_ENV"] = OPTIONS[:environment]
- require File.dirname(__FILE__) + "/../config/environment"
--require 'webrick_server'
-+require 'railties/webrick_server'
- 
- OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)
- 
-diff -ur rails-o/vendor/rails/railties/bin/update rails/vendor/rails/railties/bin/update
---- rails-o/vendor/rails/railties/bin/update	2005-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/bin/update	2005-07-11 09:08:10.000000000 -0600
-@@ -1,5 +1,5 @@
+--- 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/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)
+ 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-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/dispatches/dispatch.fcgi	2005-07-11 09:08:10.000000000 -0600
+--- 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
@@ -121,8 +74,8 @@
  
  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-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/dispatches/dispatch.rb	2005-07-11 09:08:10.000000000 -0600
+--- 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
@@ -138,32 +91,19 @@
 -Dispatcher.dispatch
 \ No newline at end of file
 +Dispatcher.dispatch
-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-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/environments/environment.rb	2005-07-11 09:08:10.000000000 -0600
-@@ -45,8 +45,6 @@
- ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
- 
- # Require Rails libraries.
--require 'rubygems' unless File.directory?("#{RAILS_ROOT}/vendor/rails")
--
- require 'active_support'
- require 'active_record'
- require 'action_controller'
-Only in rails/vendor/rails/railties/environments: environment.rb.orig
 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-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/app_generator.rb	2005-07-11 09:08:10.000000000 -0600
+--- 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 = {})
-@@ -15,6 +15,7 @@
+@@ -17,6 +17,7 @@
  
    def manifest
      script_options = { :chmod => 0755, :shebang => options[:shebang] }
@@ -171,7 +111,7 @@
  
      record do |m|
        # Root directory and all subdirectories.
-@@ -24,7 +25,6 @@
+@@ -26,7 +27,6 @@
        # Root
        m.file "fresh_rakefile", "Rakefile"
        m.file "README",         "README"
@@ -179,7 +119,7 @@
  
        # Application
        m.template "helpers/application.rb",        "app/controllers/application.rb"
-@@ -91,9 +91,6 @@
+@@ -94,9 +94,6 @@
        opt.separator 'Options:'
        opt.on("--ruby [#{DEFAULT_SHEBANG}]",
               "Path to the Ruby binary of your choice.") { |options[:shebang]| }
@@ -189,9 +129,10 @@
      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/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-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/generators/applications/app/USAGE	2005-07-11 09:08:10.000000000 -0600
+--- 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.
@@ -204,18 +145,18 @@
 -    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-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/lookup.rb	2005-07-11 09:08:10.000000000 -0600
+--- 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/script/generators.
+         #     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}/script/generators") if defined? ::RAILS_ROOT
+           sources << PathSource.new(:app, "#{::RAILS_ROOT}/lib/generators") if defined? ::RAILS_ROOT
 @@ -181,26 +180,5 @@
          end
        end
@@ -243,9 +184,10 @@
 -
    end
  end
+Only in rails/vendor/rails/railties/lib/rails_generator: lookup.rb.orig
 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-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator/scripts.rb	2005-07-11 09:08:10.000000000 -0600
+--- 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
@@ -260,8 +202,8 @@
              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-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/lib/rails_generator.rb	2005-07-11 09:08:10.000000000 -0600
+--- 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")
@@ -277,8 +219,8 @@
  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-07-11 06:32:13.000000000 -0600
-+++ rails/vendor/rails/railties/Rakefile	2005-07-11 09:09:44.000000000 -0600
+--- 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
 @@ -1,7 +1,6 @@
  require 'rake'
  require 'rake/testtask'
@@ -287,7 +229,7 @@
  require 'rake/contrib/rubyforgepublisher'
  
  require 'date'
-@@ -37,9 +36,6 @@
+@@ -46,9 +45,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 ]
  
@@ -297,7 +239,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 ]
  
-@@ -169,7 +165,6 @@
+@@ -183,7 +179,6 @@
  task :copy_rootfiles do
    cp "fresh_rakefile", "#{PKG_DESTINATION}/Rakefile"
    cp "README", "#{PKG_DESTINATION}/README"
@@ -305,25 +247,31 @@
  end
  
  task :copy_test_helpers do
-@@ -220,14 +215,6 @@
- 
- # Generate GEM ----------------------------------------------------------------------------
- 
+@@ -241,182 +236,3 @@
+   rdoc.rdoc_files.include('lib/rails_generator/*.rb')
+   rdoc.rdoc_files.include('lib/commands/**/*.rb')
+ }
+-
+-# Generate GEM ----------------------------------------------------------------------------
+-
 -task :copy_gem_environment do
 -  cp "environments/environment.rb", "#{PKG_DESTINATION}/config/environment.rb"
--  dest_file = File.join(PKG_DESTINATION, 'script', 'breakpointer')
--  copy_with_rewritten_ruby_path(File.join('bin', 'breakpointer_for_gem'), dest_file)
 -  chmod 0755, dest_file
 -end
 -
 -
- PKG_FILES = FileList[
-   '[a-zA-Z]*',
-   'bin/**/*', 
-@@ -240,161 +227,3 @@
-   'html/**/*', 
-   'lib/**/*'
- ]
+-PKG_FILES = FileList[
+-  '[a-zA-Z]*',
+-  'bin/**/*', 
+-  'configs/**/*', 
+-  'doc/**/*', 
+-  'dispatches/**/*', 
+-  'environments/**/*', 
+-  'helpers/**/*', 
+-  'generators/**/*', 
+-  'html/**/*', 
+-  'lib/**/*'
+-]
 -
 -spec = Gem::Specification.new do |s|
 -  s.name = 'rails'
@@ -334,12 +282,12 @@
 -    on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.
 -  EOF
 -
--  s.add_dependency('rake', '>= 0.5.3')
--  s.add_dependency('activesupport',    '= 1.1.1' + PKG_BUILD)
--  s.add_dependency('activerecord',     '= 1.11.1' + PKG_BUILD)
--  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('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.rdoc_options << '--exclude' << '.'
 -  s.has_rdoc = false
@@ -483,5 +431,3 @@
 -  end
 -end
 Only in rails/vendor/rails/railties: Rakefile~
-Only in rails/vendor/rails/railties: Rakefile.orig
-Only in rails/vendor/rails/railties: Rakefile.rej
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rails-sanity.patch?r1=1.7&r2=1.8&f=u




More information about the pld-cvs-commit mailing list