nanoc 3.6.7 → 3.6.8

data/lib/nanoc/extra/checking/runner.rb

@@ -21,37 +21,37 @@ module Nanoc::Extra::Checking
 
     # @return [Boolean] true if a Checks file exists, false otherwise
     def has_dsl?
-      self.checks_filename && File.file?(self.checks_filename)
+      checks_filename && File.file?(checks_filename)
     end
 
     # Lists all available checks on stdout.
     #
     # @return [void]
     def list_checks
-      self.load_dsl_if_available
+      load_dsl_if_available
 
-      puts "Available checks:"
+      puts 'Available checks:'
       puts
-      puts all_check_classes.map { |i| "  " + i.identifier.to_s }.sort.join("\n")
+      puts all_check_classes.map { |i| '  ' + i.identifier.to_s }.sort.join("\n")
     end
 
     # Runs all checks.
     #
     # @return [Boolean] true if successful, false otherwise
     def run_all
-      self.load_dsl_if_available
+      load_dsl_if_available
 
-      self.run_check_classes(self.all_check_classes)
+      run_check_classes(all_check_classes)
     end
 
     # Runs the checks marked for deployment.
     #
     # @return [Boolean] true if successful, false otherwise
     def run_for_deploy
-      self.require_dsl
+      require_dsl
 
-      return true if self.dsl.nil?
-      self.run_check_classes(self.check_classes_named(self.dsl.deploy_checks))
+      return true if dsl.nil?
+      run_check_classes(check_classes_named(dsl.deploy_checks))
     end
 
     # Runs the checks with the given names.
@@ -60,9 +60,9 @@ module Nanoc::Extra::Checking
     #
     # @return [Boolean] true if successful, false otherwise
     def run_specific(check_class_names)
-      self.load_dsl_if_available
+      load_dsl_if_available
 
-      self.run_check_classes(self.check_classes_named(check_class_names))
+      run_check_classes(check_classes_named(check_class_names))
     end
 
   protected
@@ -71,7 +71,7 @@ module Nanoc::Extra::Checking
       @dsl_loaded ||= false
       if !@dsl_loaded
         if self.has_dsl?
-          @dsl = Nanoc::Extra::Checking::DSL.from_file(self.checks_filename)
+          @dsl = Nanoc::Extra::Checking::DSL.from_file(checks_filename)
         else
           @dsl = nil
         end
@@ -80,8 +80,8 @@ module Nanoc::Extra::Checking
     end
 
     def require_dsl
-      self.load_dsl_if_available
-      if self.dsl.nil?
+      load_dsl_if_available
+      if dsl.nil?
         raise Nanoc::Errors::GenericTrivial, "No checks defined (no #{CHECKS_FILENAMES.first} file present)"
       end
     end
@@ -91,8 +91,8 @@ module Nanoc::Extra::Checking
     end
 
     def run_check_classes(classes)
-      issues = self.run_checks(classes)
-      self.print_issues(issues)
+      issues = run_checks(classes)
+      print_issues(issues)
       issues.empty? ? true : false
     end
 
@@ -101,7 +101,7 @@ module Nanoc::Extra::Checking
     end
 
     def check_classes_named(n)
-      classes = n.map do |a|
+      n.map do |a|
         klass = Nanoc::Extra::Checking::Check.named(a)
         raise Nanoc::Errors::GenericTrivial, "Unknown check: #{a}" if klass.nil?
         klass
@@ -115,7 +115,7 @@ module Nanoc::Extra::Checking
       issues = Set.new
       length = classes.map { |c| c.identifier.to_s.length }.max + 18
       classes.each do |klass|
-        print format("  %-#{length}s", "Running #{klass.identifier} check… ")
+        print format("  %-#{length}s", "Running check #{klass.identifier}… ")
 
         check = klass.new(@site)
         check.run
@@ -134,7 +134,7 @@ module Nanoc::Extra::Checking
       require 'colored'
 
       return if issues.empty?
-      puts "Issues found!"
+      puts 'Issues found!'
       issues.group_by { |i| i.subject }.to_a.sort_by { |p| p.first }.each do |pair|
         subject = pair.first
         issues  = pair.last

