middleman-core 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5dd3bae964c6e57fa3ed58f5c8ab2896878c95a
-  data.tar.gz: 9c5b8c7377aeb46639b747b276bb3199648ba8f9
+  metadata.gz: 3be0033e0fe168ddaf3b6edbf98dc5a6fd883ac8
+  data.tar.gz: b2bb2e6bb90275633f18cf7024b2f28b6f7303b4
 SHA512:
-  metadata.gz: e4a6e00d45ffdc0e4b4f0c7c2c5b9e9f37dfa752fd0d87a62be3a3be2de183068c1c90ce52143e22b3f28cce237d89f34dc1fb20d765e41cf16f7043cdc1ee0e
-  data.tar.gz: b5b3f19786d889638412fb3d4dec3f4929bdfaa05054e049165de439c03f7a4079e64942ac542ef37f5c5c5ef79fb513fbc3e0f98f3234d0f3bf1679a851f87d
+  metadata.gz: 3ebea0c549b8ece9887febef7c3afaf3c0fc6c95d013ae1f105f5d3d5456a0e50578d4ebe29f210062c14ad48caa62c4a444ab36245c12f6e7669b7ca5964b5b
+  data.tar.gz: 543d0c4944a14b1e9f1a146b7dab4077486568735dcd79fc0021f1da3909059e71fa184647be75dcb31469331b746b067b8be796d47379654e3c1bdd559e5f50

data/features/helpers_select_tag.feature

