nanoc 3.7.4 → 3.7.5

data/lib/nanoc/cli/commands/show-data.rb

@@ -9,9 +9,7 @@ current site, along with dependency information.
 EOS
 
 module Nanoc::CLI::Commands
-
   class ShowData < ::Nanoc::CLI::CommandRunner
-
     def run
       load_site
 
@@ -35,7 +33,7 @@ module Nanoc::CLI::Commands
 
     def sorted_with_prev(objects)
       prev = nil
-      objects.sort_by { |o| o.identifier }.each do |object|
+      objects.sort_by(&:identifier).each do |object|
         yield(object, prev)
         prev = object
       end
@@ -43,7 +41,7 @@ module Nanoc::CLI::Commands
 
     def sorted_reps_with_prev(items)
       prev = nil
-      items.sort_by { |i| i.identifier }.each do |item|
+      items.sort_by(&:identifier).each do |item|
         item.reps.sort_by { |r| r.name.to_s }.each do |rep|
           yield(rep, prev)
           prev = rep
@@ -89,7 +87,7 @@ module Nanoc::CLI::Commands
         end
         length = rep.raw_paths.keys.map { |s| s.to_s.length }.max
         rep.raw_paths.each do |snapshot_name, raw_path|
-          puts "  [ %-#{length}s ] %s" % [snapshot_name, raw_path]
+          puts format("  [ %-#{length}s ] %s", snapshot_name, raw_path)
         end
       end
     end
@@ -124,9 +122,7 @@ module Nanoc::CLI::Commands
         puts
       end
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::ShowData

data/lib/nanoc/cli/commands/show-plugins.rb

@@ -9,9 +9,7 @@ If the current directory contains a nanoc web site, the plugins defined in this
 EOS
 
 module Nanoc::CLI::Commands
-
   class ShowPlugins < ::Nanoc::CLI::CommandRunner
-
     def run
       # Check arguments
       if arguments.size != 0
@@ -35,8 +33,8 @@ module Nanoc::CLI::Commands
 
       PLUGIN_CLASS_ORDER.each do |superclass|
         plugins_with_this_superclass = {
-          :builtin => plugins_builtin.select { |p| p[:superclass] == superclass },
-          :custom  => plugins_custom.select  { |p| p[:superclass] == superclass }
+          builtin: plugins_builtin.select { |p| p[:superclass] == superclass },
+          custom: plugins_custom.select  { |p| p[:superclass] == superclass }
         }
 
         # Print kind
@@ -59,7 +57,7 @@ module Nanoc::CLI::Commands
           # Print plugins
           relevant_plugins.sort_by { |k| k[:identifiers].join(', ') }.each do |plugin|
             # Display
