nanoc 4.7.4 → 4.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7edb702d8929a927c1451d25bfa2371a4464914
-  data.tar.gz: 1120a8323748658b9d26bb5ca10b500dfc162a31
+  metadata.gz: ab8752a7ee706e88d3de7f0161673dd839a2edd2
+  data.tar.gz: 418c19a9d06ab842d45f5ece1b51d98eba42f9b6
 SHA512:
-  metadata.gz: a62949639c9c7ebb38ecaf5c1c4c60c1b03e73cdcc4791c300a811517e8fbf826b71079eee6dc5966ae4c25c7aea4e1eefe0ff589c3ec477e0a41f3b70717d16
-  data.tar.gz: 962038a9d13bb4d58395999e77f73a48fc6b3be78fc862e83135aa8fa82f894f01ffb8b696d2354dcaabc7b1b4983245a339bdc96d3cb98ac9bede5153cc0536
+  metadata.gz: 051aa20802e5b97c886dc8b33051af32dac210a78efbae3a1f4595e6c181f49d2f7eda56e502f4d15323963ccf420f7e81a94040e3dac9e9e07ef83f37d56aa1
+  data.tar.gz: ef1423214832df499234d8320496f67a65f709f1d6eee68fa320b33c458598f921dfc38872e7cf1989e027d7269d7d82679a547c9375b1a0641ed6e88777a3ea

data/Gemfile

@@ -49,7 +49,7 @@ group :plugins do
   gem 'mustache', '~> 1.0'
   gem 'nokogiri', '~> 1.6'
   gem 'pandoc-ruby'
-  gem 'pygments.rb', github: 'tmm1/pygments.rb', platforms: %i(ruby mswin)
+  gem 'pygments.rb', '~> 1.1', '>= 1.1.1', platforms: %i(ruby mswin)
   gem 'rack'
   gem 'rainpress'
   gem 'rdiscount', '~> 2.2', platforms: %i(ruby mswin)
@@ -59,7 +59,7 @@ group :plugins do
   gem 'rubypants'
   gem 'sass'
   gem 'slim'
-  gem 'therubyracer', github: 'cowboyd/therubyracer'
+  gem 'therubyracer', '~> 0.12'
   gem 'typogruby'
   gem 'uglifier'
   gem 'w3c_validators'

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/bbatsov/rubocop.git
-  revision: d602d0a763da9f4f16b441f6205c6913eb99fbe4
+  revision: f0990436f0c766747bbd37b164f43b00fb2d9785
   specs:
     rubocop (0.48.0)
       parser (>= 2.3.3.1, < 3.0)
@@ -9,25 +9,10 @@ GIT
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
 
-GIT
-  remote: https://github.com/cowboyd/therubyracer.git
-  revision: 466a1f0d4f696acfe971899272359623ec0a7a97
-  specs:
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
-
-GIT
-  remote: https://github.com/tmm1/pygments.rb.git
-  revision: cf50cbeda48e8a242ef9cba9467e092935730f66
-  specs:
-    pygments.rb (1.1.1)
-      multi_json (>= 1.0.0)
-
 PATH
   remote: .
   specs:
-    nanoc (4.7.4)
+    nanoc (4.7.5)
       cri (~> 2.3)
       ddplugin (~> 1.0)
       hamster (~> 3.0)
@@ -38,7 +23,7 @@ GEM
   specs:
     CFPropertyList (2.3.5)
     RedCloth (4.3.2)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     adsf (1.2.1)
       rack (>= 1.0.0)
@@ -75,11 +60,11 @@ GEM
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.0.5)
     contracts (0.15.0)
-    coveralls (0.8.19)
+    coveralls (0.8.20)
       json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
+      thor (~> 0.19.4)
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -132,7 +117,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (1.2.1)
+    fog-aws (1.3.0)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -211,15 +196,15 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.8.0)
+    fog-vsphere (1.9.0)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.3.0)
       fog-core
       fog-xml
-    fog-xml (0.1.2)
+    fog-xml (0.1.3)
       fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
+      nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
     fuubar (2.2.0)
       rspec-core (~> 3.0)
@@ -289,6 +274,8 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
     public_suffix (2.0.5)
+    pygments.rb (1.1.1)
+      multi_json (>= 1.0.0)
     rack (2.0.1)
     rainbow (2.2.1)
     rainpress (1.0.1)
@@ -328,7 +315,7 @@ GEM
     safe_yaml (1.0.4)
     sass (3.4.23)
     shellany (0.0.1)
-    simplecov (0.12.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
@@ -340,6 +327,9 @@ GEM
     temple (0.7.7)
     term-ansicolor (1.5.0)
       tins (~> 1.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
+      ref
     thor (0.19.4)
     tilt (2.0.7)
     timecop (0.8.1)
@@ -347,7 +337,7 @@ GEM
     trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
-    uglifier (3.1.11)
+    uglifier (3.1.12)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.1.3)
     url (0.3.2)
@@ -404,7 +394,7 @@ DEPENDENCIES
   nokogiri (~> 1.6)
   pandoc-ruby
   pry
-  pygments.rb!
+  pygments.rb (~> 1.1, >= 1.1.1)
   rack
   rainbow (~> 2.1)
   rainpress
@@ -421,7 +411,7 @@ DEPENDENCIES
   sass
   simplecov
   slim
-  therubyracer!
+  therubyracer (~> 0.12)
   timecop
   typogruby
   uglifier

data/NEWS.md

@@ -1,5 +1,16 @@
 # Nanoc news
 
+## 4.7.5 (2017-04-01)
+
+Fixes:
+
+* Recognize `--verbose` when calling `nanoc` without subcommand (#1145, #1146)
+
+Enhancements:
+
+* Made `show-data` print all outdatedness reasons, not just the first (#1142)
+* Sped up `@items.find_all` (#1147)
+
 ## 4.7.4 (2017-03-29)
 
 Enhancements:

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

@@ -37,6 +37,15 @@ module Nanoc::Int
       end
     end
 
+    contract C::Any => C::IterOf[C::RespondTo[:identifier]]
+    def find_all(arg)
+      if frozen?
+        find_all_memoized(arg)
+      else
+        find_all_unmemoized(arg)
+      end
+    end
+
     contract C::None => C::ArrayOf[C::RespondTo[:identifier]]
     def to_a
       @objects.to_a
@@ -77,6 +86,18 @@ module Nanoc::Int
     end
     memoize :get_memoized
 
+    contract C::Any => C::IterOf[C::RespondTo[:identifier]]
+    def find_all_unmemoized(arg)
+      pat = Nanoc::Int::Pattern.from(arg)
+      select { |i| pat.match?(i.identifier) }
+    end
+
+    contract C::Any => C::IterOf[C::RespondTo[:identifier]]
+    def find_all_memoized(arg)
+      find_all_unmemoized(arg)
+    end
+    memoize :find_all_memoized
+
     def object_with_identifier(identifier)
       if frozen?
         @mapping[identifier.to_s]

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

@@ -0,0 +1,54 @@
+module Nanoc::Int
+  class CompilationContext
+    attr_reader :site
+    attr_reader :compiled_content_cache
+    attr_reader :snapshot_repo
+
+    def initialize(action_provider:, reps:, site:, compiled_content_cache:, snapshot_repo:)
+      @action_provider = action_provider
+      @reps = reps
+      @site = site
+      @compiled_content_cache = compiled_content_cache
+      @snapshot_repo = snapshot_repo
+    end
+
+    def filter_name_and_args_for_layout(layout)
+      mem = @action_provider.action_sequence_for(layout)
+      if mem.nil? || mem.size != 1 || !mem[0].is_a?(Nanoc::Int::ProcessingActions::Filter)
+        raise Nanoc::Int::Errors::UndefinedFilterForLayout.new(layout)
+      end
+      [mem[0].filter_name, mem[0].params]
+    end
+
+    def create_view_context(dependency_tracker)
+      Nanoc::ViewContext.new(
+        reps: @reps,
+        items: @site.items,
+        dependency_tracker: dependency_tracker,
+        compilation_context: self,
+        snapshot_repo: @snapshot_repo,
+      )
+    end
+
+    def assigns_for(rep, dependency_tracker)
+      last_content = @snapshot_repo.get(rep, :last)
+      content_or_filename_assigns =
+        if last_content.binary?
+          { filename: last_content.filename }
+        else
+          { content: last_content.string }
+        end
+
+      view_context = create_view_context(dependency_tracker)
+
+      content_or_filename_assigns.merge(
+        item: Nanoc::ItemWithRepsView.new(rep.item, view_context),
+        rep: Nanoc::ItemRepView.new(rep, view_context),
+        item_rep: Nanoc::ItemRepView.new(rep, view_context),
+        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
+end

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

@@ -0,0 +1,27 @@
+module Nanoc::Int::Compiler::Stages
+  class BuildReps
+    def initialize(site:, action_provider:, reps:)
+      @site = site
+      @action_provider = action_provider
+      @reps = reps
+    end
+
+    def run
+      # FIXME: This also, as a side effect, generates the action sequences. :(
+      # Better: let this stage return a mapping of reps onto (raw) paths *and* a mapping of objects
+      # onto action sequences.
+
+      builder = Nanoc::Int::ItemRepBuilder.new(
+        @site, @action_provider, @reps
+      )
+
+      action_sequences = builder.run
+
+      @site.layouts.each do |layout|
+        action_sequences[layout] = @action_provider.action_sequence_for(layout)
+      end
+
+      action_sequences
+    end
+  end
+end

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

@@ -8,12 +8,10 @@ module Nanoc::Int::Compiler::Stages
       @outdatedness_store = outdatedness_store
     end
 
-    C_OBJ = C::Or[Nanoc::Int::Item, Nanoc::Int::ItemRep, Nanoc::Int::Layout]
-
-    contract C::HashOf[C_OBJ => Nanoc::Int::ActionSequence], C::Func[C::IterOf[Nanoc::Int::Item] => C::Any] => C::Any
-    def run(action_sequences)
+    contract C::None => C::Any
+    def run
       outdated_reps_tmp = @reps.select do |r|
-        @outdatedness_store.include?(r) || @outdatedness_checker.outdated?(r, action_sequences)
+        @outdatedness_store.include?(r) || @outdatedness_checker.outdated?(r)
       end
 
       outdated_items = outdated_reps_tmp.map(&:item).uniq
@@ -21,7 +19,7 @@ module Nanoc::Int::Compiler::Stages
 
       outdated_reps.each { |r| @outdatedness_store.add(r) }
 
-      yield(outdated_items)
+      outdated_items
     end
   end
 end

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

@@ -0,0 +1,14 @@
+module Nanoc::Int::Compiler::Stages
+  class ForgetOutdatedDependencies
+    include Nanoc::Int::ContractsSupport
+
+    def initialize(dependency_store:)
+      @dependency_store = dependency_store
+    end
+
+    contract C::IterOf[Nanoc::Int::Item] => C::Any
+    def run(outdated_items)
+      outdated_items.each { |i| @dependency_store.forget_dependencies_for(i) }
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module Nanoc::Int::Compiler::Stages
+  class LoadStores
+    include Nanoc::Int::ContractsSupport
+
+    def initialize(checksum_store:, compiled_content_cache:, dependency_store:, action_sequence_store:, outdatedness_store:)
+      @checksum_store = checksum_store
+      @compiled_content_cache = compiled_content_cache
+      @dependency_store = dependency_store
+      @action_sequence_store = action_sequence_store
+      @outdatedness_store = outdatedness_store
+    end
+
+    contract C::None => C::Any
+    def run
+      @checksum_store.load
+      @compiled_content_cache.load
+      @dependency_store.load
+      @action_sequence_store.load
+      @outdatedness_store.load
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Nanoc::Int::Compiler::Stages
+  class Postprocess
+    include Nanoc::Int::ContractsSupport
+
+    def initialize(action_provider:, site:, reps:)
+      @action_provider = action_provider
+      @site = site
+      @reps = reps
+    end
+
+    contract C::None => C::Any
+    def run
+      @action_provider.postprocess(@site, @reps)
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Nanoc::Int::Compiler::Stages
+  class StorePostCompilationState
+    include Nanoc::Int::ContractsSupport
+
+    def initialize(dependency_store:)
+      @dependency_store = dependency_store
+    end
+
+    contract C::None => C::Any
+    def run
+      @dependency_store.store
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+module Nanoc::Int::Compiler::Stages
+  class StorePreCompilationState
+    include Nanoc::Int::ContractsSupport
+
+    def initialize(reps:, layouts:, items:, code_snippets:, config:, checksum_store:, action_sequence_store:, action_sequences:)
+      @reps = reps
+      @layouts = layouts
+      @items = items
+      @code_snippets = code_snippets
+      @config = config
+      @checksum_store = checksum_store
+      @action_sequence_store = action_sequence_store
+      @action_sequences = action_sequences
+    end
+
+    contract C::None => C::Any
+    def run
+      # Calculate action sequence
+      (@reps.to_a + @layouts.to_a).each do |obj|
+        @action_sequence_store[obj] = @action_sequences[obj].serialize
+      end
+
+      # Calculate checksums
+      objects_to_checksum =
+        @items.to_a + @layouts.to_a + @code_snippets + [@config]
+      objects_to_checksum.each { |obj| @checksum_store.add(obj) }
+
+      # Store
+      @checksum_store.store
+      @action_sequence_store.store
+    end
+  end
+end

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

@@ -6,3 +6,9 @@ require_relative 'stages/compile_reps'
 require_relative 'stages/determine_outdatedness'
 require_relative 'stages/prune'
 require_relative 'stages/preprocess'
+require_relative 'stages/load_stores'
+require_relative 'stages/forget_outdated_dependencies'
+require_relative 'stages/store_pre_compilation_state'
+require_relative 'stages/store_post_compilation_state'
+require_relative 'stages/postprocess'
+require_relative 'stages/build_reps'