rails 2.3.4 → 2.3.5

data/CHANGELOG

@@ -1,3 +1,9 @@
+*Edge*
+
+* Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs [DHH]
+
+* 1.9 compatibility
+
 *2.3.4 (September 4, 2009)*
 
 * I18n support for plugins.  #2325 [Antonio Tapiador, Sven Fuchs]

data/Rakefile

@@ -202,7 +202,7 @@ task :copy_configs do
   cp "configs/seeds.rb", "#{PKG_DESTINATION}/db/seeds.rb"
 
   cp "environments/boot.rb",        "#{PKG_DESTINATION}/config/boot.rb"
-  cp "environments/environment.rb", "#{PKG_DESTINATION}/config/environment.rb"
+  File.open("#{PKG_DESTINATION}/config/environment.rb", 'w') {|f| f.write ERB.new(IO.read("environments/environment.rb"), nil, '-').result(binding)}
   cp "environments/production.rb",  "#{PKG_DESTINATION}/config/environments/production.rb"
   cp "environments/development.rb", "#{PKG_DESTINATION}/config/environments/development.rb"
   cp "environments/test.rb",        "#{PKG_DESTINATION}/config/environments/test.rb"
@@ -314,11 +314,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.3.4' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.3.4' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.3.4' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.3.4' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.3.4' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.5' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false

data/lib/commands/plugin.rb

@@ -268,7 +268,7 @@ class Plugin
     
     def install_using_git(options = {})
       root = rails_env.root
-      install_path = mkdir_p "#{root}/vendor/plugins/#{name}"
+      mkdir_p(install_path = "#{root}/vendor/plugins/#{name}")
       Dir.chdir install_path do
         init_cmd = "git init"
         init_cmd += " -q" if options[:quiet] and not $verbose

data/lib/rails/rack/debugger.rb

@@ -4,6 +4,8 @@ module Rails
       def initialize(app)
         @app = app
 
+        ARGV.clear # clear ARGV so that script/server options aren't passed to IRB
+
         require_library_or_gem 'ruby-debug'
         ::Debugger.start
         ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)

data/lib/rails/version.rb

@@ -2,7 +2,7 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 3
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/rails_generator/options.rb

@@ -131,16 +131,16 @@ module Rails
           opt.on('-q', '--quiet', 'Suppress normal output.') { |v| options[:quiet] = v }
           opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |v| options[:backtrace] = v }
           opt.on('-c', '--svn', 'Modify files with subversion. (Note: svn must be in path)') do
-            options[:svn] = `svn status`.inject({}) do |opt, e|
-              opt[e.chomp[7..-1]] = true
-              opt
+            options[:svn] = {}
+            `svn status`.each_line do |line|
+              options[:svn][line.chomp[7..-1]] = true
             end
           end
           opt.on('-g', '--git', 'Modify files with git. (Note: git must be in path)') do
-            options[:git] = `git status`.inject({:new => {}, :modified => {}}) do |opt, e|
-              opt[:new][e.chomp[14..-1]] = true if e =~ /new file:/
-              opt[:modified][e.chomp[14..-1]] = true if e =~ /modified:/
-              opt
+            options[:git] = {:new => {}, :modified => {}}
+            `git status`.each_line do |line|
+              options[:git][:new][line.chomp[14..-1]] = true if line =~ /new file:/
+              options[:git][:modified][line.chomp[14..-1]] = true if line =~ /modified:/
             end
           end
         end

data/lib/tasks/rails.rb

@@ -4,5 +4,6 @@ $VERBOSE = nil
 Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
 
 # Load any custom rakefile extensions
-Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/vendor/plugins/*/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/vendor/plugins/*/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
 Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-04 00:00:00 +12:00
+date: 2009-11-27 00:00:00 +13:00
 default_executable: rails
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.4
+        version: 2.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.4
+        version: 2.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.4
+        version: 2.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.4
+        version: 2.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.4
+        version: 2.3.5
     version: 
 description: "    Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick\n    on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.\n"
 email: david@loudthinking.com
@@ -84,7 +84,6 @@ files:
 - CHANGELOG
 - fresh_rakefile
 - MIT-LICENSE
-- rails-2.3.4.gem
 - Rakefile
 - README
 - bin/about
@@ -426,7 +425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rails
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Web-application framework with template engine, control-flow layer, and ORM.