pith 0.2.1 → 0.2.2

data/README.markdown

@@ -70,7 +70,8 @@ Page metadata
 A YAML header can be provided at the top of any template, defining page metadata.  The header is introduced by a first line containing three dashes, and terminated by a line containing three dots.
 
     ---
-    title: "All about fish"
+    title: "Fish"
+    subtitle: "All about fish"
     ...
 
 Metadata provided in the header can be referenced by template content, via the "`page.meta`" Hash:
@@ -80,9 +81,12 @@ Metadata provided in the header can be referenced by template content, via the "
         %title= page.meta["title"]
       %body
         %h1= page.meta["title"]
+        %h2= page.meta["subtitle"]
 
 This is especially useful in "layout" templates (see below).
-    
+
+Since the page title is such a common thing to want to specify in the header, it's also available as "`page.title`", as a shortcut (if no explicit title was provided, Pith will guess one from the input file name).
+
 Partials and Layouts
 --------------------
 
@@ -173,10 +177,10 @@ For quick prototyping, use the "`watch`" command, rather than "`build`".  After
 
     $ pith -i SITE watch
     Generating to "SITE/_out"
-    --(copy)-->   images/logo.png
-    --(haml)-->   index.html
+    --> images/logo.png
+    --> index.html
     # ... edit "index.html.haml" ...
-    --(haml)-->   index.html
+    --> index.html
 
 Built-in web-server
 -------------------
@@ -185,8 +189,8 @@ For even quicker prototyping, Pith includes a simple HTTP server.  Start it by u
 
     $ pith -i SITE serve
     Generating to "SITE/_out"
-    --(copy)-->   images/logo.png
-    --(haml)-->   index.html
+    --> images/logo.png
+    --> index.html
     Taking the Pith at "http://localhost:4321"
     >> Thin web server (v1.2.7 codename No Hup)
     >> Maximum connections set to 1024

data/Rakefile

@@ -4,10 +4,10 @@ Bundler::GemHelper.install_tasks
 
 task :default => :spec
 
-require 'spec/rake/spectask'
+require "rspec/core/rake_task"
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts << ["--color"]
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
 task :default => :cucumber
@@ -15,7 +15,7 @@ task :default => :cucumber
 require 'cucumber/rake/task'
 
 namespace :cucumber do
-  
+
   [:wip, :default].each do |profile|
 
     Cucumber::Rake::Task.new(profile) do |t|

data/features/incremental_rebuild.feature

@@ -1,8 +1,8 @@
 Feature: incremental rebuilding
 
   I want to rebuild just the outputs whose inputs have changed
-  So that that I can bring the project up-to-date efficiently
-  
+  So that I can bring the project up-to-date efficiently
+
 Scenario: alter an input, and the output changes
 
   Given input file "page.html.haml" contains "Old content"
@@ -10,7 +10,7 @@ Scenario: alter an input, and the output changes
 
   When I change input file "page.html.haml" to contain "New content"
   And I rebuild the site
-  
+
   Then output file "page.html" should be re-generated
   And output file "page.html" should contain "New content"
 

data/features/reloading.feature

@@ -0,0 +1,48 @@
+Feature: incremental rebuilding
+
+  I want to reload any altered Ruby code
+  So that I can quickly iterate config and support libraries
+
+@wip
+Scenario: change a helper
+
+  Given input file "_pith/config.rb" contains
+    """
+    lib_dir = File.expand_path("../lib", __FILE__)
+    $: << lib_dir unless $:.member?(lib_dir)
+
+    require 'stuff'
+
+    project.helpers do
+      include Stuff
+    end
+    """
+
+  And input file "_pith/lib/stuff.rb" contains
+
+    """
+    module Stuff
+      def greet(subject)
+        "Hello, #{subject}"
+      end
+    end
+    """
+
+  And input file "index.html.haml" contains "= greet('mate')"
+
+  When I build the site
+
+  Then output file "index.html" should contain "Hello, mate"
+
+  When I change input file "_pith/lib/stuff.rb" to contain
+    """
+    module Stuff
+      def greet(subject)
+        "Hola, #{subject}"
+      end
+    end
+    """
+
+  And I rebuild the site
+
+  Then output file "index.html" should contain "Hola, mate"

data/features/support/rspec_matchers.rb

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

data/lib/pith/project.rb

@@ -8,7 +8,7 @@ module Pith
 
   class Project
 
-    DEFAULT_IGNORE_PATTERNS = ["_*", ".git", ".svn"].freeze
+    DEFAULT_IGNORE_PATTERNS = ["_*", ".git", ".svn", "*~"].freeze
 
     def initialize(attributes = {})
       @ignore_patterns = DEFAULT_IGNORE_PATTERNS.dup
@@ -68,6 +68,7 @@ module Pith
       refresh
       load_config
       remove_old_outputs
+      output_dir.mkpath
       generate_outputs
       output_dir.touch
     end

data/lib/pith/version.rb

@@ -1,3 +1,3 @@
 module Pith
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 end

data/spec/pith/project_spec.rb

@@ -5,7 +5,19 @@ describe Pith::Project do
 
   before do
     $input_dir.mkpath
-    @project = Pith::Project.new(:input_dir => $input_dir)
+    @project = Pith::Project.new(:input_dir => $input_dir, :output_dir => $output_dir)
+  end
+
+  describe "#build" do
+    
+    before do
+      @project.build
+    end
+    
+    it "creates the output directory" do
+      $output_dir.should be_directory
+    end
+    
   end
 
   describe "#input" do

data/spec/spec_helper.rb

@@ -1,18 +1,18 @@
 require "rubygems"
 
 require "fileutils"
-  
+
 $project_dir = Pathname(__FILE__).expand_path.parent.parent
 $tmp_dir = $project_dir + "tmp"
 $input_dir = $tmp_dir + "input"
 $output_dir = $tmp_dir + "output"
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
   config.before(:suite) do
     [$input_dir, $output_dir].each do |dir|
       dir.rmtree if dir.exist?
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pith
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-10 00:00:00.000000000Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70152548570880 !ruby/object:Gem::Requirement
+  requirement: &70328100528500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70152548570880
+  version_requirements: *70328100528500
 - !ruby/object:Gem::Dependency
   name: adsf
-  requirement: &70152548570160 !ruby/object:Gem::Requirement
+  requirement: &70328100527980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70152548570160
+  version_requirements: *70328100527980
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70152548569500 !ruby/object:Gem::Requirement
+  requirement: &70328100527460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70152548569500
+  version_requirements: *70328100527460
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70152548568780 !ruby/object:Gem::Requirement
+  requirement: &70328100527000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,84 +54,18 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70152548568780
+  version_requirements: *70328100527000
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &70152548568040 !ruby/object:Gem::Requirement
+  requirement: &70328100526520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152548568040
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70152548567460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70152548567460
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70152548551340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.9
-  type: :development
-  prerelease: false
-  version_requirements: *70152548551340
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &70152548550740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-  type: :development
-  prerelease: false
-  version_requirements: *70152548550740
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70152548550260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70152548550260
-- !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: &70152548549740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70152548549740
-- !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: &70152548549320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70152548549320
+  version_requirements: *70328100526520
 description: ! 'Pith builds static websites, using markup/template languages including
   Haml, Sass, ERb, Liquid, Markdown and Textile.
 
@@ -207,6 +141,7 @@ files:
 - features/pipeline.feature
 - features/relative_linking.feature
 - features/relative_linking.feature~
+- features/reloading.feature
 - features/resources.feature
 - features/step_definitions/build_steps.rb
 - features/step_definitions/build_steps.rb~
@@ -233,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3377947525028361057
+      hash: 1318173105558920173
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -242,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3377947525028361057
+      hash: 1318173105558920173
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -282,6 +217,7 @@ test_files:
 - features/pipeline.feature
 - features/relative_linking.feature
 - features/relative_linking.feature~
+- features/reloading.feature
 - features/resources.feature
 - features/step_definitions/build_steps.rb
 - features/step_definitions/build_steps.rb~