nanoc 4.7.4 → 4.7.5

data/spec/nanoc/base/services/outdatedness_rules_spec.rb

@@ -10,7 +10,7 @@ describe Nanoc::Int::OutdatednessRules do
         checksum_store: checksum_store,
         dependency_store: dependency_store,
         action_sequence_store: action_sequence_store,
-        action_provider: action_provider,
+        action_sequences: action_sequences,
         reps: reps,
       )
     end
@@ -30,7 +30,7 @@ describe Nanoc::Int::OutdatednessRules do
       )
     end
 
-    let(:action_provider) { double(:action_provider) }
+    let(:action_sequences) { {} }
     let(:reps) { Nanoc::Int::ItemRepRepo.new }
     let(:dependency_store) { Nanoc::Int::DependencyStore.new(dependency_store_objects) }
     let(:action_sequence_store) { Nanoc::Int::ActionSequenceStore.new }
@@ -309,9 +309,10 @@ describe Nanoc::Int::OutdatednessRules do
         end
       end
 
+      let(:action_sequences) { { item_rep => new_mem } }
+
       before do
         action_sequence_store[item_rep] = old_mem.serialize
-        allow(action_provider).to receive(:action_sequence_for).with(item_rep).and_return(new_mem)
       end
 
       context 'memory is the same' do
@@ -334,9 +335,7 @@ describe Nanoc::Int::OutdatednessRules do
     context 'PathsModified' do
       let(:rule_class) { Nanoc::Int::OutdatednessRules::PathsModified }
 
-      before do
-        allow(action_provider).to receive(:action_sequence_for).with(item_rep).and_return(new_mem)
-      end
+      let(:action_sequences) { { item_rep => new_mem } }
 
       context 'old mem does not exist' do
         let(:new_mem) do
@@ -513,9 +512,7 @@ describe Nanoc::Int::OutdatednessRules do
     describe 'UsesAlwaysOutdatedFilter' do
       let(:rule_class) { Nanoc::Int::OutdatednessRules::UsesAlwaysOutdatedFilter }
 
-      before do
-        allow(action_provider).to receive(:action_sequence_for).with(item_rep).and_return(mem)
-      end
+      let(:action_sequences) { { item_rep => mem } }
 
       context 'unknown filter' do
         let(:mem) do

data/spec/nanoc/cli/commands/show_data_spec.rb

@@ -125,4 +125,151 @@ describe Nanoc::CLI::Commands::ShowData, stdio: true do
       end
     end
   end
+
+  describe '#print_item_rep_outdatedness' do
+    subject { runner.send(:print_item_rep_outdatedness, items, compiler) }
+
+    let(:runner) do
+      described_class.new(options, arguments, command)
+    end
+
+    let(:options) { {} }
+    let(:arguments) { [] }
+    let(:command) { double(:command) }
+
+    let(:config) { Nanoc::Int::Configuration.new }
+
+    let(:items) do
+      Nanoc::Int::IdentifiableCollection.new(
+        config,
+        [
+          item_about,
+          item_dog,
+        ],
+      )
+    end
+
+    let(:item_about) { Nanoc::Int::Item.new('About Me', {}, '/about.md') }
+    let(:item_dog)   { Nanoc::Int::Item.new('About My Dog', {}, '/dog.md') }
+
+    let(:item_rep_about) { Nanoc::Int::ItemRep.new(item_about, :default) }
+    let(:item_rep_dog)   { Nanoc::Int::ItemRep.new(item_dog, :default) }
+
+    let(:site) { double(:site) }
+    let(:compiler) { double(:compiler) }
+    let(:outdatedness_checker) { double(:outdatedness_checker) }
+
+    let(:reps) do
+      {
+        item_about => [item_rep_about],
+        item_dog => [item_rep_dog],
+      }
+    end
+
+    before do
+      allow(runner).to receive(:site).and_return(site)
+      allow(site).to receive(:compiler).and_return(compiler)
+      allow(compiler).to receive(:create_outdatedness_checker).and_return(outdatedness_checker)
+      allow(compiler).to receive(:reps).and_return(reps)
+    end
+
+    context 'not outdated' do
+      before do
+        allow(outdatedness_checker).to receive(:outdatedness_reasons_for).with(item_rep_about).and_return([])
+        allow(outdatedness_checker).to receive(:outdatedness_reasons_for).with(item_rep_dog).and_return([])
+      end
+
+      example do
+        expect { subject }.to output(%r{^item /about.md, rep default:\n  is not outdated$}).to_stdout
+      end
+
+      example do
+        expect { subject }.to output(%r{^item /dog.md, rep default:\n  is not outdated$}).to_stdout
+      end
+    end
+
+    context 'outdated' do
+      before do
+        reasons_about =
+          [
+            Nanoc::Int::OutdatednessReasons::ContentModified,
+            Nanoc::Int::OutdatednessReasons::AttributesModified.new([:title]),
+          ]
+
+        reasons_dog =
+          [Nanoc::Int::OutdatednessReasons::DependenciesOutdated]
+
+        allow(outdatedness_checker).to receive(:outdatedness_reasons_for)
+          .with(item_rep_about).and_return(reasons_about)
+
+        allow(outdatedness_checker).to receive(:outdatedness_reasons_for)
+          .with(item_rep_dog).and_return(reasons_dog)
+      end
+
+      example do
+        expect { subject }.to output(%r{^item /about.md, rep default:\n  is outdated:\n    - The content of this item has been modified since the last time the site was compiled.\n    - The attributes of this item have been modified since the last time the site was compiled.$}).to_stdout
+      end
+
+      example do
+        expect { subject }.to output(%r{^item /dog.md, rep default:\n  is outdated:\n    - This item uses content or attributes that have changed since the last time the site was compiled.$}).to_stdout
+      end
+    end
+  end
+
+  describe '#print_layouts' do
+    subject { runner.send(:print_layouts, layouts, compiler) }
+
+    let(:runner) do
+      described_class.new(options, arguments, command)
+    end
+
+    let(:options) { {} }
+    let(:arguments) { [] }
+    let(:command) { double(:command) }
+
+    let(:config) { Nanoc::Int::Configuration.new }
+
+    let(:layouts) do
+      Nanoc::Int::IdentifiableCollection.new(config, [layout])
+    end
+
+    let(:layout) { Nanoc::Int::Layout.new('stuff', {}, '/default.erb') }
+
+    let(:site) { double(:site) }
+    let(:compiler) { double(:compiler) }
+    let(:outdatedness_checker) { double(:outdatedness_checker) }
+
+    before do
+      allow(runner).to receive(:site).and_return(site)
+      allow(site).to receive(:compiler).and_return(compiler)
+      allow(compiler).to receive(:create_outdatedness_checker).and_return(outdatedness_checker)
+    end
+
+    context 'not outdated' do
+      before do
+        allow(outdatedness_checker).to receive(:outdatedness_reasons_for).with(layout).and_return([])
+      end
+
+      example do
+        expect { subject }.to output(%r{^layout /default.erb:\n  is not outdated$}).to_stdout
+      end
+    end
+
+    context 'outdated' do
+      before do
+        reasons =
+          [
+            Nanoc::Int::OutdatednessReasons::ContentModified,
+            Nanoc::Int::OutdatednessReasons::AttributesModified.new([:title]),
+          ]
+
+        allow(outdatedness_checker).to receive(:outdatedness_reasons_for)
+          .with(layout).and_return(reasons)
+      end
+
+      example do
+        expect { subject }.to output(%r{^layout /default.erb:\n  is outdated:\n    - The content of this item has been modified since the last time the site was compiled.\n    - The attributes of this item have been modified since the last time the site was compiled.$}).to_stdout
+      end
+    end
+  end
 end

data/spec/nanoc/integration/outdatedness_integration_spec.rb

@@ -40,7 +40,7 @@ EOS
         output(/^item \/foo\.md, rep default:\n  is not outdated/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
       )
     end
 
@@ -49,7 +49,7 @@ EOS
       FileUtils.touch('content/foo.md', mtime: time)
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
         output(/^item \/bar\.md, rep default:\n  is not outdated/).to_stdout,
@@ -61,10 +61,10 @@ EOS
       FileUtils.touch('content/foo.md', mtime: time)
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
       )
     end
   end
@@ -104,7 +104,7 @@ EOS
         output(/^item \/foo\.md, rep default:\n  is not outdated/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
       )
     end
 
@@ -112,10 +112,10 @@ EOS
       File.write('content/foo.md', "---\ntitle: hello\n---\n\nfoooOoooOOoooOooo")
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
       )
     end
 
@@ -123,7 +123,7 @@ EOS
       File.write('content/foo.md', "---\ntitle: bye\n---\n\nfoo")
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
         output(/^item \/bar\.md, rep default:\n  is not outdated/).to_stdout,
@@ -166,7 +166,7 @@ EOS
         output(/^item \/foo\.md, rep default:\n  is not outdated/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
       )
     end
 
@@ -174,10 +174,10 @@ EOS
       File.write('content/foo.md', "---\ntitle: hello\n---\n\nfoooOoooOOoooOooo")
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
       )
     end
 
@@ -185,10 +185,10 @@ EOS
       File.write('content/foo.md', "---\ntitle: bye\n---\n\nfoo")
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
       )
     end
 
@@ -206,7 +206,7 @@ end
 EOS
 
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-        output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,
+        output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout,
       )
       expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
         output(/^item \/bar\.md, rep default:\n  is not outdated/).to_stdout,

data/spec/nanoc/integration/partial_recompilation_spec.rb

@@ -20,9 +20,9 @@ EOS
     expect(File.file?('output/bar.html')).not_to be
 
     expect { Nanoc::CLI.run(%w(show-data --no-color)) }
-      .to(output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout)
+      .to(output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout)
     expect { Nanoc::CLI.run(%w(show-data --no-color)) }
-      .to(output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout)
+      .to(output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout)
 
     expect { Nanoc::CLI.run(%w(compile --verbose)) rescue nil }
       .to output(/create.*output\/foo\.html/).to_stdout