data/lib/nanoc/extra/chick.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'net/http'
 require 'rack'
 require 'rack/cache'
@@ -16,7 +18,7 @@ module Nanoc::Extra
 
       DEFAULT_OPTIONS = {
         :cache => {
-          :metastore   => 'file:tmp/rack/cache.meta', 
+          :metastore   => 'file:tmp/rack/cache.meta',
           :entitystore => 'file:tmp/rack/cache.body'
         },
         :cache_controller => {
@@ -24,7 +26,7 @@ module Nanoc::Extra
         }
       }
 
-      def initialize(options={})
+      def initialize(options = {})
         # Get options
         @options = DEFAULT_OPTIONS.merge(options)
         @options[:cache] = DEFAULT_OPTIONS[:cache].merge(@options[:cache])
@@ -34,11 +36,11 @@ module Nanoc::Extra
       def get(url)
         # Build app
         options = @options
-        @app ||= Rack::Builder.new {
+        @app ||= Rack::Builder.new do
           use Rack::Cache, options[:cache].merge(:verbose => true)
           use Nanoc::Extra::CHiCk::CacheController, options[:cache_controller]
           run Nanoc::Extra::CHiCk::RackClient
-        }
+        end
 
         # Build environment for request
         env = Rack::MockRequest.env_for(url, :method => 'GET')
@@ -63,14 +65,14 @@ module Nanoc::Extra
     #   [Curb](http://curb.rubyforge.org/) instead.
     class CacheController
 
-      def initialize(app, options={})
+      def initialize(app, options = {})
         @app = app
         @options = options
       end
 
       def call(env)
         res = @app.call(env)
-        unless res[1].has_key?('Cache-Control') || res[1].has_key?('Expires')
+        unless res[1].key?('Cache-Control') || res[1].key?('Expires')
           res[1]['Cache-Control'] = "max-age=#{@options[:max_age]}"
         end
         res
@@ -96,7 +98,7 @@ module Nanoc::Extra
         request = Rack::Request.new(env)
 
         # Build headers and strip HTTP_
-        request_headers = env.inject({}) do |m,(k,v)|
+        request_headers = env.reduce({}) do |m, (k, v)|
           k =~ /^HTTP_(.*)$/ && v ? m.merge($1.gsub(/_/, '-') => v) : m
         end
 
@@ -105,14 +107,14 @@ module Nanoc::Extra
         net_http_request_class = METHOD_TO_CLASS_MAPPING[request.request_method]
         raise ArgumentError, "Unsupported method: #{request.request_method}" if net_http_request_class.nil?
         net_http_request = net_http_request_class.new(request.fullpath, request_headers)
-        net_http_request.body = env['rack.input'].read if [ 'POST', 'PUT' ].include?(request.request_method)
+        net_http_request.body = env['rack.input'].read if %w( POST PUT ).include?(request.request_method)
 
         # Perform request
         http.request(net_http_request) do |response|
           # Build Rack response triplet
           return [
             response.code.to_i,
-            response.to_hash.inject({}) { |m,(k,v)| m.merge(k => v[0]) },
+            response.to_hash.reduce({}) { |m, (k, v)| m.merge(k => v[0]) },
             [ response.body ]
           ]
         end

data/lib/nanoc/extra/core_ext/pathname.rb

@@ -17,7 +17,7 @@ module Nanoc::Extra
     end
 
     def include_component?(component)
-      self.components.include?(component)
+      components.include?(component)
     end
 
   end
@@ -27,4 +27,3 @@ end
 class ::Pathname
   include ::Nanoc::Extra::PathnameExtensions
 end
-

data/lib/nanoc/extra/core_ext/time.rb

@@ -4,12 +4,12 @@ module Nanoc::Extra::TimeExtensions
 
   # @return [String] The time in an ISO-8601 date format.
   def to_iso8601_date
-    self.strftime("%Y-%m-%d")
+    strftime('%Y-%m-%d')
   end
 
   # @return [String] The time in an ISO-8601 time format.
   def to_iso8601_time
-    self.getutc.strftime("%Y-%m-%dT%H:%M:%SZ")
+    getutc.strftime('%Y-%m-%dT%H:%M:%SZ')
   end
 
 end

data/lib/nanoc/extra/core_ext.rb

@@ -3,4 +3,3 @@
 require 'nanoc/extra/core_ext/enumerable'
 require 'nanoc/extra/core_ext/pathname'
 require 'nanoc/extra/core_ext/time'
-

data/lib/nanoc/extra/deployer.rb

@@ -29,7 +29,7 @@ module Nanoc::Extra
     #
     # @option params [Boolean] :dry_run (false) true if the deployer should
     #   only show what would be deployed instead actually deploying
-    def initialize(source_path, config, params={})
+    def initialize(source_path, config, params = {})
       @source_path  = source_path
       @config       = config
       @dry_run      = params.fetch(:dry_run) { false }
@@ -39,7 +39,7 @@ module Nanoc::Extra
     #
     # @abstract
     def run
-      raise NotImplementedError.new("Nanoc::Extra::Deployer subclasses must implement #run")
+      raise NotImplementedError.new('Nanoc::Extra::Deployer subclasses must implement #run')
     end
 
   end

data/lib/nanoc/extra/deployers/fog.rb

@@ -24,14 +24,14 @@ module Nanoc::Extra::Deployers
       require 'fog'
 
       # Get params, unsetting anything we don't want to pass through to fog.
-      src      = File.expand_path(self.source_path)
-      bucket   = self.config.delete(:bucket) || self.config.delete(:bucket_name)
-      path     = self.config.delete(:path)
+      src      = File.expand_path(source_path)
+      bucket   = config.delete(:bucket) || config.delete(:bucket_name)
+      path     = config.delete(:path)
 
-      self.config.delete(:kind)
+      config.delete(:kind)
 
       # Validate params
-      error 'The path requires no trailing slash' if path && path[-1,1] == '/'
+      error 'The path requires no trailing slash' if path && path[-1, 1] == '/'
 
       # Mock if necessary
       if self.dry_run?
@@ -39,11 +39,11 @@ module Nanoc::Extra::Deployers
       end
 
       # Get connection
-      puts "Connecting"
-      connection = ::Fog::Storage.new(self.config)
+      puts 'Connecting'
+      connection = ::Fog::Storage.new(config)
 
       # Get bucket
-      puts "Getting bucket"
+      puts 'Getting bucket'
       begin
         directory = connection.directories.get(bucket, :prefix => path)
       rescue ::Excon::Errors::NotFound
@@ -64,10 +64,10 @@ module Nanoc::Extra::Deployers
         truncated = set.is_truncated
         files = files + set
       end
-      keys_to_destroy = files.all.map {|file| file.key}
+      keys_to_destroy = files.all.map { |file| file.key }
 
       # Upload all the files in the output folder to the clouds
-      puts "Uploading local files"
+      puts 'Uploading local files'
       FileUtils.cd(src) do
         files = Dir['**/*'].select { |f| File.file?(f) }
         files.each do |file_path|
@@ -81,12 +81,12 @@ module Nanoc::Extra::Deployers
       end
 
       # delete extraneous remote files
-      puts "Removing remote files"
+      puts 'Removing remote files'
       keys_to_destroy.each do |key|
         directory.files.get(key).destroy
       end
 
-      puts "Done!"
+      puts 'Done!'
     end
 
   private

data/lib/nanoc/extra/deployers/rsync.rb

@@ -34,13 +34,13 @@ module Nanoc::Extra::Deployers
       require 'systemu'
 
       # Get params
-      src = self.source_path + '/'
-      dst = self.config[:dst]
-      options = self.config[:options] || DEFAULT_OPTIONS
+      src = source_path + '/'
+      dst = config[:dst]
+      options = config[:options] || DEFAULT_OPTIONS
 
       # Validate
       raise 'No dst found in deployment configuration' if dst.nil?
-      raise 'dst requires no trailing slash' if dst[-1,1] == '/'
+      raise 'dst requires no trailing slash' if dst[-1, 1] == '/'
 
       # Run
       if dry_run
@@ -53,11 +53,11 @@ module Nanoc::Extra::Deployers
 
   private
 
-    # Runs the given shell command. It will raise an error if execution fails 
+    # Runs the given shell command. It will raise an error if execution fails
     # (results in a nonzero exit code).
     def run_shell_cmd(args)
       status = systemu(args, 'stdout' => $stdout, 'stderr' => $stderr)
-      raise "command exited with a nonzero status code #{$?.exitstatus} (command: #{args.join(' ')})" if !status.success?
+      raise "command exited with a nonzero status code #{$CHILD_STATUS.exitstatus} (command: #{args.join(' ')})" if !status.success?
     end
 
   end

data/lib/nanoc/extra/file_proxy.rb

@@ -16,7 +16,7 @@ module Nanoc::Extra
     def freeze
     end
 
-    def respond_to?(meth, include_all=false)
+    def respond_to?(meth, include_all = false)
       file_instance_methods.include?(meth.to_sym)
     end
 

data/lib/nanoc/extra/filesystem_tools.rb

@@ -59,18 +59,18 @@ module Nanoc::Extra
     #
     # @raise [UnsupportedFileTypeError] if a file of an unsupported type is
     #   detected (something other than file, directory or link)
-    def all_files_in(dir_name, recursion_limit=10)
+    def all_files_in(dir_name, recursion_limit = 10)
       Dir[dir_name + '/**/*'].map do |fn|
         case File.ftype(fn)
         when 'link'
           if 0 == recursion_limit
             raise MaxSymlinkDepthExceededError.new(fn)
           else
-            absolute_target = self.resolve_symlink(fn)
+            absolute_target = resolve_symlink(fn)
             if File.file?(absolute_target)
               fn
             else
-              all_files_in(absolute_target, recursion_limit-1).map do |sfn|
+              all_files_in(absolute_target, recursion_limit - 1).map do |sfn|
                 fn + sfn[absolute_target.size..-1]
               end
             end
@@ -100,7 +100,7 @@ module Nanoc::Extra
     #
     # @raise [UnsupportedFileTypeError] if a file of an unsupported type is
     #   detected (something other than file, directory or link)
-    def resolve_symlink(filename, recursion_limit=5)
+    def resolve_symlink(filename, recursion_limit = 5)
       target = File.readlink(filename)
       absolute_target = File.expand_path(target, File.dirname(filename))
 
@@ -109,7 +109,7 @@ module Nanoc::Extra
         if 0 == recursion_limit
           raise MaxSymlinkDepthExceededError.new(absolute_target)
         else
-          self.resolve_symlink(absolute_target, recursion_limit-1)
+          resolve_symlink(absolute_target, recursion_limit - 1)
         end
       when 'file', 'directory'
         absolute_target

data/lib/nanoc/extra/link_collector.rb

@@ -6,9 +6,10 @@ module ::Nanoc::Extra
 
   class LinkCollector
 
-    def initialize(filenames, mode=nil)
+    def initialize(filenames, mode = nil)
       @filenames = filenames
-      @filter = case mode
+      @filter =
+        case mode
         when nil
           lambda { |h| true }
         when :external
@@ -17,7 +18,7 @@ module ::Nanoc::Extra
           lambda { |h| !external_href?(h) }
         else
           raise ArgumentError, 'Expected mode argument to be :internal, :external or nil'
-        end 
+        end
     end
 
     def filenames_per_href

data/lib/nanoc/extra/pruner.rb

@@ -14,7 +14,7 @@ module Nanoc::Extra
     # @option params [Boolean] :dry_run (false) true if the files to be deleted
     #   should only be printed instead of actually deleted, false if the files
     #   should actually be deleted.
-    def initialize(site, params={})
+    def initialize(site, params = {})
       @site    = site
       @dry_run = params.fetch(:dry_run) { false }
       @exclude = params.fetch(:exclude) { [] }
@@ -27,7 +27,7 @@ module Nanoc::Extra
       require 'find'
 
       # Get compiled files
-      compiled_files = self.site.items.map do |item|
+      compiled_files = site.items.map do |item|
         item.reps.map do |rep|
           rep.raw_path
         end
@@ -36,7 +36,7 @@ module Nanoc::Extra
       # Get present files and dirs
       present_files = []
       present_dirs = []
-      Find.find(self.site.config[:output_dir] + '/') do |f|
+      Find.find(site.config[:output_dir] + '/') do |f|
         present_files << f if File.file?(f)
         present_dirs  << f if File.directory?(f)
       end
@@ -45,14 +45,14 @@ module Nanoc::Extra
       stray_files = (present_files - compiled_files)
       stray_files.each do |f|
         next if filename_excluded?(f)
-        self.delete_file(f)
+        delete_file(f)
       end
 
       # Remove empty directories
       present_dirs.reverse_each do |dir|
         next if Dir.foreach(dir) { |n| break true if n !~ /\A\.\.?\z/ }
         next if filename_excluded?(dir)
-        self.delete_dir(dir)
+        delete_dir(dir)
       end
     end
 

data/lib/nanoc/extra/validators/links.rb

@@ -5,9 +5,9 @@ module Nanoc::Extra::Validators
   # @deprecated Use the Checking API or the `check` command instead
   class Links
 
-    def initialize(dir, index_filenames, params={})
-      @include_internal = params.has_key?(:internal) && params[:internal]
-      @include_external = params.has_key?(:external) && params[:external]
+    def initialize(dir, index_filenames, params = {})
+      @include_internal = params.key?(:internal) && params[:internal]
+      @include_external = params.key?(:external) && params[:external]
     end
 
     def run

data/lib/nanoc/extra/vcs.rb

@@ -57,7 +57,7 @@ module Nanoc::Extra
     def not_implemented(name)
       raise NotImplementedError.new(
         "#{self.class} does not override ##{name}, which is required for " +
-        "this data source to be used."
+        'this data source to be used.'
       )
     end
 

data/lib/nanoc/filters/asciidoc.rb

@@ -13,12 +13,12 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       # Run command
       stdout = ''
       stderr = ''
       status = systemu(
-        [ 'asciidoc', '-o', '-', '-' ],
+        %w( asciidoc -o - - ),
         'stdin'  => content,
         'stdout' => stdout,
         'stderr' => stderr)
@@ -26,7 +26,7 @@ module Nanoc::Filters
       # Show errors
       unless status.success?
         $stderr.puts stderr
-        raise RuntimeError, "AsciiDoc filter failed with status #{status}"
+        raise "AsciiDoc filter failed with status #{status}"
       end
 
       # Get result

data/lib/nanoc/filters/bluecloth.rb

@@ -11,7 +11,7 @@ module Nanoc::Filters
     # @param [String] content The content to filter
     #
     # @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       ::BlueCloth.new(content).to_html
     end
 

data/lib/nanoc/filters/coderay.rb

@@ -6,12 +6,12 @@ module Nanoc::Filters
     requires 'coderay'
 
     # @deprecated Use the `:colorize_syntax` filter instead.
-    def run(content, params={})
+    def run(content, params = {})
       # Warn
       warn 'The :coderay filter is deprecated; consider using the :colorize_syntax filter instead.'
 
       # Check params
-      raise ArgumentError, "CodeRay filter requires a :language argument which is missing" if params[:language].nil?
+      raise ArgumentError, 'CodeRay filter requires a :language argument which is missing' if params[:language].nil?
 
       # Get result
       ::CodeRay.scan(content, params[:language]).html

data/lib/nanoc/filters/coffeescript.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Nanoc::Filters
 
   # @since 3.3.0

data/lib/nanoc/filters/colorize_syntax.rb

@@ -82,7 +82,7 @@ module Nanoc::Filters
     #   such as the doctype, `html`, `head` and `body` elements will be added.
     #
     # @return [String] The filtered content
-    def run(content, params={})
+    def run(content, params = {})
       # Take colorizers from parameters
       @colorizers = Hash.new(params[:default_colorizer] || DEFAULT_COLORIZER)
       (params[:colorizers] || {}).each_pair do |language, colorizer|
@@ -97,7 +97,7 @@ module Nanoc::Filters
       when :xml, :xhtml
         klass = Nokogiri::XML
       else
-        raise RuntimeError, "unknown syntax: #{syntax.inspect} (expected :html or :xml)"
+        raise "unknown syntax: #{syntax.inspect} (expected :html or :xml)"
       end
 
       # Colorize
@@ -131,12 +131,12 @@ module Nanoc::Filters
         # Add language-something class
         unless has_class
           klass = element['class'] || ''
-          klass << ' ' unless [' ', nil].include?(klass[-1,1])
+          klass << ' ' unless [' ', nil].include?(klass[-1, 1])
           klass << "language-#{language}"
           element['class'] = klass
         end
 
-        self.highlight_postprocess(language, element.parent)
+        highlight_postprocess(language, element.parent)
       end
 
       method = "to_#{syntax}".to_sym
@@ -154,7 +154,7 @@ module Nanoc::Filters
     # @param [Hash] params Parameters to pass on to CodeRay
     #
     # @return [String] The colorized output
-    def coderay(code, language, params={})
+    def coderay(code, language, params = {})
       require 'coderay'
 
       ::CodeRay.scan(code, language).html(params)
@@ -168,7 +168,7 @@ module Nanoc::Filters
     #
     # @return [String] The colorized output, which is identical to the input
     #   in this case
-    def dummy(code, language, params={})
+    def dummy(code, language, params = {})
       code
     end
 
@@ -184,7 +184,7 @@ module Nanoc::Filters
     # @option params [String, Symbol] :encoding The encoding of the code block
     #
     # @return [String] The colorized output
-    def pygmentize(code, language, params={})
+    def pygmentize(code, language, params = {})
       require 'systemu'
       check_availability('pygmentize', '-V')
 
@@ -193,7 +193,7 @@ module Nanoc::Filters
 
       # Build command
       cmd = [ 'pygmentize', '-l', language, '-f', 'html' ]
-      cmd << '-O' << params.map { |k,v| "#{k}=#{v}" }.join(',') unless params.empty?
+      cmd << '-O' << params.map { |k, v| "#{k}=#{v}" }.join(',') unless params.empty?
 
       # Run command
       stdout = StringIO.new
@@ -214,7 +214,7 @@ module Nanoc::Filters
     # @param [String] language The language the code is written in
     #
     # @return [String] The colorized output
-    def pygmentsrb(code, language, params={})
+    def pygmentsrb(code, language, params = {})
       require 'pygments'
 
       args = params.dup
@@ -245,7 +245,7 @@ module Nanoc::Filters
     # @option params [String] :style The style to use
     #
     # @return [String] The colorized output
-    def simon_highlight(code, language, params={})
+    def simon_highlight(code, language, params = {})
       require 'systemu'
 
       check_availability('highlight', '--version')
@@ -277,7 +277,7 @@ module Nanoc::Filters
     def coderay_postprocess(language, element)
       # Skip if we're a free <code>
       return if element.parent.nil?
-      
+
       # <div class="code">
       div_inner = Nokogiri::XML::Node.new('div', element.document)
       div_inner['class'] = 'code'
@@ -301,12 +301,12 @@ module Nanoc::Filters
       s.lines.drop_while { |line| line.strip.empty? }.join.rstrip
     end
 
-    def highlight(code, language, params={})
+    def highlight(code, language, params = {})
       colorizer = @colorizers[language.to_sym]
       if KNOWN_COLORIZERS.include?(colorizer)
         send(colorizer, code, language, params[colorizer] || {})
       else
-        raise RuntimeError, "I don’t know how to highlight code using the “#{colorizer}” colorizer"
+        raise "I don’t know how to highlight code using the “#{colorizer}” colorizer"
       end
     end
 
@@ -315,16 +315,16 @@ module Nanoc::Filters
       if KNOWN_COLORIZERS.include?(colorizer)
         sym = (colorizer.to_s + '_postprocess').to_sym
         if self.respond_to?(sym)
-          self.send(sym, language, element)
+          send(sym, language, element)
         end
       else
-        raise RuntimeError, "I don’t know how to highlight code using the “#{colorizer}” colorizer"
+        raise "I don’t know how to highlight code using the “#{colorizer}” colorizer"
       end
     end
 
     def check_availability(*cmd)
       systemu cmd
-      raise "Could not spawn #{cmd.join(' ')}" if $?.exitstatus != 0
+      raise "Could not spawn #{cmd.join(' ')}" if $CHILD_STATUS.exitstatus != 0
     end
 
   end