nanoc 1.0 → 1.0.1

data/Rakefile

@@ -4,10 +4,12 @@ require 'rake/clean'
 require 'rake/gempackagetask'
 require 'rake/testtask'
 
+require File.dirname(__FILE__) + '/lib/nanoc.rb'
+
 #####
 
 NAME    = 'nanoc'
-VERS    = '1.0'
+VERS    = Nanoc::VERSION
 SUMMARY = 'a CMS that doesn\'t even run on your server'
 
 HOMEPAGE  = 'http://stoneship.org/software/nanoc'

data/bin/nanoc

@@ -17,7 +17,7 @@ require 'getoptlong'
 require File.dirname(__FILE__) + '/../lib/nanoc.rb'
 
 # Define some texts
-version_text = 'nanoc 0.1 (c) 2007 Denis Defreyne.'
+version_text = "nanoc #{Nanoc::VERSION} (c) 2007 Denis Defreyne."
 help_text    = <<EOT
 usage: nanoc [-hv]
        nanoc create_site <name>

data/lib/compiler.rb

@@ -28,7 +28,8 @@ module Nanoc
       Dir.glob('lib/*.rb').each { |f| require f }
 
       # Compile pages
-      pages = compile_pages(uncompiled_pages)
+      pages = uncompiled_pages.sort { |x,y| x[:order].to_i <=> y[:order].to_i }
+      pages = compile_pages(pages)
 
       # Put pages in their layout
       pages.each do |page|

data/lib/creator.rb

@@ -103,15 +103,17 @@ module Nanoc
       # Read template
       template_index = nil
       template_meta = nil
+      template = a_params[:template] || 'default'
       begin
-        template = a_params[:template] || 'default'
-        template_meta = File.read_file('templates/' + template + '/meta.yaml').eruby
+        template_meta = File.read_file('templates/' + template + '/meta.yaml')
         template_index_filename = Dir.glob('templates/' + template + '/index.*')[0]
-        template_index = File.read_file(template_index_filename).eruby
+        template_index = File.read_file(template_index_filename)
       rescue
         $stderr.puts 'ERROR: no such template'
         exit
       end
+      template_meta = template_meta.eruby
+      template_index = template_index.eruby
 
       # Create index and yaml file
       FileManager.create_dir 'content' do

data/lib/nanoc.rb

@@ -1,5 +1,5 @@
 module Nanoc
-  VERSION = '1.0'
+  VERSION = '1.0.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.0"
-date: 2007-05-03 00:00:00 +02:00
+  version: 1.0.1
+date: 2007-05-05 00:00:00 +02:00
 summary: a CMS that doesn't even run on your server
 require_paths: 
 - lib