nanoc 3.6.8 → 3.6.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2RmYzljOTcyNWE2NzhmYTEzZWI3MDhlNDAzNTQ2ZGZhMzhhYTliMg==
-  data.tar.gz: !binary |-
-    YWYzNTkyNDZmYWU0ZjdiMWE0NWIwNDZiMmEzMDhjYmRhMTc5NDZmZg==
+SHA1:
+  metadata.gz: e57a92e04d4e25dba882d2e0953820b5ea5cc713
+  data.tar.gz: 9046eec0428c852a64c41199cdb3582c828a9420
 SHA512:
-  metadata.gz: !binary |-
-    ZWQ1N2I4MDVhOWJhMTYzNzI3Mjg5MmIwYWVlZmE0MzViMDk4NmI3ZDA3MTUx
-    MzJmNjhhMjFjNTdhZTMzZDBjMzIyODhhNzYxYTVlOTVhNDM2MzYwNWMyOTAx
-    ZTQyMTk2M2RmMGE1Nzg2NDhiOTVlZmEzNWUyMWZlZjhjZjAzZjA=
-  data.tar.gz: !binary |-
-    NjQxYTNjMmZlYmQ0OTRlNWYzYjE4MWNiNDYyYjQ5MjI1N2U1ZjNjZDY4OWY0
-    YjU3Mjk2NjlkMTgxZTQ3YmE2OWRiMGY4MThiMzU5Mjc2MjFjMTc1MzI2YWY5
-    YWM5MzM3MzczZGMwMzI4ZDdiNjRjMDAyOWRlMWJjNTMyYjE2MmE=
+  metadata.gz: d81d19a33e83db6c091062d3df87e9f2393f8363049f255ee8fd08c51b5835f204aeb03bb2bfec71d9c97649313196415af378860b3fadfbbb0524fc0c9a0328
+  data.tar.gz: 49b337ebf2aaf1a1fb745a82ff3d0af62a87d074620b89b2b5017e8b679e42825cb8d5aa32d4a7ebf2b496b2e9126a25d8d88b34f345e830b871be1737f9fcc8

data/Gemfile

@@ -24,19 +24,18 @@ gem 'mustache'
 gem 'nokogiri', '~> 1.5.5'
 gem 'pandoc-ruby'
 gem 'pry'
-gem 'pygments.rb'
+gem 'pygments.rb', :platforms => [:ruby, :mswin]
 gem 'rack'
 gem 'rake'
 gem 'rainpress'
-gem 'rdiscount'
+gem 'rdiscount', :platforms => [:ruby, :mswin]
 gem 'rdoc'
-gem 'redcarpet'
+gem 'redcarpet', :platforms => [:ruby, :mswin]
 gem 'RedCloth'
 gem 'rubocop'
 gem 'rubypants'
 gem 'sass', '~> 3.2.2'
 gem 'slim'
-gem 'systemu'
 gem 'typogruby'
 gem 'uglifier'
 gem 'w3c_validators'

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    nanoc (3.6.7)
+    nanoc (3.6.9)
       cri (~> 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
+    RedCloth (4.2.9-java)
     adsf (1.2.0)
       rack (>= 1.0.0)
     ast (1.1.0)
@@ -26,22 +27,23 @@ GEM
     coffee-script-source (1.7.0)
     colored (1.2)
     commonjs (0.2.7)
-    compass (0.12.4)
+    compass (0.12.5)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.2.17)
-    cri (2.5.0)
-      colored (>= 1.2)
+      sass (~> 3.2.19)
+    cri (2.6.0)
+      colored (~> 1.2)
     erubis (2.7.0)
     excon (0.32.1)
     execjs (2.0.2)
     ffi (1.9.3)
+    ffi (1.9.3-java)
     fog (1.21.0)
       fog-brightbox
       fog-core (~> 1.21, >= 1.21.1)
       fog-json
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.0.1)
+    fog-brightbox (0.0.2)
       fog-core
       fog-json
     fog-core (1.21.1)
@@ -62,6 +64,7 @@ GEM
       therubyracer (~> 0.12.0)
     handlebars-source (1.3.0)
     json (1.8.1)
+    json (1.8.1-java)
     kramdown (1.3.3)
     less (2.5.0)
       commonjs (~> 0.2.7)
@@ -82,11 +85,13 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.9.2)
     mustache (0.99.5)
-    net-scp (1.1.2)
+    net-scp (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh (2.8.0)
     nio4r (1.0.0)
+    nio4r (1.0.0-java)
     nokogiri (1.5.11)
+    nokogiri (1.5.11-java)
     pandoc-ruby (0.7.5)
     parser (2.1.7)
       ast (~> 1.1)
@@ -97,22 +102,27 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pry (0.9.12.6-java)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+      spoon (~> 0.0)
     pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rainbow (2.0.0)
     rainpress (1.0)
-    rake (10.1.1)
+    rake (10.2.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
-    rdiscount (2.1.7)
+    rdiscount (2.1.7.1)
     rdoc (4.1.1)
       json (~> 1.4)
     redcarpet (3.1.1)
     ref (1.0.5)
-    rubocop (0.19.1)
+    rubocop (0.20.1)
       json (>= 1.7.7, < 2)
       parser (~> 2.1.7)
       powerpack (~> 0.0.6)
@@ -120,12 +130,13 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.4.2)
     rubypants (0.2.0)
-    sass (3.2.17)
+    sass (3.2.19)
     slim (2.0.2)
       temple (~> 0.6.6)
       tilt (>= 1.3.3, < 2.1)
     slop (3.5.0)
-    systemu (2.6.4)
+    spoon (0.0.4)
+      ffi
     temple (0.6.7)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
@@ -141,10 +152,11 @@ GEM
       json
       nokogiri
     yajl-ruby (1.1.0)
-    yard (0.8.7.3)
+    yard (0.8.7.4)
     yuicompressor (1.3.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -184,7 +196,6 @@ DEPENDENCIES
   rubypants
   sass (~> 3.2.2)
   slim
-  systemu
   typogruby
   uglifier
   w3c_validators

data/NEWS.md

@@ -1,5 +1,14 @@
 # nanoc news
 
+## 3.6.9 (2014-04-15)
+
+Fixes:
+
+* Fixed path to default stylesheet (#410, #411)
+* Improved reliability of piping from/to external processes in JRuby (#417)
+* Added workaround for “cannot modify” errors when using Nokogiri on JRuby (#416)
+* Made corrupted cached data auto-repair itself if possible (#409, #418)
+
 ## 3.6.8 (2014-03-22)
 
 Fixes:

data/README.md

@@ -1,7 +1,8 @@
-[![Build Status](https://travis-ci.org/nanoc/nanoc.png)](https://travis-ci.org/nanoc/nanoc)
-[![Code Climate](https://codeclimate.com/github/nanoc/nanoc.png)](https://codeclimate.com/github/nanoc/nanoc)
-[![Coverage Status](https://coveralls.io/repos/nanoc/nanoc/badge.png?branch=master)](https://coveralls.io/r/nanoc/nanoc)
-[![Gem Version](https://badge.fury.io/rb/nanoc.png)](http://badge.fury.io/rb/nanoc)
+[![Gem version](http://img.shields.io/gem/v/nanoc.svg)](http://rubygems.org/gems/nanoc)
+[![Build status](http://img.shields.io/travis/nanoc/nanoc.svg)](https://travis-ci.org/nanoc/nanoc)
+[![Code Climate](http://img.shields.io/codeclimate/github/nanoc/nanoc.svg)](https://codeclimate.com/github/nanoc/nanoc)
+[![Code Coverage](http://img.shields.io/coveralls/nanoc/nanoc.svg)](https://coveralls.io/r/nanoc/nanoc)
+[![Documentation Coverage](http://inch-pages.github.io/github/nanoc/nanoc.svg)](http://inch-pages.github.io/github/nanoc/nanoc/)
 
 ![nanoc logo](https://avatars1.githubusercontent.com/u/3260163?s=140)
 

data/lib/nanoc/base/store.rb

@@ -73,17 +73,22 @@ module Nanoc
         return
       end
 
-      pstore.transaction do
-        # Check version
-        if pstore[:version] != version
-          version_mismatch_detected
+      begin
+        pstore.transaction do
+          # Check version
+          if pstore[:version] != version
+            version_mismatch_detected
+            @loaded = true
+            return
+          end
+
+          # Load
+          self.data = pstore[:data]
           @loaded = true
-          return
         end
-
-        # Load
-        self.data = pstore[:data]
-        @loaded = true
+      rescue
+        FileUtils.rm_f(filename)
+        load
       end
     end
 

data/lib/nanoc/cli/commands/create-site.rb

@@ -252,7 +252,7 @@ EOS
   <head>
     <meta charset="utf-8">
     <title>A Brand New nanoc Site - <%= @item[:title] %></title>
-    <link rel="stylesheet" href="/style.css">
+    <link rel="stylesheet" href="<%= @items['/stylesheet/'].path %>">
 
     <!-- you don't need to keep this, but it's cool for stats! -->
     <meta name="generator" content="nanoc <%= Nanoc::VERSION %>">

data/lib/nanoc/cli/error_handler.rb

@@ -217,7 +217,6 @@ module Nanoc::CLI
       'redcloth'       => 'RedCloth',
       'rubypants'      => 'rubypants',
       'sass'           => 'sass',
-      'systemu'        => 'systemu',
       'w3c_validators' => 'w3c_validators'
     }
 

data/lib/nanoc/extra.rb

@@ -9,6 +9,7 @@ module Nanoc::Extra
   autoload 'LinkCollector',     'nanoc/extra/link_collector.rb'
   autoload 'Pruner',            'nanoc/extra/pruner'
   autoload 'Validators',        'nanoc/extra/validators'
+  autoload 'Piper',             'nanoc/extra/piper'
 
   # Deprecated; use {Nanoc::Context} instead
   # TODO [in nanoc 4.0] remove me

data/lib/nanoc/extra/deployers/rsync.rb

@@ -31,8 +31,6 @@ module Nanoc::Extra::Deployers
 
     # @see Nanoc::Extra::Deployer#run
     def run
-      require 'systemu'
-
       # Get params
       src = source_path + '/'
       dst = config[:dst]
@@ -53,11 +51,9 @@ module Nanoc::Extra::Deployers
 
   private
 
-    # Runs the given shell command. It will raise an error if execution fails
-    # (results in a nonzero exit code).
-    def run_shell_cmd(args)
-      status = systemu(args, 'stdout' => $stdout, 'stderr' => $stderr)
-      raise "command exited with a nonzero status code #{$CHILD_STATUS.exitstatus} (command: #{args.join(' ')})" if !status.success?
+    def run_shell_cmd(cmd)
+      piper = Nanoc::Extra::Piper.new(:stdout => $stdout, :stderr => $stderr)
+      piper.run(cmd, nil)
     end
 
   end

data/lib/nanoc/extra/piper.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+require 'open3'
+
+module Nanoc::Extra
+
+  class Piper
+
+    class Error < ::Nanoc::Errors::Generic
+
+      def initialize(command, exit_code)
+        @command   = command
+        @exit_code = exit_code
+      end
+
+      def message
+        "command exited with a nonzero status code #{@exit_code} (command: #{@command.join(' ')})"
+      end
+
+    end
+
+    # @option [IO] :stdout ($stdout)
+    # @option [IO] :stderr ($stderr)
+    def initialize(params={})
+      @stdout = params.fetch(:stdout, $stdout)
+      @stderr = params.fetch(:stderr, $stderr)
+    end
+
+    # @param [Array<String>] cmd
+    #
+    # @param [String, nil] input
+    def run(cmd, input)
+      Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thr|
+        stdout_thread = Thread.new { @stdout << stdout.read }
+        stderr_thread = Thread.new { @stderr << stderr.read }
+
+        if input
+          stdin << input
+        end
+        stdin.close
+
+        stdout_thread.join
+        stderr_thread.join
+
+        exit_status = wait_thr.value
+        if !exit_status.success?
+          raise Error.new(exit_status.to_i, cmd)
+        end
+      end
+    end
+
+  end
+
+end

data/lib/nanoc/filters/asciidoc.rb

@@ -5,8 +5,6 @@ module Nanoc::Filters
   # @since 3.2.0
   class AsciiDoc < Nanoc::Filter
 
-    requires 'systemu'
-
     # Runs the content through [AsciiDoc](http://www.methods.co.nz/asciidoc/).
     # This method takes no options.
     #
@@ -14,23 +12,11 @@ module Nanoc::Filters
     #
     # @return [String] The filtered content
     def run(content, params = {})
-      # Run command
-      stdout = ''
-      stderr = ''
-      status = systemu(
-        %w( asciidoc -o - - ),
-        'stdin'  => content,
-        'stdout' => stdout,
-        'stderr' => stderr)
-
-      # Show errors
-      unless status.success?
-        $stderr.puts stderr
-        raise "AsciiDoc filter failed with status #{status}"
-      end
-
-      # Get result
-      stdout
+      stdout = StringIO.new
+      stderr = $stderr
+      piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+      piper.run(%w( asciidoc -o - - ), content)
+      stdout.string
     end
 
   end

data/lib/nanoc/filters/colorize_syntax.rb

@@ -101,8 +101,7 @@ module Nanoc::Filters
       end
 
       # Colorize
-      is_fullpage = params.fetch(:is_fullpage) { false }
-      doc = is_fullpage ? klass.parse(content, nil, 'UTF-8') : klass.fragment(content)
+      doc = parse(content, klass, params.fetch(:is_fullpage, false))
       selector = params[:outside_pre] ? 'code' : 'pre > code'
       doc.css(selector).each do |element|
         # Get language
@@ -143,6 +142,35 @@ module Nanoc::Filters
       doc.send(method, :encoding => 'UTF-8')
     end
 
+    # Parses the given content using the given class. This method also handles
+    # an issue with Nokogiri on JRuby causing “cannot modify frozen string”
+    # errors.
+    #
+    # @param [String] content The content to parse
+    #
+    # @param [Class] klass The Nokogiri parser class (either Nokogiri::HTML
+    #   or Nokogiri::XML)
+    #
+    # @param [Boolean] is_fullpage true if the given content is a full page,
+    #   false if it is a fragment
+    #
+    # @api private
+    def parse(content, klass, is_fullpage)
+      begin
+        if is_fullpage
+          klass.parse(content, nil, 'UTF-8')
+        else
+          klass.fragment(content)
+        end
+      rescue => e
+        if e.message =~ /can't modify frozen string/
+          parse(content.dup, klass, is_fullpage)
+        else
+          raise e
+        end
+      end
+    end
+
     # Runs the code through [CodeRay](http://coderay.rubychan.de/).
     #
     # @api private
@@ -185,23 +213,20 @@ module Nanoc::Filters
     #
     # @return [String] The colorized output
     def pygmentize(code, language, params = {})
-      require 'systemu'
       check_availability('pygmentize', '-V')
 
       params[:encoding] ||= 'utf-8'
       params[:nowrap]   ||= 'True'
 
-      # Build command
       cmd = [ 'pygmentize', '-l', language, '-f', 'html' ]
       cmd << '-O' << params.map { |k, v| "#{k}=#{v}" }.join(',') unless params.empty?
 
-      # Run command
       stdout = StringIO.new
-      systemu cmd, 'stdin' => code, 'stdout' => stdout
+      stderr = $stderr
+      piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+      piper.run(cmd, code)
 
-      # Get result
-      stdout.rewind
-      stdout.read
+      stdout.string
     end
 
     # Runs the content through [Pygments](http://pygments.org/) via
@@ -246,11 +271,8 @@ module Nanoc::Filters
     #
     # @return [String] The colorized output
     def simon_highlight(code, language, params = {})
-      require 'systemu'
-
       check_availability('highlight', '--version')
 
-      # Build command
       cmd = [ 'highlight', '--syntax', language, '--fragment' ]
       params.each do |key, value|
         if SIMON_HIGHLIGHT_OPT_MAP[key]
@@ -264,13 +286,12 @@ module Nanoc::Filters
         end
       end
 
-      # Run command
       stdout = StringIO.new
-      systemu cmd, 'stdin' => code, 'stdout' => stdout
+      stderr = $stderr
+      piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+      piper.run(cmd, code)
 
-      # Get result
-      stdout.rewind
-      stdout.read
+      stdout.string
     end
 
     # Wraps the element in <div class="CodeRay"><div class="code">
@@ -323,8 +344,8 @@ module Nanoc::Filters
     end
 
     def check_availability(*cmd)
-      systemu cmd
-      raise "Could not spawn #{cmd.join(' ')}" if $CHILD_STATUS.exitstatus != 0
+      piper = Nanoc::Extra::Piper.new(:stdout => StringIO.new, :stderr => StringIO.new)
+      piper.run(cmd, nil)
     end
 
   end

data/lib/nanoc/version.rb

@@ -3,6 +3,6 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.6.8'
+  VERSION = '3.6.9'
 
 end

data/test/base/test_store.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+class Nanoc::StoreTest < Nanoc::TestCase
+
+  class TestStore < Nanoc::Store
+
+    def data
+      @data
+    end
+
+    def data=(new_data)
+      @data = new_data
+    end
+
+  end
+
+  def test_delete_and_reload_on_error
+    store = TestStore.new('test.db', 1)
+
+    # Create
+    store.load
+    store.data = { :fun => 'sure' }
+    store.store
+
+    # Test stored values
+    store = TestStore.new('test.db', 1)
+    store.load
+    assert_equal({ :fun => 'sure' }, store.data)
+
+    # Mess up
+    File.open('test.db', 'w') do |io|
+      io << 'Damn {}#}%@}$^)@&$&*^#@ broken stores!!!'
+    end
+
+    # Reload
+    store = TestStore.new('test.db', 1)
+    store.load
+    assert_equal(nil, store.data)
+  end
+
+end

data/test/cli/commands/test_create_site.rb

@@ -19,4 +19,14 @@ class Nanoc::CLI::Commands::CreateSiteTest < Nanoc::TestCase
     end
   end
 
+  def test_new_site_has_correct_stylesheets
+    Nanoc::CLI.run %w( create_site foo )
+    FileUtils.cd('foo') do
+      Nanoc::CLI.run %w( compile )
+
+      assert File.file?('content/stylesheet.css')
+      assert_match(/\/stylesheet.css/, File.read('output/index.html'))
+    end
+  end
+
 end

data/test/cli/commands/test_deploy.rb

@@ -4,182 +4,166 @@ class Nanoc::CLI::Commands::DeployTest < Nanoc::TestCase
 
   def test_deploy
     skip_unless_have_command "rsync"
-    if_have 'systemu' do
-      with_site do |site|
-        File.open('nanoc.yaml', 'w') do |io|
-          io.write "deploy:\n"
-          io.write "  public:\n"
-          io.write "    kind: rsync\n"
-          io.write "    dst: mydestination"
-        end
+    with_site do |site|
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "deploy:\n"
+        io.write "  public:\n"
+        io.write "    kind: rsync\n"
+        io.write "    dst: mydestination"
+      end
 
-        FileUtils.mkdir_p('output')
-        File.open('output/blah.html', 'w') { |io| io.write 'moo' }
+      FileUtils.mkdir_p('output')
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-        Nanoc::CLI.run %w( deploy -t public )
+      Nanoc::CLI.run %w( deploy -t public )
 
-        assert File.directory?('mydestination')
-        assert File.file?('mydestination/blah.html')
-      end
+      assert File.directory?('mydestination')
+      assert File.file?('mydestination/blah.html')
     end
   end
 
   def test_deploy_with_dry_run
-    if_have 'systemu' do
-      with_site do |site|
-        File.open('nanoc.yaml', 'w') do |io|
-          io.write "deploy:\n"
-          io.write "  public:\n"
-          io.write "    kind: rsync\n"
-          io.write "    dst: mydestination"
-        end
+    with_site do |site|
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "deploy:\n"
+        io.write "  public:\n"
+        io.write "    kind: rsync\n"
+        io.write "    dst: mydestination"
+      end
 
-        FileUtils.mkdir_p('output')
-        File.open('output/blah.html', 'w') { |io| io.write 'moo' }
+      FileUtils.mkdir_p('output')
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-        Nanoc::CLI.run %w( deploy -t public -n )
+      Nanoc::CLI.run %w( deploy -t public -n )
 
-        refute File.directory?('mydestination')
-        refute File.file?('mydestination/blah.html')
-      end
+      refute File.directory?('mydestination')
+      refute File.file?('mydestination/blah.html')
     end
   end
 
   def test_deploy_with_list_without_config
-    if_have 'systemu' do
-      with_site do |site|
-        FileUtils.mkdir_p('output')
-        File.open('output/blah.html', 'w') { |io| io.write 'moo' }
+    with_site do |site|
+      FileUtils.mkdir_p('output')
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-        ios = capturing_stdio do
-          Nanoc::CLI.run %w( deploy -L )
-        end
+      ios = capturing_stdio do
+        Nanoc::CLI.run %w( deploy -L )
+      end
 
-        assert ios[:stdout].include?('No deployment configurations.')
+      assert ios[:stdout].include?('No deployment configurations.')
 
-        refute File.directory?('mydestination')
-        refute File.file?('mydestination/blah.html')
-      end
+      refute File.directory?('mydestination')
+      refute File.file?('mydestination/blah.html')
     end
   end
 
   def test_deploy_with_list
-    if_have 'systemu' do
-      with_site do |site|
-        File.open('nanoc.yaml', 'w') do |io|
-          io.write "deploy:\n"
-          io.write "  public:\n"
-          io.write "    kind: rsync\n"
-          io.write "    dst: mydestination"
-        end
+    with_site do |site|
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "deploy:\n"
+        io.write "  public:\n"
+        io.write "    kind: rsync\n"
+        io.write "    dst: mydestination"
+      end
 
-        FileUtils.mkdir_p('output')
-        File.open('output/blah.html', 'w') { |io| io.write 'moo' }
+      FileUtils.mkdir_p('output')
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-        ios = capturing_stdio do
-          Nanoc::CLI.run %w( deploy -L )
-        end
+      ios = capturing_stdio do
+        Nanoc::CLI.run %w( deploy -L )
+      end
 
-        assert ios[:stdout].include?('Available deployment configurations:')
+      assert ios[:stdout].include?('Available deployment configurations:')
 
-        refute File.directory?('mydestination')
-        refute File.file?('mydestination/blah.html')
-      end
+      refute File.directory?('mydestination')
+      refute File.file?('mydestination/blah.html')
     end
   end
 
   def test_deploy_with_list_deployers
-    if_have 'systemu' do
-      with_site do |site|
-        File.open('nanoc.yaml', 'w') do |io|
-          io.write "deploy:\n"
-          io.write "  public:\n"
-          io.write "    kind: rsync\n"
-          io.write "    dst: mydestination"
-        end
+    with_site do |site|
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "deploy:\n"
+        io.write "  public:\n"
+        io.write "    kind: rsync\n"
+        io.write "    dst: mydestination"
+      end
 
-        FileUtils.mkdir_p('output')
-        File.open('output/blah.html', 'w') { |io| io.write 'moo' }
+      FileUtils.mkdir_p('output')
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-        ios = capturing_stdio do
-          Nanoc::CLI.run %w( deploy -D )
-        end
+      ios = capturing_stdio do
+        Nanoc::CLI.run %w( deploy -D )
+      end
 
-        assert ios[:stdout].include?('Available deployers:')
+      assert ios[:stdout].include?('Available deployers:')
 
-        refute File.directory?('mydestination')
-        refute File.file?('mydestination/blah.html')
-      end
+      refute File.directory?('mydestination')
+      refute File.file?('mydestination/blah.html')
     end
   end
 
   def test_deploy_without_kind
     skip_unless_have_command "rsync"
-    if_have 'systemu' do
-      with_site do |site|
-        File.open('nanoc.yaml', 'w') do |io|
-          io.write "deploy:\n"
-          io.write "  public:\n"
-          io.write "    dst: mydestination"
-        end
+    with_site do |site|
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "deploy:\n"
+        io.write "  public:\n"
+        io.write "    dst: mydestination"
+      end
 
-        FileUtils.mkdir_p('output')
-        File.open('output/blah.html', 'w') { |io| io.write 'moo' }
+      FileUtils.mkdir_p('output')
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-        ios = capturing_stdio do
-          Nanoc::CLI.run %w( deploy -t public )
-        end
+      ios = capturing_stdio do
+        Nanoc::CLI.run %w( deploy -t public )
+      end
 
-        assert ios[:stderr].include?('Warning: The specified deploy target does not have a kind attribute. Assuming rsync.')
+      assert ios[:stderr].include?('Warning: The specified deploy target does not have a kind attribute. Assuming rsync.')
 
-        assert File.directory?('mydestination')
-        assert File.file?('mydestination/blah.html')
-      end
+      assert File.directory?('mydestination')
+      assert File.file?('mydestination/blah.html')
     end
   end
 
   def test_deploy_without_target_without_default
-    if_have 'systemu' do
-      with_site do |site|
-        File.open('nanoc.yaml', 'w') do |io|
-          io.write "deploy:\n"
-          io.write "  public:\n"
-          io.write "    dst: mydestination"
-        end
+    with_site do |site|
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "deploy:\n"
+        io.write "  public:\n"
+        io.write "    dst: mydestination"
+      end
 
-        FileUtils.mkdir_p('output')
-        File.open('output/blah.html', 'w') { |io| io.write 'moo' }
+      FileUtils.mkdir_p('output')
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-         capturing_stdio do
-          err = assert_raises Nanoc::Errors::GenericTrivial do
-            Nanoc::CLI.run %w( deploy )
-          end
-          assert_equal 'The site has no deployment configuration for default.', err.message
+       capturing_stdio do
+        err = assert_raises Nanoc::Errors::GenericTrivial do
+          Nanoc::CLI.run %w( deploy )
         end
+        assert_equal 'The site has no deployment configuration for default.', err.message
       end
     end
   end
 
   def test_deploy_without_target_with_default
     skip_unless_have_command "rsync"
-    if_have 'systemu' do
-      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' }
+    with_site do |site|
+      File.open('nanoc.yaml', 'w') do |io|
+        io.write "deploy:\n"
+        io.write "  default:\n"
+        io.write "    dst: mydestination"
+      end
 
-        capturing_stdio do
-          Nanoc::CLI.run %w( deploy )
-        end
+      FileUtils.mkdir_p('output')
+      File.open('output/blah.html', 'w') { |io| io.write 'moo' }
 
-        assert File.directory?('mydestination')
-        assert File.file?('mydestination/blah.html')
+      capturing_stdio do
+        Nanoc::CLI.run %w( deploy )
       end
+
+      assert File.directory?('mydestination')
+      assert File.file?('mydestination/blah.html')
     end
   end
 

data/test/extra/deployers/test_rsync.rb

@@ -3,96 +3,88 @@
 class Nanoc::Extra::Deployers::RsyncTest < Nanoc::TestCase
 
   def test_run_without_dst
-    if_have 'systemu' do
-      # Create deployer
-      rsync = Nanoc::Extra::Deployers::Rsync.new(
-        'output/',
-        {})
-
-      # Mock run_shell_cmd
-      def rsync.run_shell_cmd(args)
-        @shell_cms_args = args
-      end
-
-      # Try running
-      error = assert_raises(RuntimeError) do
-        rsync.run
-      end
-
-      # Check error message
-      assert_equal 'No dst found in deployment configuration', error.message
+    # Create deployer
+    rsync = Nanoc::Extra::Deployers::Rsync.new(
+      'output/',
+      {})
+
+    # Mock run_shell_cmd
+    def rsync.run_shell_cmd(args)
+      @shell_cms_args = args
     end
+
+    # Try running
+    error = assert_raises(RuntimeError) do
+      rsync.run
+    end
+
+    # Check error message
+    assert_equal 'No dst found in deployment configuration', error.message
   end
 
   def test_run_with_erroneous_dst
-    if_have 'systemu' do
-      # Create deployer
-      rsync = Nanoc::Extra::Deployers::Rsync.new(
-        'output/',
-        { :dst => 'asdf/' })
-
-      # Mock run_shell_cmd
-      def rsync.run_shell_cmd(args)
-        @shell_cms_args = args
-      end
-
-      # Try running
-      error = assert_raises(RuntimeError) do
-        rsync.run
-      end
-
-      # Check error message
-      assert_equal 'dst requires no trailing slash', error.message
+    # Create deployer
+    rsync = Nanoc::Extra::Deployers::Rsync.new(
+      'output/',
+      { :dst => 'asdf/' })
+
+    # Mock run_shell_cmd
+    def rsync.run_shell_cmd(args)
+      @shell_cms_args = args
     end
-  end
 
-  def test_run_everything_okay
-    if_have 'systemu' do
-      # Create deployer
-      rsync = Nanoc::Extra::Deployers::Rsync.new(
-        'output',
-        { :dst => 'asdf' })
-
-      # Mock run_shell_cmd
-      def rsync.run_shell_cmd(args)
-        @shell_cms_args = args
-      end
-
-      # Run
+    # Try running
+    error = assert_raises(RuntimeError) do
       rsync.run
+    end
+
+    # Check error message
+    assert_equal 'dst requires no trailing slash', error.message
+  end
 
-      # Check args
-      opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
-      assert_equal(
-        [ 'rsync', opts, 'output/', 'asdf' ].flatten,
-        rsync.instance_eval { @shell_cms_args }
-      )
+  def test_run_everything_okay
+    # Create deployer
+    rsync = Nanoc::Extra::Deployers::Rsync.new(
+      'output',
+      { :dst => 'asdf' })
+
+    # Mock run_shell_cmd
+    def rsync.run_shell_cmd(args)
+      @shell_cms_args = args
     end
+
+    # Run
+    rsync.run
+
+    # Check args
+    opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
+    assert_equal(
+      [ 'rsync', opts, 'output/', 'asdf' ].flatten,
+      rsync.instance_eval { @shell_cms_args }
+    )
   end
 
   def test_run_everything_okay_dry
-    if_have 'systemu' do
-      # Create deployer
-      rsync = Nanoc::Extra::Deployers::Rsync.new(
-        'output',
-        { :dst => 'asdf' },
-        :dry_run => true)
-
-      # Mock run_shell_cmd
-      def rsync.run_shell_cmd(args)
-        @shell_cms_args = args
-      end
-
-      # Run
-      rsync.run
-
-      # Check args
-      opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
-      assert_equal(
-        [ 'echo', 'rsync', opts, 'output/', 'asdf' ].flatten,
-        rsync.instance_eval { @shell_cms_args }
-      )
+    # Create deployer
+    rsync = Nanoc::Extra::Deployers::Rsync.new(
+      'output',
+      { :dst => 'asdf' },
+      :dry_run => true)
+
+    # Mock run_shell_cmd
+    def rsync.run_shell_cmd(args)
+      @shell_cms_args = args
     end
+
+    # Run
+    rsync.run
+
+    # Check args
+    opts = Nanoc::Extra::Deployers::Rsync::DEFAULT_OPTIONS
+    assert_equal(
+      [ 'echo', 'rsync', opts, 'output/', 'asdf' ].flatten,
+      rsync.instance_eval { @shell_cms_args }
+    )
   end
 
 end

data/test/extra/test_piper.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+
+class Nanoc::Extra::PiperTest < Nanoc::TestCase
+
+  def test_basic
+    stdout = StringIO.new
+    stderr = StringIO.new
+
+    cmd = %w( ls -l )
+
+    File.open('foo.txt', 'w') { |io| io.write('hi') }
+    File.open('bar.txt', 'w') { |io| io.write('ho') }
+
+    piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+    piper.run(cmd, nil)
+
+    assert_match(/foo\.txt/, stdout.string)
+    assert_match(/bar\.txt/, stdout.string)
+    assert stderr.string.empty?
+  end
+
+  def test_stdin
+    stdout = StringIO.new
+    stderr = StringIO.new
+
+    input = 'Hello World!'
+    cmd = %w( cat )
+
+    piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+    piper.run(cmd, input)
+
+    assert_equal(input, stdout.string)
+    assert_equal('', stderr.string)
+  end
+
+end

data/test/filters/test_asciidoc.rb

@@ -3,16 +3,14 @@
 class Nanoc::Filters::AsciiDocTest < Nanoc::TestCase
 
   def test_filter
-    if_have 'systemu' do
-      skip_unless_have_command "asciidoc"
+    skip_unless_have_command "asciidoc"
 
-      # Create filter
-      filter = ::Nanoc::Filters::AsciiDoc.new
+    # Create filter
+    filter = ::Nanoc::Filters::AsciiDoc.new
 
-      # Run filter
-      result = filter.setup_and_run("== Blah blah")
-      assert_match %r{<h2 id="_blah_blah">Blah blah</h2>}, result
-    end
+    # Run filter
+    result = filter.setup_and_run("== Blah blah")
+    assert_match %r{<h2 id="_blah_blah">Blah blah</h2>}, result
   end
 
 end

data/test/filters/test_colorize_syntax.rb

@@ -35,6 +35,16 @@ class Nanoc::Filters::ColorizeSyntaxTest < Nanoc::TestCase
     end
   end
 
+  def test_with_frozen_input
+    if_have 'nokogiri' do
+      input = '<pre title="moo"><code class="language-ruby"># comment</code></pre>'.freeze
+      input.freeze
+
+      filter = ::Nanoc::Filters::ColorizeSyntax.new
+      filter.setup_and_run(input, :default_colorizer => :dummy)
+    end
+  end
+
   def test_full_page
     if_have 'nokogiri' do
       # Create filter
@@ -121,7 +131,7 @@ EOS
   end
 
   def test_pygmentize
-    if_have 'nokogiri', 'systemu' do
+    if_have 'nokogiri' do
       skip_unless_have_command "pygmentize"
 
       # Create filter
@@ -154,7 +164,7 @@ EOS
   end
 
   def test_simon_highlight
-    if_have 'nokogiri', 'systemu' do
+    if_have 'nokogiri' do
       skip_unless_have_command "highlight"
 
       # Create filter
@@ -215,7 +225,7 @@ EOS
   def test_colorize_syntax_with_default_colorizer
     skip_unless_have_command "pygmentize"
 
-    if_have 'nokogiri', 'systemu' do
+    if_have 'nokogiri' do
       # Create filter
       filter = ::Nanoc::Filters::ColorizeSyntax.new
 
@@ -230,7 +240,7 @@ EOS
   end
 
   def test_colorize_syntax_with_missing_executables
-    if_have 'nokogiri', 'systemu' do
+    if_have 'nokogiri' do
       begin
         original_path = ENV['PATH']
         ENV['PATH'] = './blooblooblah'

data/test/test_gem.rb

@@ -8,21 +8,15 @@ class Nanoc::GemTest < Nanoc::TestCase
   end
 
   def test_build
-    require 'systemu'
-
     # Require clean environment
     Dir['nanoc-*.gem'].each { |f| FileUtils.rm(f) }
 
     # Build
     files_before = Set.new Dir['**/*']
-    stdout = ''
-    stderr = ''
-    status = systemu(
-      [ 'gem', 'build', 'nanoc.gemspec' ],
-      'stdin'  => '',
-      'stdout' => stdout,
-      'stderr' => stderr)
-    assert status.success?
+    stdout = StringIO.new
+    stderr = StringIO.new
+    piper = Nanoc::Extra::Piper.new(:stdout => stdout, :stderr => stderr)
+    piper.run(%w( gem build nanoc.gemspec ), nil)
     files_after = Set.new Dir['**/*']
 
     # Check new files
@@ -31,8 +25,8 @@ class Nanoc::GemTest < Nanoc::TestCase
     assert_match(/^nanoc-.*\.gem$/, diff.to_a[0])
 
     # Check output
-    assert_match(/Successfully built RubyGem\s+Name: nanoc\s+Version: .*\s+File: nanoc-.*\.gem\s+/, stdout)
-    assert_equal '', stderr
+    assert_match(/Successfully built RubyGem\s+Name: nanoc\s+Version: .*\s+File: nanoc-.*\.gem\s+/, stdout.string)
+    assert_equal '', stderr.string
   ensure
     Dir['nanoc-*.gem'].each { |f| FileUtils.rm(f) }
   end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.6.8
+  version: 3.6.9
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 description: nanoc is a simple but very flexible static site generator written in
@@ -165,6 +165,7 @@ files:
 - lib/nanoc/extra/file_proxy.rb
 - lib/nanoc/extra/filesystem_tools.rb
 - lib/nanoc/extra/link_collector.rb
+- lib/nanoc/extra/piper.rb
 - lib/nanoc/extra/pruner.rb
 - lib/nanoc/extra/validators.rb
 - lib/nanoc/extra/validators/links.rb
@@ -255,6 +256,7 @@ files:
 - test/base/test_rule.rb
 - test/base/test_rule_context.rb
 - test/base/test_site.rb
+- test/base/test_store.rb
 - test/cli/commands/test_check.rb
 - test/cli/commands/test_compile.rb
 - test/cli/commands/test_create_item.rb
@@ -292,6 +294,7 @@ files:
 - test/extra/test_file_proxy.rb
 - test/extra/test_filesystem_tools.rb
 - test/extra/test_link_collector.rb
+- test/extra/test_piper.rb
 - test/extra/test_vcs.rb
 - test/extra/validators/test_links.rb
 - test/extra/validators/test_w3c.rb
@@ -343,18 +346,18 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []