sinatra-gen 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.1 2009-02-10
+
+	* Updated tests and templates for Sinatra 0.9
+	* Added support for test/bacon
+	* Fixed errors with latest rubigen where git commands were happening before file generation
+	* Updated rubigen dependency
+	
 == 0.2.0 2008-12-23
 
 * 1 major enhancement

data/Manifest.txt

@@ -12,6 +12,7 @@ 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

data/README.rdoc

@@ -5,7 +5,9 @@ http://github.com/quirkey/sinatra-gen
 == 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://sinatra.rubyforge.org
+For more information on sinatra, check out http://sinatrarb.com
+
+!! NOW WITH SUPPORT FOR SINATRA 0.9 (02/10/09)
 
 == SYNOPSIS:
   
@@ -57,7 +59,7 @@ It will also generate test skeletons in the test framework of your choosing.
 	    --cap                        Adds config directory with basic capistrano deploy.rb
 	    --scripts                    Install the rubigen scripts (script/generate, script/destroy)
 	    --git /path/to/git           Specify a different path for 'git'
-	    --test=test_framework        Specify your testing framework (unit (default)/rspec/spec/shoulda)
+	    --test=test_framework        Specify your testing framework (unit (default)/rspec/spec/shoulda/bacon)
 	    --views=view_framework       Specify your view framework (erb (default)/haml/builder)
 
 

data/Rakefile

