nanoc 4.3.6 → 4.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33272b9e2fbec854248b3d0bd0abbcb714f3e1eb
-  data.tar.gz: 5f4d064d412bb748a9103454243c06bd851e9f6a
+  metadata.gz: 6d052e7d5720a345ca133515b628b273f7ab649f
+  data.tar.gz: aeba9202e6a052fc7f43743a95bd5d624cbd3da8
 SHA512:
-  metadata.gz: 2f32329a10aac398a06ca5974db441a3b685fc27e8db011a87f4e8e8937bcb371495e822a4ba6fe3c6bd4391f823cbc946a38cc77fba0d388671d2629358ac6c
-  data.tar.gz: 4b32d6d3c48b88ad8f996c53278f759073a17844d729c532991f5da01e8c7923d3851e653cf8cb31a0de877140ef15bbbad40d30977cacab7af9a1217869d70a
+  metadata.gz: 873ae8427b92df4ca6e3cdffd6636ecb860ecfd092085f9a657725cce83e9cc839287b9860b76100c083cba1bd831eddc50f7e6bbe9bcc77d3290d5dee060607
+  data.tar.gz: '094be294404797042fb05beb21497887b828aa6ad58b37d76b29e110d90ecf60685394aee6a5d03d3debc119f69f928faf955ee6e5ec05323737c78466bd17ef'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.3.6)
+    nanoc (4.3.7)
       cri (~> 2.3)
       hamster (~> 3.0)
       parallel (~> 1.9)
@@ -127,7 +127,7 @@ GEM
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
-    fog-local (0.3.0)
+    fog-local (0.3.1)
       fog-core (~> 1.27)
     fog-openstack (0.1.15)
       fog-core (>= 1.40)
@@ -174,7 +174,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.4.0)
+    fog-vsphere (1.5.0)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
@@ -257,7 +257,7 @@ GEM
     rainbow (2.1.0)
     rainpress (1.0)
     rake (11.3.0)
-    rb-fsevent (0.9.7)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rbvmomi (1.9.4)
@@ -316,7 +316,7 @@ GEM
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
-    uglifier (3.0.2)
+    uglifier (3.0.3)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.1)
     vcr (3.0.3)

data/NEWS.md

@@ -1,5 +1,18 @@
 # Nanoc news
 
