frank 1.0.2 → 1.0.3

data/README.md

@@ -54,7 +54,7 @@ Frank Templates
 
 Frank (as of 1.0) has support for saving "templates" in `~/.frank_templates`. This is very handy if find yourself wanting a custom starting point. All you have to do to use the feature is create a `~/.frank_templates` folder and start putting templates in it.
 
-Once you have a few templates saved you can simply run `frank new` to be presented with a list of templates to choose from as the starting point for the project.
+Once you have a few templates saved, when you run `frank new <project_path>` you'll be presented with a list of templates to choose from as the starting point for the project.
 
 Views & Meta Data
 -------------------------
@@ -233,4 +233,4 @@ Installation
 [11]: http://en.wikipedia.org/wiki/Lorem_ipsum
 [12]: http://www.imagemagick.org/script/binary-releases.php?ImageMagick=4pg9cdfr8e6gn7aru9mtelepr3
 [13]: http://www.yaml.org/start.html
-[14]: http://placehold.it
+[14]: http://placehold.it

data/frank.gemspec

@@ -1,119 +1,117 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{frank}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["blahed", "nwah"]
-  s.date = %q{2010-11-12}
+  s.date = %q{2010-11-16}
   s.default_executable = %q{frank}
   s.description = %q{Rapidly develop static sites using any supported templating language}
   s.email = %q{travis.dunn@thisismedium.com}
   s.executables = ["frank"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "autotest/discover.rb",
-     "bin/frank",
-     "frank.gemspec",
-     "lib/frank.rb",
-     "lib/frank/base.rb",
-     "lib/frank/cli.rb",
-     "lib/frank/compile.rb",
-     "lib/frank/lorem.rb",
-     "lib/frank/middleware/imager.rb",
-     "lib/frank/middleware/refresh.rb",
-     "lib/frank/middleware/statik.rb",
-     "lib/frank/publish.rb",
-     "lib/frank/rescue.rb",
-     "lib/frank/settings.rb",
-     "lib/frank/template_helpers.rb",
-     "lib/frank/templates/404.haml",
-     "lib/frank/templates/500.haml",
-     "lib/frank/templates/frank-404.png",
-     "lib/frank/templates/frank-500.png",
-     "lib/frank/templates/imager/frank0.jpg",
-     "lib/frank/templates/imager/frank1.jpg",
-     "lib/frank/templates/imager/frank2.jpg",
-     "lib/frank/templates/imager/frank3.jpg",
-     "lib/frank/templates/imager/frank4.jpg",
-     "lib/frank/templates/imager/frank5.jpg",
-     "lib/frank/templates/imager/frank6.jpg",
-     "lib/frank/templates/imager/frank7.jpg",
-     "lib/frank/templates/imager/frank8.jpg",
-     "lib/frank/templates/imager/frank9.jpg",
-     "lib/frank/tilt_setup.rb",
-     "lib/frank/upgrades.rb",
-     "lib/template/dynamic/css/frank.sass",
-     "lib/template/dynamic/index.haml",
-     "lib/template/helpers.rb",
-     "lib/template/layouts/default.haml",
-     "lib/template/setup.rb",
-     "lib/template/static/favicon.ico",
-     "lib/template/static/images/frank-med.png",
-     "lib/template/static/js/frank.js",
-     "spec/base_spec.rb",
-     "spec/compile_spec.rb",
-     "spec/helper.rb",
-     "spec/publish_spec.rb",
-     "spec/render_spec.rb",
-     "spec/template/dynamic/500.haml",
-     "spec/template/dynamic/_partial.haml",
-     "spec/template/dynamic/_partial_with_locals.haml",
-     "spec/template/dynamic/builder.builder",
-     "spec/template/dynamic/erb.erb",
-     "spec/template/dynamic/helper_test.haml",
-     "spec/template/dynamic/index.haml",
-     "spec/template/dynamic/layout2_test.haml",
-     "spec/template/dynamic/liquid.liquid",
-     "spec/template/dynamic/lorem_test.haml",
-     "spec/template/dynamic/markdown.md",
-     "spec/template/dynamic/markdown_in_haml.md",
-     "spec/template/dynamic/nested/child.haml",
-     "spec/template/dynamic/nested/deeper/deep.haml",
-     "spec/template/dynamic/no_layout.haml",
-     "spec/template/dynamic/partial_locals_test.haml",
-     "spec/template/dynamic/partial_test.haml",
-     "spec/template/dynamic/redcloth.textile",
-     "spec/template/dynamic/refresh.haml",
-     "spec/template/dynamic/setting_in_layout.haml",
-     "spec/template/dynamic/stylesheets/sass.sass",
-     "spec/template/dynamic/stylesheets/sass_with_compass.sass",
-     "spec/template/dynamic/stylesheets/scss_with_compass.scss",
-     "spec/template/helpers.rb",
-     "spec/template/layouts/default.haml",
-     "spec/template/layouts/explicit/layout2.haml",
-     "spec/template/layouts/nested/default.haml",
-     "spec/template/setup.rb",
-     "spec/template/static/files/static.html",
-     "spec/template_helpers_spec.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "autotest/discover.rb",
+    "bin/frank",
+    "frank.gemspec",
+    "lib/frank.rb",
+    "lib/frank/base.rb",
+    "lib/frank/cli.rb",
+    "lib/frank/compile.rb",
+    "lib/frank/lorem.rb",
+    "lib/frank/middleware/imager.rb",
+    "lib/frank/middleware/refresh.rb",
+    "lib/frank/middleware/statik.rb",
+    "lib/frank/publish.rb",
+    "lib/frank/rescue.rb",
+    "lib/frank/settings.rb",
+    "lib/frank/template_helpers.rb",
+    "lib/frank/templates/404.haml",
+    "lib/frank/templates/500.haml",
+    "lib/frank/templates/frank-404.png",
+    "lib/frank/templates/frank-500.png",
+    "lib/frank/templates/imager/frank0.jpg",
+    "lib/frank/templates/imager/frank1.jpg",
+    "lib/frank/templates/imager/frank2.jpg",
+    "lib/frank/templates/imager/frank3.jpg",
+    "lib/frank/templates/imager/frank4.jpg",
+    "lib/frank/templates/imager/frank5.jpg",
+    "lib/frank/templates/imager/frank6.jpg",
+    "lib/frank/templates/imager/frank7.jpg",
+    "lib/frank/templates/imager/frank8.jpg",
+    "lib/frank/templates/imager/frank9.jpg",
+    "lib/frank/tilt_setup.rb",
+    "lib/frank/upgrades.rb",
+    "lib/template/dynamic/css/frank.sass",
+    "lib/template/dynamic/index.haml",
+    "lib/template/helpers.rb",
+    "lib/template/layouts/default.haml",
+    "lib/template/setup.rb",
+    "lib/template/static/favicon.ico",
+    "lib/template/static/images/frank-med.png",
+    "lib/template/static/js/frank.js",
+    "spec/base_spec.rb",
+    "spec/compile_spec.rb",
+    "spec/helper.rb",
+    "spec/publish_spec.rb",
+    "spec/render_spec.rb",
+    "spec/template/dynamic/500.haml",
+    "spec/template/dynamic/_partial.haml",
+    "spec/template/dynamic/_partial_with_locals.haml",
+    "spec/template/dynamic/builder.builder",
+    "spec/template/dynamic/erb.erb",
+    "spec/template/dynamic/helper_test.haml",
+    "spec/template/dynamic/index.haml",
+    "spec/template/dynamic/layout2_test.haml",
+    "spec/template/dynamic/liquid.liquid",
+    "spec/template/dynamic/lorem_test.haml",
+    "spec/template/dynamic/markdown.md",
+    "spec/template/dynamic/markdown_in_haml.md",
+    "spec/template/dynamic/nested/child.haml",
+    "spec/template/dynamic/nested/deeper/deep.haml",
+    "spec/template/dynamic/no_layout.haml",
+    "spec/template/dynamic/partial_locals_test.haml",
+    "spec/template/dynamic/partial_test.haml",
+    "spec/template/dynamic/redcloth.textile",
+    "spec/template/dynamic/refresh.haml",
+    "spec/template/dynamic/setting_in_layout.haml",
+    "spec/template/dynamic/stylesheets/sass.sass",
+    "spec/template/dynamic/stylesheets/sass_with_compass.sass",
+    "spec/template/dynamic/stylesheets/scss_with_compass.scss",
+    "spec/template/helpers.rb",
+    "spec/template/layouts/default.haml",
+    "spec/template/layouts/explicit/layout2.haml",
+    "spec/template/layouts/nested/default.haml",
+    "spec/template/setup.rb",
+    "spec/template/static/files/static.html",
+    "spec/template_helpers_spec.rb"
   ]
   s.homepage = %q{http://github.com/blahed/frank}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Static Site Non-Framework}
   s.test_files = [
     "spec/base_spec.rb",
-     "spec/compile_spec.rb",
-     "spec/helper.rb",
-     "spec/publish_spec.rb",
-     "spec/render_spec.rb",
-     "spec/template/helpers.rb",
-     "spec/template/setup.rb",
-     "spec/template_helpers_spec.rb"
+    "spec/compile_spec.rb",
+    "spec/helper.rb",
+    "spec/publish_spec.rb",
+    "spec/render_spec.rb",
+    "spec/template/helpers.rb",
+    "spec/template/setup.rb",
+    "spec/template_helpers_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -121,12 +119,52 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, [">= 1.0"])
+      s.add_runtime_dependency(%q<mongrel>, [">= 1.0"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.0"])
+      s.add_runtime_dependency(%q<tilt>, ["= 0.9"])
+      s.add_runtime_dependency(%q<net-ssh>, [">= 2.0"])
+      s.add_runtime_dependency(%q<net-scp>, [">= 1.0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+      s.add_runtime_dependency(%q<rack-test>, [">= 0.5"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<contest>, [">= 0"])
+      s.add_runtime_dependency(%q<builder>, [">= 0"])
+      s.add_runtime_dependency(%q<erubis>, [">= 0"])
+      s.add_runtime_dependency(%q<compass>, [">= 0.10.2"])
+      s.add_runtime_dependency(%q<rdiscount>, [">= 0"])
+      s.add_runtime_dependency(%q<liquid>, [">= 0"])
+      s.add_runtime_dependency(%q<less>, [">= 0"])
+      s.add_runtime_dependency(%q<coffee-script>, [">= 0"])
+      s.add_runtime_dependency(%q<RedCloth>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby-debug>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0"])
       s.add_runtime_dependency(%q<haml>, [">= 3.0"])
       s.add_runtime_dependency(%q<tilt>, ["= 0.9"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5"])
     else
+      s.add_dependency(%q<rack>, [">= 1.0"])
+      s.add_dependency(%q<mongrel>, [">= 1.0"])
+      s.add_dependency(%q<haml>, [">= 3.0"])
+      s.add_dependency(%q<tilt>, ["= 0.9"])
+      s.add_dependency(%q<net-ssh>, [">= 2.0"])
+      s.add_dependency(%q<net-scp>, [">= 1.0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+      s.add_dependency(%q<rack-test>, [">= 0.5"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<contest>, [">= 0"])
+      s.add_dependency(%q<builder>, [">= 0"])
+      s.add_dependency(%q<erubis>, [">= 0"])
+      s.add_dependency(%q<compass>, [">= 0.10.2"])
+      s.add_dependency(%q<rdiscount>, [">= 0"])
+      s.add_dependency(%q<liquid>, [">= 0"])
+      s.add_dependency(%q<less>, [">= 0"])
+      s.add_dependency(%q<coffee-script>, [">= 0"])
+      s.add_dependency(%q<RedCloth>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 1.0"])
       s.add_dependency(%q<haml>, [">= 3.0"])
       s.add_dependency(%q<tilt>, ["= 0.9"])
@@ -134,6 +172,26 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rack-test>, [">= 0.5"])
     end
   else
+    s.add_dependency(%q<rack>, [">= 1.0"])
+    s.add_dependency(%q<mongrel>, [">= 1.0"])
+    s.add_dependency(%q<haml>, [">= 3.0"])
+    s.add_dependency(%q<tilt>, ["= 0.9"])
+    s.add_dependency(%q<net-ssh>, [">= 2.0"])
+    s.add_dependency(%q<net-scp>, [">= 1.0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+    s.add_dependency(%q<rack-test>, [">= 0.5"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<contest>, [">= 0"])
+    s.add_dependency(%q<builder>, [">= 0"])
+    s.add_dependency(%q<erubis>, [">= 0"])
+    s.add_dependency(%q<compass>, [">= 0.10.2"])
+    s.add_dependency(%q<rdiscount>, [">= 0"])
+    s.add_dependency(%q<liquid>, [">= 0"])
+    s.add_dependency(%q<less>, [">= 0"])
+    s.add_dependency(%q<coffee-script>, [">= 0"])
+    s.add_dependency(%q<RedCloth>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 1.0"])
     s.add_dependency(%q<haml>, [">= 3.0"])
     s.add_dependency(%q<tilt>, ["= 0.9"])

data/lib/frank.rb

@@ -12,7 +12,6 @@ require 'rubygems'
 require 'yaml'
 require 'fileutils'
 require 'rack'
-require 'net/ssh'
 require 'frank/settings'
 require 'frank/base'
 require 'frank/compile'

data/lib/frank/base.rb

@@ -6,7 +6,7 @@ require 'frank/middleware/statik'
 require 'frank/middleware/refresh'
 
 module Frank
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
   extend Frank::Upgrades
 
   module Render; end
@@ -231,6 +231,16 @@ module Frank
     Frank.reset
     Frank.root = new_root if new_root
 
+    if %w[publish p].include? ARGV.first
+      begin
+        require 'net/ssh'
+        require 'net/scp'
+      rescue LoadError
+        puts "\033[31mpublish requires the 'net-scp' gem. `gem install net-scp'\033[0m"
+        exit!
+      end
+    end
+
     # setup compass
     begin
       require 'compass'
@@ -256,19 +266,7 @@ module Frank
       load setup
     elsif File.exist? File.join(Dir.pwd, 'settings.yml')
       puts "\033[31mFrank could not find setup.rb, perhaps you need to upgrade with the `frank upgrade\' command \033[0m"
-      exit
-    else
-      puts " \033[31mFrank could not find setup.rb \033[0m"
-      exit
-    end
-
-    if Frank.publish.host || Frank.publish.path || Frank.publish.username || Frank.publish.password
-      begin
-        require 'net/scp'
-      rescue LoadError
-        puts "\033[31m`frank publish' requires the 'net-scp' gem. `gem install net-scp'\033[0m"
-        exit
-      end
+      exit!
     end
 
   end
@@ -284,17 +282,21 @@ module Frank
     end
 
     unless Frank.environment == :test
-      m = "got it under control \n got your back \n holdin' it down
-             takin' care of business \n workin' some magic".split("\n").sort_by{rand}.first.strip
-      puts "\n-----------------------\n" +
-           " Frank's #{ m }...\n" +
-           " #{Frank.server.hostname}:#{Frank.server.port} \n\n"
+      message = ['got it under control', 'got your back', 'holdin\' it down', 'takin\' care of business', 'workin\' some magic'].sort_by{rand}.first.strip
+
+      puts "\n-----------------------"
+      if Frank.serving_static?
+        puts " This doesn't look like a frank project. Frank's serving this folder up his way..."
+      else
+        puts " Frank's #{ message }..."
+      end
+      puts " #{Frank.server.hostname}:#{Frank.server.port} \n\n"
 
       begin
         server = Rack::Handler.get(Frank.server.handler)
       rescue LoadError
         puts "\n\nUnable to find handler for: #{Frank.server.handler}"
-        puts "\nUse `gem install \"#{Frank.server.handler}\"` to install it"
+        puts "\nUse `gem install #{Frank.server.handler}' to install it"
         puts "\nDefaulting to using webrick"
         server = Rack::Handler.get("webrick")
       end

data/lib/frank/cli.rb

@@ -110,10 +110,16 @@ module Frank
           Frank.server.handler  = server_options['handler'] if server_options['handler']
           Frank.server.hostname = server_options['hostname'] if server_options['hostname']
           Frank.server.port     = server_options['port'] if server_options['port']
-
-          # setup folder options
-          Frank.dynamic_folder = @options[:dynamic_folder] if @options[:dynamic_folder]
-          Frank.static_folder  = @options[:static_folder] if @options[:static_folder]
+          if File.exist? 'setup.rb'
+            # setup folder options if we have setup.rb
+            Frank.dynamic_folder = @options[:dynamic_folder] if @options[:dynamic_folder]
+            Frank.static_folder  = @options[:static_folder] if @options[:static_folder]
+          else
+            # let frank act like a real grown up server
+            Frank.serving_static!
+            Frank.dynamic_folder = '.'
+            Frank.static_folder = '.'
+          end
           Frank.new
         when 'export', 'e', 'out'
           # compile the project
@@ -129,6 +135,9 @@ module Frank
         when 'upgrade'
           # upgrade if we need to upgrade
           Frank.upgrade!
+        else
+          puts "frank doesn't know that one... `frank --help' for usage"
+          exit
         end
       end
 

data/lib/frank/middleware/refresh.rb

@@ -12,7 +12,7 @@ module Frank
       def call(env)
         request = Rack::Request.new(env)
         if request.path_info.match /^\/__refresh__$/
-          [ 200, { 'Content-Type' => 'application/json' }, "[#{get_mtime}]" ]
+          [ 200, { 'Content-Type' => 'application/json', 'Connection' => 'Keep-Alive', 'Keep-Alive' => 'timeout=60', 'Cache-Control' => 'max-age=0' }, "#{get_mtime}" ]
         else
           @app.call(env)
         end

data/lib/frank/publish.rb

@@ -3,6 +3,8 @@ module Frank
 
     class SCP
       def self.execute!
+        exit_unless_configured
+
         puts "\nFrank is..."
         puts " - \033[32mExporting templates\033[0m"
 
@@ -27,7 +29,7 @@ module Frank
 
         # upload the files and report progress
         Net::SSH.start(Frank.publish.host, Frank.publish.username, ssh_options) do |ssh|
-          ssh.scp.upload!(tmp_folder, Frank.publish.path, :recursive => true, :chunk_size => 2048) do |ch, name, sent, total|
+          ssh.scp.upload!("#{tmp_folder}/", Frank.publish.path, :recursive => true, :chunk_size => 2048) do |ch, name, sent, total|
 
             puts "   - #{name[tmp_folder.length..-1]}" unless name == current
 
@@ -40,7 +42,25 @@ module Frank
 
         puts "\n\033[32mPublish complete!\033[0m"
       end
+
+      def self.exit_unless_configured
+        required_settings = { :host => Frank.publish.host, :path => Frank.publish.path, :username => Frank.publish.username }
+        should_exit       = false
+        message           = "\033[31m"
+
+        required_settings.each do |name, value|
+          if value.nil?
+            message << "Frank.publish.#{name} is required to publish. You can configure it in setup.rb\n"
+            exiting = true
+          end
+        end
+
+        message << "\033[0m"
+
+        puts message and exit! if should_exit
+      end
+
     end
 
   end
-end
+end

data/lib/frank/settings.rb

@@ -57,6 +57,16 @@ module Frank
       @root.split('/').last
     end
 
+    # Are we serving up a raw static folder?
+    def serving_static?
+      @serving_static
+    end
+
+    # Mark this Frank run as serving static
+    def serving_static!
+      @serving_static = true
+    end
+
     # Check to see if we're compiling
     def exporting?
       @exporting

data/lib/frank/template_helpers.rb

@@ -25,19 +25,21 @@ module Frank
             var when = #{Time.now.to_i};
 
             function process( raw ){
-              if( eval(raw)[0] > when )
+              if( parseInt(raw) > when ) {
                 window.location.reload();
+              }
             }
-
-            (function poll(){
-              var req = new XMLHttpRequest();
-              req.open('GET', '/__refresh__', true);
+            
+            (function (){
+              var req = (typeof XMLHttpRequest !== "undefined") ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP");
               req.onreadystatechange = function (aEvt) {
-                if ( req.readyState == 4 && req.status == 200 )
-                  process(req.responseText);
+                if ( req.readyState === 4 ) {
+                  process( req.responseText );
+                }
               };
-              req.send(null);
-              setTimeout( poll, 1000 );
+              req.open('GET', '/__refresh__', true);
+              req.send( null );
+              setTimeout( arguments.callee, 1000 );
             })();
 
           })();

data/lib/frank/templates/404.haml

@@ -14,18 +14,18 @@
     #wrapper
       %img{:src=>'/__frank__/frank-404.png'}
       %h1= "Not Found—"
-      - unless environment == :serving
+      - unless Frank.serving_static?
         %p
           - if request['REQUEST_PATH']
             - path = request['REQUEST_PATH'][1..-1]
             = "Try creating"
-          
+
             - if path.match(/\.css$/)
               = "<tt>#{path.match(/([\w\/]+)\./)[1]}.sass</tt>"
             - else
               = "<tt>#{path.gsub(/\/$/, '')}.haml</tt>"
             = "in the <tt>#{dynamic_folder}</tt> folder, or"
-          
+
             - if path.match(/\.\w+/)
               = "<tt>#{path}</tt>"
             - else

data/lib/template/setup.rb

@@ -58,6 +58,9 @@ Frank.layouts_folder = "layouts"
 #  Frank.publish.port = 22
 #
 
+# ----------------------
+# Sass Options:
+# Frank.sass_options = { :load_paths => [ File.join(File.dirname(__FILE__), 'dynamic/css') ] }
 
 
 # ----------------------

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frank
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - blahed
@@ -16,12 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 -05:00
+date: 2010-11-16 00:00:00 -05:00
 default_executable: frank
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,11 +31,26 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
+  name: rack
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: haml
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  name: mongrel
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,11 +61,11 @@ dependencies:
         - 0
         version: "3.0"
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: tilt
+  name: haml
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -63,11 +76,55 @@ dependencies:
         - 9
         version: "0.9"
   type: :runtime
-  version_requirements: *id003
+  name: tilt
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :runtime
+  name: net-ssh
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  name: net-scp
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: jeweler
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,12 +137,246 @@ dependencies:
         - beta
         - 19
         version: 2.0.0.beta.19
-  type: :development
-  version_requirements: *id004
+  type: :runtime
+  name: rspec
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
+  type: :runtime
   name: rack-test
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: rake
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: contest
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: builder
+  prerelease: false
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: erubis
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
+  type: :runtime
+  name: compass
+  prerelease: false
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: rdiscount
+  prerelease: false
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: liquid
+  prerelease: false
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: less
+  prerelease: false
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: coffee-script
+  prerelease: false
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: RedCloth
+  prerelease: false
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: ruby-debug
+  prerelease: false
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
+  requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  name: rack
+  prerelease: false
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  requirement: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  name: haml
+  prerelease: false
+  version_requirements: *id022
+- !ruby/object:Gem::Dependency 
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  type: :runtime
+  name: tilt
+  prerelease: false
+  version_requirements: *id023
+- !ruby/object:Gem::Dependency 
+  requirement: &id024 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 62196421
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 19
+        version: 2.0.0.beta.19
+  type: :development
+  name: rspec
+  prerelease: false
+  version_requirements: *id024
+- !ruby/object:Gem::Dependency 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,7 +387,9 @@ dependencies:
         - 5
         version: "0.5"
   type: :development
-  version_requirements: *id005
+  name: rack-test
+  prerelease: false
+  version_requirements: *id025
 description: Rapidly develop static sites using any supported templating language
 email: travis.dunn@thisismedium.com
 executables: 
@@ -107,7 +400,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -192,8 +484,8 @@ homepage: http://github.com/blahed/frank
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,6 +0,0 @@
-.DS_Store
-pkg
-lib/frank/output_old.rb
-.rvmrc
-.sass-cache
-.bundle