nanoc 1.1 → 1.1.1

data/Rakefile

@@ -32,7 +32,7 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.8.2'
 
   s.has_rdoc      = false
-  s.files         = %w( README LICENSE Rakefile ) + Dir.glob('{bin,lib}/**/*')
+  s.files         = %w( README LICENSE Rakefile ) + Dir['{bin,lib}/**/*']
   s.executables   = [ 'nanoc' ]
   s.require_path  = 'lib'
   s.bindir        = 'bin'
@@ -44,7 +44,7 @@ Rake::GemPackageTask.new(spec) do |task|
 end
 
 Rake::TestTask.new(:test) do |test|
-  test.test_files = Dir.glob('test/test_*.rb')
+  test.test_files = Dir['test/test_*.rb']
 end
 
 #####

data/bin/nanoc

@@ -32,7 +32,7 @@ opts = GetoptLong.new(
   [ '--template',   '-t', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--version',    '-v', GetoptLong::NO_ARGUMENT ]
 )
-uncompileed_opts = {}
+unprocessed_opts = {}
 begin
   opts.each do |opt, arg|
     case opt
@@ -43,7 +43,7 @@ begin
       puts version_text
       exit
     else
-      uncompileed_opts[opt] = arg
+      unprocessed_opts[opt] = arg
     end
   end
 rescue GetoptLong::InvalidOption
@@ -74,7 +74,7 @@ case command
       $stderr.puts 'Usage: nanoc create_page [page_name]'
       exit
     end
-    Nanoc::Creator.create_page(ARGV[1], :template => uncompileed_opts['--template'])
+    Nanoc::Creator.create_page(ARGV[1], :template => unprocessed_opts['--template'])
 
   # Create template
   when 'create_template', 'ct'

data/lib/compiler.rb

@@ -12,11 +12,11 @@ module Nanoc
     end
 
     def run
-      Dir.glob('lib/*.rb').each { |f| require f }
+      Dir['lib/*.rb'].each { |f| require f }
 
       pages = compile_pages(uncompiled_pages)
       pages.each do |page|
-        content = (page[:layout].nil? ? '<%= @page[:content] %>' : File.read("layouts/#{page[:layout]}.erb")).eruby(page.merge({ :page => page, :pages => pages }))
+        content = File.read("layouts/#{page[:layout]}.erb").eruby(page.merge({ :page => page, :pages => pages })) # fallback for nanoc 1.0
         FileManager.create_file(path_for_page(page)) { content }
       end
     end
@@ -24,12 +24,12 @@ module Nanoc
     private
 
     def uncompiled_pages
-      Dir.glob('content/**/meta.yaml').collect do |filename|
+      Dir['content/**/meta.yaml'].collect do |filename|
         page = @global_page.merge(YAML.load_file_and_clean(filename))
         page[:path] = filename.sub(/^content/, '').sub('meta.yaml', '')
 
-        content_filenames = Dir.glob(filename.sub('meta.yaml', File.basename(File.dirname(filename)) + '.*'))
-        content_filenames += Dir.glob("#{File.dirname(filename)}/index.*") # fallback for nanoc 1.0
+        content_filenames = Dir[filename.sub('meta.yaml', File.basename(File.dirname(filename)) + '.*')].reject { |f| f =~ /~$/ }
+        content_filenames += Dir["#{File.dirname(filename)}/index.*"] # fallback for nanoc 1.0
         content_filenames.ensure_single('content files', File.dirname(filename))
         page[:_content_filename] = content_filenames[0]
 
@@ -46,7 +46,7 @@ module Nanoc
     def compile_pages(a_pages)
       a_pages.inject([]) do |pages, page|
         content = File.read(page[:_content_filename]).filter(page[:filters], :eruby_context => { :page => page, :pages => pages })
-        pages + [ page.merge( { :content => content }) ]
+        pages + [ page.merge( { :content => content, :_content_filename => nil }) ]
       end
     end
 

data/lib/creator.rb

@@ -108,8 +108,8 @@ module Nanoc
       template = a_params[:template] || 'default'
       begin
         template_meta = File.read("templates/#{template}/meta.yaml")
-        template_content_filenames = Dir.glob("templates/#{template}/#{template}.*")
-        template_content_filenames += Dir.glob("templates/#{template}/index.*")
+        template_content_filenames = Dir["templates/#{template}/#{template}.*"]
+        template_content_filenames += Dir["templates/#{template}/index.*"]
         template_content_filename = template_content_filenames[0]
         template_index = File.read(template_content_filename)
       rescue
@@ -122,7 +122,7 @@ module Nanoc
       # Create index and yaml file
       FileManager.create_dir 'content' do
         FileManager.create_dir a_pagename do
-          FileManager.create_file "#{a_pagename}#{File.extname(template_content_filename)}" do
+          FileManager.create_file "#{a_pagename.sub(/.*\/([^\/]+)/, '\1')}#{File.extname(template_content_filename)}" do
             template_index
           end
           FileManager.create_file 'meta.yaml' do
@@ -151,5 +151,4 @@ module Nanoc
     end
 
   end
-
 end

data/lib/enhancements.rb

@@ -89,26 +89,6 @@ end
 class FileManager
   @@stack = []
 
-  COLORS = {
-    :reset   => "\e[0m",
-
-    :bold    => "\e[1m",
-
-    :black   => "\e[30m",
-    :red     => "\e[31m",
-    :green   => "\e[32m",
-    :yellow  => "\e[33m",
-    :blue    => "\e[34m",
-    :magenta => "\e[35m",
-    :cyan    => "\e[36m",
-    :white   => "\e[37m"
-  }
-  ACTION_COLORS = {
-    :create     => COLORS[:bold] + COLORS[:green],
-    :update     => COLORS[:bold] + COLORS[:yellow],
-    :identical  => COLORS[:bold]
-  }
-
   def self.create_dir(a_name)
     @@stack.push(a_name)
     path = File.join(@@stack)
@@ -121,16 +101,36 @@ class FileManager
   end
 
   def self.create_file(a_name)
-    path = @@stack.empty? ? a_name : File.join(@@stack + [ a_name ])
+    path = File.join(@@stack + [ a_name ])
     FileManager.create_dir(path.sub(/\/[^\/]+$/, '')) if @@stack.empty?
     content = block_given? ? yield : nil
     File.exist?(path) ? ( block_given? and File.read(path) == content ? log('identical', path) : log('update', path) ) : log('create', path)
     open(path, 'w') { |io| io.write(content) unless content.nil? }
   end
+end
 
-  def self.log(a_action, a_path)
-    puts format('%s%12s%s %s', ACTION_COLORS[a_action.to_sym], a_action, COLORS[:reset], a_path) unless $quiet == true
-  end
+COLORS = {
+  :reset   => "\e[0m",
+
+  :bold    => "\e[1m",
+
+  :black   => "\e[30m",
+  :red     => "\e[31m",
+  :green   => "\e[32m",
+  :yellow  => "\e[33m",
+  :blue    => "\e[34m",
+  :magenta => "\e[35m",
+  :cyan    => "\e[36m",
+  :white   => "\e[37m"
+}
+ACTION_COLORS = {
+  :create     => COLORS[:bold] + COLORS[:green],
+  :update     => COLORS[:bold] + COLORS[:yellow],
+  :identical  => COLORS[:bold]
+}
+
+def log(a_action, a_path)
+  puts format('%s%12s%s %s', ACTION_COLORS[a_action.to_sym], a_action, COLORS[:reset], a_path) unless $quiet == true
 end
 
 def render(a_name, a_context={})

data/lib/nanoc.rb

@@ -1,9 +1,9 @@
 module Nanoc
-  VERSION = '1.1'
+  VERSION = '1.1.1'
 
   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.'
+      $stderr.puts 'ERROR: The current working directory does not seem to be a valid/complete nanoc site directory; aborting.' unless $quiet
       exit
     end
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: nanoc
 version: !ruby/object:Gem::Version 
-  version: "1.1"
-date: 2007-05-08 00:00:00 +02:00
+  version: 1.1.1
+date: 2007-05-17 00:00:00 +02:00
 summary: a CMS that doesn't run on your server
 require_paths: 
 - lib