sinatra-gen 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.4.1
+
+* Cucumber support with --integration_framework=cucumber [Thanks Rob Holland]
+* Explicitly set RACK_ENV in the test helper
+
 == 0.4.0 2009-08-13
 
 * Unless --tiny is specified generate an app that < Sinatra::Application

data/app_generators/sinatra_app/sinatra_app_generator.rb

@@ -18,16 +18,17 @@ class SinatraAppGenerator < RubiGen::Base
 
   default_options :author => nil
 
-  attr_accessor :app_name, 
-                :vendor, 
-                :tiny, 
-                :git, 
-                :git_init, 
-                :heroku, 
-                :test_framework, 
-                :view_framework, 
-                :install_scripts, 
-                :cap, 
+  attr_accessor :app_name,
+                :vendor,
+                :tiny,
+                :git,
+                :git_init,
+                :heroku,
+                :test_framework,
+                :integration_framework,
+                :view_framework,
+                :install_scripts,
+                :cap,
                 :actions,
                 :middleware,
                 :bin_name
@@ -45,26 +46,34 @@ class SinatraAppGenerator < RubiGen::Base
     record do |m|
       # Ensure appropriate folder(s) exists
       m.directory ''
-      
+
       if git_init
         m.run("#{git} init")
-      end      
+      end
 
       m.template 'config.ru.erb', 'config.ru'
       m.template 'Rakefile.erb' , 'Rakefile'
-      
+
       test_dir = (tests_are_specs? ? 'spec' : 'test')
-      
+
       unless tiny
         BASEDIRS.each { |path| m.directory path }
         m.directory test_dir
         m.file     'config.yml', 'config.yml'
         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", 
+        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'
+
+        case options[:integration_framework]
+        when 'cucumber'
+          m.directory 'features'
+          m.directory 'features/support'
+          m.template 'features/support/env.rb.erb', 'features/support/env.rb'
+          m.directory 'features/step_definitions'
+        end
       else
         m.template "lib/app.rb.erb", "#{app_name}.rb"
       end
@@ -78,7 +87,7 @@ class SinatraAppGenerator < RubiGen::Base
         m.directory 'vendor'
         if git_init || File.exists?(File.join(@destination_root, '.git'))
           command = "#{git} submodule add #{SINATRA_GIT_URL} vendor/sinatra"
-        else         
+        else
           command = "#{git} clone #{SINATRA_GIT_URL} vendor/sinatra"
         end
         m.run(command)
@@ -93,11 +102,12 @@ class SinatraAppGenerator < RubiGen::Base
       if install_scripts
         m.dependency "install_rubigen_scripts", [destination_root, 'sinatra-gen'], :shebang => options[:shebang], :collision => :force
       end
-      
+
       if heroku
+        m.template 'dot_gems', '.gems'
         m.run("#{heroku} create #{app_name}")
       end
-      
+
     end
   end
 
@@ -123,6 +133,7 @@ class SinatraAppGenerator < RubiGen::Base
     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 (bacon (default)/rspec/spec/shoulda/test)") {|o| options[:test_framework] = o }
