lib/nanoc.rb in nanoc-1.4 vs lib/nanoc.rb in nanoc-1.5

@@ -1,8 +1,9 @@
 module Nanoc
-  VERSION = '1.4'
 
+  VERSION = '1.5'
+
   def self.ensure_in_site
     unless in_site?
       $stderr.puts 'ERROR: The current working directory does not seem to ' +
         'be a valid/complete nanoc site directory; aborting.' unless $quiet
       exit
@@ -21,11 +22,18 @@
     return false unless File.exist?('meta.yaml')
     return false unless File.exist?('Rakefile')
 
     true
   end
+
 end
 
-require File.dirname(__FILE__) + '/page.rb'
-require File.dirname(__FILE__) + '/creator.rb'
-require File.dirname(__FILE__) + '/compiler.rb'
-require File.dirname(__FILE__) + '/enhancements.rb'
+require File.dirname(__FILE__) + '/nanoc/creator.rb'
+require File.dirname(__FILE__) + '/nanoc/compiler.rb'
+
+$nanoc_creator  = Nanoc::Creator.new
+$nanoc_compiler = Nanoc::Compiler.new
+
+require File.dirname(__FILE__) + '/nanoc/core_ext.rb'
+require File.dirname(__FILE__) + '/nanoc/enhancements.rb'
+require File.dirname(__FILE__) + '/nanoc/filters.rb'
+require File.dirname(__FILE__) + '/nanoc/page.rb'