nanoc 3.5.0b1 → 3.5.0b2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.5.0)
+    nanoc (3.5.0b1)
       cri (~> 2.2)
 
 GEM
@@ -25,7 +25,7 @@ GEM
     excon (0.16.10)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    fog (1.8.0)
+    fog (1.9.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
@@ -37,53 +37,55 @@ GEM
       ruby-hmac
     formatador (0.2.4)
     haml (3.1.7)
-    handlebars (0.3.1)
+    handlebars (0.3.2)
       commonjs (~> 0.2.3)
-      therubyracer (~> 0.10.0)
-    json (1.7.5)
-    kramdown (0.14.1)
+      therubyracer (~> 0.11.1)
+    json (1.7.6)
+    kramdown (0.14.2)
     less (2.2.2)
       commonjs (~> 0.2.6)
-    libv8 (3.3.10.4)
-    listen (0.6.0)
+    libv8 (3.11.8.13)
+    listen (0.7.2)
     markaby (0.7.2)
       builder (>= 2.0.0)
     maruku (0.6.1)
       syntax (>= 1.0.0)
     metaclass (0.0.1)
     mime-types (1.19)
-    minitest (4.3.3)
-    mocha (0.13.1)
+    minitest (4.5.0)
+    mocha (0.13.2)
       metaclass (~> 0.0.1)
     multi_json (1.5.0)
     mustache (0.99.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.6.2)
+    net-ssh (2.6.3)
     nokogiri (1.5.6)
     pandoc-ruby (0.6.0)
     posix-spawn (0.3.6)
-    pygments.rb (0.3.3)
+    pygments.rb (0.3.7)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rack (1.4.1)
+    rack (1.5.0)
     rainpress (1.0)
     rake (10.0.3)
     rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
     redcarpet (2.2.2)
+    ref (1.0.2)
     ruby-hmac (0.4.0)
     rubypants (0.2.0)
-    sass (3.2.4)
-    slim (1.3.5)
+    sass (3.2.5)
+    slim (1.3.6)
       temple (~> 0.5.5)
       tilt (~> 1.3.3)
     syntax (1.0.0)
     systemu (2.5.2)
     temple (0.5.5)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
+    therubyracer (0.11.3)
+      libv8 (~> 3.11.8.12)
+      ref
     tilt (1.3.3)
     typogruby (1.0.15)
       rubypants

data/NEWS.md

@@ -10,10 +10,11 @@ Minor changes:
 
 * Added `#include_rules` for modularising Rules files [Justin Hileman]
 * Replaced FSSM with Listen [Takashi Uchibe]
-* Made USR1 print stack trace
+* Made USR1 print stack trace (not on Windows)
 * Added ability to configure autocompiler host/port in config.yaml [Stuart Montgomery]
 * Added static data source
 * Added `:rep_select` parameter to XML sitemap to allow filtering reps
+* Removed use of bright/bold colors for compatibility with Solarized
 
 Exensions:
 
@@ -26,6 +27,7 @@ Fixes:
 
 * Made syntax colorizer only use the first non-empty line when extracting the
   language comment
+* Fixed XSL filter
 
 ## 3.4.3 (2012-12-09)
 

data/lib/nanoc.rb

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

data/lib/nanoc/base/plugin_registry.rb

@@ -132,8 +132,7 @@ module Nanoc
     # @param [Class] superclass The superclass of the plugin. For example:
     #   {Nanoc::Filter}, {Nanoc::Extra::VCS}.
     #
-    # @param [Class, String] class_or_name The class to get the identifiers for.
-    #   This can also be a string containing the name of the class.
+    # @param [Class] klass The class to get the identifiers for.
     #
     # @return [Array<Symbol>] An array of identifiers for the given class
     def identifiers_of(superclass, klass)

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

@@ -24,7 +24,6 @@ module Nanoc::CLI::Commands
       elsif options[:all]
         runner.run_all
       elsif options[:deploy]
-        runner.require_dsl
         runner.run_for_deploy
       else
         runner.run_specific(arguments)

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

@@ -60,13 +60,16 @@ module Nanoc::CLI::Commands
 
       # Check
       unless options[:'no-check']
-        puts "Running issue checks…"
-        ok = Nanoc::Extra::Checking::Runner.new(site).run_for_deploy
-        if !ok
-          puts "Issues found, deploy aborted."
-          return
+        runner = Nanoc::Extra::Checking::Runner.new(site)
+        if runner.has_dsl?
+          puts "Running issue checks…"
+          ok = runner.run_for_deploy
+          if !ok
+            puts "Issues found, deploy aborted."
+            return
+          end
+          puts "No issues found. Deploying!"
         end
-        puts "No issues found. Deploying!"
       end
 
       # Run

data/lib/nanoc/cli/error_handler.rb

@@ -58,9 +58,12 @@ module Nanoc::CLI
           exit!(0)
         end
       end
-      Signal.trap('USR1') do
-        puts "Caught USR1; dumping a stack trace"
-        puts caller.map { |i| "  #{i}" }.join("\n")
+      begin
+        Signal.trap('USR1') do
+          puts "Caught USR1; dumping a stack trace"
+          puts caller.map { |i| "  #{i}" }.join("\n")
+        end
+      rescue ArgumentError
       end
 
       # Run

data/lib/nanoc/cli/logger.rb

@@ -11,11 +11,11 @@ module Nanoc::CLI
     # Maps actions (`:create`, `:update`, `:identical`, `:skip` and `:delete`)
     # onto their ANSI color codes.
     ACTION_COLORS = {
-      :create         => "\e[1m" + "\e[32m", # bold + green
-      :update         => "\e[1m" + "\e[33m", # bold + yellow
-      :identical      => "\e[1m",            # bold
-      :skip           => "\e[1m",            # bold
-      :delete         => "\e[1m" + "\e[31m"  # bold + red
+      :create         => "\e[32m", # green
+      :update         => "\e[33m", # yellow
+      :identical      => "",       # (nothing)
+      :skip           => "",       # (nothing)
+      :delete         => "\e[31m"  # red
     }
 
     include Singleton

data/lib/nanoc/extra/checking/checks/internal_links.rb

@@ -34,6 +34,10 @@ module Nanoc::Extra::Checking::Checks
       path = href.sub(/#.*$/, '')
       return true if path.empty?
 
+      # Remove query string
+      path = path.sub(/\?.*$/, '')
+      return true if path.empty?
+
       # Make absolute
       if path[0, 1] == '/'
         path = @site.config[:output_dir] + path

data/lib/nanoc/extra/checking/runner.rb

@@ -7,24 +7,24 @@ module Nanoc::Extra::Checking
   # @api private
   class Runner
 
+    CHECKS_FILENAME = 'Checks'
+
     # @param [Nanoc::Site] site The nanoc site this runner is for
     def initialize(site)
       @site = site
     end
 
-    # Ensures that there is a deployer DSL present.
-    #
-    # @return [void]
-    def require_dsl
-      if self.dsl.nil?
-        raise Nanoc::Errors::GenericTrivial, "No checks defined (no Checks file present)"
-      end
+    # @return [Boolean] true if a Checks file exists, false otherwise
+    def has_dsl?
+      File.exist?(CHECKS_FILENAME)
     end
 
     # Lists all available checks on stdout.
     #
     # @return [void]
     def list_checks
+      self.load_dsl_if_available
+
       puts "Available checks:"
       puts
       puts all_check_classes.map { |i| "  " + i.identifier.to_s }.sort.join("\n")
@@ -34,6 +34,8 @@ module Nanoc::Extra::Checking
     #
     # @return [Boolean] true if successful, false otherwise
     def run_all
+      self.load_dsl_if_available
+
       self.run_check_classes(self.all_check_classes)
     end
 
@@ -41,6 +43,8 @@ module Nanoc::Extra::Checking
     #
     # @return [Boolean] true if successful, false otherwise
     def run_for_deploy
+      self.require_dsl
+
       return true if self.dsl.nil?
       self.run_check_classes(self.check_classes_named(self.dsl.deploy_checks))
     end
@@ -51,21 +55,33 @@ module Nanoc::Extra::Checking
     #
     # @return [Boolean] true if successful, false otherwise
     def run_specific(check_class_names)
+      self.load_dsl_if_available
+
       self.run_check_classes(self.check_classes_named(check_class_names))
     end
 
   protected
 
-    def dsl
+    def load_dsl_if_available
       @dsl_loaded ||= false
       if !@dsl_loaded
-        if File.exist?('Checks')
-          @dsl = Nanoc::Extra::Checking::DSL.from_file('Checks')
+        if self.has_dsl?
+          @dsl = Nanoc::Extra::Checking::DSL.from_file(CHECKS_FILENAME)
         else
           @dsl = nil
         end
         @dsl_loaded = true
       end
+    end
+
+    def require_dsl
+      self.load_dsl_if_available
+      if self.dsl.nil?
+        raise Nanoc::Errors::GenericTrivial, "No checks defined (no #{CHECKS_FILENAME} file present)"
+      end
+    end
+
+    def dsl
       @dsl
     end
 

data/lib/nanoc/filters/xsl.rb

@@ -36,7 +36,7 @@ module Nanoc::Filters
       end
 
       xml = ::Nokogiri::XML(content)
-      xsl = ::Nokogiri::XSLT(assigns[:content])
+      xsl = ::Nokogiri::XSLT(assigns[:layout].raw_content)
 
       xsl.transform(xml, ::Nokogiri::XSLT.quote_params(params)).to_s
     end

data/test/extra/checking/checks/test_internal_links.rb

@@ -43,4 +43,16 @@ class Nanoc::Extra::Checking::Checks::InternalLinksTest < MiniTest::Unit::TestCa
     end
   end
 
+  def test_remove_query_string
+    with_site do |site|
+      FileUtils.mkdir_p('output/stuff')
+      File.open('output/stuff/right', 'w') { |io| io.write('hi') }
+
+      check = Nanoc::Extra::Checking::Checks::InternalLinks.new(site)
+
+      assert check.send(:valid?, 'stuff/right?foo=123', 'output/origin')
+      refute check.send(:valid?, 'stuff/wrong?foo=123', 'output/origin')
+    end
+  end
+
 end

data/test/extra/checking/test_runner.rb

@@ -4,7 +4,7 @@ class Nanoc::Extra::Checking::RunnerTest < MiniTest::Unit::TestCase
 
   include Nanoc::TestHelpers
 
-  def test_run
+  def test_run_specific
     with_site do |site|
       File.open('output/blah', 'w') { |io| io.write('I am stale! Haha!') }
       runner = Nanoc::Extra::Checking::Runner.new(site)
@@ -12,4 +12,36 @@ class Nanoc::Extra::Checking::RunnerTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_run_specific_custom
+    with_site do |site|
+      File.open('Checks', 'w') do |io|
+        io.write('check :my_foo_check do ; puts "I AM FOO!" ; end')
+      end
+
+      runner = Nanoc::Extra::Checking::Runner.new(site)
+      ios = capturing_stdio do
+        runner.run_specific(%w( my_foo_check ))
+      end
+
+      assert ios[:stdout].include?('I AM FOO!')
+    end
+  end
+
+  def test_list_checks
+    with_site do |site|
+      File.open('Checks', 'w') do |io|
+        io.write('check :my_foo_check do ; end')
+      end
+
+      runner = Nanoc::Extra::Checking::Runner.new(site)
+      ios = capturing_stdio do
+        runner.list_checks
+      end
+
+      assert ios[:stdout].include?('my_foo_check')
+      assert ios[:stdout].include?('internal_links')
+      assert ios[:stderr].empty?
+    end
+  end
+
 end

data/test/filters/test_xsl.rb

@@ -82,8 +82,7 @@ EOS
     if_have 'nokogiri' do
       layout = Nanoc::Layout.new(SAMPLE_XSL, {}, '/layout/')
 
-      filter = ::Nanoc::Filters::XSL.new(
-        :layout => layout, :content => SAMPLE_XSL)
+      filter = ::Nanoc::Filters::XSL.new(:layout => layout)
       result = filter.run(SAMPLE_XML_IN)
 
       assert_equal SAMPLE_XML_OUT, result
@@ -94,8 +93,7 @@ EOS
     if_have 'nokogiri' do
       layout = Nanoc::Layout.new(SAMPLE_XSL_WITH_PARAMS, {}, '/layout/')
 
-      filter = ::Nanoc::Filters::XSL.new(
-        :layout => layout, :content => SAMPLE_XSL_WITH_PARAMS)
+      filter = ::Nanoc::Filters::XSL.new(:layout => layout)
       result = filter.run(SAMPLE_XML_IN_WITH_PARAMS, :foo => 'bar')
 
       assert_equal SAMPLE_XML_OUT_WITH_PARAMS, result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.5.0b1
+  version: 3.5.0b2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-12 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri