nanoc3 3.2.1 → 3.2.2

data/NEWS.md

@@ -1,5 +1,12 @@
 # nanoc news
 
+## 3.2.2 (2011-09-04)
+
+* Fixed command usage printing
+* Made relativize_paths filter handle Windows network paths [Ruben Verborgh]
+* Made watcher use correct configuration
+* Allowed code blocks to start with a non-language shebang line
+
 ## 3.2.1 (2011-07-27)
 
 * Made `@config` available in rules file

data/lib/nanoc3/cli/commands/create_layout.rb

@@ -19,7 +19,7 @@ module Nanoc3::CLI::Commands
     def run
       # Check arguments
       if arguments.length != 1
-        $stderr.puts "usage: #{usage}"
+        $stderr.puts "usage: #{command.usage}"
         exit 1
       end
 

data/lib/nanoc3/cli/commands/create_site.rb

@@ -286,7 +286,7 @@ EOS
     def run
       # Check arguments
       if arguments.length != 1
-        $stderr.puts "usage: #{usage}"
+        $stderr.puts "usage: #{command.usage}"
         exit 1
       end
 

data/lib/nanoc3/cli/commands/info.rb

@@ -18,7 +18,7 @@ module Nanoc3::CLI::Commands
     def run
       # Check arguments
       if arguments.size != 0
-        $stderr.puts "usage: #{usage}"
+        $stderr.puts "usage: #{command.usage}"
         exit 1
       end
 

data/lib/nanoc3/cli/commands/update.rb

@@ -26,7 +26,7 @@ module Nanoc3::CLI::Commands
     def run
       # Check arguments
       if arguments.size != 0
-        $stderr.puts "usage: #{usage}"
+        $stderr.puts "usage: #{command.usage}"
         exit 1
       end
 

data/lib/nanoc3/cli/commands/watch.rb

@@ -18,6 +18,8 @@ module Nanoc3::CLI::Commands
       require 'fssm'
       require 'pathname'
 
+      watcher_config = self.site.config[:watcher] || {}
+
       @notifier = Notifier.new
 
       # Define rebuilder
@@ -43,9 +45,7 @@ module Nanoc3::CLI::Commands
           site.compile
 
           # TODO include icon (--image misc/success-icon.png)
-          notify_on_compilation_success = site.config.has_key?(:notify_on_compilation_success) ?
-            site.config[:notify_on_compilation_success] :
-            true
+          notify_on_compilation_success = watcher_config.fetch(:notify_on_compilation_success) { true }
           if notify_on_compilation_success
             @notifier.notify('Compilation complete')
           end
@@ -54,9 +54,7 @@ module Nanoc3::CLI::Commands
           puts "done in #{format '%is %ims', *(time_spent.divmod(1000))}"
         rescue Exception => e
           # TODO include icon (--image misc/error-icon.png)
-          notify_on_compilation_failure = site.config.has_key?(:notify_on_compilation_failure) ?
-            site.config[:notify_on_compilation_failure] :
-            true
+          notify_on_compilation_failure = watcher_config.fetch(:notify_on_compilation_failure) { true }
           if notify_on_compilation_failure
             @notifier.notify('Compilation failed')
           end
@@ -71,7 +69,6 @@ module Nanoc3::CLI::Commands
       rebuilder.call(nil, nil)
 
       # Get directories to watch
-      watcher_config = self.site.config[:watcher] || {}
       dirs_to_watch  = watcher_config[:dirs_to_watch]  || %w( content layouts lib )
       files_to_watch = watcher_config[:files_to_watch] || %w( config.yaml Rules rules Rules.rb rules.rb' )
       files_to_watch.delete_if { |f| !File.file?(f) }

data/lib/nanoc3/filters/colorize_syntax.rb

@@ -102,9 +102,9 @@ module Nanoc3::Filters
           has_class = true if language
         else
           # Get language from comment line
-          match = element.inner_text.match(/^#!([^\n]+)$/)
+          match = element.inner_text.match(/^#!([^\/][^\n]*)$/)
           language = match[1] if match
-          element.content = element.content.sub(/^#!([^\n]+)$\n/, '') if language
+          element.content = element.content.sub(/^#!([^\/][^\n]*)$\n/, '') if language
         end
 
         # Give up if there is no hope left

data/lib/nanoc3/filters/relativize_paths.rb

@@ -26,11 +26,11 @@ module Nanoc3::Filters
       # FIXME use nokogiri or csspool instead of regular expressions
       case params[:type]
       when :html
-        content.gsub(/(<[^>]+\s+(src|href))=(['"]?)(\/.*?)\3([ >])/) do
+        content.gsub(/(<[^>]+\s+(src|href))=(['"]?)(\/(?:[^\/].*?)?)\3([\s\/>])/) do
           $1 + '=' + $3 + relative_path_to($4) + $3 + $5
         end
       when :css
-        content.gsub(/url\((['"]?)(\/.*?)\1\)/) do
+        content.gsub(/url\((['"]?)(\/(?:[^\/].*?)?)\1\)/) do
           'url(' + $1 + relative_path_to($2) + $1 + ')'
         end
       else

data/lib/nanoc3.rb

@@ -3,7 +3,7 @@
 module Nanoc3
 
   # The current nanoc version.
-  VERSION = '3.2.1'
+  VERSION = '3.2.2'
 
 end
 

data/test/filters/test_colorize_syntax.rb

@@ -193,4 +193,61 @@ class Nanoc3::Filters::ColorizeSyntaxTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_colorize_syntax_with_non_language_shebang_line
+    if_have 'coderay', 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc3::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = <<EOS
+before
+<pre><code>
+#!/usr/bin/env ruby
+puts 'hi!'
+</code></pre>
+after
+EOS
+      expected_output = <<EOS
+before
+<pre><code>
+#!/usr/bin/env ruby
+puts 'hi!'
+</code></pre>
+after
+EOS
+
+      # Run filter
+      actual_output = filter.run(input)
+      assert_equal(expected_output, actual_output)
+    end
+  end
+
+  def test_colorize_syntax_with_non_language_shebang_line_and_language_line
+    if_have 'coderay', 'nokogiri' do
+      # Create filter
+      filter = ::Nanoc3::Filters::ColorizeSyntax.new
+
+      # Get input and expected output
+      input = <<EOS
+before
+<pre><code>
+#!ruby
+#!/usr/bin/env ruby
+puts 'hi!'
+</code></pre>
+after
+EOS
+      expected_output = <<EOS
+before
+<pre><code class=\"language-ruby\"><span class=\"dt\">#!/usr/bin/env ruby</span>
+puts <span class=\"s\"><span class=\"dl\">'</span><span class=\"k\">hi!</span><span class=\"dl\">'</span></span></code></pre>
+after
+EOS
+
+      # Run filter
+      actual_output = filter.run(input)
+      assert_equal(expected_output, actual_output)
+    end
+  end
+
 end

data/test/filters/test_relativize_paths.rb

@@ -148,6 +148,30 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
     assert_equal(expected_content, actual_content)
   end
 
+  def test_filter_html_network_path
+    # Create filter with mock item
+    filter = Nanoc3::Filters::RelativizePaths.new
+
+    # Mock item
+    filter.instance_eval do
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/woof/meow/'
+    end
+
+    # Set content
+    raw_content      = %[<a href="//example.com/">example.com</a>]
+    expected_content = %[<a href="//example.com/">example.com</a>]
+
+    # Test
+    actual_content = filter.run(raw_content, :type => :html)
+    assert_equal(expected_content, actual_content)
+  end
+
   def test_filter_implicit
     # Create filter with mock item
     filter = Nanoc3::Filters::RelativizePaths.new
@@ -281,4 +305,28 @@ class Nanoc3::Filters::RelativizePathsTest < MiniTest::Unit::TestCase
     assert_equal(expected_content, actual_content)
   end
 
+  def test_filter_css_network_path
+    # Create filter with mock item
+    filter = Nanoc3::Filters::RelativizePaths.new
+
+    # Mock item
+    filter.instance_eval do
+      @item_rep = Nanoc3::ItemRep.new(
+        Nanoc3::Item.new(
+          'content',
+          {},
+          '/foo/bar/baz/'),
+        :blah)
+      @item_rep.path = '/woof/meow/'
+    end
+
+    # Set content
+    raw_content      = %[background: url(//example.com);]
+    expected_content = %[background: url(//example.com);]
+
+    # Test
+    actual_content = filter.run(raw_content, :type => :css)
+    assert_equal(expected_content, actual_content)
+  end
+
 end

data/test/helper.rb

@@ -169,3 +169,11 @@ EOS
   end
 
 end
+
+# A more precise inspect method for Time improves assert failure messages.
+#
+class Time
+  def inspect
+    strftime("%a %b %d %H:%M:%S.#{"%06d" % usec} %Z %Y")
+  end
+end

metadata

@@ -1,98 +1,98 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nanoc3
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.2.2
   prerelease: 
-  version: 3.2.1
 platform: ruby
-authors: 
+authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70348754969400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70348754969400
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70348754968620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70348754968620
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70348754967200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70348754967200
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70348754966620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rdiscount
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70348754966620
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &70348754965880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70348754965880
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70348754964820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-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 \xE2\x80\x9Ccompiles\xE2\x80\x9D the local source files into HTML (usually), by evaluating eRuby, Markdown, etc."
+  prerelease: false
+  version_requirements: *70348754964820
+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,
+  etc.
 email: denis.defreyne@stoneship.org
-executables: 
+executables:
 - nanoc3
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - ChangeLog
 - LICENSE
 - README.md
 - NEWS.md
-files: 
+files:
 - ChangeLog
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - NEWS.md
 - Rakefile
@@ -303,46 +303,54 @@ files:
 - .gemtest
 homepage: http://nanoc.stoneship.org/
 licenses: []
+post_install_message: ! '------------------------------------------------------------------------------
 
-post_install_message: |
-  ------------------------------------------------------------------------------
   Thanks for installing nanoc 3.2! Here are some resources to help you get
+
   started:
-  
+
+
   * The web site at <http://nanoc.stoneship.org/>
+
   * The tutorial at <http://nanoc.stoneship.org/docs/3-getting-started/>
+
   * The manual at <http://nanoc.stoneship.org/docs/4-basic-concepts/>
-  
+
+
   If you have questions, issues or simply want to share ideas, join the
+
   discussion at <http://groups.google.com/group/nanoc> or stop by in the IRC
+
   channel on irc.freenode.net, channel #nanoc. See you there!
-  
+
+
   Enjoy!
+
   ------------------------------------------------------------------------------
 
-rdoc_options: 
+'
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: a web publishing system written in Ruby for building small to medium-sized websites.
+summary: a web publishing system written in Ruby for building small to medium-sized
+  websites.
 test_files: []
-

data/Gemfile.lock

@@ -1,92 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nanoc3 (3.2.0)
-      cri (~> 2.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    RedCloth (4.2.7)
-    bluecloth (2.1.0)
-    builder (3.0.0)
-    coderay (0.9.8)
-    cri (2.0.2)
-    erubis (2.7.0)
-    execjs (1.2.0)
-      multi_json (~> 1.0)
-    haml (3.1.2)
-    kramdown (0.13.3)
-    less (2.0.5)
-      therubyracer (~> 0.9.2)
-    libv8 (3.3.10.2)
-    markaby (0.7.1)
-      builder (>= 2.0.0)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
-    mime-types (1.16)
-    minitest (2.3.1)
-    mocha (0.9.12)
-    multi_json (1.0.3)
-    mustache (0.99.4)
-    nokogiri (1.5.0)
-    rack (1.3.2)
-    rainpress (1.0)
-    rake (0.9.2)
-    rdiscount (1.6.8)
-    rdoc (3.8)
-    redcarpet (1.17.2)
-    rubypants (0.2.0)
-    sass (3.1.5)
-    slim (1.0.0)
-      temple (~> 0.3.0)
-      tilt (~> 1.2)
-    syntax (1.0.0)
-    systemu (2.2.0)
-    temple (0.3.2)
-    therubyracer (0.9.2)
-      libv8 (~> 3.3.10)
-    tilt (1.3.2)
-    typogruby (1.0.12)
-      rubypants
-    uglifier (1.0.0)
-      execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    w3c_validators (1.1.1)
-      nokogiri
-    yard (0.7.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  bluecloth
-  builder
-  coderay
-  erubis
-  haml
-  kramdown
-  less (~> 2.0)
-  markaby
-  maruku
-  mime-types
-  minitest
-  mocha
-  mustache
-  nanoc3!
-  nokogiri
-  rack
-  rainpress
-  rake
-  rdiscount
-  rdoc
-  redcarpet
-  rubypants
-  sass (~> 3.1)
-  slim
-  systemu
-  typogruby
-  uglifier
-  w3c_validators
-  yard