sinatra-gen 0.3.0 → 0.4.0

data/History.txt

@@ -1,3 +1,12 @@
+== 0.4.0 2009-08-13
+
+* Unless --tiny is specified generate an app that < Sinatra::Application
+* Added --vegas/--bin option for generating an executable using Vegas
+* Add --middleware option. e.g --middleware rack/flash,Rack::Cache
+* Fix deprecations:
+  * Require the view framework as that isn't explicit in sinatra anymore
+  * Fix config.ru deprecations
+
 == 0.3.0 2009-04-29
 
 * No longer use deprecated Sinatra::Test - depend on Rack::Test and simple helper

data/Manifest.txt

@@ -7,11 +7,11 @@ app_generators/sinatra_app/USAGE
 app_generators/sinatra_app/sinatra_app_generator.rb
 app_generators/sinatra_app/templates/Capfile
 app_generators/sinatra_app/templates/Rakefile.erb
-app_generators/sinatra_app/templates/app.rb.erb
 app_generators/sinatra_app/templates/config.ru.erb
+app_generators/sinatra_app/templates/bin/app.erb
 app_generators/sinatra_app/templates/config.yml
 app_generators/sinatra_app/templates/config/deploy.rb.erb
-app_generators/sinatra_app/templates/lib/module.rb.erb
+app_generators/sinatra_app/templates/lib/app.rb.erb
 app_generators/sinatra_app/templates/test/test_app_bacon.rb.erb
 app_generators/sinatra_app/templates/test/test_app_rspec.rb.erb
 app_generators/sinatra_app/templates/test/test_app_shoulda.rb.erb

data/README.rdoc

@@ -9,7 +9,7 @@ For more information on sinatra, check out http://sinatrarb.com
 
 == SYNOPSIS:
   
-sinatra-gen has a bunch of different options (based loosley on merb-gen) to try to not lock the 
+sinatra-gen has a bunch of different options (based looseley on merb-gen) to try to not lock the 
 user into any specific frameworks/dev practices.
 
 Run:
@@ -20,6 +20,8 @@ e.g.
 
   sinatra-gen mysinatrapp --vendor --init --test=shoulda --views=haml get:/ post:/:id
 
+! Note: As of version 0.4.0 by default the sinatra app is placed in lib/appname.rb and is a subclass of Sinatra::Application. If you want 'classic' style apps (no class/module) use the --tiny option.
+
 === Actions
 
 For even faster app development you specify actions to include in your app when generating.
@@ -27,7 +29,7 @@ Actions are written out as
 
   http_method:path
 
-And are seperated by spaces. For example:
+And are separated by spaces. For example:
 
   get:/ post:/:id put:/update/*
   
@@ -44,6 +46,22 @@ Will be added you your app as:
 
 It will also generate test skeletons in the test framework of your choosing.
 
+=== Middleware
+
+You can specify middleware to include by passing the filename(s) or class name(s), seperated by commas.
+  
+  sinatra-gen myapp --middleware=rack/flash,Rack::Cache
+  
+Will place both the 'require' and 'use' statements in your app.
+
+  require 'rack/flash'
+  require 'rack/cache'
+  
+  #...
+  
+  use Rack::Flash
+  use Rack::Cache
+
 === Options 
 
 (can also be obtained by running sinatra-gen with no arguments):
@@ -58,6 +76,8 @@ It will also generate test skeletons in the test framework of your choosing.
         --scripts                    Install the rubigen scripts (script/generate, script/destroy)
         --test=test_framework        Specify your testing framework (bacon (default)/rspec/spec/shoulda/test)
         --views=view_framework       Specify your view framework (haml (default)/erb/builder)
+        --middleware=rack-middleware Specify Rack Middleware to be required and included (comma delimited)
+        --vegas, --bin=[bin_name]    Create an executable bin using Vegas. Pass an optional bin_name
 General Options:
     -h, --help                       Show this help message and quit.
     -p, --pretend                    Run but do not make any changes.
@@ -78,12 +98,15 @@ Also, thanks to Dr. Nic (http://github.com/drnic) for the Rubigen and Newgem lib
 
 == REQUIREMENTS:
 
-To use the --vendor option, git must be installed.
+To use the --vendor option, git must be installed. 
+To use the --bin/vegas option Vegas is required (sudo gem install vegas). 
+To use the --heroku option, a Heroku account and the heroku gem is required (sudo gem install heroku).
+
 To run the app without using the vendor option, the sinatra gem must be installed.
 
 == INSTALL:
 
-  sudo gem install sintra-gen
+  sudo gem install sinatra-gen
 
 You can also install directly from github:
 

data/Rakefile

@@ -1,16 +1,20 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+%w[rubygems rake rake/clean hoe fileutils newgem rubigen].each { |f| require f }
 require File.dirname(__FILE__) + '/lib/sinatra-gen'
 
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('sinatra-gen', SinatraGen::VERSION) do |p|
+$hoe = Hoe.spec('sinatra-gen') do |p|
   p.developer('Aaron Quint', 'aaron@quirkey.com')
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
   p.rubyforge_name       = 'quirkey'
+  p.summary = %q{sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework}
+  p.description = %q{sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework. For more information on sinatra, check out http://sinatrarb.com}
+
+  p.version              = SinatraGen::VERSION
   p.extra_deps         = [
-    ['rubigen','>= 1.5.2'],
-    ['sinatra', '>= 0.9.0'],
-    ['rack-test', '>= 0.1.0']
+    ['rubigen','=1.5.2'],
+    ['sinatra', '>= 0.9.4'],
+    ['rack-test', '>= 0.4.1']
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/app_generators/sinatra_app/sinatra_app_generator.rb

@@ -28,7 +28,9 @@ class SinatraAppGenerator < RubiGen::Base
                 :view_framework, 
                 :install_scripts, 
                 :cap, 
-                :actions
+                :actions,
+                :middleware,
+                :bin_name
 
   def initialize(runtime_args, runtime_options = {})
     super
@@ -49,7 +51,6 @@ class SinatraAppGenerator < RubiGen::Base
       end      
 
       m.template 'config.ru.erb', 'config.ru'
-      m.template 'app.rb.erb'   , "#{app_name}.rb"
       m.template 'Rakefile.erb' , 'Rakefile'
       
       test_dir = (tests_are_specs? ? 'spec' : 'test')
@@ -58,12 +59,19 @@ class SinatraAppGenerator < RubiGen::Base
         BASEDIRS.each { |path| m.directory path }
         m.directory test_dir
         m.file     'config.yml', 'config.yml'
-        m.template 'lib/module.rb.erb', "lib/#{app_name}.rb"
+        m.template 'lib/app.rb.erb', "lib/#{app_name}.rb"
         m.template 'test/test_helper.rb.erb', "#{test_dir}/#{test_dir}_helper.rb"
         m.template "test/test_app_#{test_framework}.rb.erb", 
                    "#{test_dir}/#{(tests_are_specs? ? "#{app_name}_spec" : "test_#{app_name}")}.rb"
         m.template "views/#{view_framework}_index.erb", "views/index.#{view_framework}"
         m.template "views/#{view_framework}_layout.erb", "views/layout.#{view_framework}" unless view_framework == 'builder'
+      else
+        m.template "lib/app.rb.erb", "#{app_name}.rb"
+      end
+
+      if options[:bin]
+        m.directory "bin"
+        m.template "bin/app.erb", "bin/#{bin_name}", {:chmod => 0755}
       end
 
       if vendor
@@ -98,7 +106,7 @@ class SinatraAppGenerator < RubiGen::Base
     <<-EOS
     Creates the skeleton for a new sinatra app
 
-    USAGE: #{spec.name} app_name [options] [paths]
+    USAGE: sinatra-gen app_name [options] [paths]
     EOS
   end
 
@@ -116,6 +124,8 @@ class SinatraAppGenerator < RubiGen::Base
     opts.on("--git /path/to/git", "Specify a different path for 'git'") {|o| options[:git] = o }
     opts.on("--test=test_framework", String, "Specify your testing framework (bacon (default)/rspec/spec/shoulda/test)") {|o| options[:test_framework] = o }
     opts.on("--views=view_framework", "Specify your view framework (haml (default)/erb/builder)")  {|o| options[:view_framework] = o }
+    opts.on("--middleware=rack-middleware", Array, "Specify Rack Middleware to be required and included (comma delimited)") {|o| options[:middleware] = o }
+    opts.on("--vegas=[bin_name]", "--bin=[bin_name]", "Create an executable bin using Vegas. Pass an optional bin_name") {|o| options[:bin] = true; options[:bin_name] = o }
   end
 
   def extract_options
@@ -131,12 +141,18 @@ class SinatraAppGenerator < RubiGen::Base
     self.test_framework  = options[:test_framework] || 'bacon'
     self.view_framework  = options[:view_framework] || 'haml'
     self.install_scripts = options[:scripts] || false
+    self.middleware      = options[:middleware] ? options[:middleware].reject {|m| m.blank? } : []
+    self.bin_name        = options[:bin_name] || app_name
   end
 
   def klass_name
     app_name.classify
   end
 
+  def app_klass
+    tiny ? "Sinatra::Application" : klass_name
+  end
+
   def parse_actions(*action_args)
     @actions = action_args.flatten.collect { |a| a.split(':', 2) }
   end

data/app_generators/sinatra_app/templates/bin/app.erb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require File.join(File.dirname(__FILE__), '..', <%- unless tiny -%>'lib', <%- end -%>'<%= app_name %>.rb')
+require 'vegas'
+  
+Vegas::Runner.new(<%= app_klass %>, '<%= bin_name %>')

data/app_generators/sinatra_app/templates/config.ru.erb

@@ -1,8 +1,8 @@
 # To use with thin 
 #  thin start -p PORT -R config.ru
 
-require File.join(File.dirname(__FILE__), '<%= app_name %>.rb')
+require File.join(File.dirname(__FILE__), <%- unless tiny -%>'lib', <%- end -%>'<%= app_name %>.rb')
 
 disable :run
-set :env, :production
-run Sinatra.application
+set :environment, :production
+run <%= app_klass -%>

data/app_generators/sinatra_app/templates/lib/app.rb.erb

@@ -0,0 +1,57 @@
+<%- if tiny -%>
+APP_ROOT = File.expand_path(File.dirname(__FILE__))
+<%- else -%>
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+<%- end -%>
+
+require 'rubygems'
+<%- if vendor -%>
+$:.unshift File.join(APP_ROOT, 'vendor', 'sinatra', 'lib')
+require 'sinatra'
+<%- else -%>
+require 'sinatra'
+<%- end -%>
+require '<%= view_framework %>'
+<%- middleware.each do |m| -%>
+require '<%= m.to_s.underscore %>'
+<%- end -%>
+
+<%- if tiny -%>
+set :root, APP_ROOT
+
+<%- unless actions.empty? -%>
+<%- actions.each do |meth, path| -%>
+<%= meth %> '<%= path %>' do
+end
+
+<%- end -%>
+<%- else -%>
+get '/' do
+  <%= view_framework -%> :index
+end
+<%- end -%>
+
+<%- else -%>
+class <%= klass_name -%> < Sinatra::Application
+  
+  set :root, APP_ROOT  
+  <%- middleware.each do |m| -%>
+  use <%= m.to_s.classify %>
+  <%- end -%>
+
+  <%- unless actions.empty? -%>
+  <%- actions.each do |meth, path| -%>
+  <%= meth %> '<%= path %>' do
+    <%= view_framework -%> :<%= path %>
+  end
+
+  <%- end -%>
+  <%- else -%>
+  get '/' do
+    <%= view_framework -%> :index
+  end
+  <%- end -%>
+
+end
+<%- end -%>
+

data/app_generators/sinatra_app/templates/test/test_helper.rb.erb

@@ -4,14 +4,14 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra', 'lib')
 require 'sinatra'
 require 'rack/test'
 
-Sinatra::Default.set(
+<%= app_klass -%>.set(
   :environment => :test,
   :run => false,
   :raise_errors => true,
   :logging => false
 )
 
-require File.join(File.dirname(__FILE__), '..', '<%= app_name %>.rb')
+require File.join(File.dirname(__FILE__), '..', <%- unless tiny -%>'lib', <%- end -%>'<%= app_name %>.rb')
 
 module TestHelper
   

data/lib/sinatra-gen.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module SinatraGen
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/sinatra-gen.gemspec

@@ -2,49 +2,46 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-gen}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2009-04-29}
+  s.date = %q{2009-08-13}
   s.default_executable = %q{sinatra-gen}
   s.description = %q{sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework. For more information on sinatra, check out http://sinatrarb.com}
   s.email = ["aaron@quirkey.com"]
   s.executables = ["sinatra-gen"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "app_generators/sinatra_app/USAGE", "app_generators/sinatra_app/sinatra_app_generator.rb", "app_generators/sinatra_app/templates/Capfile", "app_generators/sinatra_app/templates/Rakefile.erb", "app_generators/sinatra_app/templates/app.rb.erb", "app_generators/sinatra_app/templates/config.ru.erb", "app_generators/sinatra_app/templates/config.yml", "app_generators/sinatra_app/templates/config/deploy.rb.erb", "app_generators/sinatra_app/templates/lib/module.rb.erb", "app_generators/sinatra_app/templates/test/test_app_bacon.rb.erb", "app_generators/sinatra_app/templates/test/test_app_rspec.rb.erb", "app_generators/sinatra_app/templates/test/test_app_shoulda.rb.erb", "app_generators/sinatra_app/templates/test/test_app_spec.rb.erb", "app_generators/sinatra_app/templates/test/test_app_unit.rb.erb", "app_generators/sinatra_app/templates/test/test_helper.rb.erb", "app_generators/sinatra_app/templates/views/builder_index.erb", "app_generators/sinatra_app/templates/views/erb_index.erb", "app_generators/sinatra_app/templates/views/erb_layout.erb", "app_generators/sinatra_app/templates/views/haml_index.erb", "app_generators/sinatra_app/templates/views/haml_layout.erb", "bin/sinatra-gen", "lib/sinatra-gen.rb", "sinatra-gen.gemspec", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_sinatra_app_generator.rb"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/quirkey/sinatra-gen}
-  s.post_install_message = %q{PostInstall.txt}
-  s.rdoc_options = ["--main", "README.rdoc"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "app_generators/sinatra_app/USAGE", "app_generators/sinatra_app/sinatra_app_generator.rb", "app_generators/sinatra_app/templates/Capfile", "app_generators/sinatra_app/templates/Rakefile.erb", "app_generators/sinatra_app/templates/config.ru.erb", "app_generators/sinatra_app/templates/bin/app.erb", "app_generators/sinatra_app/templates/config.yml", "app_generators/sinatra_app/templates/config/deploy.rb.erb", "app_generators/sinatra_app/templates/lib/app.rb.erb", "app_generators/sinatra_app/templates/test/test_app_bacon.rb.erb", "app_generators/sinatra_app/templates/test/test_app_rspec.rb.erb", "app_generators/sinatra_app/templates/test/test_app_shoulda.rb.erb", "app_generators/sinatra_app/templates/test/test_app_spec.rb.erb", "app_generators/sinatra_app/templates/test/test_app_unit.rb.erb", "app_generators/sinatra_app/templates/test/test_helper.rb.erb", "app_generators/sinatra_app/templates/views/builder_index.erb", "app_generators/sinatra_app/templates/views/erb_index.erb", "app_generators/sinatra_app/templates/views/erb_layout.erb", "app_generators/sinatra_app/templates/views/haml_index.erb", "app_generators/sinatra_app/templates/views/haml_layout.erb", "bin/sinatra-gen", "lib/sinatra-gen.rb", "sinatra-gen.gemspec", "test/test_generator_helper.rb", "test/test_helper.rb", "test/test_sinatra_app_generator.rb"]
+  s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{quirkey}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework}
   s.test_files = ["test/test_generator_helper.rb", "test/test_helper.rb", "test/test_sinatra_app_generator.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rubigen>, [">= 1.5.2"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.0"])
-      s.add_runtime_dependency(%q<rack-test>, [">= 0.1.0"])
-      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_runtime_dependency(%q<rubigen>, ["= 1.5.2"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_runtime_dependency(%q<rack-test>, [">= 0.4.1"])
+      s.add_development_dependency(%q<newgem>, [">= 1.5.2"])
+      s.add_development_dependency(%q<hoe>, [">= 2.3.3"])
     else
-      s.add_dependency(%q<rubigen>, [">= 1.5.2"])
-      s.add_dependency(%q<sinatra>, [">= 0.9.0"])
-      s.add_dependency(%q<rack-test>, [">= 0.1.0"])
-      s.add_dependency(%q<newgem>, [">= 1.2.3"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_dependency(%q<rubigen>, ["= 1.5.2"])
+      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_dependency(%q<rack-test>, [">= 0.4.1"])
+      s.add_dependency(%q<newgem>, [">= 1.5.2"])
+      s.add_dependency(%q<hoe>, [">= 2.3.3"])
     end
   else
-    s.add_dependency(%q<rubigen>, [">= 1.5.2"])
-    s.add_dependency(%q<sinatra>, [">= 0.9.0"])
-    s.add_dependency(%q<rack-test>, [">= 0.1.0"])
-    s.add_dependency(%q<newgem>, [">= 1.2.3"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    s.add_dependency(%q<rubigen>, ["= 1.5.2"])
+    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+    s.add_dependency(%q<rack-test>, [">= 0.4.1"])
+    s.add_dependency(%q<newgem>, [">= 1.5.2"])
+    s.add_dependency(%q<hoe>, [">= 2.3.3"])
   end
 end

data/test/test_sinatra_app_generator.rb

@@ -59,7 +59,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     end
   end
   
-  def test_generate_app_with_rspect_test_option
+  def test_generate_app_with_rspec_test_option
     run_generator('sinatra_app', [APP_ROOT, '--test=rspec'], sources)
     assert_basic_paths_and_files('spec')
     assert_generated_file 'spec/spec_helper.rb' do |helper_contents|
@@ -115,10 +115,10 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     end
   end
 
-  def test_generate_app_with_views_haml_option
+  def test_generate_app_with_views_erb_option
     run_generator('sinatra_app', [APP_ROOT, '--views=erb'], sources)
     assert_basic_paths_and_files('spec')
-    assert_generated_file "#{app_name}.rb" do |app_contents|
+    assert_generated_file "lib/#{app_name}.rb" do |app_contents|
       assert_match(/erb \:index/, app_contents)
     end
     assert_generated_file 'views/layout.erb'
@@ -128,7 +128,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
   def test_generate_app_with_views_haml_option
     run_generator('sinatra_app', [APP_ROOT, '--views=haml'], sources)
     assert_basic_paths_and_files('spec')
-    assert_generated_file "#{app_name}.rb" do |app_contents|
+    assert_generated_file "lib/#{app_name}.rb" do |app_contents|
       assert_match(/haml \:index/, app_contents)
     end
     assert_generated_file 'views/layout.haml'
@@ -138,7 +138,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
   def test_generate_app_with_views_builder_option
     run_generator('sinatra_app', [APP_ROOT, '--views=builder'], sources)
     assert_basic_paths_and_files('spec')
-    assert_generated_file "#{app_name}.rb" do |app_contents|
+    assert_generated_file "lib/#{app_name}.rb" do |app_contents|
       assert_match(/builder \:index/, app_contents)
     end
     assert_generated_file 'views/index.builder'
@@ -155,7 +155,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
   def test_generate_app_with_actions_and_no_options
     run_generator('sinatra_app', [APP_ROOT, 'get:/', 'post:/users/:id', 'put:/users/*'], sources)
     assert_basic_paths_and_files('spec')
-    assert_generated_file "#{app_name}.rb" do |app_contents|
+    assert_generated_file "lib/#{app_name}.rb" do |app_contents|
       assert_match(/get '\/' do/, app_contents)
       assert_match(/post '\/users\/\:id' do/, app_contents)
       assert_match(/put '\/users\/\*' do/, app_contents)
@@ -165,7 +165,6 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
   def test_generate_app_with_actions_and_options
     run_generator('sinatra_app', [APP_ROOT, 'get:/', 'post:/users/:id', '--tiny', 'put:/users/*'], sources)
     assert_generated_file   'config.ru'
-    assert_generated_file   "#{app_name}.rb"
     assert_generated_file   'Rakefile'
     assert_generated_file "#{app_name}.rb" do |app_contents|
       assert_match(/get '\/' do/, app_contents)
@@ -174,6 +173,34 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     end
   end
   
+  def test_generate_app_with_middleware
+    run_generator('sinatra_app', [APP_ROOT, "--middleware", "rack/flash,Rack::Cache"], sources)
+    assert_generated_file   'config.ru'
+    assert_generated_file   'Rakefile'
+    assert_generated_file "lib/#{app_name}.rb" do |app_contents|
+      assert_match(/require \'rack\/flash\'/, app_contents)
+      assert_match(/require \'rack\/cache\'/, app_contents)
+      assert_match(/use Rack::Flash/, app_contents)
+      assert_match(/use Rack::Cache/, app_contents)
+    end
+  end
+  
+  def test_generate_app_with_vegas_and_default_bin
+    run_generator('sinatra_app', [APP_ROOT, '--vegas'], sources)
+    assert_basic_paths_and_files('spec')
+    assert_generated_file "bin/#{app_name}" do |app_contents|
+      assert_match("Vegas::Runner.new(#{app_name.classify}, '#{app_name}')", app_contents)
+    end
+  end
+  
+  def test_generate_app_with_vegas_and_different_bin_name
+    run_generator('sinatra_app', [APP_ROOT, '--vegas=other_bin'], sources)
+    assert_basic_paths_and_files('spec')
+    assert_generated_file "bin/other_bin" do |app_contents|
+      assert_match("Vegas::Runner.new(#{app_name.classify}, 'other_bin')", app_contents)
+    end
+  end
+  
   private
   def assert_basic_paths_and_files(spec_or_test = 'spec')
     assert_directory_exists 'lib'
@@ -181,10 +208,9 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     assert_directory_exists 'public'
     assert_directory_exists 'views'
     assert_generated_file   'config.ru'
-    assert_generated_file   "#{app_name}.rb"
     assert_generated_file   'Rakefile'
     assert_generated_file   'config.yml'
-    assert_generated_module  "lib/#{app_name}"
+    assert_generated_class  "lib/#{app_name}"
   end
     
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-gen
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 00:00:00 -04:00
+date: 2009-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,7 +18,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.5.2
     version: 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
+        version: 0.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.3
     version: 
 description: sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework. For more information on sinatra, check out http://sinatrarb.com
 email: 
@@ -73,7 +73,6 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.rdoc
 files: 
 - History.txt
 - Manifest.txt
@@ -84,11 +83,11 @@ files:
 - app_generators/sinatra_app/sinatra_app_generator.rb
 - app_generators/sinatra_app/templates/Capfile
 - app_generators/sinatra_app/templates/Rakefile.erb
-- app_generators/sinatra_app/templates/app.rb.erb
 - app_generators/sinatra_app/templates/config.ru.erb
+- app_generators/sinatra_app/templates/bin/app.erb
 - app_generators/sinatra_app/templates/config.yml
 - app_generators/sinatra_app/templates/config/deploy.rb.erb
-- app_generators/sinatra_app/templates/lib/module.rb.erb
+- app_generators/sinatra_app/templates/lib/app.rb.erb
 - app_generators/sinatra_app/templates/test/test_app_bacon.rb.erb
 - app_generators/sinatra_app/templates/test/test_app_rspec.rb.erb
 - app_generators/sinatra_app/templates/test/test_app_shoulda.rb.erb
@@ -104,11 +103,13 @@ files:
 - lib/sinatra-gen.rb
 - sinatra-gen.gemspec
 has_rdoc: true
-homepage: http://github.com/quirkey/sinatra-gen
+homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -126,9 +127,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: quirkey
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework
 test_files: 
 - test/test_generator_helper.rb

data/app_generators/sinatra_app/templates/app.rb.erb

@@ -1,25 +0,0 @@
-require 'rubygems'
-<%- if vendor -%>
-$:.unshift File.join(File.dirname(__FILE__), 'vendor', 'sinatra', 'lib')
-require 'sinatra'
-<%- else -%>
-require 'sinatra'
-<%- end -%>
-<%- unless tiny -%>
-require File.join(File.dirname(__FILE__), 'lib', '<%= app_name %>')
-
-set :public, 'public'
-set :views,  'views'
-<%- end -%>
-
-<%- unless actions.empty? -%>
-<%- actions.each do |meth, path| -%>
-<%= meth %> '<%= path %>' do
-end
-
-<%- end -%>
-<%- else -%>
-get '/' do
-  <%= view_framework -%> :index
-end
-<%- end -%>

data/app_generators/sinatra_app/templates/lib/module.rb.erb

@@ -1,3 +0,0 @@
-module <%= klass_name %>
-  
-end