nanoc 4.8.11 → 4.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 686e6a239ceae1d59678f267f4aa4c5dfc46b45e
-  data.tar.gz: e80de3bfc0c9475292ad4f9f4fa886f87bd272a8
+SHA256:
+  metadata.gz: e5cc17f8346af531417d26173e8610348080326f2f9faceb6485e19d9fc9c194
+  data.tar.gz: 2e9ebdd0c7da3bb1d4119b4dc8ca51dc840b66ff191af0336a88da006b5af8f4
 SHA512:
-  metadata.gz: b476ce18ea4cdd880de849b64bc5c8bbe1287a1b3cbd67a7a54a0fa079812107d9448f839785b391ae192147f331facb47e89d828a65c896aae5dad8b40a5c08
-  data.tar.gz: 8ffcb7d57ea237b0fef6490828d960247fd618c814990e14f0f707a55831f8288b2666cc21693792452f3d9d1e475aa9c33cbebc6807405d7749cda3022fedc9
+  metadata.gz: d3674db085f03b8a75de0c39c202c69769b77317a830eb3ffb8164e14959842270e16c8cc153f1e8de75ba1e35a6c23e6c410a35a459873173664a71829b9373
+  data.tar.gz: 650b49e7c74857d1d2dfd3fe16edd60005a0a47cd06799cc894813896edf406560f8712063959f94993d40bdaf7bf308a382f5c165a12d9d96a1759b9b7ea3fa

data/NEWS.md

@@ -1,5 +1,15 @@
 # Nanoc news
 
