nanoc 4.2.3 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 308b361e14b750d6171037c0167935bf806c7a5f
-  data.tar.gz: bf2db4108dc18dd6fa2602a3451ed5a2636af11e
+  metadata.gz: d71e907ef0318683da05fb81149422628b700007
+  data.tar.gz: 8d6e28866ff7dc184b6738005c55e4f368c2f74c
 SHA512:
-  metadata.gz: 820db95cb94318cca8afc1e6942f33e4131beb2bcc53eb0e4866079180dab65f6164e274117c53b88799b29bab3e069d245250b972a630bb5386dd3036f3a287
-  data.tar.gz: bdff99a92e4a2ff4ea4c6486bc3341728986ef259f5fe9c270c80355bf49d38d1cae5cf2f1c9b3178bce2c573313a423faca57009b7717ca1332abcab01019f1
+  metadata.gz: ef183242bffb54bc9875275146912a1bc7f3bc84ed51fa77b032ba986952a8bd6895e18170b2580e6131e8deaee0591a2df94769917ae4bd829a566310f529e7
+  data.tar.gz: bf46729b4e0e8e682327b553460f9e3611b76ef74627441d3f1189d155bd6f978da4b3668dc08cf06fec6c00ad6dcdf694f6b2afe19814cc7436efda5b7df18a

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'json', '~> 2.0'
+
 group :devel do
   gem 'contracts', '~> 0.14'
   gem 'coveralls', require: false

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    nanoc (4.2.3)
+    nanoc (4.2.4)
       cri (~> 2.3)
       hamster (~> 3.0)
+      ref (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -38,9 +39,9 @@ GEM
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.0.2)
     contracts (0.14.0)
-    coveralls (0.8.13)
-      json (~> 1.8)
-      simplecov (~> 0.11.0)
+    coveralls (0.8.14)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
@@ -51,9 +52,9 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    excon (0.50.1)
+    excon (0.51.0)
     execjs (2.7.0)
-    ffi (1.9.10)
+    ffi (1.9.14)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fog (1.38.0)
@@ -93,12 +94,12 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.9.4)
+    fog-aws (0.10.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.10.1)
+    fog-brightbox (0.11.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
@@ -107,7 +108,7 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.41.0)
+    fog-core (1.42.0)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
@@ -127,7 +128,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.0)
       fog-core (~> 1.27)
-    fog-openstack (0.1.7)
+    fog-openstack (0.1.8)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -158,7 +159,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.1.2)
+    fog-softlayer (1.1.3)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -183,7 +184,7 @@ GEM
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
-    fuubar (2.0.0)
+    fuubar (2.1.1)
       rspec (~> 3.0)
       ruby-progressbar (~> 1.4)
     guard (2.14.0)
@@ -209,7 +210,7 @@ GEM
     hashdiff (0.3.0)
     inflecto (0.0.2)
     ipaddress (0.8.3)
-    json (1.8.3)
+    json (2.0.1)
     kramdown (1.11.1)
     less (2.6.0)
       commonjs (~> 0.2.7)
@@ -246,7 +247,7 @@ GEM
     pkg-config (1.1.7)
     posix-spawn (0.3.11)
     powerpack (0.1.1)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -265,16 +266,15 @@ GEM
       nokogiri (>= 1.4.1)
       trollop
     rdiscount (2.2.0.1)
-    rdoc (4.2.2)
-      json (~> 1.4)
+    rdoc (4.2.1)
     redcarpet (3.3.4)
     ref (2.0.0)
-    rouge (2.0.2)
+    rouge (2.0.5)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.0)
+    rspec-core (3.5.1)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -283,7 +283,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.41.1)
+    rubocop (0.41.2)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -295,9 +295,9 @@ GEM
     safe_yaml (1.0.4)
     sass (3.4.22)
     shellany (0.0.1)
-    simplecov (0.11.2)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slim (3.0.7)
@@ -329,7 +329,7 @@ GEM
       hashdiff
     xml-simple (1.1.5)
     yajl-ruby (1.2.1)
-    yard (0.8.7.6)
+    yard (0.9.5)
     yuicompressor (1.3.3)
 
 PLATFORMS
@@ -352,6 +352,7 @@ DEPENDENCIES
   guard-rake
   haml
   handlebars
+  json (~> 2.0)
   kramdown
   less (~> 2.0)
   listen

data/NEWS.md

@@ -1,5 +1,18 @@
 # Nanoc news
 
+## 4.2.4 (2016-07-24)
+
+Fixes:
+
+* Fixed `UnmetDependency` errors in postprocessor (#913, #917)
+
+Enhancement:
+
+* Sped up Nanoc by not releasing cache memory as quickly (#902)
+* Let `internal_links` check also verify resource paths, such as scripts and images (#912) [Lorin Werthen]
+* Improved error reporting for errors in the Rules file (#908, #914, #915, #916)
+* Removed `win32console` support, as it’s deprecated and causing problems (#900, #918)
+
 ## 4.2.3 (2016-07-03)
 
 Fixes:

data/lib/nanoc.rb

@@ -22,6 +22,7 @@ end
 
 # Load external dependencies
 require 'hamster'
+require 'ref'
 
 # Load general requirements
 require 'digest'

data/lib/nanoc/base.rb

@@ -25,6 +25,7 @@ require_relative 'base/core_ext'
 require_relative 'base/contracts_support'
 
 require_relative 'base/entities'
+require_relative 'base/feature'
 require_relative 'base/repos'
 require_relative 'base/services'
 require_relative 'base/views'

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

@@ -191,8 +191,7 @@ module Nanoc::Int
       end
 
       # Find item reps to compile and compile them
-      outdated_reps = @reps.select { |r| outdatedness_checker.outdated?(r) }
-      selector = Nanoc::Int::ItemRepSelector.new(outdated_reps)
+      selector = Nanoc::Int::ItemRepSelector.new(@reps)
       selector.each do |rep|
         @stack = []
         compile_rep(rep)

data/lib/nanoc/base/feature.rb

@@ -0,0 +1,11 @@
+module Nanoc
+  # @api private
+  module Feature
+    TRUES = %w(y yes 1 t true).freeze
+
+    def self.enabled?(name)
+      env_name = "NANOC_FEATURE_#{name.upcase}"
+      TRUES.include?(ENV.fetch(env_name, 'f').downcase)
+    end
+  end
+end

data/lib/nanoc/base/memoization.rb

@@ -15,9 +15,12 @@ module Nanoc::Int
       end
 
       def inspect
-        @ref.inspect
-      rescue WeakRef::RefError
-        '<weak ref collected>'
+        obj = @ref.object
+        if obj
+          obj.inspect
+        else
+          '<garbage collected>'
+        end
       end
     end
 
@@ -75,17 +78,13 @@ module Nanoc::Int
 
         value = NONE
         if method_cache.key?(args)
-          value =
-            begin
-              method_cache[args].ref.value
-            rescue WeakRef::RefError
-              NONE
-            end
+          object = method_cache[args].ref.object
+          value = object ? object.value : NONE
         end
 
         if value.equal?(NONE)
           send(original_method_name, *args).tap do |r|
-            method_cache[args] = Wrapper.new(WeakRef.new(Value.new(r)))
+            method_cache[args] = Wrapper.new(Ref::SoftReference.new(Value.new(r)))
           end
         else
           value

data/lib/nanoc/cli.rb

@@ -6,13 +6,6 @@ rescue LoadError => e
   exit 1
 end
 
-if Nanoc.on_windows?
-  begin
-    require 'Win32/Console/ANSI'
-  rescue LoadError
-  end
-end
-
 # @api private
 module Nanoc::CLI
   module Commands
@@ -208,15 +201,7 @@ module Nanoc::CLI
 
   # @return [Boolean] true if color support is present, false if not
   def self.enable_ansi_colors?(io)
-    unless io.tty?
-      return false
-    end
-
-    if Nanoc.on_windows?
-      return defined?(::Win32::Console::ANSI)
-    end
-
-    true
+    io.tty?
   end
 
   def self.after_setup_procs

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

@@ -14,6 +14,7 @@ IDENTICAL - The item was deemed outdated and has been recompiled, but the compil
 SKIP - The item was deemed not outdated and was therefore not recompiled
 
 EOS
+flag nil, :profile, 'profile compilation' if Nanoc::Feature.enabled?('PROFILER')
 
 module Nanoc::CLI::Commands
   class Compile < ::Nanoc::CLI::CommandRunner
@@ -49,6 +50,18 @@ module Nanoc::CLI::Commands
       # @return [void]
       def stop
       end
+
+      # @api private
+      def start_safely
+        start
+        @_started = true
+      end
+
+      # @api private
+      def stop_safely
+        stop if @_started
+        @_started = false
+      end
     end
 
     # Generates diffs for every output file written
@@ -63,10 +76,10 @@ module Nanoc::CLI::Commands
         require 'tempfile'
         setup_diffs
         old_contents = {}
-        Nanoc::Int::NotificationCenter.on(:will_write_rep) do |rep, path|
+        Nanoc::Int::NotificationCenter.on(:will_write_rep, self) do |rep, path|
           old_contents[rep] = File.file?(path) ? File.read(path) : nil
         end
-        Nanoc::Int::NotificationCenter.on(:rep_written) do |rep, path, _is_created, _is_modified|
+        Nanoc::Int::NotificationCenter.on(:rep_written, self) do |rep, path, _is_created, _is_modified|
           unless rep.binary?
             new_contents = File.file?(path) ? File.read(path) : nil
             if old_contents[rep] && new_contents
@@ -80,6 +93,10 @@ module Nanoc::CLI::Commands
       # @see Listener#stop
       def stop
         super
+
+        Nanoc::Int::NotificationCenter.remove(:will_write_rep, self)
+        Nanoc::Int::NotificationCenter.remove(:rep_written, self)
+
         teardown_diffs
       end
 
@@ -350,6 +367,28 @@ module Nanoc::CLI::Commands
       end
     end
 
+    # Records a profile using StackProf
+    class StackProfProfiler < Listener
+      PROFILE_FILE = 'tmp/stackprof_profile'.freeze
+
+      # @see Listener#enable_for?
+      def self.enable_for?(command_runner)
+        command_runner.options.fetch(:profile, false)
+      end
+
+      # @see Listener#start
+      def start
+        require 'stackprof'
+        StackProf.start(mode: :cpu)
+      end
+
+      # @see Listener#stop
+      def stop
+        StackProf.stop
+        StackProf.results(PROFILE_FILE)
+      end
+    end
+
     attr_accessor :listener_classes
 
     def initialize(options, arguments, command)
@@ -388,6 +427,7 @@ module Nanoc::CLI::Commands
         Nanoc::CLI::Commands::Compile::TimingRecorder,
         Nanoc::CLI::Commands::Compile::GCController,
         Nanoc::CLI::Commands::Compile::FileActionPrinter,
+        Nanoc::CLI::Commands::Compile::StackProfProfiler,
       ]
     end
 
@@ -397,7 +437,7 @@ module Nanoc::CLI::Commands
         .select { |klass| klass.enable_for?(self) }
         .map    { |klass| klass.new(reps: reps) }
 
-      @listeners.each(&:start)
+      @listeners.each(&:start_safely)
     end
 
     def listeners
@@ -412,7 +452,7 @@ module Nanoc::CLI::Commands
     end
 
     def teardown_listeners
-      @listeners.each(&:stop)
+      @listeners.each(&:stop_safely)
     end
 
     def reps

data/lib/nanoc/extra/checking/checks/internal_links.rb

@@ -15,7 +15,10 @@ module Nanoc::Extra::Checking::Checks
       # TODO: de-duplicate this (duplicated in external links check)
       filenames = output_filenames.select { |f| File.extname(f) == '.html' }
       hrefs_with_filenames = ::Nanoc::Extra::LinkCollector.new(filenames, :internal).filenames_per_href
-      hrefs_with_filenames.each_pair do |href, fns|
+      resource_uris_with_filenames = ::Nanoc::Extra::LinkCollector.new(filenames, :internal).filenames_per_resource_uri
+
+      uris = hrefs_with_filenames.merge(resource_uris_with_filenames)
+      uris.each_pair do |href, fns|
         fns.each do |filename|
           next if valid?(href, filename)
 

data/lib/nanoc/rule_dsl/recording_executor.rb

@@ -22,6 +22,10 @@ module Nanoc
       end
 
       def layout(_rep, layout_identifier, extra_filter_args = {})
+        unless layout_identifier.is_a?(String)
+          raise ArgumentError.new('The layout passed to #layout must be a string')
+        end
+
         unless @rule_memory.any_layouts?
           @rule_memory.add_snapshot(:pre, true, nil)
         end

data/lib/nanoc/rule_dsl/rule_memory_calculator.rb

@@ -12,6 +12,18 @@ module Nanoc::RuleDSL
       end
     end
 
+    class NoRuleMemoryForLayoutException < ::Nanoc::Error
+      def initialize(layout)
+        super("There is no layout rule specified for #{layout.inspect}")
+      end
+    end
+
+    class NoRuleMemoryForItemRepException < ::Nanoc::Error
+      def initialize(item)
+        super("There is no compilation rule specified for #{item.inspect}")
+      end
+    end
+
     # @api private
     attr_accessor :rules_collection
 
@@ -57,14 +69,16 @@ module Nanoc::RuleDSL
     #
     # @return [Nanoc::Int::RuleMemory]
     def new_rule_memory_for_rep(rep)
-      # FIXME: What if #compilation_rule_for returns nil?
-
       dependency_tracker = Nanoc::Int::DependencyTracker::Null.new
       view_context = @site.compiler.create_view_context(dependency_tracker)
 
       executor = Nanoc::RuleDSL::RecordingExecutor.new(rep, @rules_collection, @site)
       rule = @rules_collection.compilation_rule_for(rep)
 
+      unless rule
+        raise NoRuleMemoryForItemRepException.new(rep)
+      end
+
       executor.snapshot(rep, :raw)
       executor.snapshot(rep, :pre, final: false)
       rule.apply_to(rep, executor: executor, site: @site, view_context: view_context)
@@ -83,7 +97,11 @@ module Nanoc::RuleDSL
     # @return [Nanoc::Int::RuleMemory]
     def new_rule_memory_for_layout(layout)
       res = @rules_collection.filter_for_layout(layout)
-      # FIXME: what if res is nil?
+
+      unless res
+        raise NoRuleMemoryForLayoutException.new(layout)
+      end
+
       Nanoc::Int::RuleMemory.new(layout).tap do |rm|
         rm.add_filter(res[0], res[1])
       end

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.2.3'.freeze
+  VERSION = '4.2.4'.freeze
 end

data/nanoc.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('cri', '~> 2.3')
   s.add_runtime_dependency('hamster', '~> 3.0')
+  s.add_runtime_dependency('ref', '~> 2.0')
 
   s.add_development_dependency('bundler', '>= 1.7.10', '< 2.0')
 end

data/test/base/test_compiler.rb

@@ -208,6 +208,21 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
     end
   end
 
+  def test_compile_should_recompile_all_reps
+    Nanoc::CLI.run %w(create_site bar)
+
+    FileUtils.cd('bar') do
+      Nanoc::CLI.run %w(compile)
+
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compile
+
+      # At this point, even the already compiled items in the previous pass
+      # should have their compiled content assigned, so this should work:
+      site.compiler.reps[site.items['/index.*']][0].compiled_content
+    end
+  end
+
   def test_disallow_multiple_snapshots_with_the_same_name
     # Create site
     Nanoc::CLI.run %w(create_site bar)

data/test/extra/checking/checks/test_internal_links.rb

@@ -16,6 +16,21 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < Nanoc::TestCase
     end
   end
 
+  def test_resource_uris
+    with_site do |site|
+      # Create files
+      FileUtils.mkdir_p('output')
+      File.open('output/bar.html', 'w') { |io| io.write('<link rel="stylesheet" href="/styledinges.css">') }
+
+      # Create check
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.create(site)
+      check.run
+
+      # Test
+      assert check.issues.size == 1
+    end
+  end
+
   def test_valid?
     with_site do |site|
       # Create files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ref
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,7 @@ files:
 - lib/nanoc/base/entities/snapshot_def.rb
 - lib/nanoc/base/error.rb
 - lib/nanoc/base/errors.rb
+- lib/nanoc/base/feature.rb
 - lib/nanoc/base/memoization.rb
 - lib/nanoc/base/plugin_registry.rb
 - lib/nanoc/base/repos.rb
@@ -392,4 +407,3 @@ signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.
 test_files: []
-has_rdoc: