pith 0.0.12 → 0.1.1

data/bin/pith

@@ -3,87 +3,96 @@
 $: << File.expand_path("../../lib", __FILE__)
 
 require "rubygems"
-require "optparse"
+require "clamp"
 require "pathname"
 require "pith/version"
 require "thin"
 
-$input_dir = Pathname(".")
-$interval = 2
-$port = 4321
-
-BANNER = <<EOF
-usage: pith [OPTIONS] [COMMAND]
-
-  Commands: (default: "build")
-
-    build       Generate the website (into OUTPUT_DIR)
-    watch       Monitor INPUT_DIR, and incrementally rebuild OUTPUT_DIR
-    serve       Serve the generated website at "http://localhost:#{$port}"
+require "pith/console_logger"
+require "pith/project"
 
-EOF
+class PithCommand < Clamp::Command
 
-OptionParser.new do |opts|
-  opts.banner = BANNER
-  opts.version = Pith::VERSION
-  opts.separator "  Options:"
-  opts.on("-i", "--input INPUT_DIR",      %[Input directory   (default: ".")]) do |dir|
-    $input_dir = Pathname(dir)
-  end
-  opts.on("-o", "--output OUTPUT_DIR",    %[Output directory  (default: "INPUT_DIR/_out")]) do |dir|
-    $output_dir = Pathname(dir)
+  option ["-i", "--input"], "INPUT_DIR", "Input directory", :attribute_name => :input_dir, :default => "." do |dir|
+    Pathname(dir)
   end