@@ -9,7 +9,7 @@ $hoe = Hoe.new('sinatra-gen', SinatraGen::VERSION) do |p|
   p.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   p.rubyforge_name       = 'quirkey'
   p.extra_deps         = [
-    ['rubigen','>= 1.3.3'],
+    ['rubigen','>= 1.5.2'],
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/app_generators/sinatra_app/USAGE

@@ -1,7 +1,7 @@
 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://sinatra.rubyforge.org
+  For more information on sinatra, check out http://sinatrarb.com
   
 Usage:
   

data/app_generators/sinatra_app/sinatra_app_generator.rb

@@ -1,8 +1,21 @@
+class RubiGen::Commands::Create
+  
+  def run(command, relative_path = '')
+    in_directory = destination_path(relative_path)
+    logger.run command
+    system("cd #{in_directory} && #{command}")
+  end
+  
+end
+
+
 class SinatraAppGenerator < RubiGen::Base
 
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
 
+  SINATRA_GIT_URL = 'git://github.com/sinatra/sinatra.git'
+
   default_options :author => nil
 
   attr_accessor :app_name, :vendor, :tiny, :git, :git_init, :test_framework, :view_framework, :install_scripts, :cap, :actions
@@ -22,11 +35,11 @@ class SinatraAppGenerator < RubiGen::Base
       m.directory ''
 
       if git_init
-        `cd #{@destination_root} && #{git} init`
+        m.run("#{git} init")
       end
       
       m.template 'config.ru.erb', 'config.ru'
-      m.template 'app.rb.erb'   , 'app.rb'
+      m.template 'app.rb.erb'   , "#{app_name}.rb"
       m.template 'Rakefile.erb' , 'Rakefile'
             
       unless tiny
@@ -40,14 +53,14 @@ class SinatraAppGenerator < RubiGen::Base
       end
       
       if vendor
-        m.directory 'vendor'
-        if git_init || File.exists?(File.join(@destination_root, '.git'))
-          command = "cd #{@destination_root} && #{git} submodule add git://github.com/bmizerany/sinatra.git vendor/sinatra"
-        else
-          command = "cd #{@destination_root} && #{git} clone git://github.com/bmizerany/sinatra.git vendor/sinatra"
+          m.directory 'vendor'
+          if git_init || File.exists?(File.join(@destination_root, '.git'))
+            command = "#{git} submodule add #{SINATRA_GIT_URL} vendor/sinatra"
+          else         
+            command = "#{git} clone #{SINATRA_GIT_URL} vendor/sinatra"
+          end
+          m.run(command)
         end
-        `#{command}`
-      end
       
       if cap
         m.directory 'config'
@@ -81,7 +94,7 @@ EOS
       opts.on("--cap", "Adds config directory with basic capistrano deploy.rb") {|o| options[:cap] = o }
       opts.on("--scripts", "Install the rubigen scripts (script/generate, script/destroy)")  {|o| options[:scripts] = o }
       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 (unit (default)/rspec/spec/shoulda)") {|o| options[:test_framework] = o }
+      opts.on("--test=test_framework", String, "Specify your testing framework (unit (default)/rspec/spec/shoulda/bacon)") {|o| options[:test_framework] = o }
       opts.on("--views=view_framework", "Specify your view framework (erb (default)/haml/builder)")  {|o| options[:view_framework] = o }
     end
 
@@ -93,7 +106,7 @@ EOS
       self.tiny            = options[:tiny]
       self.cap             = options[:cap]
       self.git             = options[:git] || `which git`.strip
-      self.git_init        = options[:init]
+      self.git_init        = options[:init] || false
       self.test_framework  = options[:test_framework] || 'unit'
       self.view_framework  = options[:view_framework] || 'erb'
       self.install_scripts = options[:scripts] || false

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

@@ -1,7 +1,7 @@
 # To use with thin 
 #  thin start -p PORT -R config.ru
 
-require File.join(File.dirname(__FILE__), 'app.rb')
+require File.join(File.dirname(__FILE__), '<%= app_name %>.rb')
 
 disable :run
 set :env, :production

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

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+describe '<%= klass_name %>' do
+
+  <%- unless actions.empty? -%>
+  <% actions.each do |meth, path| %>  
+  it 'should <%= meth %> <%= path %>' do
+    <%= meth %> '<%= path %>'
+    should.be.ok
+  end
+  
+  <%- end -%>
+  <%- else -%>  
+  it 'should load the index' do
+    get '/'
+    should.be.ok
+  end
+  <%- end -%>
+end
+

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

@@ -5,14 +5,14 @@ describe '<%= klass_name %>' do
   <%- unless actions.empty? -%>
   <% actions.each do |meth, path| %>  
   it 'should <%= meth %> <%= path %>' do
-    <%= meth %>_it '<%= path %>'
+    <%= meth %> '<%= path %>'
     @response.should be_ok
   end
   
   <%- end -%>
   <%- else -%>  
   it 'should load the index' do
-    get_it '/'
+    get '/'
     @response.should be_ok
   end
   <%- end -%>

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

@@ -7,7 +7,7 @@ class <%= klass_name -%>Test < Test::Unit::TestCase
     <% actions.each do |meth, path| %>
     context "<%= meth %> <%= path %>" do
       setup do
-        <%= meth %>_it '<%= path %>'
+        <%= meth %> '<%= path %>'
       end
       
       should "respond" do
@@ -19,7 +19,7 @@ class <%= klass_name -%>Test < Test::Unit::TestCase
     <%- else -%>
     context "getting the index" do
       setup do
-        get_it '/'
+        get '/'
       end
       
       should "respond" do

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

@@ -5,14 +5,14 @@ describe '<%= klass_name %>' do
   <%- unless actions.empty? -%>
   <% actions.each do |meth, path| %>  
   it 'should <%= meth %> <%= path %>' do
-    <%= meth %>_it '<%= path %>'
+    <%= meth %> '<%= path %>'
     should.be.ok
   end
   
   <%- end -%>
   <%- else -%>  
   it 'should load the index' do
-    get_it '/'
+    get '/'
     should.be.ok  
   end
   <%- end -%>

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

@@ -5,13 +5,13 @@ class <%= klass_name -%>Test < Test::Unit::TestCase
   <%- unless actions.empty? -%>
   <% actions.each do |meth, path| %>  
   def test_<%= meth %>_<%= path.to_s.gsub(/[^a-z0-9\_]/, '') %>_should
-    <%= meth %>_it '<%= path %>'
+    <%= meth %> '<%= path %>'
   end
 
   <%- end -%>
   <%- else -%>  
   def test_my_default
-    get_it '/'
+    get '/'
   end
   <%- end -%>
 

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

@@ -1,4 +1,3 @@
-require 'rubygems'
 <%- if vendor -%>
 $:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra', 'lib')
 require 'sinatra'
@@ -9,6 +8,8 @@ require 'sinatra'
 <%- when 'rspec' -%>
 require 'spec'
 require 'sinatra/test/rspec'
+<%- when 'bacon' -%>
+require 'sinatra/test/bacon'
 <%- when 'spec' -%>
 require 'sinatra/test/spec'
 <%- when 'shoulda' -%>
@@ -17,4 +18,4 @@ require 'shoulda'
 <%- when 'unit' -%>
 require 'sinatra/test/unit'
 <%- end -%>
-require File.join(File.dirname(__FILE__), '..', 'app.rb')
+require File.join(File.dirname(__FILE__), '..', '<%= app_name %>.rb')

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.2.0'
+  VERSION = '0.2.1'
 end

data/sinatra-gen.gemspec

@@ -1,24 +1,22 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = %q{sinatra-gen}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2008-12-23}
+  s.date = %q{2009-02-10}
   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://sinatra.rubyforge.org}
   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_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.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.require_paths = ["lib"]
-  s.rubyforge_project = %q{sinatra-gen}
+  s.rubyforge_project = %q{quirkey}
   s.rubygems_version = %q{1.3.1}
   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"]
@@ -28,17 +26,17 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rubigen>, [">= 1.3.3"])
-      s.add_development_dependency(%q<newgem>, [">= 1.2.1"])
+      s.add_runtime_dependency(%q<rubigen>, [">= 1.5.2"])
+      s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
-      s.add_dependency(%q<rubigen>, [">= 1.3.3"])
-      s.add_dependency(%q<newgem>, [">= 1.2.1"])
+      s.add_dependency(%q<rubigen>, [">= 1.5.2"])
+      s.add_dependency(%q<newgem>, [">= 1.2.3"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
-    s.add_dependency(%q<rubigen>, [">= 1.3.3"])
-    s.add_dependency(%q<newgem>, [">= 1.2.1"])
+    s.add_dependency(%q<rubigen>, [">= 1.5.2"])
+    s.add_dependency(%q<newgem>, [">= 1.2.3"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/test/test_sinatra_app_generator.rb

@@ -30,7 +30,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
   def test_generate_app_with_tiny_option
     run_generator('sinatra_app', [APP_ROOT, '--tiny'], sources)
     assert_generated_file   'config.ru'
-    assert_generated_file   'app.rb'
+    assert_generated_file   "#{app_name}.rb"
     assert_generated_file   'Rakefile'
   end
   
@@ -94,11 +94,22 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
       assert_match(/def test/, test_contents)
     end
   end
+  
+  def test_generate_app_with_test_bacon_option
+    run_generator('sinatra_app', [APP_ROOT, '--test=bacon'], sources)
+    assert_basic_paths_and_files
+    assert_generated_file 'test/test_helper.rb' do |helper_contents|
+      assert_match(/sinatra\/test\/bacon/, helper_contents)
+    end
+    assert_generated_file "test/test_#{app_name}.rb" do |test_contents|
+      assert_match(/describe/, test_contents)
+    end
+  end
 
   def test_generate_app_with_views_haml_option
     run_generator('sinatra_app', [APP_ROOT, '--views=erb'], sources)
     assert_basic_paths_and_files
-    assert_generated_file 'app.rb' do |app_contents|
+    assert_generated_file "#{app_name}.rb" do |app_contents|
       assert_match(/erb \:index/, app_contents)
     end
     assert_generated_file 'views/layout.erb'
@@ -108,7 +119,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
-    assert_generated_file 'app.rb' do |app_contents|
+    assert_generated_file "#{app_name}.rb" do |app_contents|
       assert_match(/haml \:index/, app_contents)
     end
     assert_generated_file 'views/layout.haml'
@@ -118,7 +129,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
-    assert_generated_file 'app.rb' do |app_contents|
+    assert_generated_file "#{app_name}.rb" do |app_contents|
       assert_match(/builder \:index/, app_contents)
     end
     assert_generated_file 'views/index.builder'
@@ -135,7 +146,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
-    assert_generated_file 'app.rb' do |app_contents|
+    assert_generated_file "#{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)
@@ -145,9 +156,9 @@ 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.rb'
+    assert_generated_file   "#{app_name}.rb"
     assert_generated_file   'Rakefile'
-    assert_generated_file 'app.rb' do |app_contents|
+    assert_generated_file "#{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)
@@ -161,7 +172,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     assert_directory_exists 'public'
     assert_directory_exists 'views'
     assert_generated_file   'config.ru'
-    assert_generated_file   'app.rb'
+    assert_generated_file   "#{app_name}.rb"
     assert_generated_file   'Rakefile'
     assert_generated_file   'config.yml'
     assert_generated_module  "lib/#{app_name}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-gen
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-23 00:00:00 -05:00
+date: 2009-02-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        version: 1.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.2.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     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://sinatra.rubyforge.org
+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  !! NOW WITH SUPPORT FOR SINATRA 0.9 (02/10/09)
 email: 
 - aaron@quirkey.com
 executables: 
@@ -69,6 +69,7 @@ files:
 - 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