singem 0.0.4 → 0.0.5

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "singem"
-GEM_VERSION = "0.0.4"
+GEM_VERSION = "0.0.5"
 AUTHOR = "Corey Donohoe"
 EMAIL = "atmos@atmos.org"
 HOMEPAGE = "http://github.com/atmos/singem"
@@ -24,11 +24,9 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
 
   s.add_dependency "sinatra", ">=0.9.2"
-  s.add_dependency "rubigen", ">= 1.5.2"
-  s.add_dependency "rack-test", "~>0.3.0"
+  s.add_dependency "rack-test", ">=0.4.0"
   s.add_dependency "webrat", "~>0.4.4"
-  s.add_dependency "fakeweb", "~>1.2.0"
-  s.add_dependency 'haml', "~>2.0.9"
+  s.add_dependency "fakeweb", "~>1.2.5"
 
   s.bindir = "bin"
   s.executables = %w( singem )

data/bin/singem

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'rubigen'
+require 'digest/sha1'
 
 if %w(-v --version).include? ARGV.first
   require File.dirname(__FILE__) + "/../lib/newgem"
@@ -19,8 +20,6 @@ RubiGen::Base.prepend_sources(*[
 
 if ARGV.delete "--twitter"
   RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'twitter', :backtrace => true)
-elsif ARGV.delete "--old-school"
-  RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'singem', :backtrace => true)
 else
   RubiGen::Scripts::Generate.new.run(ARGV, :generator => 'cucumber', :backtrace => true)
 end

data/lib/generators/cucumber/cucumber_generator.rb

@@ -37,7 +37,7 @@ class CucumberGenerator < RubiGen::Base
       m.template "spec/templates_spec.rb.erb", "spec/#{name}_spec.rb"
       m.template "spec/fixtures.rb.erb", "spec/fixtures.rb"
 
-      %w(LICENSE Rakefile README.md).each do |file| 
+      %w(LICENSE Rakefile README.md Gemfile).each do |file| 
         m.template file, file
       end
       %w(TODO).each do |file| 

data/lib/generators/cucumber/templates/Gemfile

@@ -0,0 +1,22 @@
+gem 'rack_hoptoad',        '>=0.0.3'
+gem 'haml',                '~>2.2.0'
+gem 'sinatra',             '~>0.9.4'
+
+#gem 'do_sqlite3',         '>=0.9.12'
+#gem 'dm-validations',     '>=0.9.11'
+#gem 'dm-timestamps',      '>=0.9.11'
+
+gem 'rake',                     :only => [:test]
+gem 'rspec',                    :only => [:test]
+gem 'rcov',                     :only => [:test]
+gem 'bundler',      '>=0.5.0',  :only => [:test]
+gem 'cucumber',                 :only => [:test]
+gem 'webrat',       '~>0.5.0',  :only => [:test]
+gem 'rack-test',    '~>0.4.2',  :only => [:test]
+gem 'fakeweb',      '>=1.2.5',  :only => [:test]
+gem 'ParseTree',    '>=3.0.4',  :only => [:test]
+gem 'randexp',      '>=0.1.4',  :only => [:test]
+
+disable_system_gems
+
+# vim:ft=ruby

data/lib/generators/cucumber/templates/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/generators/cucumber/templates/README.md

@@ -2,3 +2,9 @@
 <%= "=" * name.size %>
 
 A sinatra app the provides a gem that...
+
+Developing
+==========
+    % gem install bundler
+    % gem bundle
+    % bin/rake

data/lib/generators/cucumber/templates/Rakefile

@@ -1,9 +1,29 @@
-require 'rubygems'
+require File.expand_path(File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environment'))
 require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
-require 'spec/rake/spectask'
+require 'bundler'
+
+task :default => [:cucumber, :spec]
+
 require 'cucumber/rake/task'
+desc "Run cucumber"
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format pretty}
+end
+
+require 'spec/rake/spectask'
+desc "Run specs"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = %w(-fs --color)
+  t.spec_opts << '--loadby' << 'random'
+
+  t.rcov_opts << '--exclude' << 'spec'
+  t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
+  t.rcov_opts << '--text-summary'
+  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+end
 
 GEM = "<%= name %>"
 GEM_VERSION = "0.0.1"
@@ -24,12 +44,11 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  s.add_dependency "sinatra", ">=0.9.2"
-  s.add_dependency "rubigen", ">= 1.5.2"
-  s.add_dependency "rack-test", "~>0.1.0"
-  s.add_dependency "webrat", "~>0.4.3"
-  s.add_dependency "fakeweb", "~>1.2.0"
-  s.add_dependency 'haml', "~>2.0.9"
+  manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
+  manifest.dependencies.each do |d|
+    next if d.only && d.only.include?('test')
+    s.add_dependency(d.name, d.version)
+  end
 
   s.require_path = 'lib'
   s.autorequire = GEM
@@ -52,22 +71,3 @@ task :make_spec do
   end
 end
 
-task :default => :features
-
-desc "Run cucumber"
-Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = %w{--format pretty}
-end
-
-
-desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w(-fs --color)
-  t.spec_opts << '--loadby' << 'random'
-
-  t.rcov_opts << '--exclude' << 'spec'
-  t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-  t.rcov_opts << '--text-summary'
-  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-end

data/lib/generators/cucumber/templates/config.ru.erb

@@ -1,11 +1,8 @@
-require 'rubygems'
-require '<%= name %>'
+require File.expand_path(File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environment'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'lib', '<%= name %>'))
 
 #DataMapper.setup(:default, "mysql://atmos:fail@localhost/<%= name.capitalize %>_production")
 
-class <%= name.camelize %>Site < <%= name.camelize %>::App
-  set :public,      File.expand_path(File.dirname(__FILE__), "public")
-  set :environment, :production
-end
+use Rack::Static, :urls => ["/css", "/img", "/js"], :root => "public"
 
-run <%= name.camelize %>Site
+run <%= name.camelize %>.app

data/lib/generators/cucumber/templates/features/basics.feature.erb

@@ -1,6 +1,7 @@
 Feature: Visiting the Home Page
-In order to display a splash page
+  In order to display a splash page
   As an anonymous user
-    Scenario: Seeing the splash page
-    When I visit the home page
-    Then I should be greeted
+
+  Scenario: Seeing the splash page
+  When I visit the home page
+  Then I should be greeted

data/lib/generators/cucumber/templates/features/support/env.rb.erb

@@ -1,7 +1,15 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment'))
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', '<%= name %>')
 require 'spec'
 require 'webrat'
 require 'rack/test'
-require File.dirname(__FILE__)+'/../../lib/<%= name %>'
+require 'fakeweb'
+
+Webrat.configure do |config|
+  config.mode = :rack
+  config.application_port = 4567
+end
+
 module <%= name.camelize %>::AppHelpers
   begin
     gem 'safariwatir', '~>0.3.3'
@@ -17,9 +25,7 @@ module <%= name.camelize %>::AppHelpers
   end
 
   def app
-    @app = Rack::Builder.new do
-      run <%= name.camelize %>::App
-    end
+    <%= name.camelize %>.app
   end
 end
 

data/lib/generators/cucumber/templates/lib/templates.rb.erb

@@ -1,9 +1,16 @@
-require 'rubygems'
 require 'sinatra/base'
 require 'haml/util'
 require 'haml/engine'
 
 module <%= name.camelize %>
+  def self.app
+    @app ||= Rack::Builder.new do
+      # use Rack::HoptoadNotifier 'mysecretkey' 
+      # use Rack::Session::Cookie, :key => 'rack.session', :path => '/',
+      #  :expire_after => 2592000, :secret => '<%= ::Digest::SHA1.hexdigest(Time.now.to_s) %>'
+      run <%= name.camelize %>::App
+    end
+  end
 end
 
 require File.dirname(__FILE__)+'/<%= name %>/app'

data/lib/generators/cucumber/templates/spec/spec_helper.rb.erb

@@ -1,11 +1,11 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-require 'rubygems'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment'))
+
+require File.join(File.dirname(__FILE__), '..', 'lib', '<%= name %>')
+
 require 'randexp'
-require '<%= name %>'
-#require 'dm-core'
 require 'rack/test'
-require 'webrat/sinatra'
+require 'webrat'
+#require 'dm-core'
 #require 'dm-sweatshop'
 require 'fakeweb'
 require 'pp'
@@ -15,11 +15,9 @@ FakeWeb.allow_net_connect = false
 #require File.dirname(__FILE__)+'/fixtures'
 #DataMapper.setup(:default, 'sqlite3::memory:')
 
-class Net::HTTPResponse 
-  def body=(content) 
-    @body = content 
-    @read = true 
-  end 
+Webrat.configure do |config|
+  config.mode = :rack
+  config.application_port = 4567
 end
 
 Spec::Runner.configure do |config|
@@ -33,8 +31,6 @@ Spec::Runner.configure do |config|
   end
 
   def app
-    @app = Rack::Builder.new do
-      run <%= name.camelize %>::App
-    end
+    <%= name.camelize %>.app
   end
 end

data/lib/generators/twitter/templates/Gemfile

@@ -0,0 +1,27 @@
+gem 'rack_hoptoad',       '>=0.0.3'
+gem 'haml',               '~>2.2.0'
+gem 'sinatra',            '~>0.9.4'
+gem 'curb',               '>=0.3.7'
+gem 'json',               '>=1.1.6'
+gem 'oauth',              '=0.3.2'
+
+gem 'do_sqlite3',         '>=0.9.12'
+gem 'dm-validations',     '>=0.9.11'
+gem 'dm-timestamps',      '>=0.9.11'
+
+
+gem 'rake',                     :only => [:test]
+gem 'rspec',                    :only => [:test]
+gem 'rcov',                     :only => [:test]
+gem 'bundler',      '>=0.5.0',  :only => [:test]
+gem 'cucumber',                 :only => [:test]
+gem 'webrat',       '~>0.5.0',  :only => [:test]
+gem 'rack-test',    '~>0.4.2',  :only => [:test]
+gem 'fakeweb',      '>=1.2.5',  :only => [:test]
+gem 'ParseTree',    '>=3.0.4',  :only => [:test]
+gem 'randexp',      '>=0.1.4',  :only => [:test]
+gem 'dm-sweatshop', '>=0.9.11', :only => [:test]
+
+disable_system_gems
+
+# vim:ft=ruby

data/lib/generators/twitter/templates/README.md

@@ -2,3 +2,9 @@
 <%= "=" * name.size %>
 
 A gem that provides...
+
+Developing
+==========
+    % gem install bundler
+    % gem bundle
+    % bin/rake

data/lib/generators/twitter/templates/Rakefile

@@ -1,7 +1,29 @@
-require 'rubygems'
+require File.expand_path(File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environment'))
 require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
+require 'bundler'
+
+task :default => [:cucumber, :spec]
+
+require 'cucumber/rake/task'
+desc "Run cucumber"
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format pretty}
+end
+
+require 'spec/rake/spectask'
+desc "Run specs"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = %w(-fs --color)
+  t.spec_opts << '--loadby' << 'random'
+
+  t.rcov_opts << '--exclude' << 'spec'
+  t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
+  t.rcov_opts << '--text-summary'
+  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+end
 
 GEM = "<%= name %>"
 GEM_VERSION = "0.0.1"
@@ -22,16 +44,15 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  s.add_dependency "sinatra", ">=0.9.2"
-  s.add_dependency "rubigen", ">= 1.5.2"
-  s.add_dependency "rack-test", "~>0.1.0"
-  s.add_dependency "webrat", "~>0.4.3"
-  s.add_dependency "fakeweb", "~>1.2.4"
-  s.add_dependency 'haml', "~>2.0.9"
+  manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
+  manifest.dependencies.each do |d|
+    next if d.only && d.only.include?('test')
+    s.add_dependency(d.name, d.version)
+  end
 
   s.require_path = 'lib'
   s.autorequire = GEM
-  s.files = %w(LICENSE README.md Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
+  s.files = %w(LICENSE README.md Rakefile TODO) + Dir.glob("{lib,features}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
@@ -50,23 +71,3 @@ task :make_spec do
   end
 end
 
-task :default => :features
-
-require 'cucumber/rake/task'
-desc "Run cucumber"
-Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = %w{--format pretty}
-end
-
-require 'spec/rake/spectask'
-desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w(-fs --color)
-  t.spec_opts << '--loadby' << 'random'
-
-  t.rcov_opts << '--exclude' << 'spec'
-  t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-  t.rcov_opts << '--text-summary'
-  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-end

data/lib/generators/twitter/templates/config.ru.erb

@@ -1,14 +1,11 @@
-require 'rubygems'
-require '<%= name %>'
+require File.expand_path(File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environment'))
+require File.join(File.dirname(__FILE__), 'lib', '<%= name %>')
 
 ENV['<%= name.upcase %>_READKEY'] = /\w{18}/.gen  # this should really be what twitter gives you
 ENV['<%= name.upcase %>_READSECRET'] = /\w{24}/.gen # this should really be what twitter gives you
 
 #DataMapper.setup(:default, "mysql://atmos:fail@localhost/<%= name.capitalize %>_production")
 
-class <%= name.camelize %>Site < <%= name.camelize %>::App
-  set :public,      File.expand_path(File.dirname(__FILE__), "public")
-  set :environment, :production
-end
+use Rack::Static, :urls => ["/css", "/img", "/js"], :root => "public"
 
-run <%= name.camelize %>Site
+run <%= name.camelize %>.app

data/lib/generators/twitter/templates/features/support/env.rb.erb

@@ -1,13 +1,21 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment'))
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', '<%= name %>')
+
 require 'spec'
 require 'spec/mocks'
 require 'webrat'
 require 'rack/test'
 require 'dm-sweatshop'
+require 'fakeweb'
 require 'pp'
 
-require File.dirname(__FILE__)+'/../../lib/<%= name %>'
 require File.dirname(__FILE__)+'/../../spec/helpers'
 
+Webrat.configure do |config|
+  config.mode = :rack
+  config.application_port = 4567
+end
+
 World(Rack::Test::Methods)
 World(Spec::Mocks::ExampleMethods)
 World(Webrat::Methods)

data/lib/generators/twitter/templates/lib/templates.rb.erb

@@ -1,21 +1,11 @@
-gem 'oauth'
 require 'oauth'
-gem 'json'
 require 'json'
-gem 'haml', '~>2.0.9'
 require 'haml/util'
 require 'haml/engine'
-gem 'curb'
 require 'curb'
 require 'logger'
 
-gem 'data_objects', '~>0.9.11'
-gem 'dm-core', '~>0.9.10'
-gem 'dm-types', '~>0.9.10'
-gem 'dm-validations', '~>0.9.10'
-gem 'dm-timestamps', '~>0.9.10'
 require 'dm-core'
-require 'dm-types'
 require 'dm-validations'
 require 'dm-timestamps'
 require 'sinatra/base'
@@ -50,7 +40,16 @@ module <%= name.camelize %>
     end
     yield
   end
+
+  def self.app
+    @app ||= Rack::Builder.new do
+      # use Rack::HoptoadNotifier 'mysecretkey' 
+      use Rack::Session::Cookie, :key => 'rack.session', :path => '/',
+        :expire_after => 2592000, :secret => '<%= ::Digest::SHA1.hexdigest(Time.now.to_s) %>'
+      run <%= name.camelize %>::App
+    end
+  end
 end
 
+require File.dirname(__FILE__)+'/<%= name %>/app'
 require File.dirname(__FILE__)+'/<%= name %>/models/user'
-require File.dirname(__FILE__)+'/<%= name %>/sinatra/app'

data/lib/generators/twitter/templates/lib/templates/{sinatra/app.rb.erb → app.rb.erb}

@@ -1,7 +1,6 @@
 module <%= name.camelize %>
   class App < Sinatra::Default
-    set    :views, File.expand_path(File.dirname(__FILE__)+'/../views')
-    enable :sessions
+    set    :views, File.expand_path(File.join(File.dirname(__FILE__), 'views'))
     enable :methodoverride
 
     helpers do

data/lib/generators/twitter/templates/spec/helpers.rb.erb

@@ -5,16 +5,9 @@ class Net::HTTPResponse
   end
 end
 
-Webrat.configure do |config|
-  config.mode = :rack_test
-  config.application_port = 4567
-end
-
 module <%= name.camelize %>::AppHelpers
   def app
-    @app = Rack::Builder.new do
-      run <%= name.camelize %>::App
-    end
+    <%= name.camelize %>.app
   end
 
   def login_quentin

data/lib/generators/twitter/templates/spec/spec_helper.rb.erb

@@ -1,12 +1,9 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-require 'rubygems'
-require 'randexp'
-require '<%= name %>'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment'))
+require File.join(File.dirname(__FILE__), '..', 'lib', '<%= name %>')
+
 require 'rack/test'
 require 'webrat'
 require 'dm-sweatshop'
-gem 'fakeweb', '~>1.2.4'
 require 'fakeweb'
 require 'pp'
 
@@ -17,6 +14,11 @@ ENV['<%= name.upcase %>_READSECRET'] = /\w{18}/.gen
 require File.dirname(__FILE__)+'/fixtures'
 require File.dirname(__FILE__)+'/helpers'
 
+Webrat.configure do |config|
+  config.mode = :rack
+  config.application_port = 4567
+end
+
 DataMapper.setup(:default, 'sqlite3::memory:')
 
 Spec::Runner.configure do |config|
@@ -35,4 +37,8 @@ Spec::Runner.configure do |config|
        {:body => "",            :status => ["403", "Forbidden"]},
        {:body => "Bad Gateway", :status => ["502", "Bad Gateway"]} ])
   end
+
+  def app
+    <%= name.camelize %>.app
+  end
 end

data/lib/generators/twitter/twitter_generator.rb

@@ -28,7 +28,7 @@ class TwitterGenerator < RubiGen::Base
       # Create stubs
       m.template "config.ru.erb", "config.ru.example"
       m.template "lib/templates.rb.erb", "lib/#{name}.rb"
-      m.template "lib/templates/sinatra/app.rb.erb", "lib/#{name}/sinatra/app.rb"
+      m.template "lib/templates/app.rb.erb", "lib/#{name}/app.rb"
       m.template "lib/templates/models/user.rb.erb", "lib/#{name}/models/user.rb"
 
       # cucumber stubs
@@ -42,7 +42,7 @@ class TwitterGenerator < RubiGen::Base
       m.template "spec/templates_spec.rb.erb", "spec/#{name}_spec.rb"
       m.template "spec/fixtures.rb.erb", "spec/fixtures.rb"
 
-      %w(LICENSE Rakefile README.md).each do |file| 
+      %w(LICENSE Rakefile README.md Gemfile).each do |file| 
         m.template file, file
       end
       %w(TODO).each do |file| 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: singem
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -9,7 +9,7 @@ autorequire: singem
 bindir: bin
 cert_chain: []
 
-date: 2009-07-05 00:00:00 -06:00
+date: 2009-09-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,25 +22,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rubigen
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: webrat
@@ -60,17 +50,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.0.9
+        version: 1.2.5
     version: 
 description: A gem that provides generators for sinatra apps, ready to go with rack-test/webrat/randexp and others
 email: atmos@atmos.org
@@ -86,67 +66,29 @@ files:
 - README.md
 - Rakefile
 - TODO
-- lib/generators
-- lib/generators/cucumber
 - lib/generators/cucumber/cucumber_generator.rb
-- lib/generators/cucumber/templates
 - lib/generators/cucumber/templates/config.ru.erb
-- lib/generators/cucumber/templates/features
 - lib/generators/cucumber/templates/features/basics.feature.erb
-- lib/generators/cucumber/templates/features/step_definitions
 - lib/generators/cucumber/templates/features/step_definitions/basics.rb.erb
-- lib/generators/cucumber/templates/features/support
 - lib/generators/cucumber/templates/features/support/env.rb.erb
-- lib/generators/cucumber/templates/lib
-- lib/generators/cucumber/templates/lib/templates
+- lib/generators/cucumber/templates/Gemfile
 - lib/generators/cucumber/templates/lib/templates/app.rb.erb
 - lib/generators/cucumber/templates/lib/templates.rb.erb
 - lib/generators/cucumber/templates/LICENSE
 - lib/generators/cucumber/templates/Rakefile
 - lib/generators/cucumber/templates/README.md
-- lib/generators/cucumber/templates/spec
 - lib/generators/cucumber/templates/spec/fixtures.rb.erb
 - lib/generators/cucumber/templates/spec/spec_helper.rb.erb
 - lib/generators/cucumber/templates/spec/templates_spec.rb.erb
 - lib/generators/cucumber/templates/TODO
 - lib/generators/cucumber/USAGE
-- lib/generators/singem
-- lib/generators/singem/singem_generator.rb
-- lib/generators/singem/templates
-- lib/generators/singem/templates/config.ru.erb
-- lib/generators/singem/templates/lib
-- lib/generators/singem/templates/lib/templates
-- lib/generators/singem/templates/lib/templates/app.rb.erb
-- lib/generators/singem/templates/lib/templates.rb.erb
-- lib/generators/singem/templates/LICENSE
-- lib/generators/singem/templates/Rakefile
-- lib/generators/singem/templates/README.md
-- lib/generators/singem/templates/spec
-- lib/generators/singem/templates/spec/fixtures.rb.erb
-- lib/generators/singem/templates/spec/spec_helper.rb.erb
-- lib/generators/singem/templates/spec/templates_spec.rb.erb
-- lib/generators/singem/templates/TODO
-- lib/generators/singem/USAGE
-- lib/generators/twitter
-- lib/generators/twitter/templates
 - lib/generators/twitter/templates/config.ru.erb
-- lib/generators/twitter/templates/features
-- lib/generators/twitter/templates/features/adding_items_from_the_bookmarklet.feature
-- lib/generators/twitter/templates/features/adding_items_to_my_wishlist.feature
 - lib/generators/twitter/templates/features/basics.feature.erb
-- lib/generators/twitter/templates/features/step_definitions
 - lib/generators/twitter/templates/features/step_definitions/basics.rb.erb
-- lib/generators/twitter/templates/features/support
 - lib/generators/twitter/templates/features/support/env.rb.erb
-- lib/generators/twitter/templates/features/viewing_my_wish_list.feature
-- lib/generators/twitter/templates/features/viewing_the_site_for_the_first_time.feature
-- lib/generators/twitter/templates/lib
-- lib/generators/twitter/templates/lib/templates
-- lib/generators/twitter/templates/lib/templates/models
+- lib/generators/twitter/templates/Gemfile
+- lib/generators/twitter/templates/lib/templates/app.rb.erb
 - lib/generators/twitter/templates/lib/templates/models/user.rb.erb
-- lib/generators/twitter/templates/lib/templates/sinatra
-- lib/generators/twitter/templates/lib/templates/sinatra/app.rb.erb
-- lib/generators/twitter/templates/lib/templates/views
 - lib/generators/twitter/templates/lib/templates/views/about.haml
 - lib/generators/twitter/templates/lib/templates/views/failed.haml
 - lib/generators/twitter/templates/lib/templates/views/home.haml
@@ -154,7 +96,6 @@ files:
 - lib/generators/twitter/templates/LICENSE
 - lib/generators/twitter/templates/Rakefile
 - lib/generators/twitter/templates/README.md
-- lib/generators/twitter/templates/spec
 - lib/generators/twitter/templates/spec/fixtures.rb.erb
 - lib/generators/twitter/templates/spec/helpers.rb.erb
 - lib/generators/twitter/templates/spec/spec_helper.rb.erb
@@ -167,6 +108,8 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/atmos/singem
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -187,9 +130,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A gem that provides generators for sinatra apps, ready to go with rack-test/webrat/randexp and others
 test_files: []
 

data/lib/generators/singem/USAGE

@@ -1,5 +0,0 @@
-Description:
-  
-  
-Usage:
-  

data/lib/generators/singem/singem_generator.rb

@@ -1,77 +0,0 @@
-class SingemGenerator < RubiGen::Base
-  DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
-                              Config::CONFIG['ruby_install_name'])
-
-  default_options :author => nil
-  attr_reader :name
-
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if args.empty?
-    @destination_root = File.expand_path(args.shift)
-    @name = base_name
-    extract_options
-  end
-
-  def manifest
-    record do |m|
-      # Ensure appropriate folder(s) exists
-      m.directory ''
-      BASEDIRS.each { |path| m.directory path }
-      m.directory "lib/#{name}"
-
-      # Create stubs
-      m.template "config.ru.erb", "config.ru.example"
-      m.template "lib/templates.rb.erb", "lib/#{name}.rb"
-      m.template "lib/templates/app.rb.erb", "lib/#{name}/app.rb"
-
-      m.template "spec/spec_helper.rb.erb", "spec/spec_helper.rb"
-      m.template "spec/templates_spec.rb.erb", "spec/#{name}_spec.rb"
-      m.template "spec/fixtures.rb.erb", "spec/fixtures.rb"
-
-      %w(LICENSE Rakefile README.md).each do |file| 
-        m.template file, file
-      end
-      %w(TODO).each do |file| 
-        m.file file, file
-      end
-
-#      m.dependency "install_rubigen_scripts", [destination_root, 'newgem_simple'], 
-#        :shebang => options[:shebang], :collision => :force
-    end
-  end
-
-  protected
-    def banner
-      <<-EOS
-Creates a simple RubyGems scaffold.
-
-USAGE: #{spec.name} name --simple"
-EOS
-    end
-
-    def add_options!(opts)
-      opts.separator ''
-      opts.separator 'Options:'
-      # For each option below, place the default
-      # at the top of the file next to "default_options"
-      # opts.on("-a", "--author=\"Your Name\"", String,
-      #         "Some comment about this option",
-      #         "Default: none") { |x| options[:author] = x }
-      opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-    end
-
-    def extract_options
-      # 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.
-      # @author = options[:author]
-    end
-
-    # Installation skeleton.  Intermediate directories are automatically
-    # created so don't sweat their absence here.
-    BASEDIRS = %w(
-      lib
-      spec
-    )
-end

data/lib/generators/singem/templates/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) <%= Time.now.year %> YOUR NAME
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/generators/singem/templates/README.md

@@ -1,4 +0,0 @@
-<%= name %>
-<%= "=" * name.size %>
-
-A gem that provides...

data/lib/generators/singem/templates/Rakefile

@@ -1,66 +0,0 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'rubygems/specification'
-require 'date'
-require 'spec/rake/spectask'
-
-GEM = "<%= name %>"
-GEM_VERSION = "0.0.1"
-AUTHOR = "Your Name"
-EMAIL = "Your Email"
-HOMEPAGE = "http://example.com"
-SUMMARY = "A sinatra app that provides..."
-
-spec = Gem::Specification.new do |s|
-  s.name = GEM
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-
-  s.add_dependency "sinatra", ">=0.9.2"
-  s.add_dependency "rubigen", ">= 1.5.2"
-  s.add_dependency "rack-test", "~>0.1.0"
-  s.add_dependency "webrat", "~>0.4.3"
-  s.add_dependency "fakeweb", "~>1.2.0"
-  s.add_dependency 'haml', "~>2.0.9"
-
-  s.require_path = 'lib'
-  s.autorequire = GEM
-  s.files = %w(LICENSE README.md Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "install the gem locally"
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
-end
-
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
-
-task :default => :spec
-
-desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = %w(-fs --color)
-  t.spec_opts << '--loadby' << 'random'
-
-  t.rcov_opts << '--exclude' << 'spec'
-  t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-  t.rcov_opts << '--text-summary'
-  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-end

data/lib/generators/singem/templates/TODO

@@ -1,4 +0,0 @@
-TODO:
-Fix LICENSE with your name
-Fix Rakefile with your name and contact info
-Add your code to lib/<%= name %>.rb

data/lib/generators/singem/templates/config.ru.erb

@@ -1,11 +0,0 @@
-require 'rubygems'
-require '<%= name %>'
-
-#DataMapper.setup(:default, "mysql://atmos:fail@localhost/<%= name.capitalize %>_production")
-
-class <%= name.camelize %>Site < <%= name.camelize %>::App
-  set :public,      File.expand_path(File.dirname(__FILE__), "public")
-  set :environment, :production
-end
-
-run <%= name.camelize %>Site

data/lib/generators/singem/templates/lib/templates.rb.erb

@@ -1,9 +0,0 @@
-require 'rubygems'
-require 'sinatra/base'
-require 'haml/util'
-require 'haml/engine'
-
-module <%= name.camelize %>
-end
-
-require File.dirname(__FILE__)+'/<%= name %>/app'

data/lib/generators/singem/templates/lib/templates/app.rb.erb

@@ -1,7 +0,0 @@
-module <%= name.camelize %>
-  class App < Sinatra::Default
-    get '/' do
-      haml "%h2= 'Hello There, buddy!'"
-    end
-  end
-end

data/lib/generators/singem/templates/spec/spec_helper.rb.erb

@@ -1,40 +0,0 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
-require 'rubygems'
-require 'randexp'
-require '<%= name %>'
-#require 'dm-core'
-require 'rack/test'
-require 'webrat/sinatra'
-#require 'dm-sweatshop'
-require 'fakeweb'
-require 'pp'
-
-FakeWeb.allow_net_connect = false
-
-#require File.dirname(__FILE__)+'/fixtures'
-#DataMapper.setup(:default, 'sqlite3::memory:')
-
-class Net::HTTPResponse 
-  def body=(content) 
-    @body = content 
-    @read = true 
-  end 
-end
-
-Spec::Runner.configure do |config|
-  config.include(Rack::Test::Methods)
-  config.include(Webrat::Methods)
-  config.include(Webrat::Matchers)
-
-  config.before(:each) do
-    #DataMapper.auto_migrate!
-    FakeWeb.clean_registry
-  end
-
-  def app
-    @app = Rack::Builder.new do
-      run <%= name.camelize %>::App
-    end
-  end
-end

data/lib/generators/singem/templates/spec/templates_spec.rb.erb

@@ -1,8 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "<%= name.camelize %>" do
-  it "should do nothing" do
-    get '/'
-    last_response.should have_selector("h2:contains('Hello There, buddy!')")
-  end
-end

data/lib/generators/twitter/templates/features/adding_items_from_the_bookmarklet.feature

@@ -1,16 +0,0 @@
-Feature: Viewing my wish list
-  In order to display a users' preferences
-  As a twitter user
-
-  Background:
-    Given I am logged in
-    And I have created a "53cm Pistas" category
-    And I have created a "54cm Cyclocross" category
-
-  Scenario: After Authenticating
-    When I visit the bookmarklet page
-    And I set the category to "53cm Pistas"
-    And the "description" is set to "Bianchi Pista Size 53cm Medium - $500 (Downtown Denver)"
-    And the "url" is set to "http://denver.craigslist.org/bik/1195971789.html" 
-    When I click submit
-    Then I should see the window close

data/lib/generators/twitter/templates/features/adding_items_to_my_wishlist.feature

@@ -1,19 +0,0 @@
-Feature: Viewing my wish list
-  In order to display a users' preferences
-  As a twitter user
-
-  Background:
-    Given I am logged in
-    And I have created a "53cm Pistas" category
-
-  Scenario: Posting to an existing category
-    When I post "Bianchi Pista Size 53cm Medium - $500 (Downtown Denver)" with a url of "http://denver.craigslist.org/bik/1195971789.html" to the "53cm Pistas" category
-    And I visit the "53cm Pistas" page
-    Then I should see the "Bianchi Pista Size 53cm Medium - $500 (Downtown Denver)" in the list
-    And the url should be set to "http://denver.craigslist.org/bik/1195971789.html"
-
-  Scenario: Posting to a new category
-    When I post "Bianchi Pista Size 54cm Medium - $500 (Downtown Denver)" with a url of "http://denver.craigslist.org/bik/1195971789.html" to the "54cm Pistas" category
-    And I visit the "54cm Pistas" page
-    Then I should see the "Bianchi Pista Size 54cm Medium - $500 (Downtown Denver)" in the list
-    And the url should be set to "http://denver.craigslist.org/bik/1195971789.html"

data/lib/generators/twitter/templates/features/viewing_my_wish_list.feature

@@ -1,14 +0,0 @@
-Feature: Viewing my wish list
-  In order to display a users' preferences
-  As a twitter user
-
-  Background:
-    Given I am logged in
-    And I have created a "53cm Pistas" category
-
-  Scenario: After Authenticating
-    When I visit the home page
-    Then I should see my list of categories
-    When I enter "Prostitutes" for a new category
-    And I click submit
-    Then I should see the "Prostitutes" list

data/lib/generators/twitter/templates/features/viewing_the_site_for_the_first_time.feature

@@ -1,6 +0,0 @@
-Feature: Visiting the Home Page
-  In order to display a splash page
-  As an anonymous user
-    Scenario: Seeing the splash page
-    When I visit the home page
-    Then I should be greeted