-  opts.on("-n", "--interval N", Integer,  %[Rebuild interval  (default: #{$interval})]) do |n|
-    $interval = n
+  
+  option ["-o", "--output"], "OUTPUT_DIR", "Output directory", :attribute_name => :output_dir, :default => "INPUT_DIR/_out" do |dir|
+    Pathname(dir)
   end
-  opts.on("-p", "--port N", Integer,      %[Web-server port   (default: #{$port})]) do |port|
-    $port = port
+  
+  option ["-n", "--interval"], "INTERVAL", "Rebuild interval", :default => 2 do |n|
+    Integer(n)
   end
-  opts.on_tail("-h", "--help", "Show this message") do
-    puts opts
-    exit
+
+  option ["-p", "--port"], "PORT", "Web-server port", :default => 4321 do |n|
+    Integer(n)
   end
-end.parse!
 
-pith_dir = $input_dir + "_pith"
-unless pith_dir.directory?
-  $stderr.puts %(ERROR: No "#{pith_dir}" directory ... this doesn't look right!)
-  exit(1)
-end
+  option "--version", :flag, "Show version" do
+    puts Pith::VERSION
+    exit(0)
+  end
 
-unless $output_dir
-  $output_dir = $input_dir + "_out"
-end
+  subcommand "build", "Generate the website (into OUTPUT_DIR)" do
+    def execute
+      build
+    end
+  end
 
-puts %{Generating to "#{$output_dir}"}
+  subcommand "watch", "Monitor INPUT_DIR; re-generate as required" do
+    def execute
+      watch
+    end
+  end
+  
+  subcommand "serve", "Serve the generated website" do
+    def execute
+      build
+      Thread.new { watch }
+      serve
+    end
+  end
 
-require "pith/console_logger"
-require "pith/project"
+  protected
 
-@project = Pith::Project.new(:input_dir => $input_dir, :output_dir => $output_dir)
-@project.logger = Pith::ConsoleLogger.new
+  def default_input_dir
+    Pathname(".")
+  end
 
-def build
-  @project.build
-end
+  def default_output_dir
+    input_dir + "_out"
+  end
+  
+  def project
+    unless @project
+      pith_dir = input_dir + "_pith"
+      unless pith_dir.directory?
+        signal_usage_error %(No "#{pith_dir}" directory ... this doesn't look right!)
+      end
+      puts %{Generating to "#{output_dir}"}
+      @project = Pith::Project.new(:input_dir => input_dir, :output_dir => output_dir)
+      @project.logger = Pith::ConsoleLogger.new
+    end
+    @project
+  end
 
-def watch
-  require "pith/watcher"
-  Pith::Watcher.new(@project, :interval => $interval).call
-end
+  def build
+    project.build
+  end
 
-def serve
+  def watch
+    require "pith/watcher"
+    Pith::Watcher.new(project, :interval => interval).call
+  end
 
-  require "pith/server"
-  server = Pith::Server.new(@project)
+  def serve
+    require "pith/server"
+    server = Pith::Server.new(project)
+    puts %{>>> Now taking the Pith at "http://localhost:#{port}"}
+    Rack::Handler.get("thin").run(server, :Port => port)
+  end
   
-  build
-  Thread.new { watch }
-
-  puts %{>>> Now taking the Pith at "http://localhost:#{$port}"}
-  Rack::Handler.get("thin").run(server, :Port => $port)
-
 end
 
-action = ARGV.shift || "build"
-self.send(action)
+PithCommand.run

data/lib/pith/input/abstract.rb

@@ -46,7 +46,7 @@ module Pith
       # Returns a fully-qualified Pathname of the asset.
       #
       def resolve_path(ref)
-        ref = ref.to_str
+        ref = ref.to_s
         if ref[0,1] == "/"
           Pathname(ref[1..-1])
         else

data/lib/pith/input/template.rb

@@ -14,13 +14,13 @@ module Pith
     class Template < Abstract
 
       def self.can_handle?(path)
-        path.to_str =~ /\.([^.]+)$/ && Tilt.registered?($1)
+        path.to_s =~ /\.([^.]+)$/ && Tilt.registered?($1)
       end
       
       def initialize(project, path)
         raise(ArgumentError, "#{path} is not a template") unless Template.can_handle?(path)
         super(project, path)
-        path.to_str =~ /^(.+)\.(.+)$/ || raise("huh?")
+        path.to_s =~ /^(.+)\.(.+)$/ || raise("huh?")
         @output_path = Pathname($1)
         @type = $2
       end
@@ -125,7 +125,7 @@ module Pith
           else
             input.rewind
           end
-          @tilt_template = Tilt.new(file, input.lineno + 1) { input.read }
+          @tilt_template = Tilt.new(file.to_s, input.lineno + 1) { input.read }
         end
       end
       

data/lib/pith/project.rb

@@ -109,7 +109,7 @@ module Pith
       config_file = input_dir + "_pith/config.rb"
       project = self
       if config_file.exist?
-        eval(config_file.read, binding, config_file)
+        eval(config_file.read, binding, config_file.to_s, 1)
       end
     end
     

data/lib/pith/render_context.rb

@@ -53,7 +53,7 @@ module Pith
     end
     
     def relative_url_to(target_path)
-      url = target_path.relative_path_from(page.path.parent).to_str
+      url = target_path.relative_path_from(page.path.parent).to_s
       url = url.sub(/index\.html$/, "") if project.assume_directory_index
       url = url.sub(/\.html$/, "") if project.assume_content_negotiation
       url = "./" if url.empty?

data/lib/pith/version.rb

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

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pith
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 12
-  version: 0.0.12
+  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mike Williams
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 +11:00
-default_executable: pith
+date: 2011-05-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -26,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
         version: "1.1"
   type: :runtime
   version_requirements: *id001
@@ -41,11 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
   type: :runtime
   version_requirements: *id002
@@ -57,11 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
         version: 1.2.1
   type: :runtime
   version_requirements: *id003
@@ -73,102 +53,86 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 2
-        - 7
         version: 1.2.7
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: clamp
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.1.7
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
         version: 0.8.3
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: RedCloth
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rdiscount
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: |
   Pith builds static websites, using markup/template languages including Haml, Sass, ERb, Liquid, Markdown and Textile.
 
@@ -217,8 +181,6 @@ files:
 - lib/pith.rb
 - lib/pith.rb~
 - sample/_layouts/standard.haml
-- sample/_out/blah/deblah.txt
-- sample/_out/features/stuff.html
 - sample/_out/index.html
 - sample/_out/stylesheets/app.css
 - sample/index.html.haml
@@ -269,7 +231,6 @@ files:
 - features/verbatim.feature~
 - cucumber.yml
 - bin/pith
-has_rdoc: true
 homepage: http://github.com/mdub/pith
 licenses: []
 
@@ -283,23 +244,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A static website generator
@@ -348,3 +303,4 @@ test_files:
 - features/textile.feature~
 - features/verbatim.feature~
 - cucumber.yml
+has_rdoc: 

data/sample/_out/blah/deblah.txt

@@ -1 +0,0 @@
-dsfsdf

data/sample/_out/features/stuff.html

@@ -1 +0,0 @@
-