nanoc 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3e14d0707707719b3f4d5d8e7df33084eb0d507
-  data.tar.gz: 2c8e065ee1515381e157a0720f18c25824abe980
+  metadata.gz: fd86fc55ceec9ba602815f93e624bd54c07d40fe
+  data.tar.gz: 112408b4eeb610c80a18acecd4ed9c2216cbb084
 SHA512:
-  metadata.gz: b4c7b4c384739c7f9163344701e78341f54c101987d52e955ff012ea45f383fbe37587b44967817436dea59c35c10ba3270cc31104f4203474c7bd3869af6406
-  data.tar.gz: 0e1fa2d68b5db87fe2ef2e71b63dbebc496bc5c038ccdeed17bb03b6236b26822e307013ddb9b4a8032220a34e495d952a42d55cdfa1c602b246746e6ec6b864
+  metadata.gz: 00c8461d90463a7c21225138a56f3a5ef2bd8f682f105a0319353cdea1d021a4c8b04116011ea865cf1847b4a26870e1d67f84b51fc7786e561c5ddfc124a580
+  data.tar.gz: 3a82634d317ddd970232ba19460e5c48d2046e41ab61925990b0e833cdc736c8b1dada7d0e8dcf183e1cfe6a2fa54933ff826d7d58f77c673fe2e59521773fcd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.1.1)
+    nanoc (4.1.2)
       cri (~> 2.3)
 
 GEM
@@ -13,8 +13,6 @@ GEM
     adsf (1.2.0)
       rack (>= 1.0.0)
     ast (2.2.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
     bluecloth (2.2.0)
     builder (3.2.2)
     chunky_png (1.3.5)
@@ -92,7 +90,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.7.6)
+    fog-aws (0.8.1)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -129,7 +127,7 @@ GEM
       fog-core
       fog-xml
       nokogiri
-    fog-radosgw (0.0.4)
+    fog-radosgw (0.0.5)
       fog-core (>= 1.21.0)
       fog-json
       fog-xml (>= 0.0.1)
@@ -143,7 +141,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.0.2)
+    fog-softlayer (1.0.3)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -161,7 +159,7 @@ GEM
     fog-vsphere (0.4.0)
       fog-core
       rbvmomi (~> 1.8)
-    fog-xenserver (0.2.2)
+    fog-xenserver (0.2.3)
       fog-core
       fog-xml
     fog-xml (0.1.2)
@@ -190,7 +188,7 @@ GEM
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     inflecto (0.0.2)
-    ipaddress (0.8.0)
+    ipaddress (0.8.2)
     json (1.8.3)
     kramdown (1.9.0)
     less (2.6.0)
@@ -199,7 +197,7 @@ GEM
     listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
+    lumberjack (1.0.10)
     markaby (0.8.0)
       builder
     maruku (0.7.2)
@@ -220,8 +218,8 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (1.0.0)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
+    parser (2.3.0.1)
+      ast (~> 2.2)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
     pry (0.10.3)
@@ -234,7 +232,7 @@ GEM
     rack (1.6.4)
     rainbow (2.0.0)
     rainpress (1.0)
-    rake (10.4.2)
+    rake (10.5.0)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
@@ -260,21 +258,19 @@ GEM
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+    rspec-mocks (3.4.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
+    rubocop (0.36.0)
+      parser (>= 2.3.0.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
     ruby-progressbar (1.7.5)
     rubypants (0.2.0)
     safe_yaml (1.0.4)
-    sass (3.4.20)
+    sass (3.4.21)
     shellany (0.0.1)
     simplecov (0.11.1)
       docile (~> 1.1.0)
@@ -292,7 +288,7 @@ GEM
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
-    tilt (2.0.1)
+    tilt (2.0.2)
     tins (1.6.0)
     trollop (2.1.2)
     typogruby (1.0.18)
@@ -307,7 +303,7 @@ GEM
     w3c_validators (1.2)
       json
       nokogiri
-    webmock (1.22.3)
+    webmock (1.22.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2015 Denis Defreyne and contributors
+Copyright (c) 2007-2016 Denis Defreyne and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/NEWS.md

@@ -1,5 +1,16 @@
 # Nanoc news
 
+## 4.1.2 (2016-01-16)
+
+Fixes:
+
+* Made @-variables (e.g. `@items`) report their frozenness properly, so that optimisations based on frozenness work once again (#795, #797)
+* Removed environment from `crash.log` to prevent leaking sensitive information (#798, #800)
+
+Enhancements:
+
+* Removed redundant checksum calculation (#789) [Ruben Verborgh]
+
 ## 4.1.1 (2015-12-30)
 
 Fixes:

data/lib/nanoc.rb

@@ -7,7 +7,7 @@ module Nanoc
     gem_info = defined?(Gem) ? "with RubyGems #{Gem::VERSION}" : 'without RubyGems'
     engine   = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
     res = ''
-    res << "Nanoc #{Nanoc::VERSION} © 2007-2015 Denis Defreyne.\n"
+    res << "Nanoc #{Nanoc::VERSION} © 2007-2016 Denis Defreyne.\n"
     res << "Running #{engine} #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) on #{RUBY_PLATFORM} #{gem_info}.\n"
     res
   end

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

@@ -148,11 +148,12 @@ module Nanoc::Int
     #
     # @api private
     def assigns_for(rep)
-      if rep.binary?
-        content_or_filename_assigns = { filename: rep.snapshot_contents[:last].filename }
-      else
-        content_or_filename_assigns = { content: rep.snapshot_contents[:last].string }
-      end
+      content_or_filename_assigns =
+        if rep.binary?
+          { filename: rep.snapshot_contents[:last].filename }
+        else
+          { content: rep.snapshot_contents[:last].string }
+        end
 
       view_context = create_view_context
 

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

@@ -25,7 +25,7 @@ module Nanoc
   # @abstract Subclass and override {#run} to implement a custom filter.
   class Filter < Nanoc::Int::Context
     # @api private
-    TMP_BINARY_ITEMS_DIR = 'binary_items'
+    TMP_BINARY_ITEMS_DIR = 'binary_items'.freeze
 
     # A hash containing variables that will be made available during
     # filtering.

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

@@ -172,12 +172,20 @@ module Nanoc::Int
     end
     memoize :rule_memory_differs_for
 
+    # @param obj The object to create a checksum for
+    #
+    # @return [String] The digest
+    def calc_checksum(obj)
+      Nanoc::Int::Checksummer.calc(obj)
+    end
+    memoize :calc_checksum
+
     # @param obj
     #
     # @return [Boolean] false if either the new or the old checksum for the
     #   given object is not available, true if both checksums are available
     def checksums_available?(obj)
-      checksum_store[obj] && Nanoc::Int::Checksummer.calc(obj)
+      checksum_store[obj] && calc_checksum(obj)
     end
     memoize :checksums_available?
 
@@ -186,7 +194,7 @@ module Nanoc::Int
     # @return [Boolean] false if the old and new checksums for the given
     #   object differ, true if they are identical
     def checksums_identical?(obj)
-      checksum_store[obj] == Nanoc::Int::Checksummer.calc(obj)
+      checksum_store[obj] == calc_checksum(obj)
     end
     memoize :checksums_identical?
 

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

@@ -23,7 +23,7 @@ module Nanoc::ArrayExtensions
   #
   # @since 3.2.0
   def __nanoc_freeze_recursively
-    return if self.frozen?
+    return if frozen?
     freeze
     each do |value|
       if value.respond_to?(:__nanoc_freeze_recursively)

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

@@ -25,7 +25,7 @@ module Nanoc::HashExtensions
   #
   # @since 3.2.0
   def __nanoc_freeze_recursively
-    return if self.frozen?
+    return if frozen?
     freeze
     each_pair do |_key, value|
       if value.respond_to?(:__nanoc_freeze_recursively)

data/lib/nanoc/base/entities/configuration.rb

@@ -3,7 +3,7 @@ module Nanoc::Int
   #
   # @api private
   class Configuration
-    NONE = Object.new
+    NONE = Object.new.freeze
 
     # The default configuration for a data source. A data source's
     # configuration overrides these options.
@@ -13,7 +13,7 @@ module Nanoc::Int
       layouts_root: '/',
       config: {},
       identifier_type: 'full',
-    }
+    }.freeze
 
     # The default configuration for a site. A site's configuration overrides
     # these options: when a {Nanoc::Int::Site} is created with a configuration
@@ -29,7 +29,7 @@ module Nanoc::Int
       enable_output_diff: false,
       prune: { auto_prune: false, exclude: ['.git', '.hg', '.svn', 'CVS'] },
       string_pattern_type: 'glob',
-    }
+    }.freeze
 
     # Creates a new configuration with the given hash.
     #
@@ -88,7 +88,8 @@ module Nanoc::Int
       self
     end
 
-    def __nanoc_freeze_recursively
+    def freeze
+      super
       @wrapped.__nanoc_freeze_recursively
     end
 

data/lib/nanoc/base/entities/document.rb

@@ -47,7 +47,7 @@ module Nanoc
       def ==(other)
         other.respond_to?(:identifier) && identifier == other.identifier
       end
-      alias_method :eql?, :==
+      alias eql? ==
     end
   end
 end

data/lib/nanoc/base/entities/identifiable_collection.rb

@@ -18,6 +18,7 @@ module Nanoc::Int
 
     def freeze
       @objects.freeze
+      @objects.each(&:freeze)
       build_mapping
       super
     end
@@ -50,7 +51,7 @@ module Nanoc::Int
     protected
 
     def object_with_identifier(identifier)
-      if self.frozen?
+      if frozen?
         @mapping[identifier.to_s]
       else
         @objects.find { |i| i.identifier == identifier }

data/lib/nanoc/base/entities/identifier.rb

@@ -72,7 +72,7 @@ module Nanoc
         false
       end
     end
-    alias_method :eql?, :==
+    alias eql? ==
 
     def hash
       self.class.hash ^ to_s.hash

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

@@ -6,7 +6,7 @@ module Nanoc::Int
 
     # @return [Boolean]
     attr_accessor :compiled
-    alias_method :compiled?, :compiled
+    alias compiled? compiled
 
     # @return [Hash<Symbol,String>]
     attr_accessor :raw_paths
@@ -25,7 +25,7 @@ module Nanoc::Int
 
     # @return [Boolean]
     attr_accessor :modified
-    alias_method :modified?, :modified
+    alias modified? modified
 
     # @param [Nanoc::Int::Item] item
     #
@@ -82,7 +82,7 @@ module Nanoc::Int
         when :pre
           snapshot_def.nil? || !snapshot_def.final?
         end
-      is_usable_snapshot = @snapshot_contents[snapshot_name] && (self.compiled? || !is_still_moving)
+      is_usable_snapshot = @snapshot_contents[snapshot_name] && (compiled? || !is_still_moving)
       unless is_usable_snapshot
         raise Nanoc::Int::Errors::UnmetDependency.new(self)
       end
@@ -99,7 +99,7 @@ module Nanoc::Int
     def snapshot?(snapshot_name)
       !@snapshot_contents[snapshot_name].nil?
     end
-    alias_method :has_snapshot?, :snapshot?
+    alias has_snapshot? snapshot?
 
     # Returns the item rep’s raw path. It includes the path to the output
     # directory and the full filename.
@@ -145,7 +145,7 @@ module Nanoc::Int
     end
 
     def inspect
-      "<#{self.class} name=\"#{name}\" binary=#{self.binary?} raw_path=\"#{raw_path}\" item.identifier=\"#{item.identifier}\">"
+      "<#{self.class} name=\"#{name}\" binary=#{binary?} raw_path=\"#{raw_path}\" item.identifier=\"#{item.identifier}\">"
     end
 
     private

data/lib/nanoc/base/entities/rule_memory_action.rb

@@ -12,7 +12,7 @@ module Nanoc::Int
       format(
         '<%s %s>',
         self.class.to_s,
-        serialize[1..-1].map(&:inspect).join(', ')
+        serialize[1..-1].map(&:inspect).join(', '),
       )
     end
   end

data/lib/nanoc/base/entities/rule_memory_actions/snapshot.rb

@@ -7,7 +7,7 @@ module Nanoc::Int::RuleMemoryActions
     attr_reader :snapshot_name
     attr_reader :final
     attr_reader :path
-    alias_method :final?, :final
+    alias final? final
 
     def initialize(snapshot_name, final, path)
       @snapshot_name = snapshot_name

data/lib/nanoc/base/entities/site.rb

@@ -41,9 +41,10 @@ module Nanoc::Int
     #
     # @return [void]
     def freeze
-      config.__nanoc_freeze_recursively
-      items.each(&:freeze)
-      layouts.each(&:freeze)
+      config.freeze
+      items.freeze
+      layouts.freeze
+      code_snippets.__nanoc_freeze_recursively
     end
 
     def ensure_identifier_uniqueness(objects, type)

data/lib/nanoc/base/repos/site_loader.rb

@@ -12,6 +12,11 @@ module Nanoc::Int
       site_from_config(Nanoc::Int::ConfigLoader.new.new_from_cwd)
     end
 
+    # @return [Boolean]
+    def self.cwd_is_nanoc_site?
+      Nanoc::Int::ConfigLoader.cwd_is_nanoc_site?
+    end
+
     private
 
     def site_from_config(config)
@@ -42,11 +47,6 @@ module Nanoc::Int
       )
     end
 
-    # @return [Boolean]
-    def self.cwd_is_nanoc_site?
-      Nanoc::Int::ConfigLoader.cwd_is_nanoc_site?
-    end
-
     def with_data_sources(config, &_block)
       data_sources = create_data_sources(config)
 

data/lib/nanoc/base/services/executor.rb

@@ -34,11 +34,12 @@ module Nanoc
           last = rep.snapshot_contents[:last]
           source = rep.binary? ? last.filename : last.string
           result = filter.setup_and_run(source, filter_args)
-          if klass.to_binary?
-            rep.snapshot_contents[:last] = Nanoc::Int::BinaryContent.new(filter.output_filename).tap(&:freeze)
-          else
-            rep.snapshot_contents[:last] = Nanoc::Int::TextualContent.new(result).tap(&:freeze)
-          end
+          rep.snapshot_contents[:last] =
+            if klass.to_binary?
+              Nanoc::Int::BinaryContent.new(filter.output_filename).tap(&:freeze)
+            else
+              Nanoc::Int::TextualContent.new(result).tap(&:freeze)
+            end
 
           # Check whether file was written
           if klass.to_binary? && !File.file?(filter.output_filename)