+## 4.8.12 (2017-11-16)
+
+Fixes:
+
+* Fixed issue where changing `:output_dir` during preprocessing would prevent Nanoc from performing incremental compilation (#1248, #1249)
+
+Enhancements:
+
+* Allowed creation of pattern from symbols, not just strings (#1247) [Gregory Pakosz]
+
 ## 4.8.11 (2017-10-28)
 
 Enhancements:

data/README.md

@@ -3,6 +3,7 @@
 [![Build status](http://img.shields.io/travis/nanoc/nanoc.svg)](https://travis-ci.org/nanoc/nanoc)
 [![Code Climate](http://img.shields.io/codeclimate/github/nanoc/nanoc.svg)](https://codeclimate.com/github/nanoc/nanoc)
 [![Code Coverage](https://img.shields.io/codecov/c/github/nanoc/nanoc.svg)](https://codecov.io/gh/nanoc/nanoc)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fnanoc%2Fnanoc.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fnanoc%2Fnanoc?ref=badge_shield)
 
 ![Nanoc logo](https://avatars1.githubusercontent.com/u/3260163?s=140)
 

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

@@ -14,6 +14,8 @@ module Nanoc::Int
         Nanoc::Int::StringPattern.new(obj)
       when Regexp
         Nanoc::Int::RegexpPattern.new(obj)
+      when Symbol
+        Nanoc::Int::StringPattern.new(obj.to_s)
       else
         raise ArgumentError, "Do not know how to convert `#{obj.inspect}` into a Nanoc::Pattern"
       end

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

@@ -9,7 +9,7 @@ module Nanoc::Int
     attr_reader :config
     attr_accessor :data_source
 
-    contract C::KeywordArgs[config: Nanoc::Int::Configuration, code_snippets: C::IterOf[Nanoc::Int::CodeSnippet], data_source: C::Maybe[C::Named['Nanoc::DataSource']]] => C::Any
+    contract C::KeywordArgs[config: Nanoc::Int::Configuration, code_snippets: C::IterOf[Nanoc::Int::CodeSnippet], data_source: C::Named['Nanoc::DataSource']] => C::Any
     def initialize(config:, code_snippets:, data_source:)
       @config = config
       @code_snippets = code_snippets

data/lib/nanoc/base/repos/action_sequence_store.rb

@@ -6,7 +6,10 @@ module Nanoc::Int
   #
   # @api private
   class ActionSequenceStore < ::Nanoc::Int::Store
-    def initialize(site: nil)
+    include Nanoc::Int::ContractsSupport
+
+    contract C::KeywordArgs[site: Nanoc::Int::Site] => C::Any
+    def initialize(site:)
       super(Nanoc::Int::Store.tmp_path_for(site: site, store_name: 'rule_memory'), 1)
 
       @action_sequences = {}

data/lib/nanoc/base/repos/compiled_content_cache.rb

@@ -8,8 +8,8 @@ module Nanoc::Int
   class CompiledContentCache < ::Nanoc::Int::Store
     include Nanoc::Int::ContractsSupport
 
-    contract C::KeywordArgs[site: C::Maybe[Nanoc::Int::Site], items: C::IterOf[Nanoc::Int::Item]] => C::Any
-    def initialize(site: nil, items:)
+    contract C::KeywordArgs[site: Nanoc::Int::Site, items: C::IterOf[Nanoc::Int::Item]] => C::Any
+    def initialize(site:, items:)
       super(Nanoc::Int::Store.tmp_path_for(site: site, store_name: 'compiled_content'), 2)
 
       @items = items

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

@@ -7,6 +7,9 @@ module Nanoc::Int
     def initialize(site, compiled_content_cache:, checksum_store:, action_sequence_store:, action_provider:, dependency_store:, outdatedness_store:)
       @site = site
 
+      # Needed because configuration is mutable :(
+      @output_dirs = @site.config.output_dirs
+
       @compiled_content_cache = compiled_content_cache
       @checksum_store         = checksum_store
       @action_sequence_store  = action_sequence_store
@@ -199,7 +202,7 @@ module Nanoc::Int
     end
 
     def cleanup_stage
-      @_cleanup_stage ||= Stages::Cleanup.new(@site.config)
+      @_cleanup_stage ||= Stages::Cleanup.new(@output_dirs)
     end
 
     def forget_outdated_dependencies_stage

data/lib/nanoc/base/services/compiler/stages/cleanup.rb

@@ -2,8 +2,8 @@
 
 module Nanoc::Int::Compiler::Stages
   class Cleanup
-    def initialize(config)
-      @config = config
+    def initialize(output_dirs)
+      @output_dirs = output_dirs
     end
 
     def run
@@ -20,7 +20,7 @@ module Nanoc::Int::Compiler::Stages
     end
 
     def cleanup_unused_stores
-      used_paths = @config.output_dirs.map { |d| Nanoc::Int::Store.tmp_path_prefix(d) }
+      used_paths = @output_dirs.map { |d| Nanoc::Int::Store.tmp_path_prefix(d) }
       all_paths = Dir.glob('tmp/nanoc/*')
       (all_paths - used_paths).each do |obsolete_path|
         FileUtils.rm_rf(obsolete_path)

data/lib/nanoc/filters/colorize_syntax/colorizers.rb

@@ -131,8 +131,7 @@ module Nanoc::Filters::ColorizeSyntax::Colorizers
     def process(code, language, params = {})
       require 'rouge'
 
-      if Rouge.version < '2' || params.fetch(:legacy, false)
-        # Rouge 1.x or Rouge 2.x legacy options
+      if params.fetch(:legacy, false)
         formatter_options = {
           css_class: params.fetch(:css_class, 'highlight'),
           inline_theme: params.fetch(:inline_theme, nil),
@@ -140,7 +139,7 @@ module Nanoc::Filters::ColorizeSyntax::Colorizers
           start_line: params.fetch(:start_line, 1),
           wrap: params.fetch(:wrap, false),
         }
-        formatter_cls = Rouge::Formatters.const_get(Rouge.version < '2' ? 'HTML' : 'HTMLLegacy')
+        formatter_cls = Rouge::Formatters::HTMLLegacy
         formatter = formatter_cls.new(formatter_options)
       else
         formatter = params.fetch(:formatter, Rouge::Formatters::HTML.new)

data/lib/nanoc/filters/pandoc.rb

@@ -22,7 +22,7 @@ module Nanoc::Filters
     #
     # @example Passing arguments using `:arg`
     #
-    #     filter :pandoc, args: [:s, {:f => :markdown, :to => :html}, 'no-wrap', :toc]
+    #     filter :pandoc, args: [:s, {:f => :markdown, :to => :html}, 'wrap=none', :toc]
     #
     # @example Passing arguments not using `:arg`
     #

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.8.11'
+  VERSION = '4.8.12'
 end

data/nanoc.manifest

@@ -1,6 +1,5 @@
 .rspec
 .rubocop.yml
-Appraisals
 CODE_OF_CONDUCT.md
 LICENSE
 nanoc.gemspec
@@ -271,6 +270,7 @@ lib/nanoc/version.rb
 
 spec/contributors_spec.rb
 spec/manifest_spec.rb
+spec/gem_spec.rb
 spec/nanoc/base/changes_stream_spec.rb
 spec/nanoc/base/checksummer_spec.rb
 spec/nanoc/base/compiler_spec.rb
@@ -326,6 +326,7 @@ spec/nanoc/base/services/dependency_tracker_spec.rb
 spec/nanoc/base/services/executor_spec.rb
 spec/nanoc/base/services/item_rep_router_spec.rb
 spec/nanoc/base/services/item_rep_selector_spec.rb
+spec/nanoc/base/services/notification_center_spec.rb
 spec/nanoc/base/services/outdatedness_checker_spec.rb
 spec/nanoc/base/services/outdatedness_rules_spec.rb
 spec/nanoc/base/services/pruner_spec.rb
@@ -419,6 +420,7 @@ spec/nanoc/regressions/gh_1145_spec.rb
 spec/nanoc/regressions/gh_1171_spec.rb
 spec/nanoc/regressions/gh_1185_spec.rb
 spec/nanoc/regressions/gh_1216_spec.rb
+spec/nanoc/regressions/gh_1248_spec.rb
 spec/nanoc/regressions/gh_761_spec.rb
 spec/nanoc/regressions/gh_767_spec.rb
 spec/nanoc/regressions/gh_769_spec.rb
@@ -454,6 +456,7 @@ spec/nanoc/rule_dsl/action_sequence_calculator_spec.rb
 spec/nanoc/rule_dsl/recording_executor_spec.rb
 spec/nanoc/rule_dsl/rule_context_spec.rb
 spec/nanoc/rule_dsl/rules_collection_spec.rb
+spec/nanoc/rule_dsl/rule_spec.rb
 spec/nanoc/spec_spec.rb
 spec/nanoc/telemetry_spec.rb
 spec/nanoc/telemetry/counter_spec.rb
@@ -466,11 +469,8 @@ spec/regression_filenames_spec.rb
 spec/spec_helper.rb
 
 test/base/test_compiler.rb
-test/base/test_dependency_tracker.rb
 test/base/test_filter.rb
-test/base/test_notification_center.rb
 test/base/test_site.rb
-test/base/test_store.rb
 test/checking/checks/test_css.rb
 test/checking/checks/test_external_links.rb
 test/checking/checks/test_html.rb
@@ -540,6 +540,4 @@ test/helpers/test_link_to.rb
 test/helpers/test_xml_sitemap.rb
 test/rule_dsl/test_action_provider.rb
 test/rule_dsl/test_compiler_dsl.rb
-test/rule_dsl/test_rule.rb
 test/rule_dsl/test_rules_collection.rb
-test/test_gem.rb

data/spec/gem_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+describe 'nanoc.gem', chdir: false, stdio: true do
+  around do |ex|
+    Dir['*.gem'].each { |f| FileUtils.rm(f) }
+    ex.run
+    Dir['*.gem'].each { |f| FileUtils.rm(f) }
+  end
+
+  subject do
+    piper = Nanoc::Extra::Piper.new(stdout: $stdout, stderr: $stderr)
+    piper.run(%w[gem build nanoc.gemspec], nil)
+  end
+
+  it 'builds gem' do
+    expect { subject }
+      .to change { Dir['*.gem'] }
+      .from([])
+      .to(include(match(/^nanoc-.*\.gem$/)))
+  end
+end

data/spec/manifest_spec.rb

@@ -12,11 +12,11 @@ describe 'manifest', chdir: false do
 
   it 'contains all files in gemspec' do
     missing_from_manifest = gemspec_lines - manifest_lines
-    expect(missing_from_manifest).to be_empty
+    expect(missing_from_manifest).to be_empty, "Found files that appear in the gemspec, but not in the manifest: #{missing_from_manifest.join(', ')}"
   end
 
   it 'contains no files not in gemspec' do
     extra_in_manifest = manifest_lines - gemspec_lines
-    expect(extra_in_manifest).to be_empty
+    expect(extra_in_manifest).to be_empty, "Found files that appear in the manifest, but not in the gemspec: #{extra_in_manifest.join(', ')}"
   end
 end

data/spec/nanoc/base/compiler_spec.rb

@@ -14,14 +14,19 @@ describe Nanoc::Int::Compiler do
   end
 
   let(:checksum_store) { Nanoc::Int::ChecksumStore.new(objects: items) }
-  let(:action_sequence_store) { Nanoc::Int::ActionSequenceStore.new }
+  let(:action_sequence_store) { Nanoc::Int::ActionSequenceStore.new(site: site) }
 
   let(:dependency_store) { Nanoc::Int::DependencyStore.new(items, layouts, config) }
 
   let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site) }
   let(:action_provider) { double(:action_provider) }
 
-  let(:compiled_content_cache) { Nanoc::Int::CompiledContentCache.new(items: items) }
+  let(:compiled_content_cache) do
+    Nanoc::Int::CompiledContentCache.new(
+      site: site,
+      items: items,
+    )
+  end
 
   let(:rep) { Nanoc::Int::ItemRep.new(item, :default) }
   let(:item) { Nanoc::Int::Item.new('<%= 1 + 2 %>', {}, '/hi.md') }

data/spec/nanoc/base/entities/pattern_spec.rb

@@ -21,6 +21,12 @@ describe Nanoc::Int::Pattern do
       expect(pattern.match?('/foo/xyz/bar.html')).to eql(false)
     end
 
+    it 'converts from symbol' do
+      pattern = described_class.from(:'/foo/x[ab]z/bar.*')
+      expect(pattern.match?('/foo/xaz/bar.html')).to eql(true)
+      expect(pattern.match?('/foo/xyz/bar.html')).to eql(false)
+    end
+
     it 'errors on other inputs' do
       expect { described_class.from(123) }.to raise_error(ArgumentError)
     end

data/spec/nanoc/base/repos/compiled_content_cache_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe Nanoc::Int::CompiledContentCache do
-  let(:cache) { described_class.new(items: items) }
+  let(:cache) { described_class.new(items: items, site: site) }
 
   let(:items) { [item] }
 
@@ -13,6 +13,14 @@ describe Nanoc::Int::CompiledContentCache do
 
   let(:content) { Nanoc::Int::Content.create('omg') }
 
+  let(:site) do
+    Nanoc::Int::Site.new(
+      config: Nanoc::Int::Configuration.new.with_defaults,
+      code_snippets: [],
+      data_source: Nanoc::Int::InMemDataSource.new(items, []),
+    )
+  end
+
   it 'has no content by default' do
     expect(cache[item_rep]).to be_nil
   end

data/spec/nanoc/base/repos/dependency_store_spec.rb

@@ -14,6 +14,14 @@ describe Nanoc::Int::DependencyStore do
   let(:layouts) { Nanoc::Int::LayoutCollection.new(config, [layout_a, layout_b]) }
   let(:config) { Nanoc::Int::Configuration.new }
 
+  it 'is empty by default' do
+    expect(store.objects_causing_outdatedness_of(item_a)).to be_empty
+    expect(store.objects_causing_outdatedness_of(item_b)).to be_empty
+    expect(store.objects_causing_outdatedness_of(item_c)).to be_empty
+    expect(store.objects_causing_outdatedness_of(layout_a)).to be_empty
+    expect(store.objects_causing_outdatedness_of(layout_b)).to be_empty
+  end
+
   describe '#dependencies_causing_outdatedness_of' do
     context 'no dependencies' do
       it 'returns nothing for each' do
@@ -208,15 +216,17 @@ describe Nanoc::Int::DependencyStore do
       store.record_dependency(item_a, item_b, attributes: true)
 
       store.store
-      store.items = items_after
-      store.load
+    end
+
+    let(:reloaded_store) do
+      described_class.new(items_after, layouts, config).tap(&:load)
     end
 
     context 'no new items' do
       let(:items_after) { items }
 
       it 'has the right dependencies for item A' do
-        deps = store.dependencies_causing_outdatedness_of(item_a)
+        deps = reloaded_store.dependencies_causing_outdatedness_of(item_a)
         expect(deps.size).to eql(1)
 
         expect(deps[0].from).to eql(item_b)
@@ -229,12 +239,12 @@ describe Nanoc::Int::DependencyStore do
       end
 
       it 'has the right dependencies for item B' do
-        deps = store.dependencies_causing_outdatedness_of(item_b)
+        deps = reloaded_store.dependencies_causing_outdatedness_of(item_b)
         expect(deps).to be_empty
       end
 
       it 'has the right dependencies for item C' do
-        deps = store.dependencies_causing_outdatedness_of(item_c)
+        deps = reloaded_store.dependencies_causing_outdatedness_of(item_c)
         expect(deps).to be_empty
       end
     end
@@ -247,10 +257,34 @@ describe Nanoc::Int::DependencyStore do
       let(:item_d) { Nanoc::Int::Item.new('d', {}, '/d.md') }
 
       it 'does not mark items as outdated' do
-        expect(store.objects_causing_outdatedness_of(item_a)).not_to include(item_d)
-        expect(store.objects_causing_outdatedness_of(item_b)).not_to include(item_d)
-        expect(store.objects_causing_outdatedness_of(item_c)).not_to include(item_d)
-        expect(store.objects_causing_outdatedness_of(item_d)).not_to include(item_d)
+        expect(reloaded_store.objects_causing_outdatedness_of(item_a)).not_to include(item_d)
+        expect(reloaded_store.objects_causing_outdatedness_of(item_b)).not_to include(item_d)
+        expect(reloaded_store.objects_causing_outdatedness_of(item_c)).not_to include(item_d)
+        expect(reloaded_store.objects_causing_outdatedness_of(item_d)).not_to include(item_d)
+      end
+    end
+
+    context 'unrelated item removed' do
+      let(:items_after) do
+        Nanoc::Int::ItemCollection.new(config, [item_a, item_b])
+      end
+
+      it 'does not mark items as outdated' do
+        expect(reloaded_store.objects_causing_outdatedness_of(item_a)).to eq([item_b])
+        expect(reloaded_store.objects_causing_outdatedness_of(item_b)).to be_empty
+        expect(reloaded_store.objects_causing_outdatedness_of(item_c)).to be_empty
+      end
+    end
+
+    context 'related item removed' do
+      let(:items_after) do
+        Nanoc::Int::ItemCollection.new(config, [item_a, item_c])
+      end
+
+      it 'does not mark items as outdated' do
+        expect(reloaded_store.objects_causing_outdatedness_of(item_a)).to eq([nil])
+        expect(reloaded_store.objects_causing_outdatedness_of(item_b)).to be_empty
+        expect(reloaded_store.objects_causing_outdatedness_of(item_c)).to be_empty
       end
     end
   end
@@ -303,6 +337,49 @@ describe Nanoc::Int::DependencyStore do
         subject
         expect(other_items).to all(satisfy { |o| store.dependencies_causing_outdatedness_of(o).empty? })
       end
+
+      context 'dependency on self' do
+        subject { store.record_dependency(source_obj, item_a) }
+
+        it 'does not create dependency on self' do
+          expect { subject }
+            .not_to change { store.objects_causing_outdatedness_of(source_obj) }
+        end
+      end
+
+      context 'two dependencies' do
+        subject do
+          store.record_dependency(source_obj, item_b)
+          store.record_dependency(source_obj, item_b)
+        end
+
+        it 'does not create duplicate dependencies' do
+          expect { subject }
+            .to change { store.objects_causing_outdatedness_of(source_obj) }
+            .from([])
+            .to([item_b])
+        end
+      end
+
+      context 'dependency to nil' do
+        subject { store.record_dependency(source_obj, nil) }
+
+        it 'creates a dependency to nil' do
+          expect { subject }
+            .to change { store.objects_causing_outdatedness_of(source_obj) }
+            .from([])
+            .to([nil])
+        end
+      end
+
+      context 'dependency from nil' do
+        subject { store.record_dependency(nil, item_b) }
+
+        it 'does not create a dependency from nil' do
+          expect { subject }
+            .not_to change { store.objects_causing_outdatedness_of(item_b) }
+        end
+      end
     end
 
     context 'compiled content prop' do
@@ -405,4 +482,34 @@ describe Nanoc::Int::DependencyStore do
       include_examples 'records dependencies'
     end
   end
+
+  describe '#forget_dependencies_for' do
+    before do
+      store.record_dependency(item_a, item_b)
+      store.record_dependency(item_a, item_c)
+      store.record_dependency(item_b, item_a)
+      store.record_dependency(item_b, item_c)
+      store.record_dependency(item_c, item_a)
+      store.record_dependency(item_c, item_b)
+    end
+
+    subject { store.forget_dependencies_for(item_b) }
+
+    it 'removes dependencies from item_a' do
+      expect { subject }
+        .not_to change { store.objects_causing_outdatedness_of(item_a) }
+    end
+
+    it 'removes dependencies from item_b' do
+      expect { subject }
+        .to change { store.objects_causing_outdatedness_of(item_b) }
+        .from(match_array([item_a, item_c]))
+        .to(be_empty)
+    end
+
+    it 'removes dependencies from item_c' do
+      expect { subject }
+        .not_to change { store.objects_causing_outdatedness_of(item_c) }
+    end
+  end
 end