-            puts sprintf(
+            puts format(
               "    %-#{max_identifiers_length}s (%s)",
               plugin[:identifiers].join(', '),
               plugin[:class].to_s.sub(/^::/, '')
@@ -90,9 +88,7 @@ module Nanoc::CLI::Commands
     def name_for_plugin_class(klass)
       PLUGIN_CLASSES[klass]
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::ShowPlugins

data/lib/nanoc/cli/commands/show-rules.rb

@@ -8,18 +8,16 @@ Prints the rules used for all items and layouts in the current site.
 "
 
 module Nanoc::CLI::Commands
-
   class ShowRules < ::Nanoc::CLI::CommandRunner
-
     def run
       require_site
 
       @c    = Nanoc::CLI::ANSIStringColorizer
       @calc = site.compiler.rule_memory_calculator
 
-      # TODO explain /foo/
-      # TODO explain content/foo.html
-      # TODO explain output/foo/index.html
+      # TODO: explain /foo/
+      # TODO: explain content/foo.html
+      # TODO: explain output/foo/index.html
 
       site.items.each   { |i| explain_item(i)   }
       site.layouts.each { |l| explain_layout(l) }
@@ -36,16 +34,16 @@ module Nanoc::CLI::Commands
           puts '    (nothing)'
         else
           @calc[rep].each do |mem|
-            puts '    %s %s' % [
+            puts format('    %s %s',
               @c.c(format('%-10s', mem[0].to_s), :blue),
-              mem[1..-1].map { |m| m.inspect }.join(', ')
-            ]
+              mem[1..-1].map(&:inspect).join(', ')
+            )
           end
           if rep.raw_path
-            puts '    %s %s' % [
+            puts format('    %s %s',
               @c.c(format('%-10s', 'write to'), :blue),
               rep.raw_path
-            ]
+            )
           end
         end
       end
@@ -55,15 +53,13 @@ module Nanoc::CLI::Commands
     def explain_layout(layout)
       puts "#{@c.c('Layout ' + layout.identifier, :bold, :yellow)}:"
       puts "  (from #{layout[:filename]})" if layout[:filename]
-      puts '  %s %s' % [
+      puts format('  %s %s',
         @c.c(format('%-10s', 'filter'), :blue),
-        @calc[layout].map { |m| m.inspect }.join(', ')
-      ]
+        @calc[layout].map(&:inspect).join(', ')
+      )
       puts
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::ShowRules

data/lib/nanoc/cli/commands/sync.rb

@@ -8,9 +8,7 @@ for data sources which rely on slow external APIs.
 EOS
 
 module Nanoc::CLI::Commands
-
   class Sync < ::Nanoc::CLI::CommandRunner
-
     def run
       # Check arguments
       if arguments.size != 0
@@ -28,9 +26,7 @@ module Nanoc::CLI::Commands
         end
       end
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::Sync

data/lib/nanoc/cli/commands/update.rb

@@ -16,9 +16,7 @@ required :c, :vcs, 'select the VCS to use'
 flag :y, :yes, 'update the data without warning'
 
 module Nanoc::CLI::Commands
-
   class Update < ::Nanoc::CLI::CommandRunner
-
     def run
       # Check arguments
       if arguments.size != 0
@@ -57,13 +55,9 @@ module Nanoc::CLI::Commands
       end
 
       # Update
-      site.data_sources.each do |data_source|
-        data_source.update
-      end
+      site.data_sources.each(&:update)
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::Update

data/lib/nanoc/cli/commands/validate-css.rb

@@ -9,16 +9,12 @@ Validates the site’s CSS files.
 "
 
 module Nanoc::CLI::Commands
-
   class ValidateCSS < ::Nanoc::CLI::CommandRunner
-
     def run
       warn 'The `validate-css` command is deprecated. Please use the new `check` command instead.'
       Nanoc::CLI.run %w( check css )
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::ValidateCSS

data/lib/nanoc/cli/commands/validate-html.rb

@@ -9,16 +9,12 @@ Validates the site’s HTML files.
 "
 
 module Nanoc::CLI::Commands
-
   class ValidateHTML < ::Nanoc::CLI::CommandRunner
-
     def run
       warn 'The `validate-html` command is deprecated. Please use the new `check` command instead.'
       Nanoc::CLI.run %w( check html )
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::ValidateHTML

data/lib/nanoc/cli/commands/validate-links.rb

@@ -12,9 +12,7 @@ flag :i, :internal, 'validate internal links only'
 flag :e, :external, 'validate external links only'
 
 module Nanoc::CLI::Commands
-
   class ValidateLinks < ::Nanoc::CLI::CommandRunner
-
     def run
       warn 'The `validate-links` command is deprecated. Please use the new `check` command instead.'
 
@@ -23,9 +21,7 @@ module Nanoc::CLI::Commands
       checks << 'elinks' if options[:external]
       Nanoc::CLI.run ['check', checks].flatten
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::ValidateLinks

data/lib/nanoc/cli/commands/view.rb

@@ -13,9 +13,7 @@ required :o, :host,    'specify the host to listen on (default: 0.0.0.0)'
 required :p, :port,    'specify the port to listen on (default: 3000)'
 
 module Nanoc::CLI::Commands
-
   class View < ::Nanoc::CLI::CommandRunner
-
     DEFAULT_HANDLER_NAME = :thin
 
     def run
@@ -27,8 +25,8 @@ module Nanoc::CLI::Commands
 
       # Set options
       options_for_rack = {
-        :Port      => (options[:port] || 3000).to_i,
-        :Host      => (options[:host] || '0.0.0.0')
+        Port: (options[:port] || 3000).to_i,
+        Host: (options[:host] || '0.0.0.0')
       }
 
       # Get handler
@@ -49,7 +47,7 @@ module Nanoc::CLI::Commands
         use Rack::ShowExceptions
         use Rack::Lint
         use Rack::Head
-        use Adsf::Rack::IndexFileFinder, :root => site.config[:output_dir]
+        use Adsf::Rack::IndexFileFinder, root: site.config[:output_dir]
         run Rack::File.new(site.config[:output_dir])
       end.to_app
 
@@ -80,9 +78,7 @@ module Nanoc::CLI::Commands
       # Done
       exit 1
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::View

data/lib/nanoc/cli/commands/watch.rb

@@ -8,9 +8,7 @@ Start the watcher. When a change is detected, the site will be recompiled.
 EOS
 
 module Nanoc::CLI::Commands
-
   class Watch < ::Nanoc::CLI::CommandRunner
-
     def run
       warn 'WARNING: The `watch` command is deprecated. Please consider using `guard-nanoc` instead (see https://github.com/nanoc/guard-nanoc).'
 
@@ -44,7 +42,7 @@ module Nanoc::CLI::Commands
         begin
           site.compile
 
-          # TODO include icon (--image misc/success-icon.png)
+          # TODO: include icon (--image misc/success-icon.png)
           notify_on_compilation_success = watcher_config.fetch(:notify_on_compilation_success) { true }
           if notify_on_compilation_success
             @notifier.notify('Compilation complete')
@@ -53,7 +51,7 @@ module Nanoc::CLI::Commands
           time_spent = ((Time.now - start) * 1000.0).round
           puts "done in #{format '%is %ims', *(time_spent.divmod(1000))}"
         rescue Exception => e
-          # TODO include icon (--image misc/error-icon.png)
+          # TODO: include icon (--image misc/error-icon.png)
           notify_on_compilation_failure = watcher_config.fetch(:notify_on_compilation_failure) { true }
           if notify_on_compilation_failure
             @notifier.notify('Compilation failed')
@@ -84,7 +82,7 @@ module Nanoc::CLI::Commands
       end
 
       listener = Listen::Listener.new(*dirs_to_watch).change(&callback)
-      listener_root = Listen::Listener.new('.', :filter => files_to_watch, :ignore => ignore_dir).change(&callback)
+      listener_root = Listen::Listener.new('.', filter: files_to_watch, ignore: ignore_dir).change(&callback)
 
       begin
         listener_root.start
@@ -97,7 +95,6 @@ module Nanoc::CLI::Commands
 
     # Allows sending user notifications in a cross-platform way.
     class Notifier
-
       # A list of commandline tool names that can be used to send notifications
       TOOLS = %w( growlnotify notify-send ) unless defined? TOOLS
 
@@ -146,7 +143,7 @@ module Nanoc::CLI::Commands
       end
 
       def terminal_notify(message)
-        TerminalNotifier.notify(message, :title => 'nanoc')
+        TerminalNotifier.notify(message, title: 'nanoc')
       end
 
       def growlnotify_cmd_for(message)
@@ -172,11 +169,8 @@ module Nanoc::CLI::Commands
       def on_windows?
         Nanoc.on_windows?
       end
-
     end
-
   end
-
 end
 
 runner Nanoc::CLI::Commands::Watch

data/lib/nanoc/cli/error_handler.rb

@@ -1,12 +1,10 @@
 # encoding: utf-8
 
 module Nanoc::CLI
-
   # Catches errors and prints nice diagnostic messages, then exits.
   #
   # @api private
   class ErrorHandler
-
     # @option params [Nanoc::CLI::Command, nil] command The command that is
     #   currently being executed, or nil if there is none
     def initialize(params = {})
@@ -146,15 +144,15 @@ module Nanoc::CLI
       stream.puts "Crashlog created at #{Time.now}"
 
       # Sections
-      write_error_message(stream, error, :verbose => true)
-      write_compilation_stack(stream, error, :verbose => true)
-      write_stack_trace(stream, error, :verbose => true)
-      write_version_information(stream,        :verbose => true)
-      write_system_information(stream,        :verbose => true)
-      write_installed_gems(stream,        :verbose => true)
-      write_environment(stream,        :verbose => true)
-      write_gemfile_lock(stream,        :verbose => true)
-      write_load_paths(stream,        :verbose => true)
+      write_error_message(stream, error, verbose: true)
+      write_compilation_stack(stream, error, verbose: true)
+      write_stack_trace(stream, error, verbose: true)
+      write_version_information(stream,        verbose: true)
+      write_system_information(stream,        verbose: true)
+      write_installed_gems(stream,        verbose: true)
+      write_environment(stream,        verbose: true)
+      write_gemfile_lock(stream,        verbose: true)
+      write_load_paths(stream,        verbose: true)
     end
 
     protected
@@ -356,7 +354,5 @@ module Nanoc::CLI
         stream.puts "  #{index}. #{i}"
       end
     end
-
   end
-
 end

data/lib/nanoc/cli/logger.rb

@@ -3,19 +3,17 @@
 require 'singleton'
 
 module Nanoc::CLI
-
   # Nanoc::CLI::Logger is a singleton class responsible for generating
   # feedback in the terminal.
   class Logger
-
     # Maps actions (`:create`, `:update`, `:identical`, `:skip` and `:delete`)
     # onto their ANSI color codes.
     ACTION_COLORS = {
-      :create         => "\e[32m", # green
-      :update         => "\e[33m", # yellow
-      :identical      => '',       # (nothing)
-      :skip           => '',       # (nothing)
-      :delete         => "\e[31m"  # red
+      create: "\e[32m", # green
+      update: "\e[33m", # yellow
+      identical: '',       # (nothing)
+      skip: '',       # (nothing)
+      delete: "\e[31m"  # red
     }
 
     include Singleton
@@ -43,13 +41,13 @@ module Nanoc::CLI
     def file(level, action, name, duration = nil)
       log(
         level,
-        '%s%12s%s  %s%s' % [
+        format('%s%12s%s  %s%s',
           ACTION_COLORS[action.to_sym],
           action,
           "\e[0m",
-          duration.nil? ? '' : '[%2.2fs]  ' % [duration],
+          duration.nil? ? '' : format('[%2.2fs]  ', duration),
           name
-        ]
+        )
       )
     end
 
@@ -69,7 +67,5 @@ module Nanoc::CLI
       # Log when level permits it
       io.puts(message) if @level == :low || @level == level
     end
-
   end
-
 end

data/lib/nanoc/cli/stream_cleaners.rb

@@ -1,13 +1,9 @@
 # encoding: utf-8
 
 module Nanoc::CLI
-
   module StreamCleaners
-
     autoload 'Abstract',   'nanoc/cli/stream_cleaners/abstract'
     autoload 'ANSIColors', 'nanoc/cli/stream_cleaners/ansi_colors'
     autoload 'UTF8',       'nanoc/cli/stream_cleaners/utf8'
-
   end
-
 end