railties 6.1.2 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f95a5e8436f261b26ce4c66e79858252dd5537abbadd42b11c37041875479a50
-  data.tar.gz: 9cea22465cff4bacad402bb460e45f526ec3d90b3b5266677a118554d14f767d
+  metadata.gz: 579db8705bfddfb4ad877091124e238f804e03aa5eefb29913e63492622a2c2a
+  data.tar.gz: ceaf3ccf971e958b82dbd2c3ab83248d742cf6ba8bd60fb5777a32a9187cefb8
 SHA512:
-  metadata.gz: 6c2dd30ae919200539977d3732587a07cc6746201cb649fce19b94e90e46295b97c10176548d9a31807ab96a049cb304d2fa2ba9949b8a4f4c0e39ba981c10a2
-  data.tar.gz: 1dbdd0412d69d4a58b0f76ebfd5dc4accb6f2c8a695dacb2f8d66b2bc92e032a247f8c622afbd4e39edbfd7406a06ff12dc1e91708d880a43e1f4a946e288196
+  metadata.gz: 5f572d8ce2287fdaa832767e191c7b88e8703103b453c62494fb7d9e710b5d73859455ff2a6b060c70ea6e61bc8736de6a7580c54353c6a7e96d7dfb60994475
+  data.tar.gz: 63dedca83d5fe4b3df7bf94480b5612938272577c5685d89a8472449ffddcd674fbfe694d07b344f40a4211470cfd6979a42d6719d070a92e987d44ccd346111

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+## Rails 6.1.4 (June 24, 2021) ##
+
+*   Fix compatibility with `psych >= 4`.
+
+    Starting in Psych 4.0.0 `YAML.load` behaves like `YAML.safe_load`. To preserve compatibility
+    `Rails.application.config_for` now uses `YAML.unsafe_load` if available.
+
+    *Jean Boussier*
+
+*   Ensure `Rails.application.config_for` always cast hashes to `ActiveSupport::OrderedOptions`.
+
+    *Jean Boussier*
+
+*   Fix create migration generator with `--pretend` option.
+
+    *euxx*
+
+
+## Rails 6.1.3.2 (May 05, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.3.1 (March 26, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.3 (February 17, 2021) ##
+
+*   No changes.
+
+
+## Rails 6.1.2.1 (February 10, 2021) ##
+
+*   No changes.
+
+
 ## Rails 6.1.2 (February 09, 2021) ##
 
 *   No changes.

data/lib/rails/application.rb

@@ -246,11 +246,18 @@ module Rails
         all_configs    = ActiveSupport::ConfigurationFile.parse(yaml).deep_symbolize_keys
         config, shared = all_configs[env.to_sym], all_configs[:shared]
 
+        if shared
+          config = {} if config.nil?
+          if config.is_a?(Hash)
+            config = shared.deep_merge(config)
+          end
+        end
+
         if config.is_a?(Hash)
-          ActiveSupport::OrderedOptions.new.update(shared&.deep_merge(config) || config)
-        else
-          config || shared
+          config = ActiveSupport::OrderedOptions.new.update(config)
         end
+
+        config
       else
         raise "Could not load configuration. No such file - #{yaml}"
       end

data/lib/rails/application/configuration.rb

@@ -256,10 +256,13 @@ module Rails
         if path = paths["config/database"].existent.first
           require "rails/application/dummy_erb_compiler"
 
-          yaml = Pathname.new(path)
-          erb = DummyERB.new(yaml.read)
+          yaml = DummyERB.new(Pathname.new(path).read).result
 
-          YAML.load(erb.result) || {}
+          if YAML.respond_to?(:unsafe_load)
+            YAML.unsafe_load(yaml) || {}
+          else
+            YAML.load(yaml) || {}
+          end
         else
           {}
         end

data/lib/rails/command.rb

@@ -40,10 +40,8 @@ module Rails
         command_name, namespace = "help", "help" if command_name.blank? || HELP_MAPPINGS.include?(command_name)
         command_name, namespace = "version", "version" if %w( -v --version ).include?(command_name)
 
-        # isolate ARGV to ensure that commands depend only on the args they are given
-        args = args.dup # args might *be* ARGV so dup before clearing
-        old_argv = ARGV.dup
-        ARGV.clear
+        original_argv = ARGV.dup
+        ARGV.replace(args)
 
         command = find_by_namespace(namespace, command_name)
         if command && command.all_commands[command_name]
@@ -52,7 +50,7 @@ module Rails
           find_by_namespace("rake").perform(full_namespace, args, config)
         end
       ensure