@@ -9,11 +9,9 @@ Feature: select_tag helper
     """
     And the Server is running at "indexable-app"
     When I go to "/select_tag.html"
-    Then I should see:
-    """
-    <select name="colors" include_blank="Choose a color"><option value="">Choose a color</option>
-    <option value="red">red</option>
-    <option value="blue">blue</option>
-    <option value="blorange">blorange</option>
-    </select>
-    """
+    Then I should see '<select name="colors"'
+    Then I should see '<option value="">Choose a color</option>'
+    Then I should see '<option value="red">red</option>'
+    Then I should see '<option value="blue">blue</option>'
+    Then I should see '<option value="blorange">blorange</option>'
+    Then I should see '</select>'

data/lib/middleman-core.rb

@@ -1,13 +1,12 @@
 # Setup our load paths
+# rubocop:disable FileName
 libdir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 # Top-level Middleman namespace
 module Middleman
-
   # Backwards compatibility namespace
   module Features; end
-
 end
 
 require 'middleman-core/version'

data/lib/middleman-core/application.rb

@@ -52,20 +52,20 @@ module Middleman
       class_eval(&block)   if block_given?
       include(*extensions) if extensions.any?
     end
-    delegate :helpers, :to => :"self.class"
+    delegate :helpers, to: :"self.class"
 
     # Root project directory (overwritten in middleman build/server)
     # @return [String]
     def self.root
       ENV['MM_ROOT'] || Dir.pwd
     end
-    delegate :root, :to => :"self.class"
+    delegate :root, to: :"self.class"
 
     # Pathname-addressed root
     def self.root_path
       Pathname(root)
     end
-    delegate :root_path, :to => :"self.class"
+    delegate :root_path, to: :"self.class"
 
     # Name of the source directory
     # @return [String]
@@ -162,12 +162,13 @@ module Middleman
     # with_layout and page routing
     include Middleman::CoreExtensions::Routing
 
-    attr_reader :logger
+    # Reference to Logger singleton
+    def logger
+      ::Middleman::Logger.singleton
+    end
 
     # Initialize the Middleman project
     def initialize(&block)
-      @logger = ::Middleman::Logger.singleton
-
       # Clear the static class cache
       cache.clear
 
@@ -194,7 +195,7 @@ module Middleman
     def self.cache
       @_cache ||= ::Tilt::Cache.new
     end
-    delegate :cache, :to => :"self.class"
+    delegate :cache, to: :"self.class"
 
     # Whether we're in development mode
     # @return [Boolean] If we're in dev mode
@@ -215,7 +216,7 @@ module Middleman
       File.join(root, config[:source])
     end
 
-    delegate :instrument, :to => ::Middleman::Util
+    delegate :instrument, to: ::Middleman::Util
 
     # Work around this bug: http://bugs.ruby-lang.org/issues/4521
     # where Ruby will call to_s/inspect while printing exception
@@ -224,7 +225,7 @@ module Middleman
     def to_s
       "#<Middleman::Application:0x#{object_id}>"
     end
-    alias :inspect :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
+    alias_method :inspect, :to_s # Ruby 2.0 calls inspect for NoMethodError instead of to_s
 
     # Hooks clones _hooks from the class to the instance.
     # https://github.com/apotonick/hooks/blob/master/lib/hooks/instance_hooks.rb#L10

data/lib/middleman-core/cli.rb

@@ -4,9 +4,7 @@ require 'thor/group'
 
 # CLI Module
 module Middleman
-
   module Cli
-
     # The base task from which everything else etends
     class Base < Thor
       class << self
@@ -32,19 +30,20 @@ module Middleman
       # @param [Symbol, String, nil] meth
       # @param [Boolean] subcommand
       # @return [void]
-      def help(meth = nil, subcommand = false)
+      # rubocop:disable UnusedMethodArgument
+      def help(meth=nil, subcommand=false)
         if meth && !self.respond_to?(meth)
           klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
-          klass.start(['-h', task].compact, :shell => self.shell)
+          klass.start(['-h', task].compact, shell: shell)
         else
           list = []
           Thor::Util.thor_classes_in(Middleman::Cli).each do |thor_class|
             list += thor_class.printable_tasks(false)
           end
-          list.sort!{ |a,b| a[0] <=> b[0] }
+          list.sort! { |a, b| a[0] <=> b[0] }
 
           shell.say 'Tasks:'
-          shell.print_table(list, :ident => 2, :truncate => true)
+          shell.print_table(list, ident: 2, truncate: true)
           shell.say
         end
       end
@@ -53,27 +52,24 @@ module Middleman
       # @param [Symbol] meth
       def method_missing(meth, *args)
         meth = meth.to_s
-
-        if self.class.map.has_key?(meth)
-          meth = self.class.map[meth]
-        end
+        meth = self.class.map[meth] if self.class.map.key?(meth)
 
         klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
 
         if klass.nil?
           tasks_dir = File.join(Dir.pwd, 'tasks')
 
-          if File.exists?(tasks_dir)
+          if File.exist?(tasks_dir)
             Dir[File.join(tasks_dir, '**/*_task.rb')].each { |f| require f }
             klass, task = Thor::Util.find_class_and_task_by_namespace("#{meth}:#{meth}")
           end
         end
 
         if klass.nil?
-          raise Thor::Error.new "There's no '#{meth}' command for Middleman. Try 'middleman help' for a list of commands."
+          raise Thor::Error, "There's no '#{meth}' command for Middleman. Try 'middleman help' for a list of commands."
         else
           args.unshift(task) if task
-          klass.start(args, :shell => self.shell)
+          klass.start(args, shell: shell)
         end
       end
     end

data/lib/middleman-core/cli/build.rb

@@ -4,7 +4,7 @@ require 'set'
 # CLI Module
 module Middleman::Cli
   # Alias "b" to "build"
-  Base.map({ 'b' => 'build' })
+  Base.map('b' => 'build')
 
   # The CLI Build class
   class Build < Thor
@@ -19,31 +19,31 @@ module Middleman::Cli
 
     desc 'build [options]', 'Builds the static site for deployment'
     method_option :clean,
-      :type    => :boolean,
-      :default => true,
-      :desc    => 'Remove orphaned files from build (--no-clean to disable)'
+                  type: :boolean,
+                  default: true,
+                  desc: 'Remove orphaned files from build (--no-clean to disable)'
     method_option :glob,
-      :type    => :string,
-      :aliases => '-g',
-      :default => nil,
-      :desc    => 'Build a subset of the project'
+                  type: :string,
+                  aliases: '-g',
+                  default: nil,
+                  desc: 'Build a subset of the project'
     method_option :verbose,
-      :type    => :boolean,
-      :default => false,
-      :desc    => 'Print debug messages'
+                  type: :boolean,
+                  default: false,
+                  desc: 'Print debug messages'
     method_option :instrument,
-      :type    => :string,
-      :default => false,
-      :desc    => 'Print instrument messages'
+                  type: :string,
+                  default: false,
+                  desc: 'Print instrument messages'
     method_option :profile,
-      :type    => :boolean,
-      :default => false,
-      :desc    => 'Generate profiling report for the build'
+                  type: :boolean,
+                  default: false,
+                  desc: 'Generate profiling report for the build'
 
     # Core build Thor command
     # @return [void]
     def build
-      if !ENV['MM_ROOT']
+      unless ENV['MM_ROOT']
         raise Thor::Error, 'Error: Could not find a Middleman project config, perhaps you are in the wrong folder?'
       end
 
@@ -62,7 +62,7 @@ module Middleman::Cli
       self.class.shared_instance(options['verbose'], options['instrument'])
 
       opts = {}
-      opts[:glob]  = options['glob'] if options.has_key?('glob')
+      opts[:glob]  = options['glob'] if options.key?('glob')
       opts[:clean] = options['clean']
 
       self.class.shared_instance.run_hook :before_build, self
@@ -71,15 +71,15 @@ module Middleman::Cli
 
       self.class.shared_instance.run_hook :after_build, self
 
-      if self.had_errors && !self.debugging
+      if had_errors && !debugging
         msg = 'There were errors during this build'
         unless options['verbose']
           msg << ', re-run with `middleman build --verbose` to see the full exception.'
         end
-        self.shell.say msg, :red
+        shell.say msg, :red
       end
 
-      exit(1) if self.had_errors
+      exit(1) if had_errors
     end
 
     # Static methods
@@ -129,17 +129,17 @@ module Middleman::Cli
       clean! if should_clean?
     end
 
-  protected
+    protected
 
     # Remove files which were not built in this cycle
     # @return [void]
     def clean!
       @to_clean.each do |f|
-        base.remove_file f, :force => true
+        base.remove_file f, force: true
       end
 
-      Dir[@build_dir.join('**', '*')].select {|d| File.directory?(d) }.each do |d|
-        base.remove_file d, :force => true if directory_empty? d
+      Dir[@build_dir.join('**', '*')].select { |d| File.directory?(d) }.each do |d|
+        base.remove_file d, force: true if directory_empty? d
       end
     end
 
@@ -273,7 +273,6 @@ module Middleman::Cli
       base.say_status :error, file_name, :red
       if base.debugging
         raise e
-        exit(1)
       elsif base.options['verbose']
         base.shell.say response, :red
       end

data/lib/middleman-core/cli/bundler.rb

@@ -1,6 +1,5 @@
 # CLI Module
 module Middleman::Cli
-
   # A initializing Bundler
   class Bundle < Thor
     include Thor::Actions
@@ -8,11 +7,11 @@ module Middleman::Cli
 
     namespace :bundle
 
-    desc 'bundle', 'Setup initial bundle', :hide => true
+    desc 'bundle', 'Setup initial bundle', hide: true
 
     # The setup task
     def bundle
-      run('bundle install')#, :capture => true)
+      run('bundle install')# , :capture => true)
     end
   end
 
@@ -28,13 +27,13 @@ module Middleman::Cli
     # The upgrade task
     def upgrade
       inside(ENV['MM_ROOT']) do
-        run('bundle update')#, :capture => true)
+        run('bundle update')# , :capture => true)
       end
     end
   end
 
   # Map "u" to "upgrade"
-  Base.map({
-    'u' => 'upgrade'
-  })
+  Base.map(
+             'u' => 'upgrade'
+  )
 end

data/lib/middleman-core/cli/console.rb

@@ -1,6 +1,5 @@
 # CLI Module
 module Middleman::Cli
-
   # A thor task for creating new projects
   class Console < Thor
     include Thor::Actions
@@ -11,26 +10,24 @@ module Middleman::Cli
 
     desc 'console [options]', 'Start an interactive console in the context of your Middleman application'
     method_option :environment,
-      :aliases => '-e',
-      :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
-      :desc    => 'The environment Middleman will run under'
+                  aliases: '-e',
+                  default: ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development',
+                  desc: 'The environment Middleman will run under'
     method_option :verbose,
-      :type    => :boolean,
-      :default => false,
-      :desc    => 'Print debug messages'
+                  type: :boolean,
+                  default: false,
+                  desc: 'Print debug messages'
     def console
       require 'middleman-core'
       require 'irb'
 
       opts = {
-        :environment => options['environment'],
-        :debug => options['verbose']
+        environment: options['environment'],
+        debug: options['verbose']
       }
 
-      @app =::Middleman::Application.server.inst do
-        if opts[:environment]
-          set :environment, opts[:environment].to_sym
-        end
+      @app = ::Middleman::Application.server.inst do
+        set :environment, opts[:environment].to_sym if opts[:environment]
 
         ::Middleman::Logger.singleton(opts[:debug] ? 0 : 1, opts[:instrumenting] || false)
       end

data/lib/middleman-core/cli/extension.rb

@@ -1,6 +1,5 @@
 # CLI Module
 module Middleman::Cli
-
   # A thor task for creating new projects
   class Extension < Thor
     include Thor::Actions
@@ -10,7 +9,7 @@ module Middleman::Cli
     namespace :extension
 
     # Required path for the new project to be generated
-    argument :name, :type => :string
+    argument :name, type: :string
 
     # Template files are relative to this file
     # @return [String]
@@ -34,7 +33,7 @@ module Middleman::Cli
     end
 
     # Output a .gitignore file
-    class_option :git, :type => :boolean, :default => true
+    class_option :git, type: :boolean, default: true
 
     no_tasks {
       # Write a .gitignore file for project
@@ -44,6 +43,5 @@ module Middleman::Cli
         copy_file 'gitignore', File.join(name, '.gitignore')
       end
     }
-
   end
 end

data/lib/middleman-core/cli/init.rb

@@ -2,7 +2,6 @@ require 'middleman-core/templates'
 
 # CLI Module
 module Middleman::Cli
-
   # A thor task for creating new projects
   class Init < Thor
     check_unknown_options!
@@ -12,41 +11,41 @@ module Middleman::Cli
     desc 'init NAME [options]', 'Create new project NAME'
     available_templates = ::Middleman::Templates.registered.keys.join(', ')
     method_option 'template',
-      :aliases => '-T',
-      :default => 'default',
-      :desc    => "Use a project template: #{available_templates}"
+                  aliases: '-T',
+                  default: 'default',
+                  desc: "Use a project template: #{available_templates}"
     method_option 'css_dir',
       # :default => "stylesheets",
-      :desc    => 'The path to the css files'
+                  desc: 'The path to the css files'
     method_option 'js_dir',
       # :default => "javascripts",
-      :desc    => 'The path to the javascript files'
+                  desc: 'The path to the javascript files'
     method_option 'images_dir',
       # :default => "images",
-      :desc    => 'The path to the image files'
+                  desc: 'The path to the image files'
     method_option 'rack',
-      :type    => :boolean,
-      :default => false,
-      :desc    => 'Include a config.ru file'
+                  type: :boolean,
+                  default: false,
+                  desc: 'Include a config.ru file'
     method_option 'skip-gemfile',
-      :type    => :boolean,
-      :default => false,
-      :desc    => "Don't create a Gemfile"
+                  type: :boolean,
+                  default: false,
+                  desc: "Don't create a Gemfile"
     method_option 'skip-bundle',
-      :type    => :boolean,
-      :aliases => '-B',
-      :default => false,
-      :desc    => "Don't run bundle install"
+                  type: :boolean,
+                  aliases: '-B',
+                  default: false,
+                  desc: "Don't run bundle install"
     method_option 'skip-git',
-      :type    => :boolean,
-      :default => false,
-      :desc    => 'Skip Git ignores and keeps'
+                  type: :boolean,
+                  default: false,
+                  desc: 'Skip Git ignores and keeps'
     # The init task
     # @param [String] name
-    def init(name = '.')
+    def init(name='.')
       key = options[:template].to_sym
-      unless ::Middleman::Templates.registered.has_key?(key)
-        raise Thor::Error.new "Unknown project template '#{key}'"
+      unless ::Middleman::Templates.registered.key?(key)
+        raise Thor::Error, "Unknown project template '#{key}'"
       end
 
       thor_group = ::Middleman::Templates.registered[key]
@@ -59,9 +58,9 @@ module Middleman::Cli
   end
 
   # Map "i", "new" and "n" to "init"
-  Base.map({
-    'i'   => 'init',
-    'new' => 'init',
-    'n'   => 'init'
-  })
+  Base.map(
+             'i'   => 'init',
+             'new' => 'init',
+             'n'   => 'init'
+  )
 end