frank 0.4.1 → 1.0.0

data/Gemfile

@@ -1,27 +1,26 @@
 source :gemcutter
-gem "rack", ">=1.0"
-gem "mongrel", ">=1.0"
-gem "haml", ">=3.0"
-gem "tilt", "=0.9"
+gem 'rack', '>=1.0'
+gem 'mongrel', '>=1.0'
+gem 'haml', '>=3.0'
+gem 'tilt', '=0.9'
+gem 'net-ssh', '>=2.0'
+gem 'net-scp', '>=1.0'
 
 # dev dependencies
-gem "jeweler"
-gem "rspec", ">=2.0.0.beta.19"
-gem "rack-test", ">=0.5"
-gem "rake"
+gem 'jeweler'
+gem 'rspec', '>=2.0.0.beta.19'
+gem 'rack-test', '>=0.5'
+gem 'rake'
 
 # tilt dev dependencies
 gem 'contest'
 gem 'builder'
 gem 'erubis'
 gem 'compass', '>= 0.10.2'
-gem 'mustache'
 gem 'rdiscount'
 gem 'liquid'
 gem 'less'
 gem 'coffee-script'
-gem "RedCloth"
-
-gem "mini_magick"
+gem 'RedCloth'
 
 gem 'ruby-debug'

data/Gemfile.lock

@@ -29,15 +29,15 @@ GEM
       treetop (>= 1.4.2)
     linecache (0.43)
     liquid (2.1.2)
-    mini_magick (1.3.1)
-      subexec (~> 0.0.4)
     mongrel (1.1.5)
       cgi_multipart_eof_fix (>= 2.4)
       daemons (>= 1.0.3)
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
-    mustache (0.11.2)
     mutter (0.5.3)
+    net-scp (1.0.1)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.0.23)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-test (0.5.4)
@@ -59,7 +59,6 @@ GEM
       linecache (>= 0.3)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
-    subexec (0.0.4)
     tilt (0.9)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
@@ -78,9 +77,9 @@ DEPENDENCIES
   jeweler
   less
   liquid
-  mini_magick
   mongrel (>= 1.0)
-  mustache
+  net-scp (>= 1.0)
+  net-ssh (>= 2.0)
   rack (>= 1.0)
   rack-test (>= 0.5)
   rake

data/README.md

@@ -3,12 +3,13 @@ Frank
 
 Inspired by [Sinatra][0]'s simplicity and ease of use, Frank lets you build
 static sites using your favorite libs. Frank has a built in development server
-for previewing work as you develop. Frank also has a "dump" command for compiling and saving
-your work out to static html and css.
+for previewing work as you develop, an "export" command for compiling and saving
+your work out to static html and css, and a publish command for copying your
+exported pages to a server.
 
 Frank uses [Tilt][1], so it
-comes with support for [Haml & Sass][2], [LESS][10], [Builder][3], [ERB][4],
-[Liquid][5], and [Mustache][6].
+comes with support for [Haml & Sass][2], [LESS][10], [Builder][3], [ERB][4], and
+[Liquid][5].
 
 Overview
 --------
@@ -38,11 +39,23 @@ to compile templates and copy them--along with static your assets--into `<export
 
 to compile & copy over, but organized to work as a static website in production. (e.g. folders named after your views, with an `index.html` inside)
 
-Upgrading to 0.4
+You can add publish settings in setup.rb and publish directly to a server via scp.
+
+    $ frank publish
+
+Upgrading
 -------------------------
 
 As of version 0.4, Frank no longer uses settings.yml. However you can use `frank upgrade` in order convert your old settings.yml to the new setup.rb format.
 
+
+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.
+
 Views & Meta Data
 -------------------------
 
@@ -146,7 +159,7 @@ Built-in Helpers
 
 ### Auto-Refresh
 
-Frank now has a handy automatic page refreshing helper. Just include `= refresh`
+Frank has a handy automatic page refreshing helper. Just include `= refresh`
 (or equivalent) in your view, and Frank will automatically refresh the page for you whenever you
 save a project file. This eliminates the tedium of hundreds of manual refreshes over the course
 of building a project.
@@ -190,6 +203,7 @@ Frank now uses [placehold.it][14] for placeholder images, the `lorem.image` help
 ### Replacement Text
 
 All of the lorem helpers accept an optional "replacement" argument. This will be the text rendered when you `frank export`.
+
 For example `lorem.sentence("<%= page.content %>")` will generate a lorem sentence when you view the page using the `frank server` for development.
 However, when you `frank export` the template will render "<%= page.content %>". This is useful if you plan on moving a frank project
 into a framework. (e.g. rails, sinatra, django, etc)
@@ -204,8 +218,6 @@ Check the comments there if you need help.
 Installation
 ------------
 
-### [Gemcutter](http://gemcutter.org/)
-
     $ gem install frank
 
 
@@ -215,7 +227,6 @@ Installation
 [3]: http://builder.rubyforge.org/
 [4]: http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/
 [5]: http://www.liquidmarkup.org/
-[6]: http://github.com/defunkt/mustache
 [8]: http://lesscss.org/
 [9]: http://rack.rubyforge.org/
 [10]: http://lesscss.org/

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { 'rspec2' }

data/bin/frank

@@ -2,7 +2,6 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'frank'
-require 'optparse'
 
 begin
   # try to use bundler if its available
@@ -18,116 +17,4 @@ rescue LoadError
   $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 end
 
-options = {:server => {}}
-
-banner = <<-USAGE
-Usage:
-  frank new PROJECT_PATH
-  frank server [options]
-  frank export PATH [options]
-
-Description:
-  The `frank new' command generates a frank template project with the default
-  directory structure and configuration at the given path.
-
-  Once you have a frank project you can use the `frank server' or the aliased 'frank up' commands
-  to start the development server and begin developing your project.
-
-  When you are finished working and ready to export you can use
-  the `frank export' or aliased `frank out' commands.
-
-Example:
-  frank new ~/Dev/blah.com
-  cd ~/Dev/blah.com
-  frank server
-
-  # do some development
-
-  frank export ~/Dev/html/blah.com
-USAGE
-
-
-opts = OptionParser.new do |opts|
-  opts.banner = banner
-
-  opts.separator ''
-  opts.separator 'Options:'
-
-  opts.on('--server [HANDLER]', 'Set the server handler (frank server)') do |handler|
-    options[:server]['handler'] = handler unless handler.nil?
-  end
-
-  opts.on('--hostname [HOSTNAME]', 'Set the server hostname (frank server)') do |hostname|
-    options[:server]['hostname'] = hostname unless hostname.nil?
-  end
-
-  opts.on('--port [PORT]', 'Set the server port (frank server)') do |port|
-    options[:server]['port'] = port unless port.nil?
-  end
-
-  opts.on('--dynamic_folder [FOLDER]', 'Set the dynamic folder (frank server)') do |folder|
-    options[:dynamic_folder] = folder unless folder.nil?
-  end
-
-  opts.on('--static_folder [FOLDER]', 'Set the static folder (frank server)') do |folder|
-    options[:static_folder] = folder unless folder.nil?
-  end
-
-  opts.on('--production', 'Production ready export (frank export) i.e. ([FOLDER]/index.html)') do |handler|
-    options[:production] = true
-  end
-
-  opts.on('-v', '--version', 'Show the frank version and exit') do
-    puts "Frank v#{Frank::VERSION}"
-    exit
-  end
-
-  opts.on( '-h', '--help', 'Display this help' ) do
-    puts opts
-    exit
-  end
-end
-
-opts.parse!
-
-if ARGV.empty?
-  puts opts
-  exit
-else
-  if %w[server up export out upgrade s e].include? ARGV.first
-    begin
-      Frank.bootstrap(Dir.pwd)
-    rescue Errno::ENOENT
-      if File.exist? File.join(Dir.pwd, 'helpers.rb')
-        puts "Frank could not find setup.rb, perhaps you need to upgrade with the `frank upgrade' command"
-      else
-        puts "Frank could not find setup.rb"
-      end
-    end
-  end
-
-  case ARGV.first
-  when 'new', 'n'
-    # stub out the project
-    Frank.stub(ARGV[1])
-  when 'server', 's', 'up'
-    # setup server from options
-    server_options        = options[:server]
-    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]
-    Frank.new
-  when 'export', 'e', 'out'
-    Frank.production! if options[:production]
-    Frank::Output.new do
-      set :environment, :output
-      set :output_folder, ARGV[1]
-    end.dump(options[:production])
-  when 'upgrade'
-    Frank.upgrade!
-  end
-end
+Frank::CLI.run

data/frank.gemspec

@@ -5,37 +5,38 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frank}
-  s.version = "0.4.1"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["blahed", "nwah"]
-  s.date = %q{2010-10-15}
+  s.date = %q{2010-11-08}
+  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", "frankout", "frankup"]
+  s.executables = ["frank"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.md"
   ]
   s.files = [
     ".gitignore",
-     "Featurelist",
      "Gemfile",
      "Gemfile.lock",
      "LICENSE",
      "README.md",
      "Rakefile",
+     "autotest/discover.rb",
      "bin/frank",
-     "bin/frankout",
-     "bin/frankup",
      "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/output.rb",
+     "lib/frank/publish.rb",
      "lib/frank/rescue.rb",
      "lib/frank/settings.rb",
      "lib/frank/template_helpers.rb",
@@ -64,8 +65,9 @@ Gem::Specification.new do |s|
      "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/output_spec.rb",
+     "spec/publish_spec.rb",
      "spec/render_spec.rb",
      "spec/template/dynamic/500.haml",
      "spec/template/dynamic/_partial.haml",
@@ -79,7 +81,6 @@ Gem::Specification.new do |s|
      "spec/template/dynamic/lorem_test.haml",
      "spec/template/dynamic/markdown.md",
      "spec/template/dynamic/markdown_in_haml.md",
-     "spec/template/dynamic/mustache.mustache",
      "spec/template/dynamic/nested/child.haml",
      "spec/template/dynamic/nested/deeper/deep.haml",
      "spec/template/dynamic/no_layout.haml",
@@ -106,8 +107,9 @@ Gem::Specification.new do |s|
   s.summary = %q{Static Site Non-Framework}
   s.test_files = [
     "spec/base_spec.rb",
+     "spec/compile_spec.rb",
      "spec/helper.rb",
-     "spec/output_spec.rb",
+     "spec/publish_spec.rb",
      "spec/render_spec.rb",
      "spec/template/helpers.rb",
      "spec/template/setup.rb",

data/lib/frank.rb

@@ -12,9 +12,12 @@ require 'rubygems'
 require 'yaml'
 require 'fileutils'
 require 'rack'
+require 'net/ssh'
 require 'frank/settings'
 require 'frank/base'
-require 'frank/output'
+require 'frank/compile'
+require 'frank/publish'
+require 'frank/cli'
 
 # relay
 module Frank

data/lib/frank/base.rb

@@ -6,7 +6,7 @@ require 'frank/middleware/statik'
 require 'frank/middleware/refresh'
 
 module Frank
-  VERSION = '0.4.1'
+  VERSION = '1.0.0'
   extend Frank::Upgrades
 
   module Render; end
@@ -17,10 +17,6 @@ module Frank
     include Frank::TemplateHelpers
     include Frank::Render
 
-    def initialize(&block)
-      instance_eval(&block) if block_given?
-    end
-
     def call(env)
       dup.call!(env)
     end
@@ -36,13 +32,6 @@ module Frank
 
     private
 
-    # setter for options
-    def set(option, value)
-      if respond_to?("#{option}=")
-        send "#{option}=", value
-      end
-    end
-
     # attempt to render with the request path,
     # if it cannot be found, render error page
     def process
@@ -74,11 +63,11 @@ module Frank
   module Render
 
     TMPL_EXTS = {
-      :html => %w[haml erb rhtml builder liquid mustache textile md mkd markdown],
+      :html => %w[haml erb rhtml builder liquid textile md mkd markdown],
       :css  => %w[sass less scss]
     }
 
-    LAYOUT_EXTS = %w[.haml .erb .rhtml .liquid .mustache]
+    LAYOUT_EXTS = %w[.haml .erb .rhtml .liquid]
 
     # render request path or template path
     def render(path, partial = false, local_vars = nil)
@@ -121,11 +110,6 @@ module Frank
         # add layout_path to locals
         raise Frank::TemplateError, "Layout not found #{layout_path}" unless File.exist? layout_path
 
-        # original
-        # tilt(File.extname(layout), layout_path, locals) do
-        #   tilt(ext, template, locals)
-        # end
-
         page_content = tilt(page, ext, template, locals)
         tilt(page, File.extname(layout), layout_path, locals) do
           page_content
@@ -267,8 +251,24 @@ module Frank
 
     # try to pull in setup
     setup = File.join(Frank.root, 'setup.rb')
+
     if File.exists?(setup)
       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
     end
 
   end
@@ -312,11 +312,39 @@ module Frank
 
   # copies over the generic project template
   def self.stub(project)
+    templates_dir = File.join(ENV['HOME'], '.frank_templates')
+
     puts "\nFrank is...\n - \033[32mCreating\033[0m your project '#{project}'"
+
+    # if user has a ~/.frank_templates folder
+    # provide an interface for choosing template
+    if File.exist? templates_dir
+      templates = %w[default] + Dir[File.join(templates_dir, '**')].map { |d| d.split('/').last }
+
+      puts "\nWhich template would you like to use? "
+      templates.each_with_index { |t, i| puts " #{i + 1}. #{t}" }
+
+      print '> '
+
+      # get input and wait for a valid response
+      trap(:INT) { puts "\nbye"; exit }
+      choice = STDIN.gets.chomp
+      until ( choice.match(/^\d+$/) && templates[choice.to_i - 1] ) || choice == '1'
+        print " `#{choice}' \033[31mis not a valid template choice\033[0m\n> "
+        choice = STDIN.gets.chomp
+      end
+    end
+
     Dir.mkdir project
+    template = templates[choice.to_i - 1]
 
-    puts " - \033[32mCopying\033[0m Frank template"
-    FileUtils.cp_r( Dir.glob(File.join(LIBDIR, 'template/*')), project )
+    puts " - \033[32mCopying\033[0m #{template} Frank template"
+
+    if template == 'default'
+      FileUtils.cp_r( Dir.glob(File.join(LIBDIR, 'template/*')), project )
+    else
+      FileUtils.cp_r( Dir.glob(File.join(templates_dir, "#{template}/*")), project )
+    end
 
     puts "\n \033[32mCongratulations, '#{project}' is ready to go!\033[0m"
   rescue Errno::EEXIST