pith 0.0.11 → 0.0.12

data/Rakefile

@@ -1,3 +1,7 @@
+require 'bundler'
+
+Bundler::GemHelper.install_tasks
+
 task :default => :spec
 
 require 'spec/rake/spectask'

data/features/error_handling.feature

@@ -0,0 +1,16 @@
+Feature: error handling
+
+  I want to be told when something goes wrong
+  
+Scenario: bad haml
+
+  Given input file "index.html.haml" contains
+    """
+    %h2{class="this is not valid ruby"} Heading
+    
+    %p Content
+    """
+    
+  When I build the site
+  
+  Then output file "index.html" should contain /syntax error/

data/features/ignorance.feature

@@ -1,37 +1,28 @@
 Feature: ignorable files are ignored
 
-  I want any file (or directory) beginning with "_" to be ignored
+  I want certain files (or directories) to be ignored
   So that I can place supporting files anywhere within the input directory
-  
-Scenario: a layout template at the input root
 
-  Given input file "_layout.haml" contains
-    """
-    Blah de blah
-    """
-    
-  When I build the site
-  
-  Then output file "_layout" should not exist
-
-Scenario: a partial in an ignored subdirectory
+Scenario Outline: ignorable templates
 
-  Given input file "_partials/foo.html.haml" contains
-    """
-    Blah de blah
-    """
-    
+  Given input file <input> exists
   When I build the site
-  
-  Then output file "_partials/foo.html" should not exist
+  Then output file <output> should not exist
 
-Scenario: an ignored partial in a subdirectory
+  Examples:
+    | input                           | output                  |
+    | "_layout.haml"                  | "_layout"               |
+    | "_partials/foo.html.haml"       | "_partials/foo.html"    |
+    | "partials/_foo.html.haml"       | "partials/_foo.html"    |
 
-  Given input file "partials/_foo.html.haml" contains
-    """
-    Blah de blah
-    """
-    
+Scenario Outline: ignorable resources
+
+  Given input file <file> exists
   When I build the site
-  
-  Then output file "partials/_foo.html" should not exist
+  Then output file <file> should not exist
+
+  Examples:
+    | file                  |
+    | "_data/xyz.json"      |
+    | ".git/config"         |
+    | "xyz/.svn/blah"       |

data/features/step_definitions/build_steps.rb

@@ -49,6 +49,10 @@ Then /^output file "([^\"]*)" should contain "([^\"]*)"$/ do |path, content|
   @outputs[path].clean.should == content.clean
 end
 
+Then %r{^output file "([^\"]*)" should contain /([^\/]*)/$} do |path, regexp|
+  @outputs[path].clean.should =~ Regexp.compile(regexp)
+end
+
 Then /^output file "([^\"]*)" should contain$/ do |path, content|
   @outputs[path].clean.should == content.clean
 end
