staticmatic 0.2.1 → 0.3.0

data/bin/staticmatic

@@ -1,11 +1,32 @@
 #!/usr/bin/env ruby
+require 'optparse'
+DEFAULT_PORT = 3000
+DEFAULT_HOST = "127.0.0.1"
 require File.dirname(__FILE__) + '/../lib/staticmatic'
 
+$options = {:host=>DEFAULT_HOST,:port=>DEFAULT_PORT}
+
+optparse = OptionParser.new do |opt|
+  opt.banner = "Usage: #{$0} <build|setup|preview> [OPTIONS]"
+  opt.separator ""
+  opt.on "-p", "--port [PORT]", "Select the server port, defaults to #{DEFAULT_PORT}" do |port|
+    $options[:port] = port
+  end
+  opt.on "-h", "--host [HOST]", "Select the server host, defaults to #{DEFAULT_HOST}" do |host|
+    $options[:host] = host
+  end
+  opt.on_tail "-h", "--help", "Display this help message" do
+    puts opt
+    exit
+  end
+end
+optparse.parse!
+
 command = ARGV[0]
 directory = ARGV[1]
 
 if !command || !directory
-  puts 'Usage: staticmatic <build|setup|preview> <directory>'
+  puts "Usage: #{$0} <build|setup|preview> <directory>"
   exit
 end
 

data/lib/staticmatic/helpers.rb

@@ -3,7 +3,7 @@ module Haml
     
     # Generates links to all stylesheets in the source directory
     def stylesheets
-      stylesheet_dir = "#{base_dir}/src/stylesheets"
+      stylesheet_dir = "#{@base_dir}/src/stylesheets"
       output = ""
       Dir["#{stylesheet_dir}/**/*.sass"].each do |path|
         filename_without_extension = File.basename(path).chomp(File.extname(path))

data/lib/staticmatic/server.rb

@@ -38,7 +38,11 @@ module StaticMatic
               output = e.message
             end
           else
-            output = "File not Found"
+            if @files.can_serve(path_info)
+              @files.process(request,response)
+            else
+              output = "File not Found"
+            end
           end
           out.write output
         end
@@ -55,9 +59,9 @@ module StaticMatic
       #
       # StaticMatic.start('/path/to/site/')
       #
-      def start(base_dir, port = 3000)
-        config = Mongrel::Configurator.new :host => "127.0.0.1" do
-          puts "Running Preview of #{base_dir} on 127.0.0.1:#{port}"
+      def start(base_dir, port = $options[:port])
+        config = Mongrel::Configurator.new :host => $options[:host] do
+          puts "Running Preview of #{base_dir} on #{$options[:host]}:#{port}"
           listener :port => port do
             uri "/", :handler => Server.new(base_dir)
           end
@@ -68,4 +72,4 @@ module StaticMatic
       end
     end
   end
-end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: staticmatic
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2007-06-10 00:00:00 +01:00
+  version: 0.3.0
+date: 2007-07-26 00:00:00 +01:00
 summary: Manage static sites using Haml & Sass
 require_paths: 
 - lib
@@ -30,30 +30,25 @@ authors:
 - Stephen Bartholomew
 files: 
 - bin
-- example
-- lib
-- RakeFile
-- README
-- staticmatic-0.2.0.gem
-- test
 - bin/staticmatic
+- example
 - example/site
-- example/src
 - example/site/contact.html
 - example/site/images
 - example/site/index.html
 - example/site/javascripts
 - example/site/stylesheets
 - example/site/stylesheets/application.css
+- example/src
 - example/src/layouts
-- example/src/pages
-- example/src/stylesheets
 - example/src/layouts/application.haml
+- example/src/pages
 - example/src/pages/contact.haml
 - example/src/pages/index.haml
+- example/src/stylesheets
 - example/src/stylesheets/application.sass
+- lib
 - lib/staticmatic
-- lib/staticmatic.rb
 - lib/staticmatic/base.rb
 - lib/staticmatic/error.rb
 - lib/staticmatic/helpers.rb
@@ -62,26 +57,30 @@ files:
 - lib/staticmatic/templates/application.haml
 - lib/staticmatic/templates/application.sass
 - lib/staticmatic/templates/index.haml
+- lib/staticmatic.rb
+- RakeFile
+- README
+- test
 - test/base_test.rb
 - test/helpers_test.rb
 - test/sandbox
-- test/server_test.rb
 - test/sandbox/test_site
-- test/sandbox/tmp
 - test/sandbox/test_site/config.rb
 - test/sandbox/test_site/site
-- test/sandbox/test_site/src
 - test/sandbox/test_site/site/images
 - test/sandbox/test_site/site/index.html
 - test/sandbox/test_site/site/javascripts
 - test/sandbox/test_site/site/stylesheets
 - test/sandbox/test_site/site/stylesheets/application.css
+- test/sandbox/test_site/src
 - test/sandbox/test_site/src/layouts
-- test/sandbox/test_site/src/pages
-- test/sandbox/test_site/src/stylesheets
 - test/sandbox/test_site/src/layouts/application.haml
+- test/sandbox/test_site/src/pages
 - test/sandbox/test_site/src/pages/index.haml
+- test/sandbox/test_site/src/stylesheets
 - test/sandbox/test_site/src/stylesheets/application.sass
+- test/sandbox/tmp
+- test/server_test.rb
 test_files: 
 - test/base_test.rb
 - test/helpers_test.rb