nanoc 3.3.1 → 3.3.2

data/Gemfile.lock

@@ -0,0 +1,111 @@
+PATH
+  remote: .
+  specs:
+    nanoc (3.3.2)
+      cri (~> 2.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    RedCloth (4.2.9)
+    albino (1.3.3)
+      posix-spawn (>= 0.3.6)
+    bluecloth (2.2.0)
+    builder (3.0.0)
+    coderay (1.0.5)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.2.0)
+    commonjs (0.2.0)
+      therubyracer (~> 0.9.9)
+    cri (2.2.0)
+    erubis (2.7.0)
+    execjs (1.3.0)
+      multi_json (~> 1.0)
+    haml (3.1.4)
+    json (1.6.5)
+    kramdown (0.13.5)
+    less (2.0.9)
+      commonjs (~> 0.2.0)
+      therubyracer (~> 0.9.9)
+    libv8 (3.3.10.4)
+    markaby (0.7.2)
+      builder (>= 2.0.0)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
+    metaclass (0.0.1)
+    mime-types (1.17.2)
+    minitest (2.11.3)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.1.0)
+    mustache (0.99.4)
+    nokogiri (1.5.0)
+    posix-spawn (0.3.6)
+    rack (1.4.1)
+    rainpress (1.0)
+    rake (0.9.2.2)
+    rdiscount (1.6.8)
+    rdoc (3.12)
+      json (~> 1.4)
+    redcarpet (2.1.0)
+    rubypants (0.2.0)
+    sass (3.1.15)
+    slim (1.1.1)
+      temple (~> 0.4.0)
+      tilt (~> 1.3.2)
+    syntax (1.0.0)
+    systemu (2.4.2)
+    temple (0.4.0)
+    therubyracer (0.9.9)
+      libv8 (~> 3.3.10)
+    tilt (1.3.3)
+    typogruby (1.0.14)
+      rubypants
+    uglifier (1.2.3)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    w3c_validators (1.2)
+      json
+      nokogiri
+    yard (0.7.5)
+    yuicompressor (1.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  albino
+  bluecloth
+  builder
+  coderay
+  coffee-script
+  erubis
+  haml
+  kramdown
+  less (~> 2.0)
+  markaby
+  maruku
+  mime-types
+  minitest
+  mocha
+  mustache
+  nanoc!
+  nokogiri
+  rack
+  rainpress
+  rake
+  rdiscount
+  rdoc
+  redcarpet
+  rubypants
+  sass (~> 3.1)
+  slim
+  systemu
+  typogruby
+  uglifier
+  w3c_validators
+  yard
+  yuicompressor

data/NEWS.md

@@ -1,5 +1,13 @@
 # nanoc news
 
+## 3.3.2 (2012-03-16)
+
+* Removed bin/nanoc3 (use nanoc3 gem if you want it)
+* Fixed wrong “no such snapshot” errors
+* Made deployer default to rsync for backwards compatibility
+* Fixed missing Nanoc::CLI in deployment tasks
+* Fixed “unrecognised kind” deployer error
+
 ## 3.3.1 (2012-02-18)
 
 * Fixed issue with long paths on Windows

data/README.md

@@ -90,6 +90,7 @@ may be interested in the development dependencies:
 * Felix Hanley
 * Justin Hileman
 * Starr Horne
+* Daniel Hofstetter
 * Tuomas Kareinen
 * Matt Keveney
 * Kevin Lynagh

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

@@ -321,6 +321,11 @@ module Nanoc
       Nanoc::NotificationCenter.on(:processing_started, self) { |obj| @stack.push(obj) }
       Nanoc::NotificationCenter.on(:processing_ended,   self) { |obj| @stack.pop       }
 
+      # Assign snapshots
+      reps.each do |rep|
+        rep.snapshots = rules_collection.snapshots_for(rep)
+      end
+
       # Attempt to compile all active reps
       loop do
         # Find rep to compile
@@ -365,9 +370,6 @@ module Nanoc
       # Calculate rule memory if we haven’t yet done do
       rules_collection.new_rule_memory_for_rep(rep)
 
-      # Assign snapshots
-      rep.snapshots = rules_collection.snapshots_for(rep)
-
       if !outdatedness_checker.outdated?(rep) && compiled_content_cache[rep]
         # Reuse content
         Nanoc::NotificationCenter.post(:cached_content_used, rep)

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

@@ -55,12 +55,12 @@ module Nanoc::CLI::Commands
       # Get deployer
       names = Nanoc::Extra::Deployer.all.keys
       name = config.fetch(:kind) do
-        $stderr.puts "The specified deploy target does not have a kind."
-        $stderr.puts "(expected one of #{names.join(', ')})"
-        exit 1
+        $stderr.puts "Warning: The specified deploy target does not have a kind attribute. Assuming rsync."
+        'rsync'
       end
-      deployer_class = Nanoc::Extra::Deployer.named(name) do
-        $stderr.puts "The specified deploy target has an unrecognised kind (#{kind})."
+      deployer_class = Nanoc::Extra::Deployer.named(name)
+      if deployer_class.nil?
+        $stderr.puts "The specified deploy target has an unrecognised kind (#{name})."
         $stderr.puts "(expected one of #{names.join(', ')})"
         exit 1
       end

data/lib/nanoc/cli/error_handler.rb

@@ -66,7 +66,7 @@ module Nanoc::CLI
     def print_error(error)
       # Header
       $stderr.puts
-      $stderr.puts "Captain! We’ve been hit!"
+      $stderr.puts "Captain! We’ve been hit!".make_compatible_with_env
 
       # Exception and resolution (if any)
       $stderr.puts

data/lib/nanoc/tasks/deploy/rsync.rake

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'nanoc/cli'
+
 namespace :deploy do
 
   desc 'Upload the compiled site using rsync'

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 
   # @return [String] A string containing information about this nanoc version
   #   and its environment (Ruby engine and version, Rubygems version if any).

data/nanoc.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
                          Dir['doc/yardoc_templates/**/*'] +
                          Dir['{bin,lib,tasks,test}/**/*'] +
                          [ 'nanoc.gemspec', '.gemtest' ]
-  s.executables        = [ 'nanoc', 'nanoc3' ]
+  s.executables        = [ 'nanoc' ]
   s.require_paths      = [ 'lib' ]
 
   s.rdoc_options     = [ '--main', 'README.md' ]
   s.extra_rdoc_files = [ 'ChangeLog', 'LICENSE', 'README.md', 'NEWS.md' ]
 
-  s.add_runtime_dependency('cri', '~> 2.1')
+  s.add_runtime_dependency('cri', '~> 2.2')
 
   s.add_development_dependency('minitest')
   s.add_development_dependency('mocha')

data/test/base/test_compiler.rb

@@ -371,6 +371,40 @@ class Nanoc::CompilerTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_mutually_include_compiled_content_at_previous_snapshot
+    with_site do |site|
+      # Create items
+      File.open('content/a.html', 'w') do |io|
+        io.write('[<%= @items.find { |i| i.identifier == "/z/" }.compiled_content(:snapshot => :guts) %>]')
+      end
+      File.open('content/z.html', 'w') do |io|
+        io.write('stuff')
+      end
+
+      # Create routes
+      File.open('Rules', 'w') do |io|
+        io.write "compile '*' do\n"
+        io.write "  snapshot :guts\n"
+        io.write "  filter :erb\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "route '*' do\n"
+        io.write "  item.identifier + 'index.html'\n"
+        io.write "end\n"
+        io.write "\n"
+        io.write "layout '*', :erb\n"
+      end
+
+      # Compile
+      site = Nanoc::Site.new('.')
+      site.compile
+
+      # Check
+      assert_equal '[stuff]', File.read('output/a/index.html')
+      assert_equal 'stuff', File.read('output/z/index.html')
+    end
+  end
+
   def test_layout_with_extra_filter_args
     with_site do |site|
       # Create item

data/test/cli/commands/test_deploy.rb

@@ -84,17 +84,13 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
         File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
         ios = capturing_stdio do
-          assert_raises SystemExit do
-            Nanoc::CLI.run %w( deploy -t public )
-          end
+          Nanoc::CLI.run %w( deploy -t public )
         end
 
-        assert ios[:stdout].empty?
-        assert ios[:stderr].include?('The specified deploy target does not have a kind.')
-        assert ios[:stderr].include?('(expected one of ')
+        assert ios[:stderr].include?('Warning: The specified deploy target does not have a kind attribute. Assuming rsync.')
 
-        refute File.directory?('mydestination')
-        refute File.file?('mydestination/blah.html')
+        assert File.directory?('mydestination')
+        assert File.file?('mydestination/blah.html')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: &70230609637420 !ruby/object:Gem::Requirement
+  requirement: &70355075174180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70230609637420
+  version_requirements: *70355075174180
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70230609637020 !ruby/object:Gem::Requirement
+  requirement: &70355075173560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230609637020
+  version_requirements: *70355075173560
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70230609636560 !ruby/object:Gem::Requirement
+  requirement: &70355075172820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230609636560
+  version_requirements: *70355075172820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70230609652500 !ruby/object:Gem::Requirement
+  requirement: &70355075309900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230609652500
+  version_requirements: *70355075309900
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70230609652080 !ruby/object:Gem::Requirement
+  requirement: &70355075308600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230609652080
+  version_requirements: *70355075308600
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70230609651660 !ruby/object:Gem::Requirement
+  requirement: &70355075306460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230609651660
+  version_requirements: *70355075306460
 description: nanoc is a simple but very flexible static site generator written in
   Ruby. It operates on local files, and therefore does not run on the server. nanoc
   “compiles” the local source files into HTML (usually), by evaluating eRuby, Markdown,
@@ -84,7 +84,6 @@ description: nanoc is a simple but very flexible static site generator written i
 email: denis.defreyne@stoneship.org
 executables:
 - nanoc
-- nanoc3
 extensions: []
 extra_rdoc_files:
 - ChangeLog
@@ -94,13 +93,13 @@ extra_rdoc_files:
 files:
 - ChangeLog
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - NEWS.md
 - Rakefile
 - README.md
 - doc/yardoc_templates/default/layout/html/footer.erb
 - bin/nanoc
-- bin/nanoc3
 - lib/nanoc/base/compilation/checksum_store.rb
 - lib/nanoc/base/compilation/compiled_content_cache.rb
 - lib/nanoc/base/compilation/compiler.rb
@@ -369,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: a web publishing system written in Ruby for building small to medium-sized

data/bin/nanoc3

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-
-exec File.dirname(__FILE__) + '/nanoc', *ARGV