nanoc 3.6.6 → 3.6.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDYwZDczMTNhNTI0MzcxNDYwZjAzY2ZhMzRiY2E1OTA5ZmJjZDZjZg==
+  data.tar.gz: !binary |-
+    NzhlNjQyMjdiMmQ0ZWEzZGM2NWMwNjRjZWI4NTVmN2YzYTE3MWM5NA==
+SHA512:
+  metadata.gz: !binary |-
+    MTY3NDMxNjY3ZWFlY2FkN2EwZjA2ZWNiMGI2MDJiYTRlY2Y5N2Y4Y2QxZjQ0
+    NThlYTg0ZTQ4OWU0YjA2YjM4ZDBlOTQwY2ExNTQxMDdhMTZhYzM1NmUyZDQx
+    YThkZDI5ZjdmYmZmMGE5NGU0ZDZjMzMyNjk0YWM1NTNlYzM3NmE=
+  data.tar.gz: !binary |-
+    NWEwMzcxMTY2ODBjMDBkYWE5NjUyNjI1MTEyMDU4MDNlNGI4NDcwMWI0ZTJj
+    OTVmNWY2YjU4ZTQ4N2I2YmRjNzdkYWQ3ZjhkY2RiNzdjN2FhN2VkNTQ0Mjc4
+    MGIyNWI2M2NlNmQ2ZWYyZmZmN2I1YTcwNzIxZTFhY2VmNmM4NGY=

data/Gemfile

@@ -3,16 +3,17 @@ source "http://rubygems.org"
 gemspec
 
 gem 'adsf'
-gem 'bluecloth'
+gem 'bluecloth', :platforms => :ruby
 gem 'builder'
 gem 'coderay'
+gem 'compass'
 gem 'coffee-script'
 gem 'erubis'
 gem 'fog'
 gem 'haml'
-gem 'handlebars'
+gem 'handlebars', :platforms => :ruby
 gem 'kramdown'
-gem 'less', '~> 2.0'
+gem 'less', '~> 2.0', :platforms => :ruby
 gem 'listen'
 gem 'markaby'
 gem 'maruku'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.6.5)
+    nanoc (3.6.7)
       cri (~> 2.3)
 
 GEM
@@ -12,22 +12,29 @@ GEM
       rack (>= 1.0.0)
     bluecloth (2.2.0)
     builder (3.2.2)
-    coderay (1.0.9)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    chunky_png (1.2.9)
+    coderay (1.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
     colored (1.2)
-    commonjs (0.2.6)
+    commonjs (0.2.7)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     cri (2.4.0)
       colored (>= 1.2)
     erubis (2.7.0)
-    excon (0.25.3)
-    execjs (2.0.1)
-    ffi (1.9.0)
-    fog (1.15.0)
+    excon (0.28.0)
+    execjs (2.0.2)
+    ffi (1.9.3)
+    fog (1.18.0)
       builder
-      excon (~> 0.25.0)
+      excon (~> 0.28.0)
       formatador (~> 0.2.0)
       mime-types
       multi_json (~> 1.0)
@@ -36,82 +43,82 @@ GEM
       nokogiri (~> 1.5)
       ruby-hmac
     formatador (0.2.4)
-    haml (4.0.3)
+    fssm (0.2.10)
+    haml (4.0.4)
       tilt
-    handlebars (0.4.0)
+    handlebars (0.5.0)
       commonjs (~> 0.2.3)
-      therubyracer (~> 0.11.1)
-    json (1.8.0)
+      handlebars-source (~> 1.0.12)
+      therubyracer (~> 0.12.0)
+    handlebars-source (1.0.12)
+    json (1.8.1)
     kramdown (1.2.0)
-    less (2.3.3)
-      commonjs (~> 0.2.6)
-    libv8 (3.11.8.17)
-    listen (1.3.0)
+    less (2.4.0)
+      commonjs (~> 0.2.7)
+    libv8 (3.16.14.3)
+    listen (2.2.0)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     markaby (0.7.2)
       builder (>= 2.0.0)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
+    maruku (0.7.0)
     metaclass (0.0.1)
     method_source (0.8.2)
-    mime-types (1.25)
+    mime-types (2.0)
     minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.9)
-    mustache (0.99.4)
+    multi_json (1.8.2)
+    mustache (0.99.5)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
+    net-ssh (2.7.0)
     nokogiri (1.5.10)
     pandoc-ruby (0.7.5)
     posix-spawn (0.3.6)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pygments.rb (0.5.2)
+    pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rainpress (1.0)
     rake (10.1.0)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.1)
+    rb-inotify (0.9.2)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rdiscount (2.1.6)
+    rdiscount (2.1.7)
     rdoc (4.0.1)
       json (~> 1.4)
     redcarpet (3.0.0)
     ref (1.0.5)
     ruby-hmac (0.4.0)
     rubypants (0.2.0)
-    sass (3.2.10)
-    slim (2.0.1)
+    sass (3.2.12)
+    slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
-    slop (3.4.6)
-    syntax (1.0.0)
+    slop (3.4.7)
     systemu (2.5.2)
-    temple (0.6.6)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
+    temple (0.6.7)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
       ref
     tilt (1.4.1)
+    timers (1.1.0)
     typogruby (1.0.16)
       rubypants
-    uglifier (2.2.1)
+    uglifier (2.3.1)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     w3c_validators (1.2)
       json
       nokogiri
     yajl-ruby (1.1.0)
-    yard (0.8.7)
+    yard (0.8.7.3)
     yuicompressor (1.2.1)
 
 PLATFORMS
@@ -124,6 +131,7 @@ DEPENDENCIES
   builder
   coderay
   coffee-script
+  compass
   erubis
   fog
   haml

data/NEWS.md

@@ -1,17 +1,35 @@
 # nanoc news
 
+## 3.6.7 (2013-12-09)
+
+Fixes:
+
+* Made Handlebars filter usable outside layouts (#346, #348)
+* Fixed ANSI color support on Windows (#352, #356)
+* Made fog deployer handle prefixes properly (#351) [Oliver Byford]
+* Fixed crash in watcher (#358)
+* Fixed huge durations when showing skipped items after compilation (#360, #364)
+* Fixed output of `--verbose` compilation statistics (#359, #365)
+* Fixed issue with Sass files not recompiling (#350, 370)
+
+Enhancements:
+
+* Fixed Windows compatibility issues in test suite (#353) [Raphael von der Grün]
+* Hid deprecated `autocompile` and `watch` commands in help
+* Made CLI swallow broken pipe errors when piping to a process that terminates prematurely (#318, #369)
+
 ## 3.6.6 (2013-11-08)
 
 Enhancements:
 
 * Reduced number of dependencies generated by Sass filter (#306) [Gregory Pakosz]
-* Recognised lowercase `utf` in language value (e.g. `en_US.utf8`) as being UTF-8 (#335)
+* Recognised lowercase `utf` in language value (e.g. `en_US.utf8`) as being UTF-8 (#335, #338)
 * Set [Thin](http://code.macournoyer.com/thin/) as the default server for `nanoc view` (#342, #345)
 * Removed watcher section from the default configuration file (#343, #344)
 
 Fixes:
 
-* Prevented capturing helper from erroneously compiling items twice (#337)
+* Prevented capturing helper from erroneously compiling items twice (#331, #337)
 
 ## 3.6.5 (2013-09-29)
 

data/lib/nanoc/cli/cleaning_stream.rb

@@ -41,12 +41,16 @@ module Nanoc::CLI
 
     # @see IO#write
     def write(s)
-      @stream.write(self.clean(s))
+      self._nanoc_swallow_broken_pipe_errors_while do
+        @stream.write(self._nanoc_clean(s))
+      end
     end
 
     # @see IO#<<
     def <<(s)
-      @stream.<<(self.clean(s))
+      self._nanoc_swallow_broken_pipe_errors_while do
+        @stream.<<(self._nanoc_clean(s))
+      end
     end
 
     # @see IO#tty?
@@ -56,7 +60,9 @@ module Nanoc::CLI
 
     # @see IO#flush
     def flush
-      @stream.flush
+      self._nanoc_swallow_broken_pipe_errors_while do
+        @stream.flush
+      end
     end
 
     # @see IO#tell
@@ -66,12 +72,16 @@ module Nanoc::CLI
 
     # @see IO#print
     def print(s)
-      @stream.print(self.clean(s))
+      self._nanoc_swallow_broken_pipe_errors_while do
+        @stream.print(self._nanoc_clean(s))
+      end
     end
 
     # @see IO#puts
     def puts(*s)
-      @stream.puts(*s.map { |ss| self.clean(ss) })
+      self._nanoc_swallow_broken_pipe_errors_while do
+        @stream.puts(*s.map { |ss| self._nanoc_clean(ss) })
+      end
     end
 
     # @see StringIO#string
@@ -111,10 +121,15 @@ module Nanoc::CLI
 
   protected
 
-    def clean(s)
+    def _nanoc_clean(s)
       @stream_cleaners.inject(s) { |m,c| c.clean(m) }
     end
 
+    def _nanoc_swallow_broken_pipe_errors_while
+      yield
+    rescue Errno::EPIPE
+    end
+
   end
 
 end

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

@@ -2,6 +2,7 @@
 
 usage       'autocompile [options]'
 summary     'start the autocompiler'
+be_hidden
 aliases     :aco
 description <<-EOS
 Start the autocompiler web server. Unless overridden with commandline options

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

@@ -162,33 +162,33 @@ module Nanoc::CLI::Commands
 
       # @option params [Array<Nanoc::ItemRep>] :reps The list of item representations in the site
       def initialize(params={})
-        @filter_times = {}
+        @times = {}
 
-        @reps       = params.fetch(:reps)
+        @reps = params.fetch(:reps)
       end
 
       # @see Listener#start
       def start
         Nanoc::NotificationCenter.on(:filtering_started) do |rep, filter_name|
-          @filter_times[filter_name] ||= []
-          @filter_times[filter_name] << Time.now
+          @times[filter_name] ||= []
+          @times[filter_name] << { :start => Time.now }
         end
         Nanoc::NotificationCenter.on(:filtering_ended) do |rep, filter_name|
-          @filter_times[filter_name] << Time.now - @filter_times[filter_name].pop
+          @times[filter_name].last[:stop] = Time.now
         end
       end
 
       # @see Listener#stop
       def stop
-        super
         self.print_profiling_feedback
+        super
       end
 
     protected
 
       def print_profiling_feedback
         # Get max filter length
-        max_filter_name_length = @filter_times.keys.map { |k| k.to_s.size }.max
+        max_filter_name_length = durations_per_filter.keys.map { |k| k.to_s.size }.max
         return if max_filter_name_length.nil?
 
         # Print warning if necessary
@@ -203,19 +203,19 @@ module Nanoc::CLI::Commands
         puts ' ' * max_filter_name_length + ' | count    min    avg    max     tot'
         puts '-' * max_filter_name_length + '-+-----------------------------------'
 
-        @filter_times.to_a.sort_by { |r| r[1] }.each do |row|
-          self.print_row(row)
+        durations_per_filter.to_a.sort_by { |r| r[1] }.each do |row|
+          self.print_row(row, max_filter_name_length)
         end
       end
 
-      def print_row(row)
+      def print_row(row, length)
         # Extract data
         filter_name, samples = *row
 
         # Calculate stats
         count = samples.size
         min   = samples.min
-        tot   = samples.inject { |memo, i| memo + i}
+        tot   = samples.inject(0) { |memo, i| memo + i }
         avg   = tot/count
         max   = samples.max
 
@@ -227,8 +227,26 @@ module Nanoc::CLI::Commands
         tot   = format('%5.2f', tot)
 
         # Output stats
-        filter_name = format("%#{max}s", filter_name)
-        puts "#{filter_name} |  #{count}  #{min}s  #{avg}s  #{max}s  #{tot}s"
+        key = format("%#{length}s", filter_name)
+        puts "#{key} |  #{count}  #{min}s  #{avg}s  #{max}s  #{tot}s"
+      end
+
+      def durations_per_filter
+        @_durations_per_filter ||= begin
+          @times.keys.each_with_object({}) do |filter_name, result|
+            if durations = durations_for_filter(filter_name)
+              result[filter_name] = durations
+            end
+          end
+        end
+      end
+
+      def durations_for_filter(filter_name)
+        @times[filter_name].each_with_object([]) do |sample, result|
+          if sample[:start] && sample[:stop]
+            result << sample[:stop] - sample[:start]
+          end
+        end
       end
 
     end
@@ -310,26 +328,26 @@ module Nanoc::CLI::Commands
     # Prints file actions (created, updated, deleted, identical, skipped)
     class FileActionPrinter < Listener
 
-      # @option params [Array<Nanoc::ItemRep>] :reps The list of item representations in the site 
+      # @option params [Array<Nanoc::ItemRep>] :reps The list of item representations in the site
       def initialize(params={})
-        @rep_times       = {}
+        @start_times = {}
+        @stop_times  = {}
 
-        @reps            = params.fetch(:reps)
+        @reps = params.fetch(:reps)
       end
 
       # @see Listener#start
       def start
         Nanoc::NotificationCenter.on(:compilation_started) do |rep|
-          @rep_times[rep.raw_path] = Time.now
+          @start_times[rep.raw_path] = Time.now
         end
         Nanoc::NotificationCenter.on(:compilation_ended) do |rep|
-          @rep_times[rep.raw_path] = Time.now - @rep_times[rep.raw_path]
+          @stop_times[rep.raw_path] = Time.now
         end
         Nanoc::NotificationCenter.on(:rep_written) do |rep, path, is_created, is_modified|
           action = (is_created ? :create : (is_modified ? :update : :identical))
           level  = (is_created ? :high   : (is_modified ? :high   : :low))
-          duration = Time.now - @rep_times[rep.raw_path] if @rep_times[rep.raw_path]
-          Nanoc::CLI::Logger.instance.file(level, action, path, duration)
+          log(level, action, path, duration_for(rep))
         end
       end
 
@@ -337,14 +355,28 @@ module Nanoc::CLI::Commands
       def stop
         super
         @reps.select { |r| !r.compiled? }.each do |rep|
-          rep.raw_paths.each do |snapshot_name, filename|
-            next if filename.nil?
-            duration = @rep_times[filename]
-            Nanoc::CLI::Logger.instance.file(:high, :skip, filename, duration)
+          rep.raw_paths.each do |snapshot_name, raw_path|
+            log(:low, :skip, raw_path, duration_for(rep))
           end
         end
       end
 
+      private
+
+      def duration_for(rep)
+        return nil if rep.raw_path.nil?
+
+        start = @start_times[rep.raw_path]
+        stop  = @stop_times[rep.raw_path]
+        return nil if start.nil? || stop.nil?
+
+        stop - start
+      end
+
+      def log(level, action, path, duration)
+        Nanoc::CLI::Logger.instance.file(level, action, path, duration)
+      end
+
     end
 
     def initialize(options, arguments, command, params={})
@@ -371,7 +403,7 @@ module Nanoc::CLI::Commands
 
   protected
 
-    def prune  
+    def prune
       if self.site.config[:prune][:auto_prune]
         Nanoc::Extra::Pruner.new(self.site, :exclude => self.prune_config_exclude).run
       end

data/lib/nanoc/cli/commands/create-site.rb

@@ -150,7 +150,7 @@ EOS
   margin: 0;
   padding: 0;
 
-  font-family: Georgia, Palatino, Times, 'Times New Roman', sans-serif;
+  font-family: Georgia, Palatino, serif;
 }
 
 body {

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

@@ -2,6 +2,7 @@
 
 usage       'watch [options]'
 summary     'start the watcher'
+be_hidden
 description <<-EOS
 Start the watcher. When a change is detected, the site will be recompiled.
 EOS
@@ -71,7 +72,7 @@ module Nanoc::CLI::Commands
       dirs_to_watch  = watcher_config[:dirs_to_watch]  || [ 'content', 'layouts', 'lib' ]
       files_to_watch = watcher_config[:files_to_watch] || [ 'nanoc.yaml', 'config.yaml', 'Rules', 'rules', 'Rules.rb', 'rules.rb' ]
       files_to_watch = Regexp.new(files_to_watch.map { |name| Regexp.quote(name) + '$' }.join('|'))
-      ignore_dir = Regexp.new(Dir.glob('*').map { |dir| dir if File.dir?(dir) }.compact.join('|'))
+      ignore_dir = Regexp.new(Dir.glob('*').map { |dir| dir if File.directory?(dir) }.compact.join('|'))
 
       # Watch
       puts "Watching for changes…"
@@ -169,7 +170,7 @@ module Nanoc::CLI::Commands
       end
 
       def on_windows?
-        !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i)
+        Nanoc.on_windows?
       end
 
     end

data/lib/nanoc/cli.rb

@@ -8,6 +8,13 @@ rescue LoadError => e
   exit 1
 end
 
+if Nanoc.on_windows?
+  begin
+    require 'Win32/Console/ANSI'
+  rescue LoadError
+  end
+end
+
 module Nanoc::CLI
 
   module Commands
@@ -191,10 +198,8 @@ protected
   def self.enable_ansi_colors?(io)
     return false if !io.tty?
 
-    begin
-      require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /mswin|mingw/
-    rescue LoadError
-      return false
+    if Nanoc.on_windows?
+      return defined?(::Win32::Console::ANSI)
     end
 
     return true

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

@@ -23,10 +23,10 @@ module Nanoc::Extra::Deployers
     def run
       require 'fog'
 
-      # Get params
+      # 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[:path]
+      path     = self.config.delete(:path)
 
       self.config.delete(:kind)
 
@@ -45,7 +45,7 @@ module Nanoc::Extra::Deployers
       # Get bucket
       puts "Getting bucket"
       begin
-        directory = connection.directories.get(bucket)
+        directory = connection.directories.get(bucket, :prefix => path)
       rescue ::Excon::Errors::NotFound
         should_create_bucket = true
       end
@@ -53,7 +53,7 @@ module Nanoc::Extra::Deployers
 
       # Create bucket if necessary
       if should_create_bucket
-        directory = connection.directories.create(:key => bucket)
+        directory = connection.directories.create(:key => bucket, :prefix => path)
       end
 
       # Get list of remote files
@@ -71,7 +71,7 @@ module Nanoc::Extra::Deployers
       FileUtils.cd(src) do
         files = Dir['**/*'].select { |f| File.file?(f) }
         files.each do |file_path|
-          key = "#{path}#{file_path}"
+          key = path ? File.join(path, file_path) : file_path
           directory.files.create(
             :key => key,
             :body => File.open(file_path),

data/lib/nanoc/filters/handlebars.rb

@@ -18,9 +18,11 @@ module Nanoc::Filters
     def run(content, params={})
       context = item.attributes.dup
       context[:item]   = assigns[:item].attributes
-      context[:layout] = assigns[:layout].attributes
       context[:config] = assigns[:config]
       context[:yield]  = assigns[:content]
+      if assigns.has_key?(:layout)
+        context[:layout] = assigns[:layout].attributes
+      end
 
       handlebars = ::Handlebars::Context.new
       template = handlebars.compile(content)

data/lib/nanoc/filters/sass/sass_filesystem_importer.rb

@@ -1,28 +1,21 @@
 # encoding: utf-8
 
-module Nanoc::Filters
-  class Sass
+class ::Sass::Importers::Filesystem
 
-    # Essentially the `Sass::Importers::Filesystem` but registering each
-    # import file path.
-    class SassFilesystemImporter < ::Sass::Importers::Filesystem
+  alias_method :_orig_find, :_find
 
-      private
+  def _find(dir, name, options)
+    # Find filename
+    full_filename, syntax = ::Sass::Util.destructure(find_real_file(dir, name, options))
+    return nil if full_filename.nil?
 
-      def _find(dir, name, options)
-        full_filename, syntax = ::Sass::Util.destructure(find_real_file(dir, name, options))
-        return unless full_filename && File.readable?(full_filename)
-
-        filter = options[:nanoc_current_filter]
-        item = filter.imported_filename_to_item(full_filename)
-        filter.depend_on([ item ]) unless item.nil?
-
-        options[:syntax] = syntax
-        options[:filename] = full_filename
-        options[:importer] = self
-        ::Sass::Engine.new(File.read(full_filename), options)
-      end
-    end
+    # Create dependency
+    filter = options[:nanoc_current_filter]
+    item = filter.imported_filename_to_item(full_filename)
+    filter.depend_on([ item ]) unless item.nil?
 
+    # Call original _find
+    _orig_find(dir, name, options)
   end
+
 end