snfn 0.2.0 → 0.3.0

data/Gemfile

@@ -8,6 +8,7 @@ source "http://rubygems.org"
 group :development do
 #  gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
+  gem "fakefs", "~> 0.3.2"
   gem "jeweler", "~> 1.6.4"
 #  gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    fakefs (0.3.2)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -14,5 +15,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
+  fakefs (~> 0.3.2)
   jeweler (~> 1.6.4)
   thor (~> 0.14.6)

data/README.mdown

@@ -18,11 +18,11 @@ can be configured using the following options:
 Standard Heroku app, using sqlite for local development and
 PostgreSQL for production.
 
-    snfn new my_app
+    snfn my_app
 
 App without Heroku options and mysql config.
 
-    snfn new my_app -d mysql --no-heroku
+    snfn my_app -d mysql --no-heroku
 
 ## Architecture
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/bin/snfn

@@ -1,73 +1,6 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-%w{rubygems extensions/string thor}.each do |lib|
-  require lib
-end
-
-class SnfnGenerator < Thor
-  include Thor::Actions
-
-  desc "new NAME", "Creates new Snfn application"
-  method_option :database, :aliases => "-d", :default => "sqlite", :desc => "The type of database to use. Values are \"sqlite\", \"postgres\", \"mysql\", and \"mongo\". Default is \"postgres\"."
-  method_option :no_heroku, :type => :boolean, :desc => "Include Heroku configuration options."
-  method_option :no_database, :type => :boolean, :desc => "Do not use any database."
-  method_option :redis, :type => :boolean, :desc => "Include Redis configuration options."
-  def new(name)
-    @name = @app_path = name.file_name
-    @database = options[:database]
-    @no_database = options[:no_database]
-    @redis = options[:redis]
-    @no_heroku = options[:no_heroku]
-
-    create_directories
-    add_templates
-  end
-
-  def self.source_root
-    File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "templates"))
-  end
-
-  protected
-  def create_directories
-    %w{config/initializers db/migrate lib log tmp}.each do |dir|
-      add_app_directory dir
-    end
-
-    %w{public/css public/js public/img views}.each do |dir|
-      directory dir, File.join(@app_path, dir)
-    end
-  end
-
-  def add_templates
-    copy_template "app.rb", "#{@name}.rb"
-    copy_template "config.ru"
-    copy_template "Gemfile"
-    copy_static "Procfile" unless @no_heroku
-    copy_static "Rakefile"
-    copy_static "README.mdown"
-    copy_template "config/unicorn.rb"
-
-    copy_static "config/redis.yml" if @redis
-    copy_template "config/db.yml" unless @no_database
-    copy_template "config/initializers/database.rb"
-
-    create_file File.join(@app_path, "lib", ".gitkeep")
-  end
-
-  def add_app_directory(name)
-    empty_directory(File.join(@app_path, name))
-  end
-
-  def copy_template(name, new_name = nil)
-    new_name ||= name
-    template name, File.join(@app_path, new_name)
-  end
-
-  def copy_static(name)
-    copy_file name, File.join(@app_path, name)
-  end
-end
-
-SnfnGenerator.start
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))) unless $:.include? File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+require "snfn"
 
+Snfn::Generator.start

data/lib/snfn.rb

@@ -1 +1,92 @@
+%w{rubygems extensions/string thor/group}.each { |lib| require lib }
+
+module Snfn
+  class Generator < Thor::Group
+    include Thor::Actions
+
+    desc "Creates a new snfn application"
+    argument :name, :type => :string, :desc => "The name of the new application"
+    class_option :database, :aliases => "-d", :default => "sqlite", :desc => "The type of database to use"
+    class_option :no_heroku, :type => :boolean, :desc => "Exclude Heroku configuration"
+    class_option :no_database, :type => :boolean, :desc => "Exclude all database configuration files"
+    class_option :redis, :type => :boolean, :desc => "Include Redis configuration"
+
+    # Creates instance variables from options passed to snfn.
+    def setup
+      @name = @app_path = name.file_name
+      options.each do |key, value|
+        instance_variable_set "@#{key.to_s}".to_sym, value
+      end
+    end
+
+    def self.source_root
+      File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "templates"))
+    end
+
+    # Create empty directories
+    def create_empty_directories
+      %w{config/initializers db/migrate lib log tmp}.each do |dir|
+        empty_directory File.join(@app_path, dir)
+      end
+    end
+
+    def create_public_directory
+      %w{public/css public/js public/img}.each do |dir|
+        directory dir, File.join(@app_path, dir)
+      end
+    end
+
+    def create_view_directory
+      directory "views", File.join(@app_path, "views")
+    end
+
+    def create_app
+      template "app.rb", File.join(@app_path, "#{@name}.rb")
+    end
+
+    def create_config
+      template "config.ru", File.join(@app_path, "config.ru")
+    end
+
+    def create_gemfile
+      template "Gemfile", File.join(@app_path, "Gemfile")
+    end
+
+    def create_procfile
+      copy_file("Procfile", File.join(@app_path, "Procfile")) unless @no_heroku
+    end
+
+    def create_rakefile
+      copy_file "Rakefile", File.join(@app_path, "Rakefile")
+    end
+
+    def create_readme
+      copy_file "README.mdown", File.join(@app_path, "README.mdown")
+    end
+
+    def create_server_config
+      template "config/unicorn.rb", File.join(@app_path, "config/unicorn.rb")
+    end
+
+    def create_db_config
+      template("config/db.yml", File.join(@app_path, "config/db.yml")) unless @no_database
+    end
+
+    def create_database_initializer
+      template("config/initializers/database.rb", File.join(@app_path, "config/initializers/database.rb")) unless @no_database
+    end
+
+    def create_redis_config
+      copy_file("config/redis.yml", File.join(@app_path, "config/redis.yml")) if @redis
+    end
+
+    def create_redis_initializer
+      template("config/initializers/redis.rb", File.join(@app_path, "config/initializers/redis.rb")) if @redis
+    end
+
+    def create_lib_gitkeep
+      create_file File.join(@app_path, "lib", ".gitkeep")
+    end
+  end
+end
 

data/lib/templates/Gemfile

@@ -40,9 +40,9 @@ group :production do
   gem "pg"
 end
 <% end -%>
+<% end -%>
 <% if @redis -%>
 # Redis
 gem "redis"
 <% end -%>
-<% end -%>
 

data/lib/templates/README.mdown

@@ -18,11 +18,11 @@ can be configured using the following options:
 Standard Heroku app, using sqlite for local development and
 PostgreSQL for production.
 
-    snfn new my_app
+    snfn my_app
 
 App without Heroku options and mysql config.
 
-    snfn new my_app -d mysql --no-heroku
+    snfn my_app -d mysql --no-heroku
 
 ## Architecture
 

data/lib/templates/config/initializers/database.rb

@@ -11,17 +11,5 @@ settings[ENV['RACK_ENV']]["uri"] = ENV['MONGOLAB_URI']
 MongoMapper.config = settings
 MongoMapper.connect(ENV['RACK_ENV'])
 <% end -%>
-
-<% end -%>
-<% if @redis -%>
-# Redis Configuration
-if ENV['REDISTOGO_URL']
-require "uri"
-uri = URI.parse(ENV['REDISTOGO_URL'])
-REDIS = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
-else
-redis_settings = YAML::load_file("config/redis.yml")
-REDIS = Redis.new(redis_settings[ENV['RACK_ENV']])
-end
 <% end -%>
 

data/lib/templates/config/initializers/redis.rb

@@ -0,0 +1,10 @@
+# Redis Configuration
+if ENV['REDISTOGO_URL']
+  require "uri"
+  uri = URI.parse(ENV['REDISTOGO_URL'])
+  REDIS = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
+else
+  redis_settings = YAML::load_file("config/redis.yml")
+  REDIS = Redis.new(redis_settings[ENV['RACK_ENV']])
+end
+

