railties 5.0.0.beta1.1 → 5.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23335496f6d7e45ebcb75396de70773e320caf7
-  data.tar.gz: ae756993b2b619caf4414441bdd22dc44b700ebf
+  metadata.gz: 83e9a8d14879b7cd28fc9fd57f76b5e2f280c609
+  data.tar.gz: ac950ac53f6b98b0797920ed8d93fd96e875b74e
 SHA512:
-  metadata.gz: ff0406de559fb90e7ebfaa23acca91dd40238dcc78804787d68da413be03c02f5ff72ac5d6b272658580c833ab95471529008d3047b72745f905ec13a7769bc2
-  data.tar.gz: 46034d9104babd7ec8bbd92710eec64e6fcb2a0131939467e32d65d2d1c3470d427455c48a5a98adc2fb24df02788791406572ddebbe23e7f13e901379db1300
+  metadata.gz: 99c2414aba749e7dd0bb5fb7fb473387ded69a813dae0a40e4d4b2925318575bfed83ae59b46b28234590a7606aa5e82ef1237d97b9435da4504be22c9712e53
+  data.tar.gz: 0b1c83b2b97aa12caf646777cc37313eb25f46111b9359b4b648507698840678e1f2a12af058fd6ea288a8c35e267adaa5718e6529922340d581d7766bc67b40

data/CHANGELOG.md

@@ -1,7 +1,30 @@
-## Rails 5.0.0.beta1 (December 18, 2015) ##
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+*   Add `after_bundle` callbacks in Rails plugin templates.  Useful for allowing
+    templates to perform actions that are dependent upon `bundle install`.
+
+    *Ryan Manuel*
+
+*   Bring back `TEST=` env for `rake test` task.
+
+    *Yves Senn*
+
+*   Specify log file names or all logs to clear `rake log:clear`
 
-*   No changes.
+    Specify which logs to clear when using the `rake log:clear` task, e.g. `rake log:clear LOGS=test,staging`
 
+    Clear all logs from log/*.log e.g. `rake log:clear LOGS=all`
+
+    By default `rake log:clear` clears standard environment log files i.e. 'development,test,production'
+
+    *Pramod Shinde*
+
+*   Fix using `add_source` with a block after using `gem` in a custom generator.
+
+    *Will Fisher*
+
+
+## Rails 5.0.0.beta1 (December 18, 2015) ##
 
 *   Newly generated plugins get a `README.md` in Markdown.
 
@@ -200,7 +223,7 @@
 *   Fix STATS_DIRECTORIES already defined warning when running rake from within
     the top level directory of an engine that has a test app.
 
-    Fixes #20510
+    Fixes #20510.
 
     *Ersin Akinci*
 
@@ -248,13 +271,13 @@
     middleware for API apps & generators generates the right files,
     folders and configurations.
 
-    *Santiago Pastorino & Jorge Bejar*
+    *Santiago Pastorino*, *Jorge Bejar*
 
 *   Make generated scaffold functional tests work inside engines.
 
     *Yuji Yaginuma*
 
-*   Generator a `.keep` file in the `tmp` folder by default as many scripts
+*   Generate a `.keep` file in the `tmp` folder by default as many scripts
     assume the existence of this folder and most would fail if it is absent.
 
     See #20299.
@@ -320,7 +343,7 @@
 *   Created rake restart task. Restarts your Rails app by touching the
     `tmp/restart.txt`.
 
-    Fixes #18876.
+    See #18876.
 
     *Hyonjee Joo*
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2015 David Heinemeier Hansson
+Copyright (c) 2004-2016 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/RDOC_MAIN.rdoc

@@ -57,7 +57,7 @@ can read more about Action Pack in its {README}[link:files/actionpack/README_rdo
 
 * The \README file created within your application.
 * {Getting Started with \Rails}[http://guides.rubyonrails.org/getting_started.html].
-* {Ruby on \Rails Tutorial}[http://ruby.railstutorial.org/ruby-on-rails-tutorial-book].
+* {Ruby on \Rails Tutorial}[http://www.railstutorial.org/book].
 * {Ruby on \Rails Guides}[http://guides.rubyonrails.org].
 * {The API Documentation}[http://api.rubyonrails.org].
 

data/lib/rails/application/default_middleware_stack.rb

@@ -68,7 +68,7 @@ module Rails
           middleware.use ::ActionDispatch::Cookies unless config.api_only
 
           if !config.api_only && config.session_store
-            if config.force_ssl && !config.session_options.key?(:secure)
+            if config.force_ssl && config.ssl_options.fetch(:secure_cookies, true) && !config.session_options.key?(:secure)
               config.session_options[:secure] = true
             end
             middleware.use config.session_store, config.session_options

data/lib/rails/application/finisher.rb

@@ -86,7 +86,7 @@ module Rails
       # added in the hook are taken into account.
       initializer :set_clear_dependencies_hook, group: :all do
         callback = lambda do
-          ActiveSupport::Dependencies.interlock.attempt_unloading do
+          ActiveSupport::Dependencies.interlock.unloading do
             ActiveSupport::DescendantsTracker.clear
             ActiveSupport::Dependencies.clear
           end

data/lib/rails/code_statistics.rb

@@ -33,7 +33,7 @@ class CodeStatistics #:nodoc:
       Hash[@pairs.map{|pair| [pair.first, calculate_directory_statistics(pair.last)]}]
     end
 
-    def calculate_directory_statistics(directory, pattern = /.*\.(rb|js|coffee|rake)$/)
+    def calculate_directory_statistics(directory, pattern = /^(?!\.).*?\.(rb|js|coffee|rake)$/)
       stats = CodeStatisticsCalculator.new
 
       Dir.foreach(directory) do |file_name|

data/lib/rails/commands/runner.rb

@@ -58,5 +58,11 @@ elsif File.exist?(code_or_file)
   $0 = code_or_file
   Kernel.load code_or_file
 else
-  eval(code_or_file, binding, __FILE__, __LINE__)
+  begin
+    eval(code_or_file, binding, __FILE__, __LINE__) 
+  rescue SyntaxError,NameError => err
+    $stderr.puts "Please specify a valid ruby command or the path of a script to run."
+    $stderr.puts "Run '#{$0} -h' for help."
+    exit 1
+  end
 end

data/lib/rails/commands/server.rb

@@ -6,6 +6,8 @@ require 'rails'
 module Rails
   class Server < ::Rack::Server
     class Options
+      DEFAULT_PID_PATH = File.expand_path("tmp/pids/server.pid").freeze
+
       def parse!(args)
         args, options = args.dup, {}
 
@@ -91,7 +93,7 @@ module Rails
         environment:        (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
         daemonize:          false,
         caching:            false,
-        pid:                File.expand_path("tmp/pids/server.pid")
+        pid:                Options::DEFAULT_PID_PATH
       })
     end
 
@@ -133,11 +135,13 @@ module Rails
       def log_to_stdout
         wrapped_app # touch the app so the logger is set up
 
-        console = ActiveSupport::Logger.new($stdout)
+        console = ActiveSupport::Logger.new(STDOUT)
         console.formatter = Rails.logger.formatter
         console.level = Rails.logger.level
 
-        Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
+        unless ActiveSupport::Logger.logger_outputs_to?(Rails.logger, STDOUT)
+          Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
+        end
       end
   end
 end

data/lib/rails/engine/commands.rb

@@ -1,3 +1,5 @@
+require 'rails/engine/commands_tasks'
+
 ARGV << '--help' if ARGV.empty?
 
 aliases = {
@@ -9,35 +11,4 @@ aliases = {
 command = ARGV.shift
 command = aliases[command] || command
 
-require ENGINE_PATH
-engine = ::Rails::Engine.find(ENGINE_ROOT)
-
-case command
-when 'generate', 'destroy', 'test'
-  require 'rails/generators'
-  Rails::Generators.namespace = engine.railtie_namespace
-  engine.load_generators
-  require "rails/commands/#{command}"
-
-when '--version', '-v'
-  ARGV.unshift '--version'
-  require 'rails/commands/application'
-
-else
-  puts "Error: Command not recognized" unless %w(-h --help).include?(command)
-  puts <<-EOT
-Usage: rails COMMAND [ARGS]
-
-The common Rails commands available for engines are:
- generate    Generate new code (short-cut alias: "g")
- destroy     Undo code generated with "generate" (short-cut alias: "d")
- test        Run tests (short-cut alias: "t")
-
-All commands can be run with -h for more information.
-
-If you want to run any commands that need to be run in context
-of the application, like `rails server` or `rails console`,
-you should do it from application's directory (typically test/dummy).
-  EOT
-  exit(1)
-end
+Rails::Engine::CommandsTasks.new(ARGV).run_command!(command)

data/lib/rails/engine/commands_tasks.rb

@@ -0,0 +1,116 @@
+require 'rails/commands/rake_proxy'
+
+module Rails
+  class Engine
+    class CommandsTasks # :nodoc:
+      include Rails::RakeProxy
+
+      attr_reader :argv
+
+      HELP_MESSAGE = <<-EOT
+Usage: rails COMMAND [ARGS]
+
+The common Rails commands available for engines are:
+ generate    Generate new code (short-cut alias: "g")
+ destroy     Undo code generated with "generate" (short-cut alias: "d")
+ test        Run tests (short-cut alias: "t")
+
+All commands can be run with -h for more information.
+
+If you want to run any commands that need to be run in context
+of the application, like `rails server` or `rails console`,
+you should do it from application's directory (typically test/dummy).
+
+In addition to those commands, there are:
+  EOT
+
+      COMMAND_WHITELIST = %w(generate destroy version help test)
+
+      def initialize(argv)
+        @argv = argv
+      end
+
+      def run_command!(command)
+        command = parse_command(command)
+
+        if COMMAND_WHITELIST.include?(command)
+          send(command)
+        else
+          run_rake_task(command)
+        end
+      end
+
+      def generate
+        generate_or_destroy(:generate)
+      end
+
+      def destroy
+        generate_or_destroy(:destroy)
+      end
+
+      def test
+        require_command!("test")
+      end
+
+      def version
+        argv.unshift '--version'
+        require_command!("application")
+      end
+
+      def help
+        write_help_message
+        write_commands(formatted_rake_tasks)
+      end
+
+      private
+
+        def require_command!(command)
+          require "rails/commands/#{command}"
+        end
+
+        def generate_or_destroy(command)
+          load_generators
+          require_command!(command)
+        end
+
+        def load_generators
+          require 'rails/generators'
+          require ENGINE_PATH
+
+          engine = ::Rails::Engine.find(ENGINE_ROOT)
+          Rails::Generators.namespace = engine.railtie_namespace
+          engine.load_generators
+        end
+
+        def write_help_message
+          puts HELP_MESSAGE
+        end
+
+        def write_commands(commands)
+          width = commands.map { |name, _| name.size }.max || 10
+          commands.each { |command| printf(" %-#{width}s   %s\n", *command) }
+        end
+
+        def parse_command(command)
+          case command
+          when '--version', '-v'
+            'version'
+          when '--help', '-h'
+            'help'
+          else
+            command
+          end
+        end
+
+        def rake_tasks
+          return @rake_tasks if defined?(@rake_tasks)
+
+          load_generators
+          Rake::TaskManager.record_task_metadata = true
+          Rake.application.init('rails')
+          Rake.application.load_rakefile
+          @rake_tasks = Rake.application.tasks.select(&:comment)
+        end
+    end
+  end
+end

data/lib/rails/gem_version.rb

@@ -8,7 +8,7 @@ module Rails
     MAJOR = 5
     MINOR = 0
     TINY  = 0
-    PRE   = "beta1.1"
+    PRE   = "beta2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/actions.rb

@@ -20,7 +20,7 @@ module Rails
 
         # Set the message to be shown in logs. Uses the git repo if one is given,
         # otherwise use name (version).
-        parts, message = [ quote(name) ], name
+        parts, message = [ quote(name) ], name.dup
         if version ||= options.delete(:version)
           parts   << quote(version)
           message << " (#{version})"
@@ -75,7 +75,7 @@ module Rails
 
         in_root do
           if block
-            append_file "Gemfile", "source #{quote(source)} do", force: true
+            append_file "Gemfile", "\nsource #{quote(source)} do", force: true
             @in_group = true
             instance_eval(&block)
             @in_group = false

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

@@ -3,7 +3,7 @@ require 'thor/actions'
 module Rails
   module Generators
     module Actions
-      class CreateMigration < Thor::Actions::CreateFile
+      class CreateMigration < Thor::Actions::CreateFile #:nodoc:
 
         def migration_dir
           File.dirname(@destination)

data/lib/rails/generators/app_base.rb

@@ -51,6 +51,9 @@ module Rails
         class_option :skip_active_record, type: :boolean, aliases: '-O', default: false,
                                           desc: 'Skip Active Record files'
 
+        class_option :skip_puma,          type: :boolean, aliases: '-P', default: false,
+                                          desc: 'Skip Puma related files'
+
         class_option :skip_action_cable,  type: :boolean, aliases: '-C', default: false,
                                           desc: 'Skip Action Cable files'
 
@@ -75,7 +78,7 @@ module Rails
         class_option :edge,               type: :boolean, default: false,
                                           desc: "Setup the #{name} with Gemfile pointing to Rails repository"
 
-        class_option :rc,                 type: :string, default: false,
+        class_option :rc,                 type: :string, default: nil,
                                           desc: "Path to file containing extra configuration options for rails command"
 
         class_option :no_rc,              type: :boolean, default: false,
@@ -113,10 +116,12 @@ module Rails
       def gemfile_entries
         [rails_gemfile_entry,
          database_gemfile_entry,
+         webserver_gemfile_entry,
          assets_gemfile_entry,
          javascript_gemfile_entry,
          jbuilder_gemfile_entry,
          psych_gemfile_entry,
+         cable_gemfile_entry,
          @extra_entries].flatten.find_all(&@gem_filter)
       end
 
@@ -170,6 +175,12 @@ module Rails
                             "Use #{options[:database]} as the database for Active Record"
       end
 
+      def webserver_gemfile_entry
+        return [] if options[:skip_puma]
+        comment = 'Use Puma as the app server'
+        GemfileEntry.new('puma', nil, comment)
+      end
+
       def include_all_railties?
         options.values_at(:skip_active_record, :skip_action_mailer, :skip_test, :skip_sprockets, :skip_action_cable).none?
       end
@@ -281,6 +292,8 @@ module Rails
         return [] if options[:skip_sprockets]
 
         gems = []
+        gems << GemfileEntry.version('sass-rails', '~> 5.0',
+                                     'Use SCSS for stylesheets')
 
         gems << GemfileEntry.version('uglifier',
                                    '>= 1.3.0',
@@ -337,6 +350,14 @@ module Rails
         GemfileEntry.new('psych', '~> 2.0', comment, platforms: :rbx)
       end
 
+      def cable_gemfile_entry
+        return [] if options[:skip_action_cable]
+        comment = 'Action Cable dependencies for the Redis adapter'
+        gems = []
+        gems << GemfileEntry.new("redis", '~> 3.0', comment)
+        gems
+      end
+
       def bundle_command(command)
         say_status :run, "bundle #{command}"