nanoc 4.8.10 → 4.8.11

data/spec/nanoc/helpers/blogging_spec.rb

@@ -155,7 +155,7 @@ describe Nanoc::Helpers::Blogging, helper: true do
     end
 
     context 'with DateTime instance' do
-      let(:arg) { DateTime.new(2015, 11, 7, 13, 31, 16) }
+      let(:arg) { DateTime.new(2015, 11, 7, 13, 31, 16) } # rubocop:disable Style/DateTime
       it { is_expected.to eql(around_noon_utc) }
     end
 

data/spec/spec_helper.rb

@@ -10,9 +10,11 @@ require 'nanoc'
 require 'nanoc/cli'
 require 'nanoc/spec'
 
+require 'ddbuffer'
 require 'timecop'
 require 'rspec/its'
 require 'fuubar'
+require 'yard'
 
 Nanoc::CLI.setup
 
@@ -277,6 +279,64 @@ RSpec::Matchers.define :send_notification do |name, *expected_args|
   end
 end
 
+RSpec::Matchers.define :have_correct_yard_examples do |_name, *_expected_args|
+  chain :in_file do |file|
+    root_dir = File.expand_path(__dir__ + '/..')
+    YARD.parse(root_dir + '/' + file)
+  end
+
+  match do |actual|
+    examples =
+      P(actual).tags(:example).flat_map do |example|
+        # Classify
+        lines = example.text.lines.map do |line|
+          [line =~ /^\s*# ?=>/ ? :result : :code, line]
+        end
+
+        # Join
+        pieces = []
+        lines.each do |line|
+          if !pieces.empty? && pieces.last.first == line.first
+            pieces.last.last << line.last
+          else
+            pieces << line
+          end
+        end
+        lines = pieces.map(&:last)
+
+        # Collect
+        lines.each_slice(2).to_a
+      end
+
+    b = binding
+    executed_examples = examples.map do |pair|
+      {
+        input:    pair.first,
+        expected: eval(pair.last.match(/# ?=>(.*)/)[1], b),
+        actual:   eval(pair.first, b),
+      }
+    end
+
+    @failing_examples = executed_examples.reject { |ex| ex[:expected] == ex[:actual] }
+
+    @failing_examples.empty?
+  end
+
+  failure_message do |_actual|
+    parts =
+      @failing_examples.map do |ex|
+        format(
+          "%s\nexpected to be\n    %s\nbut was\n    %s",
+          ex[:input],
+          ex[:expected].inspect,
+          ex[:actual].inspect,
+        )
+      end
+
+    parts.join("\n\n---\n\n")
+  end
+end
+
 RSpec::Matchers.define :leak_open_files do |_name, *_expected_args|
   # Some remarks:
   #

data/test/base/test_compiler.rb

@@ -4,7 +4,7 @@ require 'helper'
 
 class Nanoc::Int::CompilerTest < Nanoc::TestCase
   def test_compile_rep_should_write_proper_snapshots_real
-    with_site do |site|
+    with_site do |_site|
       File.write('content/moo.txt', '<%= 1 %> <%%= 2 %> <%%%= 3 %>')
       File.write('layouts/default.erb', 'head <%= yield %> foot')
 
@@ -58,7 +58,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_compile_with_one_rep
-    with_site do |site|
+    with_site do |_site|
       File.open('content/index.html', 'w') { |io| io.write('o hello') }
 
       site = Nanoc::Int::SiteLoader.new.new_from_cwd
@@ -71,7 +71,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_compile_with_two_independent_reps
-    with_site do |site|
+    with_site do |_site|
       File.open('content/foo.html', 'w') { |io| io.write('o hai') }
       File.open('content/bar.html', 'w') { |io| io.write('o bai') }
 
@@ -87,7 +87,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_compile_with_two_dependent_reps
-    with_site(compilation_rule_content: 'filter :erb') do |site|
+    with_site(compilation_rule_content: 'filter :erb') do |_site|
       File.open('content/foo.html', 'w') do |io|
         io.write('<%= @items.find { |i| i.identifier == "/bar/" }.compiled_content %>!!!')
       end
@@ -107,7 +107,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_compile_with_two_mutually_dependent_reps
-    with_site(compilation_rule_content: 'filter :erb') do |site|
+    with_site(compilation_rule_content: 'filter :erb') do |_site|
       File.open('content/foo.html', 'w') do |io|
         io.write('<%= @items.find { |i| i.identifier == "/bar/" }.compiled_content %>')
       end
@@ -204,7 +204,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_include_compiled_content_of_active_item_at_previous_snapshot
-    with_site do |site|
+    with_site do |_site|
       # Create item
       File.open('content/index.html', 'w') do |io|
         io.write('[<%= @item.compiled_content(:snapshot => :aaa) %>]')
@@ -235,7 +235,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_mutually_include_compiled_content_at_previous_snapshot
-    with_site do |site|
+    with_site do |_site|
       # Create items
       File.open('content/a.html', 'w') do |io|
         io.write('[<%= @items.find { |i| i.identifier == "/z/" }.compiled_content(:snapshot => :guts) %>]')
@@ -269,7 +269,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_layout_with_extra_filter_args
-    with_site do |site|
+    with_site do |_site|
       # Create item
       File.open('content/index.html', 'w') do |io|
         io.write('This is <%= @foo %>.')
@@ -298,7 +298,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_change_routing_rule_and_recompile
-    with_site do |site|
+    with_site do |_site|
       # Create items
       File.open('content/a.html', 'w') do |io|
         io.write('<h1>A</h1>')
@@ -352,7 +352,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_rep_assigns
-    with_site do |site|
+    with_site do |_site|
       # Create item
       File.open('content/index.html', 'w') do |io|
         io.write('@rep.name = <%= @rep.name %> - @item_rep.name = <%= @item_rep.name %>')
@@ -406,7 +406,7 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
   end
 
   def test_tmp_text_items_are_removed_after_compilation
-    with_site do |site|
+    with_site do |_site|
       # Create item
       File.open('content/index.html', 'w') do |io|
         io.write('stuff')

data/test/cli/test_cli.rb

@@ -124,7 +124,6 @@ EOS
 
       # Check error output
       stderr_addition = $stderr.string[position_before, position_after]
-      assert_match(/Stack trace:/, stderr_addition)
       assert_match(/commands\/_test.rb/, stderr_addition)
     end
   end

data/test/cli/test_error_handler.rb

@@ -39,15 +39,15 @@ class Nanoc::CLI::ErrorHandlerTest < Nanoc::TestCase
 
     stream = StringIO.new
     @handler.send(:write_stack_trace, stream, error, verbose: false)
-    assert_match(/See full crash log for details./, stream.string)
+    assert_match(/ lines omitted \(see crash\.log for details\)/, stream.string)
 
     stream = StringIO.new
     @handler.send(:write_stack_trace, stream, error, verbose: false)
-    assert_match(/See full crash log for details./, stream.string)
+    assert_match(/ lines omitted \(see crash\.log for details\)/, stream.string)
 
     stream = StringIO.new
     @handler.send(:write_stack_trace, stream, error, verbose: true)
-    refute_match(/See full crash log for details./, stream.string)
+    refute_match(/ lines omitted \(see crash\.log for details\)/, stream.string)
   end
 
   def test_write_error_message_wrapped
@@ -65,8 +65,7 @@ class Nanoc::CLI::ErrorHandlerTest < Nanoc::TestCase
   def test_write_item_rep
     stream = StringIO.new
     @handler.send(:write_item_rep, stream, new_wrapped_error(new_error), verbose: false)
-    assert_match(/^Item identifier: \/about\.md$/, stream.string)
-    assert_match(/^Item rep name:   :latex$/, stream.string)
+    assert_match(/^Current item: \/about\.md \(:latex representation\)$/, stream.string)
   end
 
   def test_resolution_for_wrapped

data/test/filters/test_relativize_paths.rb

@@ -854,4 +854,34 @@ XML
     actual_content = filter.setup_and_run(raw_content, type: :html)
     assert_equal(expected_content, actual_content)
   end
+
+  def test_filter_nokogiri_save_with
+    if_have 'nokogiri' do
+      # Create filter with mock item
+      filter = Nanoc::Filters::RelativizePaths.new
+
+      # Mock item
+      filter.instance_eval do
+        @item_rep = Nanoc::Int::ItemRep.new(
+          Nanoc::Int::Item.new(
+            'content',
+            {},
+            '/foo/baz',
+          ),
+          :blah,
+        )
+        @item_rep.paths[:last] = ['/foo/baz/']
+      end
+
+      # Set content
+      raw_content = %(
+<td><span>some</span><span>moderately</span><span>long</span><span>content</span></td>
+)
+
+      # Test
+      nokogiri_save_options = Nokogiri::XML::Node::SaveOptions::DEFAULT_HTML & ~Nokogiri::XML::Node::SaveOptions::FORMAT
+      actual_content = filter.setup_and_run(raw_content.freeze, type: :html, nokogiri_save_options: nokogiri_save_options)
+      assert_equal(actual_content, raw_content)
+    end
+  end
 end

data/test/filters/test_sass.rb

@@ -109,7 +109,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
 
   def test_recompile_includes
     if_have 'sass' do
-      with_site do |site|
+      with_site do |_site|
         # Create two Sass files
         Dir['content/*'].each { |i| FileUtils.rm(i) }
         File.open('content/a.sass', 'w') do |io|
@@ -164,7 +164,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
 
   def test_recompile_includes_with_underscore_without_extension
     if_have 'sass' do
-      with_site do |site|
+      with_site do |_site|
         # Create two Sass files
         Dir['content/*'].each { |i| FileUtils.rm(i) }
         File.open('content/a.sass', 'w') do |io|
@@ -219,7 +219,7 @@ class Nanoc::Filters::SassTest < Nanoc::TestCase
 
   def test_recompile_includes_with_relative_path
     if_have 'sass', 'compass' do
-      with_site do |site|
+      with_site do |_site|
         # Write compass config
         FileUtils.mkdir_p('compass')
         File.open('compass/config.rb', 'w') do |io|

data/test/rule_dsl/test_compiler_dsl.rb

@@ -54,7 +54,7 @@ class Nanoc::RuleDSL::CompilerDSLTest < Nanoc::TestCase
   end
 
   def test_postprocessor_modified_method
-    with_site do |site|
+    with_site do |_site|
       # Create rules
       File.open('Rules', 'w') do |io|
         io.write <<~EOS
@@ -80,7 +80,7 @@ EOS
   end
 
   def test_include_rules
-    with_site(legacy: false) do |site|
+    with_site(legacy: false) do |_site|
       # Create a bonus rules file
       File.write(
         'more_rules.rb',

metadata

@@ -1,105 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.8.10
+  version: 4.8.11
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-08 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cri
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: hamster
+  name: cri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: ref
+  name: ddplugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ddplugin
+  name: hamster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: ref
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: slow_enumerator_tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.10
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '1.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.10
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -127,17 +121,10 @@ extra_rdoc_files:
 - README.md
 - NEWS.md
 files:
-- ".github/CONTRIBUTING.md"
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Guardfile
 - LICENSE
 - NEWS.md
 - README.md
@@ -145,6 +132,7 @@ files:
 - bin/nanoc
 - lib/nanoc.rb
 - lib/nanoc/base.rb
+- lib/nanoc/base/changes_stream.rb
 - lib/nanoc/base/contracts_support.rb
 - lib/nanoc/base/core_ext.rb
 - lib/nanoc/base/core_ext/array.rb
@@ -302,6 +290,7 @@ files:
 - lib/nanoc/cli/commands/compile_listeners/timing_recorder.rb
 - lib/nanoc/cli/commands/create-site.rb
 - lib/nanoc/cli/commands/deploy.rb
+- lib/nanoc/cli/commands/live.rb
 - lib/nanoc/cli/commands/nanoc.rb
 - lib/nanoc/cli/commands/prune.rb
 - lib/nanoc/cli/commands/shell.rb
@@ -311,6 +300,7 @@ files:
 - lib/nanoc/cli/commands/view.rb
 - lib/nanoc/cli/error_handler.rb
 - lib/nanoc/cli/logger.rb
+- lib/nanoc/cli/stack_trace_writer.rb
 - lib/nanoc/cli/stream_cleaners.rb
 - lib/nanoc/cli/stream_cleaners/abstract.rb
 - lib/nanoc/cli/stream_cleaners/ansi_colors.rb
@@ -331,6 +321,7 @@ files:
 - lib/nanoc/extra/core_ext/time.rb
 - lib/nanoc/extra/jruby_nokogiri_warner.rb
 - lib/nanoc/extra/link_collector.rb
+- lib/nanoc/extra/live_recompiler.rb
 - lib/nanoc/extra/parallel_collection.rb
 - lib/nanoc/extra/piper.rb
 - lib/nanoc/filters.rb
@@ -397,8 +388,10 @@ files:
 - lib/nanoc/telemetry/table.rb
 - lib/nanoc/version.rb
 - nanoc.gemspec
-- scripts/release
+- nanoc.manifest
 - spec/contributors_spec.rb
+- spec/manifest_spec.rb
+- spec/nanoc/base/changes_stream_spec.rb
 - spec/nanoc/base/checksummer_spec.rb
 - spec/nanoc/base/compiler_spec.rb
 - spec/nanoc/base/core_ext/array_spec.rb
@@ -409,6 +402,7 @@ files:
 - spec/nanoc/base/entities/code_snippet_spec.rb
 - spec/nanoc/base/entities/configuration_spec.rb
 - spec/nanoc/base/entities/content_spec.rb
+- spec/nanoc/base/entities/context_spec.rb
 - spec/nanoc/base/entities/document_spec.rb
 - spec/nanoc/base/entities/identifiable_collection_spec.rb
 - spec/nanoc/base/entities/identifier_spec.rb
@@ -429,11 +423,15 @@ files:
 - spec/nanoc/base/filter_spec.rb
 - spec/nanoc/base/item_rep_writer_spec.rb
 - spec/nanoc/base/memoization_spec.rb
+- spec/nanoc/base/repos/aggregate_data_source_spec.rb
 - spec/nanoc/base/repos/checksum_store_spec.rb
 - spec/nanoc/base/repos/compiled_content_cache_spec.rb
 - spec/nanoc/base/repos/config_loader_spec.rb
+- spec/nanoc/base/repos/data_source_spec.rb
 - spec/nanoc/base/repos/dependency_store_spec.rb
+- spec/nanoc/base/repos/in_mem_data_source_spec.rb
 - spec/nanoc/base/repos/outdatedness_store_spec.rb
+- spec/nanoc/base/repos/prefixed_data_source_spec.rb
 - spec/nanoc/base/repos/site_loader_spec.rb
 - spec/nanoc/base/repos/snapshot_repo_spec.rb
 - spec/nanoc/base/repos/store_spec.rb
@@ -489,11 +487,14 @@ files:
 - spec/nanoc/cli/commands/show_plugins_spec.rb
 - spec/nanoc/cli/commands/show_rules_spec.rb
 - spec/nanoc/cli/commands/view_spec.rb
+- spec/nanoc/cli/error_handler_spec.rb
+- spec/nanoc/cli/stack_trace_writer_spec.rb
 - spec/nanoc/cli/stream_cleaners/utf8_spec.rb
 - spec/nanoc/cli_spec.rb
 - spec/nanoc/data_sources/filesystem_spec.rb
 - spec/nanoc/deploying/fog_spec.rb
 - spec/nanoc/deploying/git_spec.rb
+- spec/nanoc/extra/live_recompiler_spec.rb
 - spec/nanoc/extra/parallel_collection_spec.rb
 - spec/nanoc/filters/asciidoctor_spec.rb
 - spec/nanoc/filters/colorize_syntax/rouge_spec.rb
@@ -583,14 +584,9 @@ files:
 - spec/nanoc/telemetry_spec.rb
 - spec/regression_filenames_spec.rb
 - spec/spec_helper.rb
-- test/base/test_code_snippet.rb
 - test/base/test_compiler.rb
-- test/base/test_context.rb
-- test/base/test_data_source.rb
 - test/base/test_dependency_tracker.rb
-- test/base/test_directed_graph.rb
 - test/base/test_filter.rb
-- test/base/test_item_array.rb
 - test/base/test_notification_center.rb
 - test/base/test_site.rb
 - test/base/test_store.rb
@@ -688,7 +684,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.