data/lib/templates/config/unicorn.rb

@@ -1,7 +1,7 @@
 worker_processes 3
 timeout 30
 
-<% if @noheroku -%>
+<% if @no_heroku -%>
 docroot = File.join(File.expand_path(File.dirname(__FILE__)), "..")
 
 listen "#{docroot}/tmp/sockets/unicorn.sock"

data/lib/templates/public/css/{main.css → scaffold.css}

@@ -24,9 +24,10 @@
     -moz-box-shadow: 0 0 10px rgba(0,0,0,.3);
     -webkit-box-shadow: 0 0 10px rgba(0,0,0,.3);
     box-shadow: 0 0 10px rgba(0,0,0,.3);
-    margin: 20px auto;
-    padding: 18px;
-    width: 764px;
+    margin: 16px auto;
+    max-width: 960px;
+    padding: 2.25%; /* 18px / 800px */
+    width: 85%;
   }
 
   h1 {
@@ -56,15 +57,15 @@
 
   .content {
     float: left;
-    width: 480px;
+    width: 60%; /* 480px / 800px */
   }
 
   .sidebar {
     background: #eee;
     border: 1px solid #ccc;
     float: right;
-    padding: 9px;
-    width: 240px;
+    padding: 3.75%; /* 9px / 240px */
+    width: 30%; /* 240px / 800px */
   }
 
   .sidebar ul {
@@ -82,6 +83,34 @@
   }
 }
 
-@media print {
+@media screen and (max-width: 480px) {
+  .wrapper {
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    width: auto;
+  }
+
+  .content, .sidebar {
+    float: none;
+    width: 100%;
+  }
+
+  .sidebar {
+    background: transparent;
+    border: none;
+    border-top: 2px solid #ccc;
+    padding: 0;
+  }
 
+  h1 {
+    font-size: 24px;
+    line-height: 36px;
+  }
+
+  h2 {
+    font-size: 18px;
+    line-height: 24px;
+  }
 }
+

data/lib/templates/public/js/app.js.tt

@@ -0,0 +1,14 @@
+/**
+ * Application-specific JavaScript goes here.
+ *
+ */
+
+(function(){
+  var <%= @name.camel_case %> = {
+    init : function(){
+      return this;
+    }
+  }
+
+  return <%= @name.camel_case %>.init();
+})();

data/lib/templates/views/{layout.erb → layout.erb.tt}

@@ -7,28 +7,28 @@
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
 
-  <title>Template</title>
+  <title><%= @name.camel_case %></title>
 
-  <meta name="author" content="Zach Pendleton" />
-  <meta name="description" content="Template Description" />
+  <meta name="author" content="Me" />
+  <meta name="description" content="Site Description" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
   <script src="/js/lib/modernizr-2.0.6.js"></script>
-  <link rel="stylesheet" href="/css/main.css" />
+  <link rel="stylesheet" href="/css/scaffold.css" />
 </head>
 <body>
   <div class="wrapper">
     <header class="branding">
-      <h1>My Application Title</h1>
+      <h1><%= @name.camel_case %></h1>
     </header>
 
     <div class="main">
-      <%= yield %>
+      <%%= yield %>
     </div>
 
     <footer class="branding">
-      <small>&copy; <%= Time.now.year %>, Zach Pendleton.</small>
+      <small>&copy; <%%= Time.now.year %>, Me.</small>
     </footer>
   </div>
 

data/lib/templates/views/welcome.erb

@@ -2,7 +2,7 @@
 
 <div class="content">
   <p>Welcome to the Sinatra Template! If you're seeing this page, then everything is working
-  as expected. To get started, delete this file (<code>views/welcome.erb</code> and begin adding
+  as expected. To get started, delete this file (<code>views/welcome.erb)</code> and begin adding
   your own actions to <code>app.rb</code>. For more information, see the README.</p>
 </div>
 

data/snfn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{snfn}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Zach Pendleton}]
-  s.date = %q{2011-08-15}
+  s.date = %q{2011-08-24}
   s.description = %q{An app generator for Sinatra apps with an eye towards easy Heroku setup and deployment.}
   s.email = %q{zachpendleton@gmail.com}
   s.executables = [%q{snfn}]
@@ -36,18 +36,20 @@ Gem::Specification.new do |s|
     "lib/templates/config.ru",
     "lib/templates/config/db.yml",
     "lib/templates/config/initializers/database.rb",
+    "lib/templates/config/initializers/redis.rb",
     "lib/templates/config/redis.yml",
     "lib/templates/config/unicorn.rb",
-    "lib/templates/public/css/main.css",
+    "lib/templates/public/css/scaffold.css",
     "lib/templates/public/img/.gitkeep",
-    "lib/templates/public/js/app.js",
+    "lib/templates/public/js/app.js.tt",
     "lib/templates/public/js/lib/modernizr-2.0.6.js",
-    "lib/templates/views/layout.erb",
+    "lib/templates/views/layout.erb.tt",
     "lib/templates/views/welcome.erb",
     "snfn.gemspec",
     "test/helper.rb",
     "test/test_extension_string.rb",
     "test/test_snfn.rb",
+    "vendor/cache/fakefs-0.3.2.gem",
     "vendor/cache/git-1.2.5.gem",
     "vendor/cache/jeweler-1.6.4.gem",
     "vendor/cache/rake-0.9.2.gem",
@@ -65,15 +67,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<fakefs>, ["~> 0.3.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
     else
       s.add_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<fakefs>, ["~> 0.3.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     end
   else
     s.add_dependency(%q<thor>, ["~> 0.14.6"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<fakefs>, ["~> 0.3.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
   end
 end

data/test/test_snfn.rb

@@ -1,3 +1,4 @@
+require 'fakefs'
 require 'helper'
 
 class TestSnfn < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snfn
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000Z
+date: 2011-08-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70096437864820 !ruby/object:Gem::Requirement
+  requirement: &70096299160060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70096437864820
+  version_requirements: *70096299160060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70096437861960 !ruby/object:Gem::Requirement
+  requirement: &70096299158960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70096437861960
+  version_requirements: *70096299158960
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &70096299157900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :development
+  prerelease: false
+  version_requirements: *70096299157900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70096437859720 !ruby/object:Gem::Requirement
+  requirement: &70096299157020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +54,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70096437859720
+  version_requirements: *70096299157020
 description: An app generator for Sinatra apps with an eye towards easy Heroku setup
   and deployment.
 email: zachpendleton@gmail.com
@@ -72,18 +83,20 @@ files:
 - lib/templates/config.ru
 - lib/templates/config/db.yml
 - lib/templates/config/initializers/database.rb
+- lib/templates/config/initializers/redis.rb
 - lib/templates/config/redis.yml
 - lib/templates/config/unicorn.rb
-- lib/templates/public/css/main.css
+- lib/templates/public/css/scaffold.css
 - lib/templates/public/img/.gitkeep
-- lib/templates/public/js/app.js
+- lib/templates/public/js/app.js.tt
 - lib/templates/public/js/lib/modernizr-2.0.6.js
-- lib/templates/views/layout.erb
+- lib/templates/views/layout.erb.tt
 - lib/templates/views/welcome.erb
 - snfn.gemspec
 - test/helper.rb
 - test/test_extension_string.rb
 - test/test_snfn.rb
+- vendor/cache/fakefs-0.3.2.gem
 - vendor/cache/git-1.2.5.gem
 - vendor/cache/jeweler-1.6.4.gem
 - vendor/cache/rake-0.9.2.gem
@@ -103,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1803279801753176280
+      hash: -2169240317479195428
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/templates/public/js/app.js

@@ -1,4 +0,0 @@
-/**
- * Application-specific JavaScript goes here.
- *
- */