nanoc 4.3.5 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3606c2a092c56bb20b1b07bc680d99a631114fce
-  data.tar.gz: 9e38476033f294ca4acc3e90eaf3b5ce1449294d
+  metadata.gz: 33272b9e2fbec854248b3d0bd0abbcb714f3e1eb
+  data.tar.gz: 5f4d064d412bb748a9103454243c06bd851e9f6a
 SHA512:
-  metadata.gz: 712a908ab06b6f2a1242d078f81ead6130370205ecd6eac2e21d9b5618bdd06ec1024e520e0bc15cb6242aca73fc5029ff5fbd3470c835536dd65128d25c1b46
-  data.tar.gz: 68cff4e9694008e4af025714a4a4ce4b06cd57564c7573e0da3ec051ee7925aca7451cb355c8b0f86e5660f3d2799b27c83323452418dca135e14d8fae884836
+  metadata.gz: 2f32329a10aac398a06ca5974db441a3b685fc27e8db011a87f4e8e8937bcb371495e822a4ba6fe3c6bd4391f823cbc946a38cc77fba0d388671d2629358ac6c
+  data.tar.gz: 4b32d6d3c48b88ad8f996c53278f759073a17844d729c532991f5da01e8c7923d3851e653cf8cb31a0de877140ef15bbbad40d30977cacab7af9a1217869d70a

data/Gemfile

@@ -43,6 +43,7 @@ group :plugins do
   gem 'mustache', '~> 1.0'
   gem 'nokogiri', '~> 1.6'
   gem 'pandoc-ruby'
+  gem 'parallel'
   gem 'pygments.rb', platforms: [:ruby, :mswin]
   gem 'rack'
   gem 'rainpress'

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    nanoc (4.3.5)
+    nanoc (4.3.6)
       cri (~> 2.3)
       hamster (~> 3.0)
+      parallel (~> 1.9)
       ref (~> 2.0)
 
 GEM
@@ -52,7 +53,7 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    excon (0.53.0)
+    excon (0.54.0)
     execjs (2.7.0)
     ffi (1.9.14)
     fission (0.5.0)
@@ -173,9 +174,9 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.2.1)
+    fog-vsphere (1.4.0)
       fog-core
-      rbvmomi (~> 1.8.0)
+      rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
       fog-core
       fog-xml
@@ -229,7 +230,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
-    mocha (1.2.0)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
     mustache (1.0.3)
@@ -240,6 +241,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     pandoc-ruby (2.0.1)
+    parallel (1.9.0)
     parser (2.3.1.4)
       ast (~> 2.2)
     posix-spawn (0.3.11)
@@ -258,10 +260,11 @@ GEM
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    rbvmomi (1.8.2)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
+    rbvmomi (1.9.4)
+      builder (~> 3.2)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      trollop (~> 2.1)
     rdiscount (2.2.0.1)
     rdoc (4.2.1)
     redcarpet (3.3.4)
@@ -288,7 +291,7 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
     ruby_dep (1.5.0)
-    rubypants (0.5.1)
+    rubypants (0.6.0)
     safe_yaml (1.0.4)
     sass (3.4.22)
     shellany (0.0.1)
@@ -362,6 +365,7 @@ DEPENDENCIES
   nanoc!
   nokogiri (~> 1.6)
   pandoc-ruby
+  parallel
   pry
   pygments.rb
   rack
@@ -387,4 +391,4 @@ DEPENDENCIES
   yuicompressor
 
 BUNDLED WITH
-   1.13.3
+   1.13.6

data/NEWS.md

@@ -1,10 +1,24 @@
 # Nanoc news
 
+## 4.3.6 (2016-10-23)
+
+Fixes:
+
+* Made legacy patterns properly support full identifiers (#957)
+* Fixed timezone issues in `#to_iso8601_date` (#961)
+* Fixed error when accessing item (rep) paths in shell command (#963)
+* Fixed issue that caused `#path` to be nil inside compilation rules (#964)
+* Made `__FILE__` in Checks file be a absolute path (#966)
+
+Enhancements:
+
+* Made the command line write status information to stderr, not stdout (#958)
+
 ## 4.3.5 (2016-10-14)
 
 Fixes:
 
-* Handle `form/@action` in `relativize_paths` filter [Lorin Werthen] (#950)
+* Handle `form/@action` in `relativize_paths` filter (#950) [Lorin Werthen]
 
 Experimental features:
 

data/lib/nanoc/base/feature.rb

@@ -46,6 +46,22 @@ module Nanoc
         enabled_features.include?('all')
     end
 
+    # @api private
+    def self.enable(feature_name)
+      raise ArgumentError, 'no block given' unless block_given?
+
+      if enabled?(feature_name)
+        yield
+      else
+        begin
+          enabled_features << feature_name
+          yield
+        ensure
+          enabled_features.delete(feature_name)
+        end
+      end
+    end
+
     # @api private
     def self.reset_caches
       @enabled_features = nil

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

@@ -18,5 +18,9 @@ module Nanoc::Int
     def snapshots_defs_for(_rep)
       raise NotImplementedError
     end
+
+    def paths_for(_rep)
+      raise NotImplementedError
+    end
   end
 end

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

@@ -18,15 +18,14 @@ module Nanoc::Int
     def run
       paths_to_reps = {}
       @reps.each do |rep|
-        mem = @action_provider.memory_for(rep)
-        mem.snapshot_actions.each do |snapshot_action|
-          route_rep(rep, snapshot_action, paths_to_reps)
+        @action_provider.paths_for(rep).each do |snapshot_name, path|
+          route_rep(rep, path, snapshot_name, paths_to_reps)
         end
       end
     end
 
-    def route_rep(rep, snapshot_action, paths_to_reps)
-      basic_path = snapshot_action.path
+    def route_rep(rep, path, snapshot_name, paths_to_reps)
+      basic_path = path
       return if basic_path.nil?
       basic_path = basic_path.encode('UTF-8')
 
@@ -37,8 +36,8 @@ module Nanoc::Int
         paths_to_reps[basic_path] = rep
       end
 
-      rep.raw_paths[snapshot_action.snapshot_name] = @site.config[:output_dir] + basic_path
-      rep.paths[snapshot_action.snapshot_name] = strip_index_filename(basic_path)
+      rep.raw_paths[snapshot_name] = @site.config[:output_dir] + basic_path
+      rep.paths[snapshot_name] = strip_index_filename(basic_path)
     end
 
     def strip_index_filename(basic_path)

data/lib/nanoc/cli/cleaning_stream.rb

@@ -56,6 +56,11 @@ module Nanoc::CLI
       @cached_is_tty ||= @stream.tty?
     end
 
+    # @see IO#isatty
+    def isatty
+      tty?
+    end
+
     # @see IO#flush
     def flush
       _nanoc_swallow_broken_pipe_errors_while do

data/lib/nanoc/cli/command_runner.rb

@@ -45,8 +45,8 @@ module Nanoc::CLI
     #
     # @return [void]
     def load_site(preprocess: false)
-      print 'Loading site… '
-      $stdout.flush
+      $stderr.print 'Loading site… '
+      $stderr.flush
 
       if site.nil?
         raise ::Nanoc::Int::Errors::GenericTrivial, 'The current working directory does not seem to be a Nanoc site.'
@@ -56,7 +56,7 @@ module Nanoc::CLI
         site.compiler.action_provider.preprocess(site)
       end
 
-      puts 'done'
+      $stderr.puts 'done'
     end
 
     # @return [Boolean] true if debug output is enabled, false if not

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

@@ -21,11 +21,30 @@ module Nanoc::CLI::Commands
       self.class.env_for_site(site)
     end
 
+    def self.reps_for(site)
+      Nanoc::Int::ItemRepRepo.new.tap do |reps|
+        action_provider = Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
+        builder = Nanoc::Int::ItemRepBuilder.new(site, action_provider, reps)
+        builder.run
+      end
+    end
+
+    def self.view_context_for(site)
+      Nanoc::ViewContext.new(
+        reps: reps_for(site),
+        items: site.items,
+        dependency_tracker: Nanoc::Int::DependencyTracker::Null.new,
+        compiler: nil,
+      )
+    end
+
     def self.env_for_site(site)
+      view_context = view_context_for(site)
+
       {
-        items: Nanoc::ItemCollectionWithRepsView.new(site.items, nil),
-        layouts: Nanoc::LayoutCollectionView.new(site.layouts, nil),
-        config: Nanoc::ConfigView.new(site.config, nil),
+        items: Nanoc::ItemCollectionWithRepsView.new(site.items, view_context),
+        layouts: Nanoc::LayoutCollectionView.new(site.layouts, view_context),
+        config: Nanoc::ConfigView.new(site.config, view_context),
       }
     end
   end

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

@@ -12,6 +12,8 @@ module ::Nanoc::Extra::Checking::Checks
     identifiers :external_links, :elinks
 
     def run
+      require 'parallel'
+
       # Find all broken external hrefs
       # TODO: de-duplicate this (duplicated in internal links check)
       filenames = output_filenames.select { |f| File.extname(f) == '.html' && !excluded_file?(f) }
@@ -40,45 +42,8 @@ module ::Nanoc::Extra::Checking::Checks
       end
     end
 
-    class ArrayEnumerator
-      def initialize(array)
-        @array = array
-        @index = 0
-        @mutex = Mutex.new
-      end
-
-      def next
-        @mutex.synchronize do
-          @index += 1
-          return @array[@index - 1]
-        end
-      end
-    end
-
     def select_invalid(hrefs)
-      enum = ArrayEnumerator.new(hrefs.sort)
-      mutex = Mutex.new
-      invalid = Set.new
-
-      threads = []
-      10.times do
-        threads << Thread.new do
-          loop do
-            href = enum.next
-            break if href.nil?
-
-            res = validate(href)
-            next unless res
-
-            mutex.synchronize do
-              invalid << res
-            end
-          end
-        end
-      end
-      threads.each(&:join)
-
-      invalid
+      Parallel.map(hrefs, in_threads: 10) { |href| validate(href) }.compact
     end
 
     def validate(href)

data/lib/nanoc/extra/checking/dsl.rb

@@ -5,7 +5,8 @@ module Nanoc::Extra::Checking
 
     def self.from_file(filename)
       dsl = new
-      dsl.instance_eval(File.read(filename), filename)
+      absolute_filename = File.expand_path(filename)
+      dsl.instance_eval(File.read(filename), absolute_filename)
       dsl
     end
 

data/lib/nanoc/extra/core_ext/time.rb

@@ -2,7 +2,7 @@
 module Nanoc::Extra::TimeExtensions
   # @return [String] The time in an ISO-8601 date format.
   def __nanoc_to_iso8601_date
-    strftime('%Y-%m-%d')
+    getutc.strftime('%Y-%m-%d')
   end
 
   # @return [String] The time in an ISO-8601 time format.

data/lib/nanoc/helpers/blogging.rb

@@ -244,7 +244,7 @@ module Nanoc::Helpers
       when DateTime
         arg.to_time
       when Date
-        Time.local(arg.year, arg.month, arg.day)
+        Time.utc(arg.year, arg.month, arg.day)
       when String
         Time.parse(arg)
       else

data/lib/nanoc/rule_dsl/action_provider.rb

@@ -40,6 +40,10 @@ module Nanoc::RuleDSL
       @rule_memory_calculator.snapshots_defs_for(rep)
     end
 
+    def paths_for(rep)
+      @rule_memory_calculator.paths_for_rep(rep)
+    end
+
     def preprocess(site)
       ctx = new_preprocessor_context(site)
 

data/lib/nanoc/rule_dsl/compiler_dsl.rb

@@ -278,9 +278,15 @@ module Nanoc::RuleDSL
         # Add leading/trailing slashes if necessary
         new_identifier = identifier.dup
         new_identifier[/^/] = '/' if identifier[0, 1] != '/'
-        new_identifier[/$/] = '/' unless ['*', '/'].include?(identifier[-1, 1])
+        new_identifier[/$/] = '/?' unless ['*', '/'].include?(identifier[-1, 1])
 
-        /^#{new_identifier.gsub('*', '(.*?)').gsub('+', '(.+?)')}$/
+        regex_string =
+          new_identifier
+          .gsub('.', '\.')
+          .gsub('*', '(.*?)')
+          .gsub('+', '(.+?)')
+
+        /^#{regex_string}$/
       else
         identifier
       end

data/lib/nanoc/rule_dsl/rule_memory_calculator.rb

@@ -38,9 +38,6 @@ module Nanoc::RuleDSL
     #
     # @return [Nanoc::Int::RuleMemory]
     def [](obj)
-      # FIXME: Remove this
-      obj = obj.unwrap if obj.respond_to?(:unwrap)
-
       case obj
       when Nanoc::Int::ItemRep
         new_rule_memory_for_rep(obj)
@@ -92,6 +89,17 @@ module Nanoc::RuleDSL
       executor.rule_memory
     end
 
+    # @param [Nanoc::Int::ItemRep] rep The item representation to get the rule
+    #   memory for
+    #
+    # @return [Hash<Symbol, String>] Pairs of snapshot name and path
+    def paths_for_rep(rep)
+      snapshot_actions = new_rule_memory_for_rep(rep).snapshot_actions
+      snapshot_actions.each_with_object({}) do |action, paths|
+        paths[action.snapshot_name] = action.path
+      end
+    end
+
     # @param [Nanoc::Int::Layout] layout
     #
     # @return [Nanoc::Int::RuleMemory]

data/lib/nanoc/version.rb

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

data/nanoc.gemspec

@@ -27,6 +27,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_runtime_dependency('parallel', '~> 1.9')
 
   s.add_development_dependency('bundler', '>= 1.7.10', '< 2.0')
 end

data/test/cli/test_cleaning_stream.rb

@@ -3,7 +3,7 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
     attr_accessor :called_methods
 
     def initialize
-      @called_methods = Set.new
+      @called_methods = []
     end
 
     # rubocop:disable Style/MethodMissing
@@ -18,7 +18,7 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
   end
 
   def test_forward
-    methods = [:write, :<<, :tty?, :flush, :tell, :print, :puts, :string, :reopen, :exist?, :exists?, :close]
+    methods = [:write, :<<, :tty?, :tty?, :flush, :tell, :print, :puts, :string, :reopen, :exist?, :exists?, :close]
 
     s = Stream.new
     cs = Nanoc::CLI::CleaningStream.new(s)
@@ -26,6 +26,7 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
     cs.write('aaa')
     cs << 'bb'
     cs.tty?
+    cs.isatty
     cs.flush
     cs.tell
     cs.print('cc')
@@ -41,6 +42,16 @@ class Nanoc::CLI::CleaningStreamTest < Nanoc::TestCase
     end
   end
 
+  def test_forward_tty_cached
+    s = Stream.new
+    cs = Nanoc::CLI::CleaningStream.new(s)
+
+    cs.tty?
+    cs.isatty
+
+    assert_equal [:tty?], s.called_methods
+  end
+
   def test_works_with_logger
     require 'logger'
     stream = StringIO.new

data/test/extra/checking/test_dsl.rb

@@ -20,4 +20,12 @@ class Nanoc::Extra::Checking::DSLTest < Nanoc::TestCase
       assert_equal 'hello', $greeting
     end
   end
+
+  def test_has_absolute_path
+    with_site do |_site|
+      File.write('Checks', '$stuff = __FILE__')
+      Nanoc::Extra::Checking::DSL.from_file('Checks')
+      assert($stuff.start_with?('/'))
+    end
+  end
 end

data/test/extra/core_ext/test_time.rb

@@ -1,8 +1,12 @@
 class Nanoc::ExtraCoreExtTimeTest < Nanoc::TestCase
-  def test___nanoc_to_iso8601_date
+  def test___nanoc_to_iso8601_date_utc
     assert_equal('2008-05-19', Time.utc(2008, 5, 19, 14, 20, 0, 0).__nanoc_to_iso8601_date)
   end
 
+  def test___nanoc_to_iso8601_date_non_utc
+    assert_equal('2008-05-18', Time.new(2008, 5, 19, 0, 0, 0, '+02:00').__nanoc_to_iso8601_date)
+  end
+
   def test___nanoc_to_iso8601_time
     assert_equal('2008-05-19T14:20:00Z', Time.utc(2008, 5, 19, 14, 20, 0, 0).__nanoc_to_iso8601_time)
   end

data/test/helpers/test_xml_sitemap.rb

@@ -30,7 +30,7 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       @items << item
 
       # Create item 3
-      attrs = { mtime: Time.parse('2004-07-12'), changefreq: 'daily', priority: 0.5 }
+      attrs = { mtime: Time.parse('2004-07-12 00:00:00 +02:00'), changefreq: 'daily', priority: 0.5 }
       item = Nanoc::ItemWithRepsView.new(Nanoc::Int::Item.new('some content 3', attrs, '/item-three/'), @view_context)
       @items << item
       create_item_rep(item.unwrap, :three_a, '/item-three/a/')
@@ -70,8 +70,8 @@ class Nanoc::Helpers::XMLSitemapTest < Nanoc::TestCase
       assert_equal '0.5',                              urls[3].css('> priority').inner_text
       assert_equal '',                                 urls[0].css('> lastmod').inner_text
       assert_equal '',                                 urls[1].css('> lastmod').inner_text
-      assert_equal '2004-07-12',                       urls[2].css('> lastmod').inner_text
-      assert_equal '2004-07-12',                       urls[3].css('> lastmod').inner_text
+      assert_equal '2004-07-11',                       urls[2].css('> lastmod').inner_text
+      assert_equal '2004-07-11',                       urls[3].css('> lastmod').inner_text
     end
   end
 

data/test/rule_dsl/test_compiler_dsl.rb

@@ -319,7 +319,7 @@ EOS
     compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('foo') }
-    expected = %r{^/foo/$}
+    expected = %r{^/foo/?$}
 
     assert_equal(expected.to_s,      actual.to_s)
     assert_equal(expected.source,    actual.source)
@@ -333,7 +333,7 @@ EOS
     compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('foo/*/bar') }
-    expected = %r{^/foo/(.*?)/bar/$}
+    expected = %r{^/foo/(.*?)/bar/?$}
 
     assert_equal(expected.to_s,      actual.to_s)
     assert_equal(expected.source,    actual.source)
@@ -347,7 +347,7 @@ EOS
     compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('foo/*/bar/*/qux') }
-    expected = %r{^/foo/(.*?)/bar/(.*?)/qux/$}
+    expected = %r{^/foo/(.*?)/bar/(.*?)/qux/?$}
 
     assert_equal(expected.to_s,      actual.to_s)
     assert_equal(expected.source,    actual.source)
@@ -403,7 +403,7 @@ EOS
     compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
 
     actual   = compiler_dsl.instance_eval { identifier_to_regex('/foo/+') }
-    expected = %r{^/foo/(.+?)/$}
+    expected = %r{^/foo/(.+?)/?$}
 
     assert_equal(expected.to_s,      actual.to_s)
     assert_equal(expected.source,    actual.source)
@@ -414,6 +414,20 @@ EOS
     refute('/foo/' =~ actual)
   end
 
+  def test_identifier_to_regex_with_full_identifier
+    # Create compiler DSL
+    compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
+
+    actual   = compiler_dsl.instance_eval { identifier_to_regex('/favicon.ico') }
+    expected = %r{^/favicon\.ico/?$}
+
+    assert_equal(expected.to_s, actual.to_s)
+
+    assert('/favicon.ico' =~ actual)
+    assert('/favicon.ico/' =~ actual)
+    refute('/faviconxico' =~ actual)
+  end
+
   def test_dsl_has_no_access_to_compiler
     compiler_dsl = Nanoc::RuleDSL::CompilerDSL.new(nil, {})
     assert_raises(NameError) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 4.3.6
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement