diff -Nru ruby-railties-3.2-3.2.13/CHANGELOG.md ruby-railties-3.2-3.2.16/CHANGELOG.md
--- ruby-railties-3.2-3.2.13/CHANGELOG.md 2013-03-19 09:27:20.000000000 +0000
+++ ruby-railties-3.2-3.2.16/CHANGELOG.md 2013-12-04 16:41:56.000000000 +0000
@@ -1,9 +1,29 @@
-## unreleased ##
+## Rails 3.2.15 (Oct 16, 2013) ##
-* No changes.
+* No changes.
+
+## Rails 3.2.14 (Jul 22, 2013) ##
+
+* Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
+ `rails benchmarker`.
+ Fixes #4938.
+ Backport rails/rails-perftest#2.
+
+ *Dmitry Vorotilin + Yves Senn*
+
+* Add support for runner hook.
+
+ Backport #7695.
+
+ *Ben Holley*
+
+* Fixes bug with scaffold generator with `--assets=false --resource-route=false`.
+ Fixes #9525.
+
+ *Arun Agrawal*
-## Rails 3.2.13 (Feb 17, 2013) ##
+## Rails 3.2.13 (Mar 18, 2013) ##
* No changes.
Binary files /tmp/tPYZX5W3Da/ruby-railties-3.2-3.2.13/checksums.yaml.gz and /tmp/tXV_aXFUCg/ruby-railties-3.2-3.2.16/checksums.yaml.gz differ
diff -Nru ruby-railties-3.2-3.2.13/debian/changelog ruby-railties-3.2-3.2.16/debian/changelog
--- ruby-railties-3.2-3.2.13/debian/changelog 2013-06-25 16:40:08.000000000 +0000
+++ ruby-railties-3.2-3.2.16/debian/changelog 2013-12-15 15:34:36.000000000 +0000
@@ -1,9 +1,15 @@
-ruby-railties-3.2 (3.2.13-4.1) unstable; urgency=low
+ruby-railties-3.2 (3.2.16-2) unstable; urgency=high
- * Non-maintainer upload.
- * Correct rails epoch to fix redmine uninstallability. (Closes: #712697)
+ * Fix invalid conflict with rails (<< 3:3.2.0) (Closes: #731888)
- -- Dmitrijs Ledkovs
If you see any typos or factual errors you are confident to - patch, please clone <%= link_to 'docrails', 'https://github.com/lifo/docrails' %> - and push the change yourself. That branch of Rails has public write access. - Commits are still reviewed, but that happens after you've submitted your - contribution. <%= link_to 'docrails', 'https://github.com/lifo/docrails' %> is - cross-merged with master periodically. + patch, please clone the <%= link_to 'rails', 'https://github.com/rails/rails' %> + repository and open a new pull request. You can also ask for commit rights on + <%= link_to 'docrails', 'https://github.com/rails/docrails' %> if you plan to submit + several patches. Commits are reviewed, but that happens after you've submitted your + contribution. This repository is cross-merged with master periodically.
You may also find incomplete content, or stuff that is not up to date. diff -Nru ruby-railties-3.2-3.2.13/lib/rails/application.rb ruby-railties-3.2-3.2.16/lib/rails/application.rb --- ruby-railties-3.2-3.2.13/lib/rails/application.rb 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/application.rb 2013-12-04 16:41:56.000000000 +0000 @@ -154,6 +154,14 @@ self end + # Load the application runner and invoke the registered hooks. + # Check Rails::Railtie.runner for more info. + def load_runner(app=self) + initialize_runner + super + self + end + # Rails.application.env_config stores some of the Rails initial environment parameters. # Currently stores: # @@ -167,7 +175,7 @@ # These parameters will be used by middlewares and engines to configure themselves. # def env_config - @env_config ||= super.merge({ + @app_env_config ||= super.merge({ "action_dispatch.parameter_filter" => config.filter_parameters, "action_dispatch.secret_token" => config.secret_token, "action_dispatch.show_exceptions" => config.action_dispatch.show_exceptions, @@ -305,6 +313,9 @@ require "rails/console/helpers" end + def initialize_runner #:nodoc: + end + def build_original_fullpath(env) path_info = env["PATH_INFO"] query_string = env["QUERY_STRING"] diff -Nru ruby-railties-3.2-3.2.13/lib/rails/commands/benchmarker.rb ruby-railties-3.2-3.2.16/lib/rails/commands/benchmarker.rb --- ruby-railties-3.2-3.2.13/lib/rails/commands/benchmarker.rb 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/commands/benchmarker.rb 2013-12-04 16:41:56.000000000 +0000 @@ -2,9 +2,8 @@ require 'rails/test_help' require 'rails/performance_test_help' -ARGV.push('--benchmark') # HAX +ENV["BENCHMARK_TESTS"] = '1' require 'active_support/testing/performance' -ARGV.pop def options options = {} @@ -31,4 +30,5 @@ end RUBY end + ARGV.clear end diff -Nru ruby-railties-3.2-3.2.13/lib/rails/commands/profiler.rb ruby-railties-3.2-3.2.16/lib/rails/commands/profiler.rb --- ruby-railties-3.2-3.2.13/lib/rails/commands/profiler.rb 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/commands/profiler.rb 2013-12-04 16:41:56.000000000 +0000 @@ -29,4 +29,5 @@ end RUBY end + ARGV.clear end diff -Nru ruby-railties-3.2-3.2.13/lib/rails/commands/runner.rb ruby-railties-3.2-3.2.16/lib/rails/commands/runner.rb --- ruby-railties-3.2-3.2.13/lib/rails/commands/runner.rb 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/commands/runner.rb 2013-12-04 16:41:56.000000000 +0000 @@ -42,6 +42,7 @@ require APP_PATH Rails.application.require_environment! + Rails.application.load_runner if code_or_file.nil? $stderr.puts "Run '#{$0} -h' for help." diff -Nru ruby-railties-3.2-3.2.13/lib/rails/engine.rb ruby-railties-3.2-3.2.16/lib/rails/engine.rb --- ruby-railties-3.2-3.2.13/lib/rails/engine.rb 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/engine.rb 2013-12-04 16:41:56.000000000 +0000 @@ -430,6 +430,11 @@ super end + def load_runner(app=self) + railties.all { |r| r.load_runner(app) } + super + end + def eager_load! railties.all(&:eager_load!) diff -Nru ruby-railties-3.2-3.2.13/lib/rails/generators/rails/app/app_generator.rb ruby-railties-3.2-3.2.16/lib/rails/generators/rails/app/app_generator.rb --- ruby-railties-3.2-3.2.13/lib/rails/generators/rails/app/app_generator.rb 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/generators/rails/app/app_generator.rb 2013-12-04 16:41:56.000000000 +0000 @@ -103,7 +103,7 @@ directory "script" do |content| "#{shebang}\n" + content end - chmod "script", 0755, :verbose => false + chmod "script", 0755 & ~File.umask, :verbose => false end def test diff -Nru ruby-railties-3.2-3.2.13/lib/rails/generators/rails/plugin_new/templates/Gemfile ruby-railties-3.2-3.2.16/lib/rails/generators/rails/plugin_new/templates/Gemfile --- ruby-railties-3.2-3.2.13/lib/rails/generators/rails/plugin_new/templates/Gemfile 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/generators/rails/plugin_new/templates/Gemfile 2013-12-04 16:41:56.000000000 +0000 @@ -1,4 +1,4 @@ -source "http://rubygems.org" +source "https://rubygems.org" # Declare your gem's dependencies in <%= name %>.gemspec. # Bundler will treat runtime dependencies like base dependencies, and diff -Nru ruby-railties-3.2-3.2.13/lib/rails/generators/rails/scaffold/scaffold_generator.rb ruby-railties-3.2-3.2.16/lib/rails/generators/rails/scaffold/scaffold_generator.rb --- ruby-railties-3.2-3.2.13/lib/rails/generators/rails/scaffold/scaffold_generator.rb 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/generators/rails/scaffold/scaffold_generator.rb 2013-12-04 16:41:56.000000000 +0000 @@ -8,6 +8,8 @@ class_option :stylesheets, :type => :boolean, :desc => "Generate Stylesheets" class_option :stylesheet_engine, :desc => "Engine for Stylesheets" + class_option :assets, :type => :boolean + class_option :resource_route, :type => :boolean hook_for :scaffold_controller, :required => true diff -Nru ruby-railties-3.2-3.2.13/lib/rails/railtie.rb ruby-railties-3.2-3.2.16/lib/rails/railtie.rb --- ruby-railties-3.2-3.2.13/lib/rails/railtie.rb 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/railtie.rb 2013-12-04 16:41:56.000000000 +0000 @@ -145,6 +145,12 @@ @load_console end + def runner(&blk) + @load_runner ||= [] + @load_runner << blk if blk + @load_runner + end + def generators(&blk) @generators ||= [] @generators << blk if blk @@ -179,6 +185,10 @@ self.class.console.each { |block| block.call(app) } end + def load_runner(app=self) + self.class.runner.each { |block| block.call(app) } + end + def load_tasks(app=self) extend Rake::DSL if defined? Rake::DSL self.class.rake_tasks.each { |block| self.instance_exec(app, &block) } diff -Nru ruby-railties-3.2-3.2.13/lib/rails/tasks/documentation.rake ruby-railties-3.2-3.2.16/lib/rails/tasks/documentation.rake --- ruby-railties-3.2-3.2.13/lib/rails/tasks/documentation.rake 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/tasks/documentation.rake 2013-12-04 16:41:56.000000000 +0000 @@ -120,8 +120,8 @@ # desc "Generate Rails Guides" task :guides do - # FIXME: Reaching outside lib directory is a bad idea - require File.expand_path('../../../../guides/rails_guides', __FILE__) + rails_gem_dir = Gem::Specification.find_by_name("rails").gem_dir + require File.expand_path(File.join(rails_gem_dir, "railties/guides/rails_guides")) RailsGuides::Generator.new(Rails.root.join("doc/guides")).generate end diff -Nru ruby-railties-3.2-3.2.13/lib/rails/test_unit/testing.rake ruby-railties-3.2-3.2.16/lib/rails/test_unit/testing.rake --- ruby-railties-3.2-3.2.13/lib/rails/test_unit/testing.rake 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/test_unit/testing.rake 2013-12-04 16:41:56.000000000 +0000 @@ -123,10 +123,13 @@ t.pattern = 'test/integration/**/*_test.rb' end - Rails::SubTestTask.new(:benchmark => 'test:prepare') do |t| + task 'test:benchmark_mode' do + ENV["BENCHMARK_TESTS"] = '1' + end + + Rails::SubTestTask.new(:benchmark => ['test:prepare', 'test:benchmark_mode']) do |t| t.libs << 'test' t.pattern = 'test/performance/**/*_test.rb' - t.options = '-- --benchmark' end Rails::SubTestTask.new(:profile => 'test:prepare') do |t| diff -Nru ruby-railties-3.2-3.2.13/lib/rails/version.rb ruby-railties-3.2-3.2.16/lib/rails/version.rb --- ruby-railties-3.2-3.2.13/lib/rails/version.rb 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/lib/rails/version.rb 2013-12-04 16:41:56.000000000 +0000 @@ -2,7 +2,7 @@ module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 13 + TINY = 16 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') diff -Nru ruby-railties-3.2-3.2.13/metadata.yml ruby-railties-3.2-3.2.16/metadata.yml --- ruby-railties-3.2-3.2.13/metadata.yml 2013-03-19 09:27:20.000000000 +0000 +++ ruby-railties-3.2-3.2.16/metadata.yml 2013-12-04 16:41:56.000000000 +0000 @@ -1,75 +1,75 @@ --- !ruby/object:Gem::Specification name: railties version: !ruby/object:Gem::Version - version: 3.2.13 + version: 3.2.16 platform: ruby authors: - David Heinemeier Hansson autorequire: bindir: bin cert_chain: [] -date: 2013-03-18 00:00:00.000000000 Z +date: 2013-12-03 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rake requirement: !ruby/object:Gem::Requirement requirements: - - - '>=' + - - ">=" - !ruby/object:Gem::Version version: 0.8.7 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - '>=' + - - ">=" - !ruby/object:Gem::Version version: 0.8.7 - !ruby/object:Gem::Dependency name: rack-ssl requirement: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: 1.3.2 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: 1.3.2 - !ruby/object:Gem::Dependency name: thor requirement: !ruby/object:Gem::Requirement requirements: - - - '>=' + - - ">=" - !ruby/object:Gem::Version version: 0.14.6 - - - < + - - "<" - !ruby/object:Gem::Version version: '2.0' type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - '>=' + - - ">=" - !ruby/object:Gem::Version version: 0.14.6 - - - < + - - "<" - !ruby/object:Gem::Version version: '2.0' - !ruby/object:Gem::Dependency name: rdoc requirement: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: '3.4' type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: '3.4' - !ruby/object:Gem::Dependency @@ -78,28 +78,28 @@ requirements: - - '=' - !ruby/object:Gem::Version - version: 3.2.13 + version: 3.2.16 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - '=' - !ruby/object:Gem::Version - version: 3.2.13 + version: 3.2.16 - !ruby/object:Gem::Dependency name: actionpack requirement: !ruby/object:Gem::Requirement requirements: - - '=' - !ruby/object:Gem::Version - version: 3.2.13 + version: 3.2.16 type: :runtime prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - '=' - !ruby/object:Gem::Version - version: 3.2.13 + version: 3.2.16 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.' email: david@loudthinking.com executables: @@ -589,23 +589,34 @@ - lib/rails/test_unit/testing.rake - lib/rails/version.rb - lib/rails.rb +- lib/rails/generators/rails/app/templates/app/mailers/.empty_directory +- lib/rails/generators/rails/app/templates/app/models/.empty_directory +- lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory +- lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory +- lib/rails/generators/rails/app/templates/test/functional/.empty_directory +- lib/rails/generators/rails/app/templates/test/integration/.empty_directory +- lib/rails/generators/rails/app/templates/test/unit/.empty_directory +- lib/rails/generators/rails/generator/templates/templates/.empty_directory +- lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory +- lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory homepage: http://www.rubyonrails.org -licenses: [] +licenses: +- MIT metadata: {} post_install_message: rdoc_options: -- --exclude -- . +- "--exclude" +- "." require_paths: - lib required_ruby_version: !ruby/object:Gem::Requirement requirements: - - - '>=' + - - ">=" - !ruby/object:Gem::Version version: 1.8.7 required_rubygems_version: !ruby/object:Gem::Requirement requirements: - - - '>=' + - - ">=" - !ruby/object:Gem::Version version: '0' requirements: []