pith 0.3.3 → 0.3.4

data/lib/pith/input.rb

@@ -188,6 +188,8 @@ module Pith
       end
     end
 
+    YamlParseError = defined?(Psych) ? Psych::SyntaxError : ArgumentError
+
     def read_meta(io)
       header = io.gets
       if header =~ /^---/
@@ -197,7 +199,7 @@ module Pith
         end
         begin
           @meta = YAML.load(header)
-        rescue ArgumentError, SyntaxError
+        rescue YamlParseError
           logger.warn "#{file}:1: badly-formed YAML header"
         end
       else

data/lib/pith/project.rb

@@ -116,7 +116,7 @@ module Pith
 
     def sync_input_files
       @mtimes ||= {}
-      removed_file_paths = @mtimes.keys
+      removed_paths = @mtimes.keys
       Pathname.glob(input_dir + "**/*", File::FNM_DOTMATCH) do |file|
         next unless file.file?
         next if file.in?(output_dir)
@@ -124,20 +124,21 @@ module Pith
         path = file.relative_path_from(input_dir)
         if @mtimes.has_key?(path)
           if @mtimes[path] < mtime
-            when_file_modified(path)
+            file_modified(path)
           end
         else
-          when_file_added(path)
+          file_added(path)
         end
         @mtimes[path] = mtime
-        removed_file_paths.delete(path)
+        removed_paths.delete(path)
       end
-      removed_file_paths.each do |path|
-        when_file_removed(path)
+      removed_paths.each do |path|
+        @mtimes.delete(path)
+        file_removed(path)
       end
     end
 
-    def when_file_added(path)
+    def file_added(path)
       i = Input.new(self, path)
       i.when_added
       @input_map[path] = i
@@ -146,11 +147,11 @@ module Pith
       end
     end
 
-    def when_file_modified(path)
+    def file_modified(path)
       @input_map[path].when_modified
     end
 
-    def when_file_removed(path)
+    def file_removed(path)
       i = @input_map.delete(path)
       i.when_removed
       if o = i.output

data/lib/pith/version.rb

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.4".freeze
 end

data/spec/pith/project_spec.rb

@@ -108,6 +108,10 @@ describe Pith::Project do
       end
     end
 
+    it "doesn't confuse subsequent calls to #sync" do
+      proc { @project.sync }.should_not raise_error
+    end
+
   end
 
 end

metadata

@@ -1,71 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: pith
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
+  prerelease: 
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.3'
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
-- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
-- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
-- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.2.7
+- !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: ! 'Pith builds static websites, using markup/template languages including
   Haml, Sass, ERb, Liquid, Markdown and Textile.
 
@@ -160,26 +169,33 @@ files:
 - bin/pith
 homepage: http://github.com/mdub/pith
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -677330549993554291
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -677330549993554291
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A static website generator
 test_files:
 - Rakefile

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTFhNTdhNzIzMjAzYTVlYmNmNTc3OTNjNjhmYjJkYTQ0ZmNlNGQ4YQ==
-  data.tar.gz: !binary |-
-    NzYwZmEyZWU2NWFhNDc0NTZjZjY5YWZhZWRjMzg1NjgzMTcyNzhmZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZWZkZDcxYjBlNjZkNDJmNzcxZjBhYTc3OWJiZjZkOWU5ZWYyYjU1MWMyMTI4
-    ZTAwNDhmZWM2ZjQ3MGVlYTMxMDU0ZmJiZjkxMzJkNjJiNGExZWQzMzY3ZjZm
-    NTgxMTcwMjQwYTY4OWJlMmRhMzRhMDg5OTIzNjc4ODJiZDM5MTA=
-  data.tar.gz: !binary |-
-    MjEwNmJlMmRhMjM1YWI1OWI3NDQ0OTU3YzIyMDFkOTdkZTcwMTA3YmNkNDRl
-    MmE0YzA2MzNlNTZmZDlmYjVjNTdmNmFjNGVkMTBiMzA2YTdhMjBmMGU4ZWM1
-    OTVmZTQ3MDJhYTgxNjdlZDM3ZGY2OWE1MWVmZjIzNGFmMzg3N2I=