nanoc 1.3 → 1.3.1

data/ChangeLog

@@ -1,3 +1,8 @@
+== 1.3.1
+
+* The contents of the 'assets' directory are now copied into the output
+  directory specified in 'config.yaml'
+
 == 1.3
 
 * The @pages array now also contains uncompiled pages
@@ -22,7 +27,7 @@
 
 == 1.1.3
 
-* Fixed bug which would cause pages without layouts to be outputed incorrectly
+* Fixed bug which would cause layoutless pages to be outputted incorrectly
 
 == 1.1.2
 

data/lib/compiler.rb

@@ -63,8 +63,14 @@ module Nanoc
 
     # Copies the contents of the assets directory into the output directory
     def copy_assets
-      Dir['assets/*'].each { |f| FileUtils.remove_entry_secure(f.sub('assets/', 'output/'), true) }
-      FileUtils.cp_r(Dir['assets/*'], 'output') if File.directory?('assets') and !Dir['assets/*'].empty?
+      # Create output assets directory if necessary
+      FileUtils.mkdir_p(@config[:output_dir])
+
+      # Remove existing assets
+      Dir['assets/*'].each { |f| FileUtils.remove_entry_secure(f.sub('assets/', @config[:output_dir] + '/'), true) }
+
+      # Copy assets
+      FileUtils.cp_r(Dir['assets/*'], @config[:output_dir]) if File.directory?('assets') and !Dir['assets/*'].empty?
     end
 
     # Returns a list of uncompiled pages

data/lib/nanoc.rb

@@ -1,5 +1,5 @@
 module Nanoc
-  VERSION = '1.3'
+  VERSION = '1.3.1'
 
   def self.ensure_in_site
     unless in_site?

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: "1.3"
-date: 2007-06-24 00:00:00 +02:00
+  version: 1.3.1
+date: 2007-06-30 00:00:00 +02:00
 summary: a CMS that doesn't run on your server
 require_paths: 
 - lib