nanoc 3.6.0 → 3.6.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanoc (3.6.0)
+    nanoc (3.6.1)
       cri (~> 2.3)
 
 GEM
@@ -11,18 +11,18 @@ GEM
     adsf (1.1.1)
       rack (>= 1.0.0)
     bluecloth (2.2.0)
-    builder (3.1.4)
-    coderay (1.0.8)
+    builder (3.2.0)
+    coderay (1.0.9)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
+    coffee-script-source (1.5.0)
     colored (1.2)
     commonjs (0.2.6)
     cri (2.3.0)
       colored (>= 1.2)
     erubis (2.7.0)
-    excon (0.16.10)
+    excon (0.18.5)
     execjs (1.4.0)
       multi_json (~> 1.0)
     fog (1.9.0)
@@ -38,7 +38,7 @@ GEM
     formatador (0.2.4)
     haml (4.0.0)
       tilt
-    handlebars (0.3.2)
+    handlebars (0.4.0)
       commonjs (~> 0.2.3)
       therubyracer (~> 0.11.1)
     json (1.7.7)
@@ -46,7 +46,7 @@ GEM
     less (2.2.2)
       commonjs (~> 0.2.6)
     libv8 (3.11.8.13)
-    listen (0.7.2)
+    listen (0.7.3)
     markaby (0.7.2)
       builder (>= 2.0.0)
     maruku (0.6.1)
@@ -69,20 +69,20 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pygments.rb (0.3.7)
+    pygments.rb (0.4.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
     rainpress (1.0)
     rake (10.0.3)
     rdiscount (2.0.7)
-    rdoc (3.12.1)
+    rdoc (4.0.0)
       json (~> 1.4)
     redcarpet (2.2.2)
     ref (1.0.2)
     ruby-hmac (0.4.0)
     rubypants (0.2.0)
-    sass (3.2.5)
+    sass (3.2.6)
     slim (1.3.6)
       temple (~> 0.5.5)
       tilt (~> 1.3.3)
@@ -103,7 +103,7 @@ GEM
       json
       nokogiri
     yajl-ruby (1.1.0)
-    yard (0.8.4.1)
+    yard (0.8.5)
     yuicompressor (1.2.0)
 
 PLATFORMS

data/NEWS.md

@@ -1,5 +1,13 @@
 # nanoc news
 
+## 3.6.1 (2013-02-25)
+
+Fixes:
+
+* Fixed bug which could cause the Sass filter to raise a load error [Damien Pollet]
+* Fixed warnings about `__send__` and `object_id` being redefined [Justin Hileman]
+* Made `files_to_watch` contain `nanoc.yaml`, not `config.yaml` by default
+
 ## 3.6 (2013-02-24)
 
 Features:

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.6.0'
+  VERSION = '3.6.1'
 
   # @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/source_data/item_array.rb

@@ -9,7 +9,16 @@ module Nanoc
 
     extend Forwardable
 
-    DELEGATED_METHODS = Array.instance_methods + Enumerable.instance_methods - [ :[], :slice, :at, :initialize, :freeze ]
+    EXCLUDED_METHODS  = [
+      :[], :at, :slice, :class, :singleton_class, :clone, :dup, :initialize_dup, :initialize_clone,
+      :freeze, :methods, :singleton_methods, :protected_methods, :private_methods, :public_methods,
+      :instance_variables, :instance_variable_get, :instance_variable_set, :instance_variable_defined?,
+      :instance_of?, :kind_of?, :is_a?, :tap, :send, :public_send, :respond_to?, :respond_to_missing?,
+      :extend, :display, :method, :public_method, :define_singleton_method, :object_id, :equal?,
+      :instance_eval, :instance_exec, :__send__, :__id__
+    ]
+
+    DELEGATED_METHODS = Array.instance_methods + Enumerable.instance_methods - EXCLUDED_METHODS
     def_delegators :@items, *DELEGATED_METHODS
 
     def initialize

data/lib/nanoc/cli/command_runner.rb

@@ -53,7 +53,7 @@ module Nanoc::CLI
       end
     end
 
-    # Asserts that the current workign directory contains a site (just like
+    # Asserts that the current working directory contains a site (just like
     # {#require_site}) and loads the site into memory.
     #
     # @return [void]

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

@@ -97,7 +97,7 @@ watcher:
 
   # A list of single files to watch for changes. As mentioned above, don’t put
   # any files from the “output/” or “tmp/” directories in here.
-  files_to_watch: [ 'config.yaml', 'Rules' ]
+  files_to_watch: [ 'nanoc.yaml', 'Rules' ]
 
   # When to send notifications (using Growl or notify-send).
   notify_on_compilation_success: true

data/lib/nanoc/cli/error_handler.rb

@@ -238,7 +238,7 @@ module Nanoc::CLI
         # Build message
         if gem_name
           if self.using_bundler?
-            "Make sure the gem is added to Gemfile and run `bundle up`."
+            "Make sure the gem is added to Gemfile and run `bundle install`."
           else
             "Install the '#{gem_name}' gem using `gem install #{gem_name}`."
           end

data/lib/nanoc/filters/sass.rb

@@ -3,7 +3,7 @@
 module Nanoc::Filters
   class Sass < Nanoc::Filter
 
-    requires 'sass'
+    requires 'sass', 'nanoc/filters/sass/sass_filesystem_importer'
 
     class << self
       # The current filter. This is definitely going to bite me if I ever get
@@ -11,27 +11,6 @@ module Nanoc::Filters
       attr_accessor :current
     end
 
-    # Essentially the `Sass::Importers::Filesystem` but registering each
-    # import file path.
-    class SassFilesystemImporter < ::Sass::Importers::Filesystem
-
-    private
-
-      def _find(dir, name, options)
-        full_filename, syntax = ::Sass::Util.destructure(find_real_file(dir, name, options))
-        return unless full_filename && File.readable?(full_filename)
-
-        filter = Nanoc::Filters::Sass.current # FIXME ew global
-        item = filter.imported_filename_to_item(full_filename)
-        filter.depend_on([ item ]) unless item.nil?
-
-        options[:syntax] = syntax
-        options[:filename] = full_filename
-        options[:importer] = self
-        ::Sass::Engine.new(File.read(full_filename), options)
-      end
-    end
-
     # Runs the content through [Sass](http://sass-lang.com/).
     # Parameters passed to this filter will be passed on to Sass.
     #

data/lib/nanoc/filters/sass/sass_filesystem_importer.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+module Nanoc::Filters
+  class Sass
+
+    # Essentially the `Sass::Importers::Filesystem` but registering each
+    # import file path.
+    class SassFilesystemImporter < ::Sass::Importers::Filesystem
+
+      private
+
+      def _find(dir, name, options)
+        full_filename, syntax = ::Sass::Util.destructure(find_real_file(dir, name, options))
+        return unless full_filename && File.readable?(full_filename)
+
+        filter = Nanoc::Filters::Sass.current # FIXME ew global
+        item = filter.imported_filename_to_item(full_filename)
+        filter.depend_on([ item ]) unless item.nil?
+
+        options[:syntax] = syntax
+        options[:filename] = full_filename
+        options[:importer] = self
+        ::Sass::Engine.new(File.read(full_filename), options)
+      end
+    end
+
+  end
+end

data/test/cli/commands/test_watch.rb

@@ -20,22 +20,42 @@ class Nanoc::CLI::Commands::WatchTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_change_nanoc_dot_yaml
+    Nanoc::CLI.run %w( create-site bleh )
+    Dir.chdir('bleh') do
+      File.open('Rules', 'w') do |io|
+        io.write("compile '*' do ; filter :erb ; end\n")
+        io.write("route '*' do ; item.identifier + 'index.html' ; end\n")
+      end
+
+      config_contents = File.read('nanoc.yaml')
+
+      watch_thread = Thread.new do
+        Nanoc::CLI.run %w( watch )
+      end
+
+      File.open('content/index.html', 'w') { |io| io.write('<%= @config[:blah].inspect %>!!!') }
+      self.wait_until_content_equals('output/index.html', 'nil!!!')
+
+      File.open('nanoc.yaml', 'w') { |io| io.write(config_contents + "\nblah: 456\n") }
+      self.wait_until_content_equals('output/index.html', '456!!!')
+
+      watch_thread.kill
+    end
+  end
+
   def test_notify
-    old_path = ENV['PATH']
     with_site do |s|
       watch_thread = Thread.new do
         Nanoc::CLI.run %w( watch )
       end
 
-      ENV['PATH'] = '.' # so that neither which nor where can be found
       File.open('content/index.html', 'w') { |io| io.write('Hello there!') }
       self.wait_until_exists('output/index.html')
       assert_equal 'Hello there!', File.read('output/index.html')
 
       watch_thread.kill
     end
-  ensure
-    ENV['PATH'] = old_path
   end
 
   def wait_until_exists(filename)
@@ -48,16 +68,23 @@ class Nanoc::CLI::Commands::WatchTest < MiniTest::Unit::TestCase
     end
   end
 
-  def wait_until_content_equals(filename, content)
+  def wait_until_content_equals(filename, expected_content)
     self.wait_until_exists(filename)
 
     20.times do
-      break if File.read(filename) == content
+      break if File.read(filename) == expected_content
       sleep 0.5
     end
-    if File.read(filename) != content
-      raise RuntimeError, "Expected #{filename} to have content #{content} but it doesn't :("
+
+    actual_content = File.read(filename)
+    if actual_content != expected_content
+      raise RuntimeError, "Expected #{filename} to have " \
+        "content #{expected_content.inspect} but it had " \
+        "content #{actual_content.inspect} instead :("
     end
+
+    # Ugly, but seems to be necessary or changes are not picked up. :(
+    sleep 0.5
   end
 
 end

data/test/filters/test_less.rb

@@ -120,7 +120,7 @@ class Nanoc::Filters::LessTest < MiniTest::Unit::TestCase
 
       # Run filter with compress option
       result = filter.setup_and_run('.foo { bar: a; } .bar { foo: b; }', :compress => true)
-      assert_match(/^\.foo{bar:a;}\n\.bar{foo:b;}/, result)
+      assert_match(/^\.foo\{bar:a;\}\n\.bar\{foo:b;\}/, result)
     end
   end
 

data/test/filters/test_uglify_js.rb

@@ -11,7 +11,7 @@ class Nanoc::Filters::UglifyJSTest < MiniTest::Unit::TestCase
 
       # Run filter
       result = filter.setup_and_run("foo = 1; (function(bar) { if (true) alert(bar); })(foo)")
-      assert_match(/foo=1,function\((.)\){alert\(\1\)}\(foo\);/, result)
+      assert_match(/foo=1,function\((.)\)\{alert\(\1\)\}\(foo\);/, result)
     end
   end
 
@@ -23,7 +23,7 @@ class Nanoc::Filters::UglifyJSTest < MiniTest::Unit::TestCase
 
       # Run filter
       result = filter.setup_and_run("foo = 1; (function(bar) { if (true) alert(bar); })(foo)", :toplevel => true)
-      assert_match(/foo=1,function\((.)\){alert\(\1\)}\(foo\);/, result)
+      assert_match(/foo=1,function\((.)\)\{alert\(\1\)\}\(foo\);/, result)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-24 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -264,6 +264,7 @@ files:
 - lib/nanoc/filters/redcloth.rb
 - lib/nanoc/filters/relativize_paths.rb
 - lib/nanoc/filters/rubypants.rb
+- lib/nanoc/filters/sass/sass_filesystem_importer.rb
 - lib/nanoc/filters/sass.rb
 - lib/nanoc/filters/slim.rb
 - lib/nanoc/filters/typogruby.rb