nanoc 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a25f62d7d0cba592a2fac26511e3a33c8b23568e
-  data.tar.gz: 58ebd91d32f0188962896e11e58f619cf71c30eb
+  metadata.gz: a3e14d0707707719b3f4d5d8e7df33084eb0d507
+  data.tar.gz: 2c8e065ee1515381e157a0720f18c25824abe980
 SHA512:
-  metadata.gz: 20f2f9e77c44f4bb357c03e32dd2c63573f07d6284b6e3ba5cbea1af13c9b64524366ec3171dbc12d9394e743490e6d18ec98efafddc0a173f9ca064c36aabfc
-  data.tar.gz: 03083d54d98bf95205a30c378d00c2eb714eb526b460022c87d6ec5c20406dbcdef965361b4dac165f7c1014892fc2480f958c369d6b9a04425bc502b2d21afc
+  metadata.gz: b4c7b4c384739c7f9163344701e78341f54c101987d52e955ff012ea45f383fbe37587b44967817436dea59c35c10ba3270cc31104f4203474c7bd3869af6406
+  data.tar.gz: 0e1fa2d68b5db87fe2ef2e71b63dbebc496bc5c038ccdeed17bb03b6236b26822e307013ddb9b4a8032220a34e495d952a42d55cdfa1c602b246746e6ec6b864

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (4.1.0rc2)
+    nanoc (4.1.1)
       cri (~> 2.3)
 
 GEM
@@ -12,7 +12,7 @@ GEM
     addressable (2.4.0)
     adsf (1.2.0)
       rack (>= 1.0.0)
-    ast (2.1.0)
+    ast (2.2.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
     bluecloth (2.2.0)
@@ -58,7 +58,7 @@ GEM
     ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.36.0)
+    fog (1.37.0)
       fog-aliyun (>= 0.1.0)
       fog-atmos
       fog-aws (>= 0.6.0)
@@ -80,10 +80,10 @@ GEM
       fog-terremark
       fog-vmfusion
       fog-voxel
+      fog-vsphere (>= 0.4.0)
       fog-xenserver
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
     fog-aliyun (0.1.0)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
@@ -137,7 +137,7 @@ GEM
       fog-core
       fog-json
       fog-xml
-    fog-sakuracloud (1.5.0)
+    fog-sakuracloud (1.7.5)
       fog-core
       fog-json
     fog-serverlove (0.1.2)
@@ -158,6 +158,9 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
+    fog-vsphere (0.4.0)
+      fog-core
+      rbvmomi (~> 1.8)
     fog-xenserver (0.2.2)
       fog-core
       fog-xml
@@ -211,7 +214,7 @@ GEM
     mustache (1.0.2)
     nenv (0.2.0)
     netrc (0.11.0)
-    nokogiri (1.6.7)
+    nokogiri (1.6.7.1)
       mini_portile2 (~> 2.0.0.rc2)
     notiffany (0.0.8)
       nenv (~> 0.1)
@@ -232,12 +235,16 @@ GEM
     rainbow (2.0.0)
     rainpress (1.0)
     rake (10.4.2)
-    rb-fsevent (0.9.6)
+    rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
+    rbvmomi (1.8.2)
+      builder
+      nokogiri (>= 1.4.1)
+      trollop
     rdiscount (2.1.8)
-    rdoc (4.2.0)
-    redcarpet (3.3.3)
+    rdoc (4.2.1)
+    redcarpet (3.3.4)
     ref (2.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -287,6 +294,7 @@ GEM
     thor (0.19.1)
     tilt (2.0.1)
     tins (1.6.0)
+    trollop (2.1.2)
     typogruby (1.0.18)
       rubypants
     uglifier (2.7.2)
@@ -295,7 +303,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    vcr (3.0.0)
+    vcr (3.0.1)
     w3c_validators (1.2)
       json
       nokogiri

data/NEWS.md

@@ -1,5 +1,15 @@
 # Nanoc news
 
+## 4.1.1 (2015-12-30)
+
+Fixes:
+
+* Fixed preprocessor not being run before check/deploy/prune commands (#763, #784, #787, #788)
+
+Enhancements:
+
+* Made `#breadcrumbs_trail` explicitly fail when using full identifiers (#781, #783)
+
 ## 4.1.0 (2015-12-18)
 
 Fixes:

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

@@ -138,7 +138,7 @@ module Nanoc
     #
     # @param [String] identifier This item's identifier.
     #
-    # @param [Boolean] :binary Whether or not this item is binary
+    # @param [Boolean] binary Whether or not this item is binary
     def new_item(content, attributes, identifier, binary: false)
       content = Nanoc::Int::Content.create(content, binary: binary)
       Nanoc::Int::Item.new(content, attributes, identifier)

data/lib/nanoc/cli/commands/deploy.rb

@@ -14,6 +14,8 @@ module Nanoc::CLI::Commands
   class Deploy < ::Nanoc::CLI::CommandRunner
     def run
       load_site
+      # FIXME: ugly to preprocess here
+      site.compiler.action_provider.preprocess(site)
 
       # List deployers
       if options[:'list-deployers']

data/lib/nanoc/cli/commands/prune.rb

@@ -16,6 +16,8 @@ module Nanoc::CLI::Commands
   class Prune < ::Nanoc::CLI::CommandRunner
     def run
       load_site
+      # FIXME: ugly to preprocess here
+      site.compiler.action_provider.preprocess(site)
       site.compiler.build_reps
 
       if options.key?(:yes)

data/lib/nanoc/helpers/blogging.rb

@@ -381,7 +381,7 @@ module Nanoc::Helpers
     # DateTime) into a Time. When given a Date instance or a string, the
     # argument is assumed to be in the local timezone.
     #
-    # @param [String, Time, Date, DateTime] time Something that contains time
+    # @param [String, Time, Date, DateTime] arg Something that contains time
     #   information but is not necessarily a Time instance yet
     #
     # @return [Time] The Time instance corresponding to the given input

data/lib/nanoc/helpers/breadcrumbs.rb

@@ -2,6 +2,12 @@ module Nanoc::Helpers
   # Provides support for breadcrumbs, which allow the user to go up in the
   # page hierarchy.
   module Breadcrumbs
+    class CannotGetBreadcrumbsForNonLegacyItem < Nanoc::Int::Errors::Generic
+      def initialize(identifier)
+        super("You cannot build a breadcrumbs trail for an item that has a “full” identifier (#{identifier}). Doing so is only possible for items that have a legacy identifier.")
+      end
+    end
+
     # Creates a breadcrumb trail leading from the current item to its parent,
     # to its parent’s parent, etc, until the root item is reached. This
     # function does not require that each intermediate item exist; for
@@ -11,6 +17,10 @@ module Nanoc::Helpers
     # @return [Array] The breadcrumbs, starting with the root item and ending
     #   with the item itself
     def breadcrumbs_trail
+      unless @item.identifier.legacy?
+        raise CannotGetBreadcrumbsForNonLegacyItem.new(@item.identifier)
+      end
+
       trail      = []
       idx_start  = 0
 

data/lib/nanoc/rule_dsl/compiler_dsl.rb

@@ -88,7 +88,9 @@ module Nanoc::RuleDSL
     # @param [String] identifier A pattern matching identifiers of items that
     #   should be routed using this rule
     #
-    # @param [Symbol] :rep The name of the representation
+    # @param [Symbol] rep The name of the representation
+    #
+    # @param [Symbol] snapshot The name of the snapshot
     #
     # @yield The block that will be executed when an item matching this
     #   compilation rule needs to be routed

data/lib/nanoc/rule_dsl/rule.rb

@@ -27,7 +27,7 @@ module Nanoc::RuleDSL
     # @param [Proc] block A block that will be called when matching items are
     #   compiled
     #
-    # @param [Symbol, nil] :snapshot The name of the snapshot this rule will
+    # @param [Symbol, nil] snapshot_name The name of the snapshot this rule will
     #   apply to. Ignored for compilation rules, but used for routing rules.
     def initialize(pattern, rep_name, block, snapshot_name: nil)
       @pattern = pattern

data/lib/nanoc/rule_dsl/rule_memory_calculator.rb

@@ -75,7 +75,7 @@ module Nanoc::RuleDSL
       executor.rule_memory
     end
 
-    # @param [Nanoc::Int::Layout]
+    # @param [Nanoc::Int::Layout] layout
     #
     # @return [Nanoc::Int::RuleMemory]
     def new_rule_memory_for_layout(layout)

data/lib/nanoc/version.rb

@@ -1,4 +1,4 @@
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/test/cli/commands/test_deploy.rb

@@ -163,4 +163,29 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
       assert File.file?('mydestination/blah.html')
     end
   end
+
+  def test_deploy_with_preprocessor
+    skip_unless_have_command 'rsync'
+    with_site do |_site|
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "deploy:\n"
+        io.write "  default:\n"
+        io.write '    dst: mydestination'
+      end
+
+      FileUtils.mkdir_p('output')
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
+
+      File.write('Rules', "preprocess do ; @config[:deploy][:default][:dst] = 'otherdestination' ; end\n\n" + File.read('Rules'))
+
+      capturing_stdio do
+        Nanoc::CLI.run %w( deploy )
+      end
+
+      refute File.directory?('mydestination')
+      refute File.file?('mydestination/blah.html')
+      assert File.directory?('otherdestination')
+      assert File.file?('otherdestination/blah.html')
+    end
+  end
 end

data/test/helpers/test_breadcrumbs.rb

@@ -3,7 +3,7 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
 
   def test_breadcrumbs_trail_at_root
     @items = Nanoc::Int::IdentifiableCollection.new({})
-    item = Nanoc::Int::Item.new('root', {}, '/')
+    item = Nanoc::Int::Item.new('root', {}, Nanoc::Identifier.new('/', type: :legacy))
     @items << item
     @item = item
 
@@ -12,8 +12,8 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
 
   def test_breadcrumbs_trail_with_1_parent
     @items = Nanoc::Int::IdentifiableCollection.new({})
-    parent_item = Nanoc::Int::Item.new('parent', {}, '/')
-    child_item  = Nanoc::Int::Item.new('child',  {}, '/foo/')
+    parent_item = Nanoc::Int::Item.new('parent', {}, Nanoc::Identifier.new('/', type: :legacy))
+    child_item  = Nanoc::Int::Item.new('child',  {}, Nanoc::Identifier.new('/foo/', type: :legacy))
     @items << parent_item
     @items << child_item
     @item = child_item
@@ -23,9 +23,9 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
 
   def test_breadcrumbs_trail_with_many_parents
     @items = Nanoc::Int::IdentifiableCollection.new({})
-    grandparent_item = Nanoc::Int::Item.new('grandparent', {}, '/')
-    parent_item      = Nanoc::Int::Item.new('parent',      {}, '/foo/')
-    child_item       = Nanoc::Int::Item.new('child',       {}, '/foo/bar/')
+    grandparent_item = Nanoc::Int::Item.new('grandparent', {}, Nanoc::Identifier.new('/', type: :legacy))
+    parent_item      = Nanoc::Int::Item.new('parent',      {}, Nanoc::Identifier.new('/foo/', type: :legacy))
+    child_item       = Nanoc::Int::Item.new('child',       {}, Nanoc::Identifier.new('/foo/bar/', type: :legacy))
     @items << grandparent_item
     @items << parent_item
     @items << child_item
@@ -36,12 +36,25 @@ class Nanoc::Helpers::BreadcrumbsTest < Nanoc::TestCase
 
   def test_breadcrumbs_trail_with_nils
     @items = Nanoc::Int::IdentifiableCollection.new({})
-    grandparent_item = Nanoc::Int::Item.new('grandparent', {}, '/')
-    child_item       = Nanoc::Int::Item.new('child',       {}, '/foo/bar/')
+    grandparent_item = Nanoc::Int::Item.new('grandparent', {}, Nanoc::Identifier.new('/', type: :legacy))
+    child_item       = Nanoc::Int::Item.new('child',       {}, Nanoc::Identifier.new('/foo/bar/', type: :legacy))
     @items << grandparent_item
     @items << child_item
     @item = child_item
 
     assert_equal [grandparent_item, nil, child_item], breadcrumbs_trail
   end
+
+  def test_breadcrumbs_trail_with_non_legacy_identifiers
+    @items = Nanoc::Int::IdentifiableCollection.new({})
+    parent_item = Nanoc::Int::Item.new('parent', {}, '/')
+    child_item  = Nanoc::Int::Item.new('child',  {}, '/foo/')
+    @items << parent_item
+    @items << child_item
+    @item = child_item
+
+    assert_raises Nanoc::Helpers::Breadcrumbs::CannotGetBreadcrumbsForNonLegacyItem do
+      breadcrumbs_trail
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -68,7 +68,6 @@ files:
 - README.md
 - Rakefile
 - bin/nanoc
-- do-release
 - doc/yardoc_handlers/identifier.rb
 - doc/yardoc_templates/default/layout/html/footer.erb
 - lib/nanoc.rb
@@ -254,7 +253,6 @@ files:
 - lib/nanoc/rule_dsl/rules_loader.rb
 - lib/nanoc/version.rb
 - nanoc.gemspec
-- tags
 - tasks/doc.rake
 - tasks/rubocop.rake
 - tasks/test.rake
@@ -380,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.

data/do-release

@@ -1,83 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require 'fileutils'
-require 'octokit'
-
-def run(*args)
-  puts "I will execute the following:"
-  puts '    ' + args.map { |a| a =~ /\s/ ? a.inspect : a }.join(' ')
-  print "Is this correct? [y/N] "
-  res = gets
-  unless res.strip.downcase == 'y'
-    $stderr.puts "Answer was not Y; release aborted."
-    exit 1
-  end
-
-  system('echo', *args)
-  system(*args)
-end
-
-
-
-puts "=== Logging in to GitHub’s API…"
-client = Octokit::Client.new(netrc: true)
-puts
-
-puts "=== Deleting old *.gem files…"
-Dir['*.gem'].each do |fn|
-  puts "  #{fn}…"
-  FileUtils.rm_f(fn)
-end
-puts
-
-puts "=== Building new gem…"
-run('gem', 'build', 'nanoc.gemspec')
-puts
-
-puts "=== Reading version…"
-require_relative 'lib/nanoc/version'
-puts "Version = #{Nanoc::VERSION}"
-puts
-
-puts "=== Verifying that release does not yet exist…"
-releases = client.releases('nanoc/nanoc')
-release = releases.find { |r| r.tag_name == Nanoc::VERSION }
-if release
-  $stderr.puts "Release already exists!"
-  $stderr.puts "ABORTED!"
-  exit 1
-end
-puts
-
-puts "=== Creating Git tag…"
-run('git', 'tag', '--sign', '--annotate', Nanoc::VERSION, '--message', "Version #{Nanoc::VERSION}")
-puts
-
-puts "=== Pushing Git data…"
-run('git', 'push', 'origin')
-run('git', 'push', 'origin', '--tags')
-puts
-
-puts "=== Pushing gem…"
-run('gem', 'push', "nanoc-#{Nanoc::VERSION}.gem")
-puts
-
-puts "=== Reading release notes…"
-release_notes = File.readlines('NEWS.md')
-  .drop(4)
-  .take_while { |l| l !~ /^## / }
-  .join
-puts
-
-puts "=== Creating release on GitHub…"
-sleep 3 # Give GitHub some time to detect the new tag
-is_prerelease = !Nanoc::VERSION =~ /a|b|rc/ || Nanoc::VERSION =~ /^0/
-client.create_release(
-  'nanoc/nanoc', Nanoc::VERSION,
-  prerelease: !!is_prerelease,
-  body: release_notes,
-)
-puts
-
-puts "DONE!"