+    opts.on("--integration=integration_framework", String, "Specify your integration framework (cucumber)") {|o| options[:integration_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 }
@@ -132,21 +143,22 @@ class SinatraAppGenerator < RubiGen::Base
     # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
     # Templates can access these value via the attr_reader-generated methods, but not the
     # raw instance variable value.
-    self.vendor          = options[:vendor]
-    self.tiny            = options[:tiny]
-    self.cap             = options[:cap]
-    self.git             = options[:git] || `which git`.strip
-    self.heroku          = options[:heroku] ? `which heroku`.strip : false
-    self.git_init        = options[:init] || !!heroku || false
-    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
+    self.vendor                = options[:vendor]
+    self.tiny                  = options[:tiny]
+    self.cap                   = options[:cap]
+    self.git                   = options[:git] || `which git`.strip
+    self.heroku                = options[:heroku] ? `which heroku`.strip : false
+    self.git_init              = options[:init] || !!heroku || false
+    self.test_framework        = options[:test_framework] || 'bacon'
+    self.integration_framework = options[:integration_framework]
+    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
+    app_name.tr('.','_').classify
   end
 
   def app_klass
@@ -156,7 +168,7 @@ class SinatraAppGenerator < RubiGen::Base
   def parse_actions(*action_args)
     @actions = action_args.flatten.collect { |a| a.split(':', 2) }
   end
-  
+
   def tests_are_specs?
     ['rspec','spec','bacon'].include?(test_framework)
   end

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

@@ -33,8 +33,8 @@ end
 
 <%- else -%>
 class <%= klass_name -%> < Sinatra::Application
-  
-  set :root, APP_ROOT  
+
+  set :root, APP_ROOT
   <%- middleware.each do |m| -%>
   use <%= m.to_s.classify %>
   <%- end -%>

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

@@ -3,18 +3,17 @@ require 'spec_helper'
 describe '<%= klass_name %>' do
 
   <%- unless actions.empty? -%>
-  <% actions.each do |meth, path| %>  
+  <% actions.each do |meth, path| %>
   it 'should <%= meth %> <%= path %>' do
     <%= meth %> '<%= path %>'
     last_response.should.be.ok
   end
-  
+
   <%- end -%>
-  <%- else -%>  
+  <%- else -%>
   it 'should load the index' do
     get '/'
     last_response.should.be.ok
   end
   <%- end -%>
 end
-

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

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

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

@@ -9,19 +9,19 @@ class <%= klass_name -%>Test < Test::Unit::TestCase
       setup do
         <%= meth %> '<%= path %>'
       end
-      
+
       should "respond" do
         assert body
       end
     end
-    
+
     <%- end -%>
     <%- else -%>
     context "getting the index" do
       setup do
         get '/'
       end
-      
+
       should "respond" do
         assert body
       end

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

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

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

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

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

@@ -4,6 +4,10 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra', 'lib')
 require 'sinatra'
 require 'rack/test'
 
+ENV['RACK_ENV'] = 'test'
+
+require File.join(File.dirname(__FILE__), '..', <%- unless tiny -%>'lib', <%- end -%>'<%= app_name %>.rb')
+
 <%= app_klass -%>.set(
   :environment => :test,
   :run => false,
@@ -11,23 +15,20 @@ require 'rack/test'
   :logging => false
 )
 
-require File.join(File.dirname(__FILE__), '..', <%- unless tiny -%>'lib', <%- end -%>'<%= app_name %>.rb')
-
 module TestHelper
-  
+
   def app
-    # change to your app class if using the 'classy' style
-    Sinatra::Application.new
+    <%= app_klass %>.new
   end
-  
+
   def body
     last_response.body
   end
-  
+
   def status
     last_response.status
   end
-  
+
   include Rack::Test::Methods
 
 end
@@ -55,4 +56,4 @@ Test::Unit::TestCase.send(:include, TestHelper)
 require 'test/unit'
 
 Test::Unit::TestCase.send(:include, TestHelper)
-<%- end -%>
+<%- end -%>

data/app_generators/sinatra_app/templates/views/erb_layout.erb

@@ -1,12 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
 	<title><%= app_name %></title>
-	
 </head>
 
 <body>

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.4.0'
+  VERSION = '0.4.1'
 end

data/test/test_sinatra_app_generator.rb

@@ -35,7 +35,7 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
   end
   
   def test_generate_app_with_init_option
-    run_generator('sinatra_app', [APP_ROOT, '-i'], sources)
+    run_generator('sinatra_app', [APP_ROOT, '--init'], sources)
     assert_basic_paths_and_files('spec')
     assert_directory_exists '.git'
   end
@@ -43,6 +43,9 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
   def test_generate_app_with_heroku_option
     run_generator('sinatra_app', [APP_ROOT, '--heroku'], sources)
     assert_basic_paths_and_files('spec')
+    assert_generated_file '.gems' do |contents|
+      assert_match(/sinatra/, contents)
+    end
     assert_directory_exists '.git'
     assert_generated_file   '.git/config' do |config_contents|
       assert_match(/\[remote "heroku"\]/, config_contents)      
@@ -115,6 +118,15 @@ class TestSinatraAppGenerator < Test::Unit::TestCase
     end
   end
 
+  def test_generate_app_with_integration_cucumber_option
+    run_generator('sinatra_app', [APP_ROOT, '--integration=cucumber'], sources)
+    assert_basic_paths_and_files('features')
+    assert_basic_paths_and_files('features/support')
+    assert_generated_file 'features/support/env.rb' do |env_contents|
+      assert_match(/World/, env_contents)
+    end
+  end
+
   def test_generate_app_with_views_erb_option
     run_generator('sinatra_app', [APP_ROOT, '--views=erb'], sources)
     assert_basic_paths_and_files('spec')

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-gen
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,59 +14,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -04:00
+date: 2010-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubigen
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 1
         version: 0.4.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: newgem
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id005
 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: 
 - aaron@quirkey.com
@@ -116,18 +141,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: quirkey
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: sinatra-gen generates a common file structure and basic app files for a web app utilizing the sinatra framework