-        ARGV.replace(old_argv)
+        ARGV.replace(original_argv)
       end
 
       # Rails finds namespaces similar to Thor, it only adds one rule:

data/lib/rails/commands/dbconsole/dbconsole_command.rb

@@ -102,7 +102,7 @@ module Rails
       # first time around to show a consistent error message to people
       # relying on 2-level database configuration.
 
-      @db_config = configurations.configs_for(env_name: environment, name: database)
+      @db_config = configurations.configs_for(env_name: environment, name: database, include_replicas: true)
 
       unless @db_config
         raise ActiveRecord::AdapterNotSpecified,

data/lib/rails/gem_version.rb

@@ -9,7 +9,7 @@ module Rails
   module VERSION
     MAJOR = 6
     MINOR = 1
-    TINY  = 2
+    TINY  = 4
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/rails/generators/actions/create_migration.rb

@@ -20,6 +20,8 @@ module Rails
         end
 
         def invoke!
+          return super if pretend?
+
           invoked_file = super
           File.exist?(@destination) ? invoked_file : relative_existing_migration
         end

data/lib/rails/generators/app_base.rb

@@ -301,7 +301,7 @@ module Rails
           ]
         elsif options.edge?
           [
-            GemfileEntry.github("rails", "rails/rails", "main")
+            GemfileEntry.github("rails", "rails/rails", "6-1-stable")
           ]
         elsif options.master?
           [
@@ -429,11 +429,19 @@ module Rails
       end
 
       def run_webpack
-        if webpack_install?
-          rails_command "webpacker:install"
-          if options[:webpack] && options[:webpack] != "webpack"
-            rails_command "webpacker:install:#{options[:webpack]}"
-          end
+        return unless webpack_install?
+
+        unless bundle_install?
+          say <<~EXPLAIN
+            Skipping `rails webpacker:install` because `bundle install` was skipped.
+            To complete setup, you must run `bundle install` followed by `rails webpacker:install`.
+          EXPLAIN
+          return
+        end
+
+        rails_command "webpacker:install"
+        if options[:webpack] && options[:webpack] != "webpack"
+          rails_command "webpacker:install:#{options[:webpack]}"
         end
       end
 

data/lib/rails/generators/rails/app/app_generator.rb

@@ -104,9 +104,7 @@ module Rails
     end
 
     def yarn_when_updating
-      return if File.exist?("bin/yarn")
-
-      template "bin/yarn" do |content|
+      template "bin/yarn", force: true do |content|
         "#{shebang}\n" + content
       end
 

data/lib/rails/generators/rails/app/templates/bin/spring.tt

@@ -3,7 +3,7 @@ if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
   require "bundler"
 
   # Load Spring without loading other gems in the Gemfile, for speed.
-  Bundler.locked_gems.specs.find { |spec| spec.name == "spring" }&.tap do |spring|
+  Bundler.locked_gems&.specs&.find { |spec| spec.name == "spring" }&.tap do |spring|
     Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
     gem "spring", spring.version
     require "spring/binstub"

data/lib/rails/source_annotation_extractor.rb

@@ -72,7 +72,7 @@ module Rails
     #
     # See <tt>#find_in</tt> for a list of file extensions that will be taken into account.
     #
-    # This class method is the single entry point for the `rails notes` command.
+    # This class method is the single entry point for the <tt>rails notes</tt> command.
     def self.enumerate(tag = nil, options = {})
       tag ||= Annotation.tags.join("|")
       extractor = new(tag)

data/lib/rails/tasks/yarn.rake

@@ -10,13 +10,13 @@ namespace :yarn do
     end
 
     yarn_flags =
-      if `"#{Rails.root}/bin/yarn" --version`.start_with?("1")
+      if `#{RbConfig.ruby} "#{Rails.root}/bin/yarn" --version`.start_with?("1")
         "--no-progress --frozen-lockfile"
       else
         "--immutable"
       end
 
-    system({ "NODE_ENV" => node_env }, "\"#{Rails.root}/bin/yarn\" install #{yarn_flags}")
+    system({ "NODE_ENV" => node_env }, "#{RbConfig.ruby} \"#{Rails.root}/bin/yarn\" install #{yarn_flags}")
   rescue Errno::ENOENT
     $stderr.puts "bin/yarn was not found."
     $stderr.puts "Please run `bundle exec rails app:update:bin` to create it."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.1.4
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.2
+        version: 6.1.4
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -426,11 +426,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.2/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.2/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.4/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.4/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.2/railties
-post_install_message:
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.4/railties
+post_install_message: 
 rdoc_options:
 - "--exclude"
 - "."
@@ -447,8 +447,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []