nanoc 3.3.0 → 3.3.1

data/NEWS.md

@@ -1,5 +1,12 @@
 # nanoc news
 
+## 3.3.1 (2012-02-18)
+
+* Fixed issue with long paths on Windows
+* Fixed a few deployer crashes
+* Added nanoc3.rb, nanoc3/tasks.rb, … for compatibility with older versions
+* Made nanoc setup Bundler at startup [John Nishinaga]
+
 ## 3.3 (2012-02-12)
 
 Base:

data/README.md

@@ -96,6 +96,7 @@ may be interested in the development dependencies:
 * Nikhil Marathe
 * Daniel Mendler
 * Ale Muñoz
+* John Nishinaga
 * Nicky Peeters
 * Christian Plessl
 * Šime Ramov

data/bin/nanoc

@@ -1,6 +1,13 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+# Try loading bundler if it's possible
+begin
+  require 'bundler/setup'
+rescue LoadError
+  # no problem
+end
+
 # Add lib to load path
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 

data/lib/nanoc.rb

@@ -3,7 +3,7 @@
 module Nanoc
 
   # The current nanoc version.
-  VERSION = '3.3.0'
+  VERSION = '3.3.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/compilation/filter.rb

@@ -117,7 +117,7 @@ module Nanoc
     def output_filename
       @output_filename ||= begin
         FileUtils.mkdir_p(TMP_BINARY_ITEMS_DIR)
-        tempfile = Tempfile.new(filename.gsub(/[^a-z]/, '-'), TMP_BINARY_ITEMS_DIR)
+        tempfile = Tempfile.new('', TMP_BINARY_ITEMS_DIR)
         new_filename = tempfile.path
         tempfile.close!
 

data/lib/nanoc/base/plugin_registry.rb

@@ -50,6 +50,12 @@ module Nanoc
         registry.register(klass, class_or_name, *identifiers)
       end
 
+      # @return [Hash<Symbol, Class>] All plugins of this type, with keys
+      #   being the identifiers and values the plugin classes
+      def all
+        Nanoc::Plugin.find_all(self)
+      end
+
       # Returns the plugin with the given name (identifier)
       #
       # @param [String] name The name of the plugin class to find

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

@@ -53,14 +53,15 @@ module Nanoc::CLI::Commands
       end
 
       # 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 #{KIND_MAPPING.keys.join(', ')})"
+        $stderr.puts "(expected one of #{names.join(', ')})"
         exit 1
       end
       deployer_class = Nanoc::Extra::Deployer.named(name) do
         $stderr.puts "The specified deploy target has an unrecognised kind (#{kind})."
-        $stderr.puts "(expected one of #{KIND_MAPPING.keys.join(', ')})"
+        $stderr.puts "(expected one of #{names.join(', ')})"
         exit 1
       end
 

data/lib/nanoc/cli/error_handler.rb

@@ -144,6 +144,7 @@ module Nanoc::CLI
       'cri'            => 'cri',
       'erubis'         => 'erubis',
       'escape'         => 'escape',
+      'fog'            => 'fog',
       'fssm'           => 'fssm',
       'haml'           => 'haml',
       'json'           => 'json',

data/lib/nanoc3.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+require 'nanoc'

data/lib/nanoc3/cli.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+require 'nanoc/cli'

data/lib/nanoc3/tasks.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+require 'nanoc/tasks'

data/test/cli/commands/test_deploy.rb

@@ -71,4 +71,32 @@ class Nanoc::CLI::Commands::DeployTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_deploy_without_kind
+    if_have 'systemu' do
+      with_site do |site|
+        File.open('config.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' }
+
+        ios = capturing_stdio do
+          assert_raises SystemExit do
+            Nanoc::CLI.run %w( deploy -t public )
+          end
+        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 ')
+
+        refute File.directory?('mydestination')
+        refute File.file?('mydestination/blah.html')
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
+date: 2012-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
-  requirement: &70219118237300 !ruby/object:Gem::Requirement
+  requirement: &70230609637420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70219118237300
+  version_requirements: *70230609637420
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70219118236520 !ruby/object:Gem::Requirement
+  requirement: &70230609637020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219118236520
+  version_requirements: *70230609637020
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70219118235600 !ruby/object:Gem::Requirement
+  requirement: &70230609636560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219118235600
+  version_requirements: *70230609636560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70219118234900 !ruby/object:Gem::Requirement
+  requirement: &70230609652500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219118234900
+  version_requirements: *70230609652500
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70219118250340 !ruby/object:Gem::Requirement
+  requirement: &70230609652080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219118250340
+  version_requirements: *70230609652080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70219118249240 !ruby/object:Gem::Requirement
+  requirement: &70230609651660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219118249240
+  version_requirements: *70230609651660
 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,
@@ -228,6 +228,9 @@ files:
 - lib/nanoc/tasks/validate.rake
 - lib/nanoc/tasks.rb
 - lib/nanoc.rb
+- lib/nanoc3/cli.rb
+- lib/nanoc3/tasks.rb
+- lib/nanoc3.rb
 - tasks/doc.rake
 - tasks/test.rake
 - test/base/core_ext/array_spec.rb
@@ -366,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: a web publishing system written in Ruby for building small to medium-sized