+## 4.3.7 (2016-10-29)
+
+Fixes:
+
+* Fixed issue with `show-data` and `show-rules` commands not showing all data (#970) [Chris Chapman]
+
+Enhancements:
+
+* Improved speed of `compile` command (#968)
+* Improved speed of `prune` command (#969)
+* Made kramdown warnings include affected item rep (#967) [Gregory Pakosz]
+* Made kramdown warnings configurable (#967) [Gregory Pakosz]
+
 ## 4.3.6 (2016-10-23)
 
 Fixes:

data/README.md

@@ -19,4 +19,4 @@ Contributions are greatly appreciated! Consult the [Development guidelines](http
 
 Many thanks to everyone who has contributed to Nanoc in one way or another:
 
-Ale Muñoz, Alexander Mankuta, Andy Drop, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Denis Defreyne, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Grégory Karékinian, Gregory Pakosz, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Lorin Werthen, Louis T., Lucas Vuotto, Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Micha Rosenbaum, Michal Cichra, Michal Papis, Mike Pennisi, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Paul Boone, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Šime Ramov, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Vlatko Kosturjak, whitequark, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada
+Ale Muñoz, Alexander Mankuta, Andy Drop, Arnau Siches, Ben Armston, Bil Bas, Brian Candler, Bruno Dufour, Chris Chapman, Chris Eppstein, Christian Plessl, Colin Barrett, Colin Seymour, Croath Liu, Damien Pollet, Dan Callahan, Daniel Hofstetter, Daniel Mendler, Daniel Wollschlaeger, David Alexander, David Everitt, Denis Defreyne, Dennis Sutch, Devon Luke Buchanan, Dmitry Bilunov, Eric Sunshine, Erik Hollensbe, Fabian Buch, Felix Hanley, Garen Torikian, Go Maeda, Grégory Karékinian, Gregory Pakosz, Guilherme Garnier, Jack Chu, Jake Benilov, Jasper Van der Jeugt, Jeff Forcier, Jim Mendenhall, John Nishinaga, Justin Clift, Justin Hileman, Kevin Lynagh, Lorin Werthen, Louis T., Lucas Vuotto, Mathias Bynens, Matt Keveney, Matthew Frazier, Matthias Beyer, Matthias Reitinger, Matthias Vallentin, Micha Rosenbaum, Michal Cichra, Michal Papis, Mike Pennisi, Nelson Chen, Nicky Peeters, Nikhil Marathe, Oliver Byford, Paul Boone, Peter Aronoff, Raphael von der Grün, Rémi Barraquand, Remko Tronçon, Riley Goodside, Ruben Verborgh, Scott Vokes, Šime Ramov, Simon South, Spencer Whitt, Stanley Rost, Starr Horne, Stefan Bühler, Stuart Montgomery, Takashi Uchibe, Toon Willems, Tuomas Kareinen, Ursula Kallio, Vincent Driessen, Vlatko Kosturjak, whitequark, Xavier Shay, Yannick Ihmels, Zaiste de Grengolada

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

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

data/lib/nanoc/base/views.rb

@@ -24,3 +24,5 @@ require_relative 'views/mutable_layout_collection_view'
 
 require_relative 'views/post_compile_item_view'
 require_relative 'views/post_compile_item_collection_view'
+require_relative 'views/post_compile_item_rep_view'
+require_relative 'views/post_compile_item_rep_collection_view'

data/lib/nanoc/base/views/item_rep_collection_view.rb

@@ -19,19 +19,24 @@ module Nanoc
       @item_reps
     end
 
+    # @api private
+    def view_class
+      Nanoc::ItemRepView
+    end
+
     def to_ary
-      @item_reps.map { |ir| Nanoc::ItemRepView.new(ir, @context) }
+      @item_reps.map { |ir| view_class.new(ir, @context) }
     end
 
     # Calls the given block once for each item rep, passing that item rep as a parameter.
     #
-    # @yieldparam [Nanoc::ItemRepView] item rep
+    # @yieldparam [Object] item rep view
     #
     # @yieldreturn [void]
     #
     # @return [self]
     def each
-      @item_reps.each { |ir| yield Nanoc::ItemRepView.new(ir, @context) }
+      @item_reps.each { |ir| yield view_class.new(ir, @context) }
       self
     end
 
@@ -51,7 +56,7 @@ module Nanoc
       case rep_name
       when Symbol
         res = @item_reps.find { |ir| ir.name == rep_name }
-        res && Nanoc::ItemRepView.new(res, @context)
+        res && view_class.new(res, @context)
       when Fixnum
         raise ArgumentError, "expected ItemRepCollectionView#[] to be called with a symbol (you likely want `.reps[:default]` rather than `.reps[#{rep_name}]`)"
       else
@@ -70,7 +75,7 @@ module Nanoc
     def fetch(rep_name)
       res = @item_reps.find { |ir| ir.name == rep_name }
       if res
-        Nanoc::ItemRepView.new(res, @context)
+        view_class.new(res, @context)
       else
         raise NoSuchItemRepError.new(rep_name)
       end

data/lib/nanoc/base/views/post_compile_item_rep_collection_view.rb

@@ -0,0 +1,8 @@
+module Nanoc
+  class PostCompileItemRepCollectionView < Nanoc::ItemRepCollectionView
+    # @api private
+    def view_class
+      Nanoc::PostCompileItemRepView
+    end
+  end
+end

data/lib/nanoc/base/views/post_compile_item_rep_view.rb

@@ -0,0 +1,18 @@
+module Nanoc
+  class PostCompileItemRepView < ::Nanoc::ItemRepView
+    def compiled_content(snapshot: nil)
+      if unwrap.binary?
+        raise Nanoc::Int::Errors::CannotGetCompiledContentOfBinaryItem.new(unwrap)
+      end
+
+      snapshot_contents = @context.compiler.compiled_content_cache[unwrap]
+      snapshot_name = snapshot || (snapshot_contents[:pre] ? :pre : :last)
+
+      if snapshot_contents[snapshot_name]
+        snapshot_contents[snapshot_name].string
+      else
+        raise Nanoc::Int::Errors::NoSuchSnapshot.new(unwrap, snapshot_name)
+      end
+    end
+  end
+end

data/lib/nanoc/base/views/post_compile_item_view.rb

@@ -1,5 +1,9 @@
 module Nanoc
   class PostCompileItemView < Nanoc::ItemWithRepsView
+    def reps
+      Nanoc::PostCompileItemRepCollectionView.new(@context.reps[unwrap], @context)
+    end
+
     # @deprecated Use {#modified_reps} instead
     def modified
       modified_reps

data/lib/nanoc/cli/commands/show-data.rb

@@ -20,6 +20,9 @@ module Nanoc::CLI::Commands
       compiler.load_stores
       dependency_store = compiler.dependency_store
 
+      # Build reps
+      compiler.build_reps
+
       # Print data
       print_item_dependencies(items, dependency_store)
       print_item_rep_paths(items)

data/lib/nanoc/cli/commands/show-rules.rb

@@ -11,7 +11,10 @@ module Nanoc::CLI::Commands
       load_site
 
       @c = Nanoc::CLI::ANSIStringColorizer
-      @reps = site.compiler.reps
+
+      compiler = site.compiler
+      compiler.build_reps
+      @reps = compiler.reps
 
       action_provider = site.compiler.action_provider
       unless action_provider.respond_to?(:rules_collection)

data/lib/nanoc/extra/pruner.rb

@@ -17,7 +17,7 @@ module Nanoc::Extra
     def initialize(site, dry_run: false, exclude: [])
       @site    = site
       @dry_run = dry_run
-      @exclude = exclude
+      @exclude = Set.new(exclude)
     end
 
     # Prunes all output files not managed by Nanoc.
@@ -37,25 +37,40 @@ module Nanoc::Extra
       present_files = []
       present_dirs = []
       Find.find(site.config[:output_dir] + '/') do |f|
-        present_files << f if File.file?(f)
-        present_dirs << f if File.directory?(f)
+        basename = File.basename(f)
+
+        case File.ftype(f)
+        when 'file'.freeze
+          unless exclude?(basename)
+            present_files << f
+          end
+        when 'directory'.freeze
+          if exclude?(basename)
+            Find.prune
+          else
+            present_dirs << f
+          end
+        end
       end
 
       # Remove stray files
       stray_files = (present_files - compiled_files)
       stray_files.each do |f|
-        next if filename_excluded?(f)
-        delete_file(f)
+        delete_file(f) unless exclude?(f)
       end
 
       # Remove empty directories
       present_dirs.reverse_each do |dir|
         next if Dir.foreach(dir) { |n| break true if n !~ /\A\.\.?\z/ }
-        next if filename_excluded?(dir)
+        next if exclude?(dir)
         delete_dir(dir)
       end
     end
 
+    def exclude?(component)
+      @exclude.include?(component)
+    end
+
     # @param [String] filename The filename to check
     #
     # @return [Boolean] true if the given file is excluded, false otherwise

data/lib/nanoc/filters/kramdown.rb

@@ -10,10 +10,22 @@ module Nanoc::Filters
     #
     # @return [String] The filtered content
     def run(content, params = {})
+      params = params.dup
+      warning_filters = params.delete(:warning_filters)
       document = ::Kramdown::Document.new(content, params)
 
-      document.warnings.each do |warning|
-        $stderr.puts "kramdown warning: #{warning}"
+      if warning_filters
+        r = Regexp.union(warning_filters)
+        warnings = document.warnings.reject { |warning| r =~ warning }
+      else
+        warnings = document.warnings
+      end
+
+      if warnings.any?
+        $stderr.puts "kramdown warning(s) for #{@item_rep.inspect}"
+        warnings.each do |warning|
+          $stderr.puts "  #{warning}"
+        end
       end
 
       document.to_html

data/lib/nanoc/version.rb

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

data/test/base/test_compiler.rb

@@ -208,21 +208,6 @@ 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/filters/test_kramdown.rb

@@ -12,15 +12,41 @@ class Nanoc::Filters::KramdownTest < Nanoc::TestCase
 
   def test_warnings
     if_have 'kramdown' do
+      # Create item
+      item = Nanoc::Int::Item.new('foo', {}, '/foo.md')
+      item_view = Nanoc::ItemWithRepsView.new(item, nil)
+      item_rep = Nanoc::Int::ItemRep.new(item, :default)
+      item_rep_view = Nanoc::ItemRepView.new(item_rep, nil)
+
       # Create filter
-      filter = ::Nanoc::Filters::Kramdown.new
+      filter = ::Nanoc::Filters::Kramdown.new(item: item_view, item_rep: item_rep_view)
 
       # Run filter
       io = capturing_stdio do
         filter.setup_and_run('{:foo}this is bogus')
       end
       assert_empty io[:stdout]
-      assert_equal "kramdown warning: Found span IAL after text - ignoring it\n", io[:stderr]
+      assert_equal "kramdown warning(s) for #{item_rep_view.inspect}\n  Found span IAL after text - ignoring it\n", io[:stderr]
+    end
+  end
+
+  def test_warning_filters
+    if_have 'kramdown' do
+      # Create item
+      item = Nanoc::Int::Item.new('foo', {}, '/foo.md')
+      item_view = Nanoc::ItemWithRepsView.new(item, nil)
+      item_rep = Nanoc::Int::ItemRep.new(item, :default)
+      item_rep_view = Nanoc::ItemRepView.new(item_rep, nil)
+
+      # Create filter
+      filter = ::Nanoc::Filters::Kramdown.new(item: item_view, item_rep: item_rep_view)
+
+      # Run filter
+      io = capturing_stdio do
+        filter.setup_and_run("{:foo}this is bogus\n[foo]: http://foo.com\n", warning_filters: 'No link definition')
+      end
+      assert_empty io[:stdout]
+      assert_equal "kramdown warning(s) for #{item_rep_view.inspect}\n  Found span IAL after text - ignoring it\n", io[:stderr]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.3.6
+  version: 4.3.7
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2016-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -193,6 +193,8 @@ files:
 - lib/nanoc/base/views/mutable_layout_collection_view.rb
 - lib/nanoc/base/views/mutable_layout_view.rb
 - lib/nanoc/base/views/post_compile_item_collection_view.rb
+- lib/nanoc/base/views/post_compile_item_rep_collection_view.rb
+- lib/nanoc/base/views/post_compile_item_rep_view.rb
 - lib/nanoc/base/views/post_compile_item_view.rb
 - lib/nanoc/base/views/view.rb
 - lib/nanoc/base/views/view_context.rb