@@ -30,7 +30,7 @@ EOS
     expect { Nanoc::CLI.run(%w(show-data --no-color)) }
       .to(output(/^item \/foo\.md, rep default:\n  is not outdated/).to_stdout)
     expect { Nanoc::CLI.run(%w(show-data --no-color)) }
-      .to(output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout)
+      .to(output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout)
 
     expect(File.file?('output/foo.html')).to be
     expect(File.file?('output/bar.html')).not_to be
@@ -43,6 +43,6 @@ EOS
     expect { Nanoc::CLI.run(%w(show-data --no-color)) }
       .to(output(/^item \/foo\.md, rep default:\n  is not outdated/).to_stdout)
     expect { Nanoc::CLI.run(%w(show-data --no-color)) }
-      .to(output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout)
+      .to(output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout)
   end
 end

data/spec/nanoc/regressions/gh_1145_spec.rb

@@ -0,0 +1,16 @@
+describe 'GH-1145', site: true, stdio: true do
+  before do
+    File.write('content/foo.txt', 'asdf')
+
+    File.write('Rules', <<EOS)
+compile '/**/*' do
+  filter :erb
+  write '/last.html'
+end
+EOS
+  end
+
+  it 'detects missing output file of non-default rep' do
+    expect { Nanoc::CLI.run(%w(--verbose)) }.to output(/erb /).to_stdout
+  end
+end

data/spec/nanoc/regressions/gh_970b_spec.rb

@@ -33,7 +33,7 @@ EOS
       output(/^item \/foo\.md, rep default:\n  is not outdated/).to_stdout,
     )
     expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-      output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout,
+      output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
     )
   end
 
@@ -41,10 +41,10 @@ EOS
     File.write('content/foo.md', 'FOO!')
 
     expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-      output(/^item \/foo\.md, rep default:\n  is outdated: /).to_stdout,
+      output(/^item \/foo\.md, rep default:\n  is outdated:/).to_stdout,
     )
     expect { Nanoc::CLI.run(%w(show-data --no-color)) }.to(
-      output(/^item \/bar\.md, rep default:\n  is outdated: /).to_stdout,
+      output(/^item \/bar\.md, rep default:\n  is outdated:/).to_stdout,
     )
   end
 end

data/spec/spec_helper.rb

@@ -70,7 +70,7 @@ RSpec.configure do |c|
     File.write('Rules', 'passthrough "/**/*"')
   end
 
-  c.include(Nanoc::Spec::HelperHelper, helper: true) # rubocop:disable Style/MixinGrouping
+  c.include(Nanoc::Spec::HelperHelper, helper: true)
 
   # Set focus if any
   if ENV.fetch('FOCUS', false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.7.4
+  version: 4.7.5
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -178,6 +178,7 @@ files:
 - lib/nanoc/base/services.rb
 - lib/nanoc/base/services/action_provider.rb
 - lib/nanoc/base/services/checksummer.rb
+- lib/nanoc/base/services/compilation_context.rb
 - lib/nanoc/base/services/compiler.rb
 - lib/nanoc/base/services/compiler/phases.rb
 - lib/nanoc/base/services/compiler/phases/abstract.rb
@@ -187,11 +188,17 @@ files:
 - lib/nanoc/base/services/compiler/phases/resume.rb
 - lib/nanoc/base/services/compiler/phases/write.rb
 - lib/nanoc/base/services/compiler/stages.rb
+- lib/nanoc/base/services/compiler/stages/build_reps.rb
 - lib/nanoc/base/services/compiler/stages/cleanup.rb
 - lib/nanoc/base/services/compiler/stages/compile_reps.rb
 - lib/nanoc/base/services/compiler/stages/determine_outdatedness.rb
+- lib/nanoc/base/services/compiler/stages/forget_outdated_dependencies.rb
+- lib/nanoc/base/services/compiler/stages/load_stores.rb
+- lib/nanoc/base/services/compiler/stages/postprocess.rb
 - lib/nanoc/base/services/compiler/stages/preprocess.rb
 - lib/nanoc/base/services/compiler/stages/prune.rb
+- lib/nanoc/base/services/compiler/stages/store_post_compilation_state.rb
+- lib/nanoc/base/services/compiler/stages/store_pre_compilation_state.rb
 - lib/nanoc/base/services/compiler_loader.rb
 - lib/nanoc/base/services/dependency_tracker.rb
 - lib/nanoc/base/services/executor.rb
@@ -477,6 +484,7 @@ files:
 - spec/nanoc/regressions/gh_1107_spec.rb
 - spec/nanoc/regressions/gh_1130_spec.rb
 - spec/nanoc/regressions/gh_1134_spec.rb
+- spec/nanoc/regressions/gh_1145_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb
@@ -536,7 +544,6 @@ files:
 - test/base/test_item_array.rb
 - test/base/test_layout.rb
 - test/base/test_notification_center.rb
-- test/base/test_outdatedness_checker.rb
 - test/base/test_site.rb
 - test/base/test_store.rb
 - test/checking/checks/test_css.rb