nanoc 4.3.7 → 4.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d052e7d5720a345ca133515b628b273f7ab649f
-  data.tar.gz: aeba9202e6a052fc7f43743a95bd5d624cbd3da8
+  metadata.gz: 8471fc905ae1f77b95c08da9253b6f4dcf20c85c
+  data.tar.gz: a944c679e283c221ec1c3f67270ceee7805f472a
 SHA512:
-  metadata.gz: 873ae8427b92df4ca6e3cdffd6636ecb860ecfd092085f9a657725cce83e9cc839287b9860b76100c083cba1bd831eddc50f7e6bbe9bcc77d3290d5dee060607
-  data.tar.gz: '094be294404797042fb05beb21497887b828aa6ad58b37d76b29e110d90ecf60685394aee6a5d03d3debc119f69f928faf955ee6e5ec05323737c78466bd17ef'
+  metadata.gz: 6e5e7d17725da1b15847d97fdead9b4f734c9b0865060124a84e8c8a5e0a832267ebe4575a781daa959657b36cf55b81b2e0b6a49f9e3afd8ba77d0438d4c1af
+  data.tar.gz: 648f66ee103dcf20b6b91f974528b4ce17cdc3f7c2c64de3df45e6377d306e3724f3874689e5706edf515022ec89caa8862901a1373d8b61c2a7bb71696492c0

data/Appraisals

@@ -0,0 +1,11 @@
+appraise 'rouge-1' do
+  group :plugins do
+    gem 'rouge', '~> 1.0'
+  end
+end
+
+appraise 'rouge-2' do
+  group :plugins do
+    gem 'rouge', '~> 2.0'
+  end
+end

data/Gemfile

@@ -2,22 +2,22 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'json', '~> 2.0'
-
 group :devel do
   gem 'contracts', '~> 0.14'
   gem 'coveralls', require: false
-  gem 'guard-rake'
   gem 'fuubar'
+  gem 'guard-rake'
+  gem 'json', '~> 2.0'
   gem 'minitest', '~> 5.0'
   gem 'mocha'
   gem 'pry'
   gem 'rake'
-  gem 'rdoc'
-  gem 'rspec'
+  gem 'rdoc', '~> 5.0'
   gem 'rspec-mocks'
+  gem 'rspec'
   gem 'rubocop'
   gem 'simplecov', require: false
+  gem 'timecop'
   gem 'vcr'
   gem 'webmock'
   gem 'yard'
@@ -44,7 +44,7 @@ group :plugins do
   gem 'nokogiri', '~> 1.6'
   gem 'pandoc-ruby'
   gem 'parallel'
-  gem 'pygments.rb', platforms: [:ruby, :mswin]
+  gem 'pygments.rb', github: 'tmm1/pygments.rb', platforms: [:ruby, :mswin]
   gem 'rack'
   gem 'rainpress'
   gem 'rdiscount', '~> 2.2', platforms: [:ruby, :mswin]

data/Gemfile.lock

@@ -1,7 +1,15 @@
+GIT
+  remote: git://github.com/tmm1/pygments.rb.git
+  revision: 4ed8701d65f6db7d8778cc56291999a0a87c7eda
+  specs:
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2)
+
 PATH
   remote: .
   specs:
-    nanoc (4.3.7)
+    nanoc (4.3.8)
       cri (~> 2.3)
       hamster (~> 3.0)
       parallel (~> 1.9)
@@ -12,13 +20,18 @@ GEM
   specs:
     CFPropertyList (2.3.3)
     RedCloth (4.3.2)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     adsf (1.2.1)
       rack (>= 1.0.0)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
     ast (2.3.0)
     bluecloth (2.2.0)
     builder (3.2.2)
-    chunky_png (1.3.7)
+    chunky_png (1.3.8)
     coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
@@ -129,7 +142,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.1)
       fog-core (~> 1.27)
-    fog-openstack (0.1.15)
+    fog-openstack (0.1.17)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -137,10 +150,10 @@ GEM
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (2.0.1)
+    fog-profitbricks (3.0.0)
       fog-core (~> 1.42)
       fog-json (~> 1.0)
-    fog-rackspace (0.1.1)
+    fog-rackspace (0.1.2)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
@@ -174,7 +187,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.5.0)
+    fog-vsphere (1.5.1)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
@@ -206,7 +219,7 @@ GEM
     handlebars (0.8.0)
       handlebars-source (~> 4.0.5)
       therubyracer (~> 0.12.1)
-    handlebars-source (4.0.5)
+    handlebars-source (4.0.6)
     hashdiff (0.3.0)
     inflecto (0.0.2)
     ipaddress (0.8.3)
@@ -244,15 +257,13 @@ GEM
     parallel (1.9.0)
     parser (2.3.1.4)
       ast (~> 2.2)
-    posix-spawn (0.3.11)
+    posix-spawn (0.3.12)
     powerpack (0.1.1)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
+    public_suffix (2.0.4)
     rack (2.0.1)
     rainbow (2.1.0)
     rainpress (1.0)
@@ -266,10 +277,10 @@ GEM
       nokogiri (~> 1.5)
       trollop (~> 2.1)
     rdiscount (2.2.0.1)
-    rdoc (4.2.1)
+    rdoc (5.0.0)
     redcarpet (3.3.4)
     ref (2.0.0)
-    rouge (2.0.6)
+    rouge (2.0.7)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -283,7 +294,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.44.1)
+    rubocop (0.45.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -312,6 +323,7 @@ GEM
       ref
     thor (0.19.1)
     tilt (2.0.5)
+    timecop (0.8.1)
     tins (1.12.0)
     trollop (2.1.2)
     typogruby (1.0.18)
@@ -328,7 +340,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff
     xml-simple (1.1.5)
-    yajl-ruby (1.2.1)
+    yajl-ruby (1.3.0)
     yard (0.9.5)
     yuicompressor (1.3.3)
 
@@ -338,6 +350,7 @@ PLATFORMS
 DEPENDENCIES
   RedCloth
   adsf
+  appraisal (~> 2.1)
   bluecloth
   builder
   bundler (>= 1.7.10, < 2.0)
@@ -367,12 +380,12 @@ DEPENDENCIES
   pandoc-ruby
   parallel
   pry
-  pygments.rb
+  pygments.rb!
   rack
   rainpress
   rake
   rdiscount (~> 2.2)
-  rdoc
+  rdoc (~> 5.0)
   redcarpet
   rouge
   rspec
@@ -382,6 +395,7 @@ DEPENDENCIES
   sass
   simplecov
   slim
+  timecop
   typogruby
   uglifier
   vcr

data/NEWS.md

@@ -1,5 +1,19 @@
 # Nanoc news
 
+## 4.3.8 (2016-11-18)
+
+Enhancements:
+
+* Improved support for Rouge 1.x and 2.x (#880) [Rémi Barraquand]
+* Added `#include` to the `nanoc shell` command (#973)
+* Improved speed of full and incremental compilations (#977, #985)
+
+Fixes:
+
+* Made routing rules and `#write` calls accept an identifier, and not just a string (#976)
+* Removed GC speed-up hacks, which became counterproductive in Ruby 2.2 (#975)
+* Fixed issue which caused items to be always recompiled if `rep`/`item_rep` or `self` are used in those items’ rules (#982)
+
 ## 4.3.7 (2016-10-29)
 
 Fixes:

data/Rakefile

@@ -1,3 +1,32 @@
-Rake.add_rakelib 'tasks'
+require 'rubocop/rake_task'
+require 'rspec/core/rake_task'
+require 'rake/testtask'
+require 'coveralls/rake/task'
+
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.options  = %w(--display-cop-names --format simple)
+  task.patterns = ['bin/nanoc', 'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb']
+end
+
+Coveralls::RakeTask.new
+
+SUBDIRS = %w(* base cli data_sources extra filters helpers).freeze
+
+namespace :test do
+  SUBDIRS.each do |dir|
+    Rake::TestTask.new(dir == '*' ? 'all' : dir) do |t|
+      t.test_files = Dir["test/#{dir}/**/*_spec.rb"] + Dir["test/#{dir}/**/test_*.rb"]
+      t.libs = ['./lib', '.']
+      t.ruby_opts = ['-r./test/helper']
+    end
+  end
+end
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = false
+end
+
+desc 'Run all tests and specs'
+task test: [:spec, :'test:all', :'coveralls:push']
 
 task default: [:test, :rubocop]

data/lib/nanoc.rb

@@ -27,6 +27,7 @@ require 'ref'
 # Load general requirements
 require 'digest'
 require 'enumerator'
+require 'fiber'
 require 'fileutils'
 require 'forwardable'
 require 'pathname'
@@ -41,6 +42,8 @@ require 'English'
 # Load Nanoc
 require 'nanoc/version'
 require 'nanoc/base'
+require 'nanoc/checking'
+require 'nanoc/deploying'
 require 'nanoc/extra'
 require 'nanoc/data_sources'
 require 'nanoc/filters'

data/lib/nanoc/base/checksummer.rb

@@ -72,6 +72,8 @@ module Nanoc::Int
           HashUpdateBehavior
         when Nanoc::Int::Item, Nanoc::Int::Layout
           DocumentUpdateBehavior
+        when Nanoc::Int::ItemRep
+          ItemRepUpdateBehavior
         when NilClass, TrueClass, FalseClass
           NoUpdateBehavior
         when Time
@@ -84,12 +86,29 @@ module Nanoc::Int
           StringUpdateBehavior
         when Nanoc::View
           UnwrapUpdateBehavior
+        when Nanoc::RuleDSL::RuleContext
+          RuleContextUpdateBehavior
         else
           RescueUpdateBehavior
         end
       end
     end
 
+    class RuleContextUpdateBehavior
+      def self.update(obj, digest)
+        digest.update('item=')
+        yield(obj.item)
+        digest.update(',rep=')
+        yield(obj.rep)
+        digest.update(',items=')
+        yield(obj.items)
+        digest.update(',layouts=')
+        yield(obj.layouts)
+        digest.update(',config=')
+        yield(obj.config)
+      end
+    end
+
     class UpdateBehavior
       def self.update(_obj, _digest)
         raise NotImpementedError
@@ -174,6 +193,15 @@ module Nanoc::Int
       end
     end
 
+    class ItemRepUpdateBehavior < UpdateBehavior
+      def self.update(obj, digest)
+        digest.update('item=')
+        yield(obj.item)
+        digest.update(',name=')
+        yield(obj.name)
+      end
+    end
+
     class PathnameUpdateBehavior < UpdateBehavior
       def self.update(obj, digest)
         filename = obj.to_s

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

@@ -183,7 +183,7 @@ module Nanoc::Int
 
     def prune
       if site.config[:prune][:auto_prune]
-        Nanoc::Extra::Pruner.new(site, exclude: prune_config_exclude).run
+        Nanoc::Pruner.new(site.config, reps, exclude: prune_config_exclude).run
       end
     end
 
@@ -227,30 +227,44 @@ module Nanoc::Int
     #
     # @return [void]
     def compile_rep(rep)
-      dependency_tracker = Nanoc::Int::DependencyTracker.new(@dependency_store)
+      @fibers ||= {}
+      @fibers[rep] ||=
+        Fiber.new do
+          begin
+            dependency_tracker = Nanoc::Int::DependencyTracker.new(@dependency_store)
+            dependency_tracker.enter(rep.item)
+
+            if can_reuse_content_for_rep?(rep)
+              Nanoc::Int::NotificationCenter.post(:cached_content_used, rep)
+              rep.snapshot_contents = compiled_content_cache[rep]
+            else
+              recalculate_content_for_rep(rep, dependency_tracker)
+            end
+
+            rep.compiled = true
+            compiled_content_cache[rep] = rep.snapshot_contents
+
+            @fibers.delete(rep)
+          ensure
+            dependency_tracker.exit(rep.item)
+          end
+        end
 
-      Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
-      Nanoc::Int::NotificationCenter.post(:processing_started,  rep)
-      dependency_tracker.enter(rep.item)
+      fiber = @fibers[rep]
+      while fiber.alive?
+        Nanoc::Int::NotificationCenter.post(:processing_started, rep)
+        Nanoc::Int::NotificationCenter.post(:compilation_started, rep)
+        res = fiber.resume
 
-      if can_reuse_content_for_rep?(rep)
-        Nanoc::Int::NotificationCenter.post(:cached_content_used, rep)
-        rep.snapshot_contents = compiled_content_cache[rep]
-      else
-        recalculate_content_for_rep(rep, dependency_tracker)
+        if res.is_a?(Nanoc::Int::Errors::UnmetDependency)
+          Nanoc::Int::NotificationCenter.post(:compilation_suspended, rep, res)
+          Nanoc::Int::NotificationCenter.post(:processing_ended, rep)
+          raise(res)
+        end
       end
 
-      rep.compiled = true
-      compiled_content_cache[rep] = rep.snapshot_contents
-
-      Nanoc::Int::NotificationCenter.post(:processing_ended,  rep)
       Nanoc::Int::NotificationCenter.post(:compilation_ended, rep)
-    rescue => e
-      rep.forget_progress
-      Nanoc::Int::NotificationCenter.post(:compilation_failed, rep, e)
-      raise e
-    ensure
-      dependency_tracker.exit(rep.item)
+      Nanoc::Int::NotificationCenter.post(:processing_ended, rep)
     end
 
     # @return [Boolean]

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

@@ -200,7 +200,7 @@ module Nanoc
       # Raise unmet dependency error if necessary
       items.each do |item|
         rep = orig_items.sample._context.reps[item].find { |r| !r.compiled? }
-        raise Nanoc::Int::Errors::UnmetDependency.new(rep) if rep
+        Fiber.yield(Nanoc::Int::Errors::UnmetDependency.new(rep)) if rep
       end
     end
   end

data/lib/nanoc/base/context.rb

@@ -40,5 +40,10 @@ module Nanoc::Int
     def get_binding
       binding
     end
+
+    def include(mod)
+      metaclass = class << self; self; end
+      metaclass.instance_eval { include(mod) }
+    end
   end
 end

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

@@ -89,7 +89,8 @@ module Nanoc::Int
         end
       is_usable_snapshot = @snapshot_contents[snapshot_name] && (compiled? || !is_still_moving)
       unless is_usable_snapshot
-        raise Nanoc::Int::Errors::UnmetDependency.new(self)
+        Fiber.yield(Nanoc::Int::Errors::UnmetDependency.new(self))
+        return compiled_content(snapshot: snapshot)
       end
 
       @snapshot_contents[snapshot_name].string
@@ -133,18 +134,6 @@ module Nanoc::Int
       @paths[snapshot]
     end
 
-    contract C::None => nil
-    # Resets the compilation progress for this item representation. This is
-    # necessary when an unmet dependency is detected during compilation.
-    #
-    # @api private
-    #
-    # @return [void]
-    def forget_progress
-      initialize_content
-      nil
-    end
-
     # Returns an object that can be used for uniquely identifying objects.
     #
     # @api private