nanoc 3.6.9 → 3.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e57a92e04d4e25dba882d2e0953820b5ea5cc713
-  data.tar.gz: 9046eec0428c852a64c41199cdb3582c828a9420
+  metadata.gz: 606b38f2b3f74c3c2b091322bf96d0e31838d9be
+  data.tar.gz: 004240ce9c783bd2a7edcb3a3ea28f4bb4f719bf
 SHA512:
-  metadata.gz: d81d19a33e83db6c091062d3df87e9f2393f8363049f255ee8fd08c51b5835f204aeb03bb2bfec71d9c97649313196415af378860b3fadfbbb0524fc0c9a0328
-  data.tar.gz: 49b337ebf2aaf1a1fb745a82ff3d0af62a87d074620b89b2b5017e8b679e42825cb8d5aa32d4a7ebf2b496b2e9126a25d8d88b34f345e830b871be1737f9fcc8
+  metadata.gz: 83ba1d9e5c6490a7354731241929bf372268b0ecfd33cde43cc7255e6cbe95174cabd85ea4683e4e84e8eb659efba791eca1328daa0f15976ac38ff53be8b95a
+  data.tar.gz: 74130a78b27dbd7b23b59e97232f1568161894343c1546fd1af6c54a68db8ef8ae23a618708c98bb5d2bd81ceaa523c2b2e81fbc0728532a67eec83216a4aa39

data/Gemfile

@@ -2,6 +2,11 @@ source "https://rubygems.org"
 
 gemspec
 
+# FIXME we may be missing some mswin dependencies here
+all_rubies = Bundler::Dependency::PLATFORM_MAP.keys
+ruby_19_plus               = [:ruby_19, :ruby_20, :ruby_21, :jruby] & all_rubies
+ruby_19_plus_without_jruby = [:ruby_19, :ruby_20, :ruby_21]         & all_rubies
+
 gem 'adsf'
 gem 'bluecloth', :platforms => :ruby
 gem 'builder'
@@ -9,19 +14,19 @@ gem 'coderay'
 gem 'compass'
 gem 'coffee-script'
 gem 'erubis'
-gem 'fog'
+gem 'fog', :platforms => ruby_19_plus
 gem 'haml'
-gem 'handlebars', :platforms => :ruby
+gem 'handlebars', :platforms => ruby_19_plus_without_jruby
 gem 'kramdown'
 gem 'less', '~> 2.0', :platforms => :ruby
-gem 'listen'
+gem 'listen', :platforms => ruby_19_plus
 gem 'markaby'
 gem 'maruku'
-gem 'mime-types'
+gem 'mime-types', :platforms => ruby_19_plus
 gem 'minitest', '~> 4.0'
 gem 'mocha'
 gem 'mustache'
-gem 'nokogiri', '~> 1.5.5'
+gem 'nokogiri', '~> 1.6'
 gem 'pandoc-ruby'
 gem 'pry'
 gem 'pygments.rb', :platforms => [:ruby, :mswin]
@@ -30,14 +35,16 @@ gem 'rake'
 gem 'rainpress'
 gem 'rdiscount', :platforms => [:ruby, :mswin]
 gem 'rdoc'
-gem 'redcarpet', :platforms => [:ruby, :mswin]
+gem 'redcarpet', :platforms => ruby_19_plus_without_jruby + [:mswin]
 gem 'RedCloth'
-gem 'rubocop'
+gem 'rubocop', :platforms => ruby_19_plus
 gem 'rubypants'
 gem 'sass', '~> 3.2.2'
 gem 'slim'
 gem 'typogruby'
 gem 'uglifier'
+gem 'vcr'
 gem 'w3c_validators'
-gem 'yuicompressor'
+gem 'webmock'
+gem 'yuicompressor', :platforms => ruby_19_plus
 gem 'yard'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.6.9)
+    nanoc (3.6.10)
       cri (~> 2.3)
 
 GEM
@@ -9,9 +9,10 @@ GEM
   specs:
     RedCloth (4.2.9)
     RedCloth (4.2.9-java)
+    addressable (2.3.6)
     adsf (1.2.0)
       rack (>= 1.0.0)
-    ast (1.1.0)
+    ast (2.0.0)
     bluecloth (2.2.0)
     builder (3.2.2)
     celluloid (0.15.2)
@@ -27,18 +28,20 @@ GEM
     coffee-script-source (1.7.0)
     colored (1.2)
     commonjs (0.2.7)
-    compass (0.12.5)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.2.19)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     cri (2.6.0)
       colored (~> 1.2)
     erubis (2.7.0)
-    excon (0.32.1)
+    excon (0.33.0)
     execjs (2.0.2)
     ffi (1.9.3)
     ffi (1.9.3-java)
-    fog (1.21.0)
+    fog (1.22.0)
       fog-brightbox
       fog-core (~> 1.21, >= 1.21.1)
       fog-json
@@ -46,10 +49,10 @@ GEM
     fog-brightbox (0.0.2)
       fog-core
       fog-json
-    fog-core (1.21.1)
+    fog-core (1.22.0)
       builder
-      excon (~> 0.32)
-      formatador (~> 0.2.0)
+      excon (~> 0.33)
+      formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
@@ -80,6 +83,7 @@ GEM
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (2.2)
+    mini_portile (0.5.3)
     minitest (4.7.5)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
@@ -90,11 +94,13 @@ GEM
     net-ssh (2.8.0)
     nio4r (1.0.0)
     nio4r (1.0.0-java)
-    nokogiri (1.5.11)
-    nokogiri (1.5.11-java)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    nokogiri (1.6.1-java)
+      mini_portile (~> 0.5.0)
     pandoc-ruby (0.7.5)
-    parser (2.1.7)
-      ast (~> 1.1)
+    parser (2.1.9)
+      ast (>= 1.1, < 3.0)
       slop (~> 3.4, >= 3.4.5)
     posix-spawn (0.3.8)
     powerpack (0.0.9)
@@ -113,7 +119,7 @@ GEM
     rack (1.5.2)
     rainbow (2.0.0)
     rainpress (1.0)
-    rake (10.2.2)
+    rake (10.3.1)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
@@ -130,6 +136,7 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.4.2)
     rubypants (0.2.0)
+    safe_yaml (1.0.3)
     sass (3.2.19)
     slim (2.0.2)
       temple (~> 0.6.6)
@@ -148,9 +155,13 @@ GEM
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    vcr (2.9.0)
     w3c_validators (1.2)
       json
       nokogiri
+    webmock (1.17.4)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
     yajl-ruby (1.1.0)
     yard (0.8.7.4)
     yuicompressor (1.3.3)
@@ -182,7 +193,7 @@ DEPENDENCIES
   mocha
   mustache
   nanoc!
-  nokogiri (~> 1.5.5)
+  nokogiri (~> 1.6)
   pandoc-ruby
   pry
   pygments.rb
@@ -198,6 +209,8 @@ DEPENDENCIES
   slim
   typogruby
   uglifier
+  vcr
   w3c_validators
+  webmock
   yard
   yuicompressor

data/NEWS.md

@@ -1,5 +1,19 @@
 # nanoc news
 
+## 3.6.10 (???)
+
+Fixes:
+
+* Fixed occasional "no such file" error on JRuby (#422)
+* Prevented multiple items and layouts from having the same identifier (#434, #435)
+
+Enhancements:
+
+* Set default encoding to UTF-8 (#428)
+* Improved checksummer to reduce number of unnecessary recompiles (#310, #431)
+* Disabled USR1 on JRuby in order to suppress warning (#425, #426)
+* Made pandoc filter argument passing more generic (#210, #433)
+
 ## 3.6.9 (2014-04-15)
 
 Fixes:

data/lib/nanoc/base.rb

@@ -7,12 +7,14 @@ module Nanoc
 
   # Load helper classes
   autoload 'Context',              'nanoc/base/context'
+  autoload 'Checksummer',          'nanoc/base/checksummer'
   autoload 'DirectedGraph',        'nanoc/base/directed_graph'
   autoload 'Errors',               'nanoc/base/errors'
   autoload 'Memoization',          'nanoc/base/memoization'
   autoload 'NotificationCenter',   'nanoc/base/notification_center'
   autoload 'PluginRegistry',       'nanoc/base/plugin_registry'
   autoload 'Store',                'nanoc/base/store'
+  autoload 'TempFilenameFactory',  'nanoc/base/temp_filename_factory'
 
   # Load source data classes
   autoload 'CodeSnippet',          'nanoc/base/source_data/code_snippet'

data/lib/nanoc/base/checksummer.rb

@@ -0,0 +1,82 @@
+# encoding: utf-8
+
+module Nanoc
+
+  # Creates checksums for given objects.
+  #
+  # A checksum is a string, such as “mL+TaqNsEeiPkWloPgCtAofT1yg=”, that is used
+  # to determine whether a piece of data has changed.
+  class Checksummer
+
+    class << self
+
+      # @param obj The object to create a checksum for
+      #
+      # @return [String] The digest
+      def calc(obj)
+        digest = Digest::SHA1.new
+        update(obj, digest)
+        digest.base64digest
+      end
+
+    private
+
+      def update(obj, digest)
+        digest.update(obj.class.to_s)
+
+        case obj
+        when String
+          digest.update(obj)
+        when Array
+          obj.each do |el|
+            digest.update('elem')
+            update(el, digest)
+          end
+        when Hash
+          obj.each do |key, value|
+            digest.update('key')
+            update(key, digest)
+            digest.update('value')
+            update(value, digest)
+          end
+        when Pathname
+          filename = obj.to_s
+          if File.exist?(filename)
+            stat = File.stat(filename)
+            digest.update(stat.size.to_s + '-' + stat.mtime.utc.to_s)
+          else
+            digest.update('???')
+          end
+        when Nanoc::RulesCollection
+          update(obj.data, digest)
+        when Nanoc::CodeSnippet
+          update(obj.data, digest)
+        when Nanoc::Item, Nanoc::Layout
+          digest.update('content')
+          if obj.respond_to?(:binary?) && obj.binary?
+            update(Pathname.new(obj.raw_filename), digest)
+          else
+            update(obj.raw_content, digest)
+          end
+
+          digest.update('attributes')
+          attributes = obj.attributes.dup
+          attributes.delete(:file)
+          update(attributes, digest)
+        else
+          data = begin
+            Marshal.dump(obj)
+          rescue
+            obj.inspect
+          end
+
+          digest.update(data)
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/nanoc/base/compilation/compiler.rb

@@ -90,9 +90,10 @@ module Nanoc
       dependency_tracker.stop
       store
     ensure
-      # Cleanup
-      FileUtils.rm_rf(Nanoc::Filter::TMP_BINARY_ITEMS_DIR)
-      FileUtils.rm_rf(Nanoc::ItemRep::TMP_TEXT_ITEMS_DIR)
+      Nanoc::TempFilenameFactory.instance.cleanup(
+        Nanoc::Filter::TMP_BINARY_ITEMS_DIR)
+      Nanoc::TempFilenameFactory.instance.cleanup(
+        Nanoc::ItemRep::TMP_TEXT_ITEMS_DIR)
     end
 
     # @group Private instance methods

data/lib/nanoc/base/compilation/filter.rb

@@ -28,8 +28,7 @@ module Nanoc
   # @abstract Subclass and override {#run} to implement a custom filter.
   class Filter < Context
 
-    # The path to the directory where temporary binary items are stored
-    TMP_BINARY_ITEMS_DIR = 'tmp/binary_items'
+    TMP_BINARY_ITEMS_DIR = 'binary_items'
 
     # A hash containing variables that will be made available during
     # filtering.
@@ -149,14 +148,8 @@ module Nanoc
     #
     # @return [String] The output filename
     def output_filename
-      @output_filename ||= begin
-        FileUtils.mkdir_p(TMP_BINARY_ITEMS_DIR)
-        tempfile = Tempfile.new('', TMP_BINARY_ITEMS_DIR)
-        new_filename = tempfile.path
-        tempfile.close!
-
-        File.expand_path(new_filename)
-      end
+      @output_filename ||=
+        Nanoc::TempFilenameFactory.instance.create(TMP_BINARY_ITEMS_DIR)
     end
 
     # Returns the filename associated with the item that is being filtered.

data/lib/nanoc/base/compilation/rules_collection.rb

@@ -7,6 +7,11 @@ module Nanoc
   # @api private
   class RulesCollection
 
+    # @return [String] the contents of the Rules file
+    #
+    # @api private
+    attr_accessor :data
+
     extend Nanoc::Memoization
 
     # @return [Array<Nanoc::Rule>] The list of item compilation rules that
@@ -161,7 +166,7 @@ module Nanoc
     # @return [String] The checksum for this object. If its contents change,
     #   the checksum will change as well.
     def checksum
-      @data.checksum
+      Nanoc::Checksummer.calc(self)
     end
 
     def inspect

data/lib/nanoc/base/core_ext/array.rb

@@ -64,7 +64,7 @@ module Nanoc::ArrayExtensions
   #
   # @api private
   def checksum
-    Marshal.dump(self).checksum
+    Nanoc::Checksummer.calc(self)
   end
 
 end

data/lib/nanoc/base/core_ext/hash.rb

@@ -66,8 +66,7 @@ module Nanoc::HashExtensions
   #
   # @api private
   def checksum
-    array = to_a.sort_by { |kv| kv[0].to_s }
-    array.checksum
+    Nanoc::Checksummer.calc(self)
   end
 
 end

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

@@ -9,8 +9,7 @@ module Nanoc::PathnameExtensions
   #
   # @api private
   def checksum
-    stat = File.stat(to_s)
-    stat.size.to_s + '-' + stat.mtime.to_s
+    Nanoc::Checksummer.calc(self)
   end
 
 end

data/lib/nanoc/base/core_ext/string.rb

@@ -16,9 +16,7 @@ module Nanoc::StringExtensions
   #
   # @api private
   def checksum
-    digest = Digest::SHA1.new
-    digest.update(self)
-    digest.hexdigest
+    Nanoc::Checksummer.calc(self)
   end
 
 end

data/lib/nanoc/base/errors.rb

@@ -221,6 +221,15 @@ module Nanoc
 
     end
 
+    # Error that is raised when multiple items or layouts with the same identifier exist.
+    class DuplicateIdentifier < Generic
+
+      def initialize(identifier, type)
+        super("There are multiple #{type}s with the #{identifier} identifier.")
+      end
+
+    end
+
   end
 
 end

data/lib/nanoc/base/result_data/item_rep.rb

@@ -149,15 +149,10 @@ module Nanoc
         Nanoc::NotificationCenter.post(:rep_written, self, raw_path, is_created, is_modified)
       end
 
-      TMP_TEXT_ITEMS_DIR = 'tmp/text_items'
+      TMP_TEXT_ITEMS_DIR = 'text_items'
 
       def temp_filename
-        FileUtils.mkdir_p(TMP_TEXT_ITEMS_DIR)
-        tempfile = Tempfile.new('', TMP_TEXT_ITEMS_DIR)
-        new_filename = tempfile.path
-        tempfile.close!
-
-        File.expand_path(new_filename)
+        Nanoc::TempFilenameFactory.instance.create(TMP_TEXT_ITEMS_DIR)
       end
 
       # Resets the compilation progress for this item representation. This is