nanoc 4.5.3 → 4.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 313d3c808d70b4205249d9c65a62bacb56ed63d6
-  data.tar.gz: d583fb40f3264a55ba3bc283a4db921d65c488f4
+  metadata.gz: a383a3d98b256b56a7e6590371884c6f189b14dc
+  data.tar.gz: a5564e313aff3b6a2a1fad8eb6378ebb7ea58136
 SHA512:
-  metadata.gz: e521ca2081dd8fe9377ab40e09d31b603f08cc6100ec875fee3cd0f629d982a8d142f94877f0f7335998737ad860bb8bb62ad16f26edf3c5b10a798325e15021
-  data.tar.gz: f64f51bfa27c7e6db9ef29a3266e5bc6a52797dfdc69e442fbedee9665afcc8a2216fea8b647f7513490745afc42a2babeeeaf8d9e5d69ad79f69217d142ce4b
+  metadata.gz: cd7789992a7d9ee85236ab87fc1ce6fcd7a134713a60a86528abce3d28d0700d5b687cb182170e5afcda5dd9eaac5b0d32c3f5a20b44e8671c2b6351c59447c2
+  data.tar.gz: 440ebab06d975006331704bf5d72e775ec65aa668bea50557163f1e3af033e0e27ca9b71347b24f6c79941efb7fb333fa841e82babe8f47d860982fa83ca3582

data/Gemfile.lock