@@ -64,3 +68,7 @@ end
 Then /^output file "([^"]*)" should not be re\-generated$/ do |path|
   @project.logger.messages.should_not contain(/--> +#{path}/)
 end
+
+Then /^output file "([^\"]*)" should contain an error$/ do |path|
+  @outputs[path].clean.should == "foo"
+end

data/features/support/rspec_matchers.rb

@@ -1,3 +1,5 @@
+require 'spec'
+
 Spec::Matchers.define :contain do |expected|
   match do |actual|
     actual.any? { |x| expected === x }

data/lib/pith/console_logger.rb

@@ -2,13 +2,24 @@ module Pith
   
   class ConsoleLogger
     
-    def initialize(io = STDOUT)
-      @io = io
+    def initialize(out = STDOUT, err = STDERR)
+      @out = out
+      @err = err
     end
 
     def info(message, &block)
       message ||= block.call
-      @io.puts(message)
+      @out.puts(message)
+    end
+
+    def warn(message, &block)
+      message ||= block.call
+      @err.puts(message)
+    end
+
+    def error(message, &block)
+      message ||= block.call
+      @err.puts("ERROR: " + message)
     end
     
   end

data/lib/pith/exception_ext.rb

@@ -0,0 +1,9 @@
+class Exception
+  
+  def summary(options = {})
+    max_backtrace = options[:max_backtrace] || 999
+    trimmed_backtrace = self.backtrace[0, max_backtrace]
+    (["#{self.class}: #{self.message}"] + trimmed_backtrace).join("\n    ") + "\n"
+  end
+  
+end

data/lib/pith/input/abstract.rb

@@ -59,7 +59,11 @@ module Pith
       # Returns true if it can.
       #
       def ignorable?
-        path.to_s.split("/").any? { |component| component.to_s[0,1] == "_" }
+        path.each_filename do |path_component|
+          project.ignore_patterns.each do |pattern|
+            return true if File.fnmatch(pattern, path_component)
+          end
+        end
       end
 
       protected

data/lib/pith/input/template.rb

@@ -1,5 +1,6 @@
 require "fileutils"
 require "pathname"
+require "pith/exception_ext"
 require "pith/input/abstract"
 require "pith/render_context"
 require "tilt"
@@ -22,7 +23,6 @@ module Pith
         path.to_str =~ /^(.+)\.(.+)$/ || raise("huh?")
         @output_path = Pathname($1)
         @type = $2
-        load
       end
 
       attr_reader :output_path, :type
@@ -41,7 +41,13 @@ module Pith
         output_file.parent.mkpath
         render_context = RenderContext.new(project)
         output_file.open("w") do |out|
-          out.puts(render_context.render(self))
+          begin
+            out.puts(render_context.render(self))
+          rescue Exception => e
+            logger.warn e.summary(:max_backtrace => 5)
+            out.puts "<pre>"
+            out.puts e.summary
+          end
         end
         @dependencies = render_context.dependencies
       end
@@ -49,6 +55,7 @@ module Pith
       # Render this input using Tilt
       #
       def render(context, locals = {}, &block)
+        load
         @tilt_template.render(context, locals, &block)
       end
       
@@ -72,6 +79,7 @@ module Pith
       # Returns a Hash.
       #
       def meta
+        load
         @meta
       end
 
@@ -100,6 +108,7 @@ module Pith
       # Read input file, extracting YAML meta-data header, and template content.
       #
       def load
+        return false if @tilt_template
         @meta = {}
         file.open do |input|
           header = input.gets

data/lib/pith/project.rb

@@ -8,13 +8,17 @@ module Pith
   
   class Project
     
+    DEFAULT_IGNORE_PATTERNS = ["_*", ".git", ".svn"].freeze
+    
     def initialize(attributes = {})
+      @ignore_patterns = DEFAULT_IGNORE_PATTERNS.dup
       attributes.each do |k,v|
         send("#{k}=", v)
       end
     end
     
     attr_reader :input_dir
+    attr_reader :ignore_patterns
     
     def input_dir=(dir)
       @input_dir = Pathname(dir)

data/lib/pith/version.rb

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.0.11".freeze
+  VERSION = "0.0.12".freeze
 end

data/lib/pith/watcher.rb

@@ -19,9 +19,6 @@ module Pith
       loop do
         begin
           project.build
-        rescue Exception => e
-          $stderr.puts "ERROR: #{e}"
-          e.backtrace.each { |line| $stderr.puts line }
         end
         sleep(interval)
       end

data/spec/pith/input/template_spec.rb

@@ -34,8 +34,8 @@ describe Pith::Input::Template do
     end
 
     it "returns false for non-template paths" do
-      Pith::Input::Template.can_handle?("foo.html").should be_false
-      Pith::Input::Template.can_handle?("foo").should be_false
+      Pith::Input::Template.can_handle?("foo.html").should_not be_true
+      Pith::Input::Template.can_handle?("foo").should_not be_true
     end
     
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pith
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +11:00
+date: 2010-11-30 00:00:00 +11:00
 default_executable: pith
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 13
         segments: 
-        - 0
-        - 9
-        version: "0.9"
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -55,14 +55,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 29
         segments: 
         - 1
+        - 2
         - 1
-        - 0
-        version: 1.1.0
+        version: 1.2.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -71,23 +71,37 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 1
         - 2
-        - 6
-        version: 1.2.6
+        - 7
+        version: 1.2.7
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 13
         segments: 
@@ -96,14 +110,14 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 57
         segments: 
@@ -112,7 +126,49 @@ dependencies:
         - 3
         version: 0.8.3
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: |
   Pith builds static websites, using markup/template languages including Haml, Sass, ERb, Liquid, Markdown and Textile.
 
@@ -126,6 +182,7 @@ extra_rdoc_files: []
 files: 
 - lib/pith/console_logger.rb
 - lib/pith/console_logger.rb~
+- lib/pith/exception_ext.rb
 - lib/pith/input/abstract.rb
 - lib/pith/input/abstract.rb~
 - lib/pith/input/base.rb~
@@ -181,6 +238,7 @@ files:
 - features/cleanup.feature
 - features/content_for.feature
 - features/content_for.feature~
+- features/error_handling.feature
 - features/haml.feature
 - features/haml.feature~
 - features/helpers.feature
@@ -260,6 +318,7 @@ test_files:
 - features/cleanup.feature
 - features/content_for.feature
 - features/content_for.feature~
+- features/error_handling.feature
 - features/haml.feature
 - features/haml.feature~
 - features/helpers.feature