singem 0.0.5 → 0.0.6

data/Rakefile

@@ -1,11 +1,10 @@
-require 'rubygems'
 require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
 require 'spec/rake/spectask'
 
 GEM = "singem"
-GEM_VERSION = "0.0.5"
+GEM_VERSION = "0.0.6"
 AUTHOR = "Corey Donohoe"
 EMAIL = "atmos@atmos.org"
 HOMEPAGE = "http://github.com/atmos/singem"
@@ -23,10 +22,8 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  s.add_dependency "sinatra", ">=0.9.2"
-  s.add_dependency "rack-test", ">=0.4.0"
-  s.add_dependency "webrat", "~>0.4.4"
-  s.add_dependency "fakeweb", "~>1.2.5"
+  s.add_dependency "rubigen"
+  s.add_dependency "bundler"
 
   s.bindir = "bin"
   s.executables = %w( singem )

data/bin/singem

@@ -4,12 +4,6 @@ require 'rubygems'
 require 'rubigen'
 require 'digest/sha1'
 
-if %w(-v --version).include? ARGV.first
-  require File.dirname(__FILE__) + "/../lib/newgem"
-  puts "#{File.basename($0)} #{Newgem::VERSION}"
-  exit(0)
-end
-
 require 'rubigen/scripts/generate'
 
 require "pp"

data/lib/generators/cucumber/templates/Gemfile

@@ -1,21 +1,25 @@
-gem 'rack_hoptoad',        '>=0.0.3'
+gem 'rack_hoptoad',        '>=0.0.4'
 gem 'haml',                '~>2.2.0'
 gem 'sinatra',             '~>0.9.4'
+gem 'shotgun'
 
-#gem 'do_sqlite3',         '>=0.9.12'
-#gem 'dm-validations',     '>=0.9.11'
-#gem 'dm-timestamps',      '>=0.9.11'
+#gem 'do_sqlite3',         '>=0.10.0'
+#gem 'dm-core',            '>=0.10.1'
+#gem 'dm-validations',     '>=0.10.1'
+#gem 'dm-timestamps',      '>=0.10.1'
 
-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]
+only :test do
+  gem 'rake'
+  gem 'rspec',                       :require_as => 'spec'
+  gem 'rcov'
+  gem 'bundler',          '>=0.7.0'
+  gem 'cucumber'
+  gem 'webrat',           '~>0.5.0'
+  gem 'rack-test',        '~>0.5.2', :require_as => 'rack/test'
+  gem 'fakeweb',          '>=1.2.5'
+  gem 'ParseTree',        '>=3.0.4', :require_as => [ ]
+  gem 'randexp',          '>=0.1.4'
+end
 
 disable_system_gems
 

data/lib/generators/cucumber/templates/Rakefile

@@ -1,4 +1,3 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environment'))
 require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
@@ -51,7 +50,6 @@ spec = Gem::Specification.new do |s|
   end
 
   s.require_path = 'lib'
-  s.autorequire = GEM
   s.files = %w(LICENSE README.md Rakefile TODO) + Dir.glob("{lib,features}/**/*")
 end
 

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

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environment'))
+Bundler.require_env
 require File.expand_path(File.join(File.dirname(__FILE__), 'lib', '<%= name %>'))
 
 #DataMapper.setup(:default, "mysql://atmos:fail@localhost/<%= name.capitalize %>_production")

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

@@ -1,9 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment'))
+Bundler.require_env(:test)
 require File.join(File.dirname(__FILE__), '..', '..', 'lib', '<%= name %>')
-require 'spec'
-require 'webrat'
-require 'rack/test'
-require 'fakeweb'
 
 Webrat.configure do |config|
   config.mode = :rack
@@ -11,19 +7,6 @@ Webrat.configure do |config|
 end
 
 module <%= name.camelize %>::AppHelpers
-  begin
-    gem 'safariwatir', '~>0.3.3'
-    require 'safariwatir'
-    def browser
-      @browser ||= Watir::Safari.new
-    end
-  rescue LoadError => e
-  end
-
-  def app_host
-    'http://localhost:9393/migration'
-  end
-
   def app
     <%= name.camelize %>.app
   end

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

@@ -1,13 +1,9 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', 'environment'))
+Bundler.require_env(:test)
 
 require File.join(File.dirname(__FILE__), '..', 'lib', '<%= name %>')
 
-require 'randexp'
-require 'rack/test'
-require 'webrat'
 #require 'dm-core'
 #require 'dm-sweatshop'
-require 'fakeweb'
 require 'pp'
 
 FakeWeb.allow_net_connect = false

data/lib/generators/twitter/templates/Gemfile

@@ -1,26 +1,29 @@
-gem 'rack_hoptoad',       '>=0.0.3'
+gem 'rack_hoptoad',       '>=0.0.4'
 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 'shotgun'
 
-gem 'do_sqlite3',         '>=0.9.12'
-gem 'dm-validations',     '>=0.9.11'
-gem 'dm-timestamps',      '>=0.9.11'
+gem 'do_sqlite3',         '~>0.10.0'
+gem 'dm-core',            '~>0.10.1'
+gem 'dm-validations',     '~>0.10.1'
+gem 'dm-timestamps',      '~>0.10.1'
 
-
-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]
+only :test do
+  gem 'rake'
+  gem 'rspec',                       :require_as => 'spec'
+  gem 'rcov'
+  gem 'bundler',          '>=0.7.0'
+  gem 'cucumber'
+  gem 'webrat',           '~>0.5.0'
+  gem 'rack-test',        '~>0.5.2', :require_as => 'rack/test'
+  gem 'fakeweb',          '>=1.2.5'
+  gem 'ParseTree',        '>=3.0.4', :require_as => [ ]
+  gem 'randexp',          '>=0.1.4'
+  gem 'dm-sweatshop',     '~>0.10.1'
+end
 
 disable_system_gems
 

data/lib/generators/twitter/templates/Rakefile

@@ -1,4 +1,3 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environment'))
 require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
@@ -51,7 +50,6 @@ spec = Gem::Specification.new do |s|
   end
 
   s.require_path = 'lib'
-  s.autorequire = GEM
   s.files = %w(LICENSE README.md Rakefile TODO) + Dir.glob("{lib,features}/**/*")
 end
 

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

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'vendor', 'gems', 'environment'))
+Bundler.require_env
 require File.join(File.dirname(__FILE__), 'lib', '<%= name %>')
 
 ENV['<%= name.upcase %>_READKEY'] = /\w{18}/.gen  # this should really be what twitter gives you

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

@@ -1,12 +1,7 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment'))
+Bundler.require_env(:test)
 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__)+'/../../spec/helpers'

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

@@ -1,10 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'gems', 'environment'))
+Bundler.require_env(:test)
 require File.join(File.dirname(__FILE__), '..', 'lib', '<%= name %>')
-
-require 'rack/test'
-require 'webrat'
-require 'dm-sweatshop'
-require 'fakeweb'
 require 'pp'
 
 FakeWeb.allow_net_connect = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: singem
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -9,48 +9,28 @@ autorequire: singem
 bindir: bin
 cert_chain: []
 
-date: 2009-09-17 00:00:00 -07:00
+date: 2009-11-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rubigen
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: bundler
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: webrat
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.4.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.2.5
+        version: "0"
     version: 
 description: A gem that provides generators for sinatra apps, ready to go with rack-test/webrat/randexp and others
 email: atmos@atmos.org