@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    nanoc (4.5.2)
+    nanoc (4.5.4)
       cri (~> 2.3)
       ddplugin (~> 1.0)
       hamster (~> 3.0)

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.5.4 (2017-01-16)
+
+Fixes:
+
+* Fixed issue with site not being recompiled fully when switching between environments (#1067, #1069)
+
 ## 4.5.3 (2017-01-15)
 
 Fixes:

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

@@ -10,9 +10,9 @@ module Nanoc::Int
 
     c_obj = C::Or[Nanoc::Int::Item, Nanoc::Int::Layout, Nanoc::Int::Configuration, Nanoc::Int::CodeSnippet]
 
-    contract C::KeywordArgs[site: C::Maybe[Nanoc::Int::Site], objects: C::IterOf[c_obj]] => C::Any
-    def initialize(site: nil, objects:)
-      super(Nanoc::Int::Store.tmp_path_for(env_name: (site.config.env_name if site), store_name: 'checksums'), 1)
+    contract C::KeywordArgs[objects: C::IterOf[c_obj]] => C::Any
+    def initialize(objects:)
+      super('tmp/checksums', 1)
 
       @objects = objects
 

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

@@ -6,9 +6,9 @@ module Nanoc::Int
   class CompiledContentCache < ::Nanoc::Int::Store
     include Nanoc::Int::ContractsSupport
 
-    contract C::KeywordArgs[env_name: C::Maybe[String], items: C::IterOf[Nanoc::Int::Item]] => C::Any
-    def initialize(env_name: nil, items:)
-      super(Nanoc::Int::Store.tmp_path_for(env_name: env_name, store_name: 'compiled_content'), 2)
+    contract C::KeywordArgs[items: C::IterOf[Nanoc::Int::Item]] => C::Any
+    def initialize(items:)
+      super('tmp/compiled_content', 2)
 
       @items = items
       @cache = {}

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

@@ -7,8 +7,8 @@ module Nanoc::Int
     attr_accessor :objects
 
     # @param [Array<Nanoc::Int::Item, Nanoc::Int::Layout>] objects
-    def initialize(objects, env_name: nil)
-      super(Nanoc::Int::Store.tmp_path_for(env_name: env_name, store_name: 'dependencies'), 4)
+    def initialize(objects)
+      super('tmp/dependencies', 4)
 
       @objects = objects
       @new_objects = []

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

@@ -4,8 +4,8 @@ module Nanoc::Int
     include Nanoc::Int::ContractsSupport
 
     contract C::KeywordArgs[site: C::Maybe[Nanoc::Int::Site], reps: Nanoc::Int::ItemRepRepo] => C::Any
-    def initialize(site: nil, reps:)
-      super(Nanoc::Int::Store.tmp_path_for(env_name: (site.config.env_name if site), store_name: 'outdatedness'), 1)
+    def initialize(reps:)
+      super('tmp/outdatedness', 1)
 
       @outdated_reps = Set.new
       @all_reps = reps

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

@@ -4,8 +4,8 @@ module Nanoc::Int
   #
   # @api private
   class RuleMemoryStore < ::Nanoc::Int::Store
-    def initialize(env_name: nil)
-      super(Nanoc::Int::Store.tmp_path_for(env_name: env_name, store_name: 'rule_memory'), 1)
+    def initialize
+      super('tmp/rule_memory', 1)
 
       @rule_memories = {}
     end

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

@@ -36,13 +36,6 @@ module Nanoc::Int
       @version  = version
     end
 
-    # Logic for building tmp path from active environment and store name
-    # @api private
-    contract C::KeywordArgs[env_name: C::Maybe[String], store_name: String] => String
-    def self.tmp_path_for(env_name:, store_name:)
-      File.join('tmp', env_name.to_s, store_name)
-    end
-
     # @group Loading and storing data
 
     # @return The data that should be written to the disk

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

@@ -2,22 +2,22 @@ module Nanoc::Int
   # @api private
   class CompilerLoader
     def load(site, action_provider: nil)
-      rule_memory_store = Nanoc::Int::RuleMemoryStore.new(env_name: site.config.env_name)
+      rule_memory_store = Nanoc::Int::RuleMemoryStore.new
 
       dependency_store =
-        Nanoc::Int::DependencyStore.new(site.items.to_a + site.layouts.to_a, env_name: site.config.env_name)
+        Nanoc::Int::DependencyStore.new(site.items.to_a + site.layouts.to_a)
 
       objects = site.items.to_a + site.layouts.to_a + site.code_snippets + [site.config]
 
       checksum_store =
-        Nanoc::Int::ChecksumStore.new(site: site, objects: objects)
+        Nanoc::Int::ChecksumStore.new(objects: objects)
 
       item_rep_repo = Nanoc::Int::ItemRepRepo.new
 
       action_provider ||= Nanoc::Int::ActionProvider.named(:rule_dsl).for(site)
 
       outdatedness_store =
-        Nanoc::Int::OutdatednessStore.new(site: site, reps: item_rep_repo)
+        Nanoc::Int::OutdatednessStore.new(reps: item_rep_repo)
 
       outdatedness_checker =
         Nanoc::Int::OutdatednessChecker.new(
@@ -30,10 +30,7 @@ module Nanoc::Int
         )
 
       compiled_content_cache =
-        Nanoc::Int::CompiledContentCache.new(
-          env_name: site.config.env_name,
-          items: site.items,
-        )
+        Nanoc::Int::CompiledContentCache.new(items: site.items)
 
       params = {
         compiled_content_cache: compiled_content_cache,

data/lib/nanoc/version.rb

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

data/spec/nanoc/base/compiler_spec.rb

@@ -20,7 +20,7 @@ describe Nanoc::Int::Compiler do
   let(:reps) { Nanoc::Int::ItemRepRepo.new }
 
   let(:outdatedness_checker) { double(:outdatedness_checker) }
-  let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(site: site, reps: reps) }
+  let(:outdatedness_store) { Nanoc::Int::OutdatednessStore.new(reps: reps) }
   let(:action_provider) { double(:action_provider) }
 
   let(:compiled_content_cache) { Nanoc::Int::CompiledContentCache.new(items: items) }

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

@@ -1,5 +1,5 @@
 describe Nanoc::Int::OutdatednessStore do
-  subject(:store) { described_class.new(site: site, reps: reps) }
+  subject(:store) { described_class.new(reps: reps) }
 
   let(:site) { double(:site) }
   let(:reps) { Nanoc::Int::ItemRepRepo.new }

data/spec/nanoc/base/services/compiler/phases/cache_spec.rb

@@ -8,7 +8,7 @@ describe Nanoc::Int::Compiler::Phases::Cache do
   end
 
   let(:compiled_content_cache) do
-    Nanoc::Int::CompiledContentCache.new(env_name: nil, items: [item])
+    Nanoc::Int::CompiledContentCache.new(items: [item])
   end
 
   let(:snapshot_repo) { Nanoc::Int::SnapshotRepo.new }

data/spec/nanoc/regressions/gh_1067_spec.rb

@@ -0,0 +1,34 @@
+describe 'GH-1067', site: true, stdio: true do
+  before do
+    File.write('nanoc.yaml', <<EOS)
+environments:
+  default:
+    build: dev
+  prod:
+    build: prod
+EOS
+
+    File.write('content/foo.erb', 'build=<%= @config[:build] %>')
+
+    File.write('Rules', <<EOS)
+  compile '/*' do
+    filter :erb
+    write item.identifier
+  end
+EOS
+  end
+
+  it 'recompiles when env changes' do
+    ENV['NANOC_ENV'] = nil
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/foo.erb')).to eql('build=dev')
+
+    ENV['NANOC_ENV'] = nil
+    Nanoc::CLI.run(%w(compile -e prod))
+    expect(File.read('output/foo.erb')).to eql('build=prod')
+
+    ENV['NANOC_ENV'] = nil
+    Nanoc::CLI.run(%w(compile))
+    expect(File.read('output/foo.erb')).to eql('build=dev')
+  end
+end

data/test/base/test_compiler.rb

@@ -17,14 +17,14 @@ class Nanoc::Int::CompilerTest < Nanoc::TestCase
 
     params = {
       compiled_content_cache: Nanoc::Int::CompiledContentCache.new(items: site.items),
-      checksum_store: Nanoc::Int::ChecksumStore.new(site: site, objects: objects),
+      checksum_store: Nanoc::Int::ChecksumStore.new(objects: objects),
       rule_memory_store: Nanoc::Int::RuleMemoryStore.new,
       dependency_store: Nanoc::Int::DependencyStore.new(
         site.items.to_a + site.layouts.to_a,
       ),
       action_provider: action_provider,
       reps: reps,
-      outdatedness_store: Nanoc::Int::OutdatednessStore.new(site: site, reps: reps),
+      outdatedness_store: Nanoc::Int::OutdatednessStore.new(reps: reps),
     }
 
     params[:outdatedness_checker] =

data/test/base/test_store.rb

@@ -34,26 +34,4 @@ class Nanoc::Int::StoreTest < Nanoc::TestCase
     store.load
     assert_equal(nil, store.data)
   end
-
-  def test_tmp_path_with_nil_env
-    tmp_path_for_checksum = Nanoc::Int::Store.tmp_path_for(env_name: nil, store_name: 'checksum')
-    tmp_path_for_rule_memory = Nanoc::Int::Store.tmp_path_for(env_name: nil, store_name: 'rule_memory')
-    tmp_path_for_dependencies = Nanoc::Int::Store.tmp_path_for(env_name: nil, store_name: 'dependencies')
-    tmp_path_for_compiled_content = Nanoc::Int::Store.tmp_path_for(env_name: nil, store_name: 'compiled_content')
-    assert_equal('tmp/checksum', tmp_path_for_checksum)
-    assert_equal('tmp/rule_memory', tmp_path_for_rule_memory)
-    assert_equal('tmp/dependencies', tmp_path_for_dependencies)
-    assert_equal('tmp/compiled_content', tmp_path_for_compiled_content)
-  end
-
-  def test_tmp_path_with_test_env
-    tmp_path_for_checksum = Nanoc::Int::Store.tmp_path_for(env_name: 'test', store_name: 'checksum')
-    tmp_path_for_rule_memory = Nanoc::Int::Store.tmp_path_for(env_name: 'test', store_name: 'rule_memory')
-    tmp_path_for_dependencies = Nanoc::Int::Store.tmp_path_for(env_name: 'test', store_name: 'dependencies')
-    tmp_path_for_compiled_content = Nanoc::Int::Store.tmp_path_for(env_name: 'test', store_name: 'compiled_content')
-    assert_equal('tmp/test/checksum', tmp_path_for_checksum)
-    assert_equal('tmp/test/rule_memory', tmp_path_for_rule_memory)
-    assert_equal('tmp/test/dependencies', tmp_path_for_dependencies)
-    assert_equal('tmp/test/compiled_content', tmp_path_for_compiled_content)
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.5.3
+  version: 4.5.4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -415,6 +415,7 @@ files:
 - spec/nanoc/regressions/gh_1045_spec.rb
 - spec/nanoc/regressions/gh_1047_spec.rb
 - spec/nanoc/regressions/gh_1064_spec.rb
+- spec/nanoc/regressions/gh_1067_spec.rb
 - spec/nanoc/regressions/gh_761_spec.rb
 - spec/nanoc/regressions/gh_767_spec.rb
 - spec/nanoc/regressions/gh_769_spec.rb