singem 0.0.7 → 0.1.0

data/README.md

@@ -20,13 +20,13 @@ Basic Sinatra App, no sessions, cucumber testing
 ------------------------------------------------
     % singem foo
     % cd foo
-    % gem bundle
-    % bin/rake
+    % bundle install
+    % bundle exec rake
 
 Basic Twitter OAuth App,
 ------------------------------
     % singem --twitter foo
     % cd foo
-    % gem bundle
-    % rake
+    % bundle install
+    % bundle exec rake
     % open http://twitter.com/oauth_clients

data/Rakefile

@@ -4,7 +4,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "singem"
-GEM_VERSION = "0.0.7"
+GEM_VERSION = "0.1.0"
 AUTHOR = "Corey Donohoe"
 EMAIL = "atmos@atmos.org"
 HOMEPAGE = "http://github.com/atmos/singem"
@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
 
   s.add_dependency "rubigen"
-  s.add_dependency "bundler"
+  s.add_dependency "bundler", '~>0.9.3'
 
   s.bindir = "bin"
   s.executables = %w( singem )

data/lib/generators/cucumber/templates/Gemfile

@@ -1,5 +1,7 @@
-only :runtime do
-  gem 'rack_hoptoad',        '~>0.1.1', :require_as => 'rack/hoptoad'
+source :gemcutter
+
+group :runtime do
+  gem 'rack_hoptoad',        '~>0.1.1', :require => 'rack/hoptoad'
   gem 'haml',                '~>2.2.0'
   gem 'sinatra',             '~>0.9.4'
   #gem 'do_sqlite3',         '>=0.10.1.1'
@@ -8,24 +10,19 @@ only :runtime do
   #gem 'dm-timestamps',      '>=0.10.2'
 end
 
-only :development do
-  gem 'shotgun'
-end
-
-only :test do
+group :test do
   gem 'rake'
-  gem 'rspec',                       :require_as => 'spec'
+  gem 'rspec',                       :require => 'spec'
   gem 'rcov'
-  gem 'bundler',          '~>0.8.1'
+  gem 'shotgun'
+  gem 'bundler',          '~>0.9.3'
   gem 'cucumber'
   gem 'webrat',           '~>0.7.0'
-  gem 'rack-test',        '~>0.5.3', :require_as => 'rack/test'
+  gem 'rack-test',        '~>0.5.3', :require => 'rack/test'
   gem 'fakeweb',          '>=1.2.8'
   gem 'randexp',          '>=0.1.4'
-  #gem 'ParseTree',        '>=3.0.4', :require_as => [ ]
+  gem 'ParseTree',        '>=3.0.4', :require => [ ]
   #gem 'dm-sweatshop',     '~>0.10.2'
 end
 
-disable_system_gems
-
 # vim:ft=ruby

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

@@ -6,5 +6,5 @@ A sinatra app the provides a gem that...
 Developing
 ==========
     % gem install bundler
-    % gem bundle
-    % bin/rake
+    % bundle install
+    % bundle exec rake

data/lib/generators/cucumber/templates/Rakefile

@@ -18,7 +18,7 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_opts = %w(-fs --color)
   t.spec_opts << '--loadby' << 'random'
 
-  t.rcov_opts << '--exclude' << 'spec'
+  t.rcov_opts << '--exclude' << 'spec,.bundle'
   t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
   t.rcov_opts << '--text-summary'
   t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
@@ -43,10 +43,10 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  bundle = Bundler::Bundle.load(File.dirname(__FILE__) + '/Gemfile')
-  bundle.environment.dependencies.each do |dep|
-    next unless dep.only && dep.only.include?('runtime')
-    s.add_dependency(dep.name, dep.version.to_s)
+  bundle = Bundler::Definition.from_gemfile('Gemfile')
+  bundle.dependencies.each do |dep|
+    next unless dep.groups.include?(:runtime)
+    s.add_dependency(dep.name, dep.version_requirements.to_s)
   end
 
   s.require_path = 'lib'

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

@@ -1,4 +1,4 @@
-Bundler.require_env(:test)
+Bundler.require(:default, :runtime, :test)
 require File.join(File.dirname(__FILE__), '..', '..', 'lib', '<%= name %>')
 
 Webrat.configure do |config|

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

@@ -1,4 +1,4 @@
-Bundler.require_env(:test)
+Bundler.require(:default, :runtime, :test)
 
 require File.join(File.dirname(__FILE__), '..', 'lib', '<%= name %>')
 

data/lib/generators/twitter/templates/Gemfile

@@ -1,5 +1,7 @@
-only :runtime do
-  gem 'rack_hoptoad',       '~>0.1.1', :require_as => 'rack/hoptoad'
+source :gemcutter
+
+group :runtime do
+  gem 'rack_hoptoad',       '~>0.1.1', :require => 'rack/hoptoad'
   gem 'haml',               '~>2.2.0'
   gem 'sinatra',            '~>0.9.4'
   gem 'curb',               '>=0.3.7'
@@ -11,24 +13,19 @@ only :runtime do
   gem 'dm-timestamps',      '~>0.10.2'
 end
 
-only :development do
-  gem 'shotgun'
-end
-
-only :test do
+group :test do
   gem 'rake'
-  gem 'rspec',                       :require_as => 'spec'
+  gem 'rspec',                       :require => 'spec'
   gem 'rcov'
-  gem 'bundler',          '~>0.8.1'
+  gem 'shotgun'
+  gem 'bundler',          '~>0.9.3'
   gem 'cucumber'
   gem 'webrat',           '~>0.7.0'
-  gem 'rack-test',        '~>0.5.3', :require_as => 'rack/test'
+  gem 'rack-test',        '~>0.5.3', :require => 'rack/test'
   gem 'fakeweb',          '~>1.2.8'
   gem 'randexp',          '>=0.1.4'
-  #gem 'ParseTree',        '>=3.0.4', :require_as => [ ]
+  gem 'ParseTree',        '>=3.0.4', :require => [ ]
   #gem 'dm-sweatshop',     '~>0.10.2'
 end
 
-disable_system_gems
-
 # vim:ft=ruby

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

@@ -6,5 +6,5 @@ A gem that provides...
 Developing
 ==========
     % gem install bundler
-    % gem bundle
-    % bin/rake
+    % bundle install
+    % bundle exec rake

data/lib/generators/twitter/templates/Rakefile

@@ -18,7 +18,7 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_opts = %w(-fs --color)
   t.spec_opts << '--loadby' << 'random'
 
-  t.rcov_opts << '--exclude' << 'spec'
+  t.rcov_opts << '--exclude' << 'spec,.bundle'
   t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
   t.rcov_opts << '--text-summary'
   t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
@@ -43,10 +43,10 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  bundle = Bundler::Bundle.load(File.dirname(__FILE__) + '/Gemfile')
-  bundle.environment.dependencies.each do |dep|
-    next unless dep.only && dep.only.include?('runtime')
-    s.add_dependency(dep.name, dep.version.to_s)
+  bundle = Bundler::Definition.from_gemfile('Gemfile')
+  bundle.dependencies.each do |dep|
+    next unless dep.groups.include?(:runtime)
+    s.add_dependency(dep.name, dep.version_requirements.to_s)
   end
 
   s.require_path = 'lib'

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

@@ -1,4 +1,4 @@
-Bundler.require_env(:test)
+Bundler.require(:default, :runtime, :test)
 require File.join(File.dirname(__FILE__), '..', '..', 'lib', '<%= name %>')
 
 require 'spec/mocks'

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

@@ -5,7 +5,7 @@ module <%= name.camelize %>
     storage_names[:default] = '<%= name.camelize %>_users'
 
     property :id, Serial
-    property :twitter_id, Integer, :nullable => false, :unique => true
+    property :twitter_id, Integer, :required => true, :unique => true
     property :name, String
     property :token, String
     property :secret, String

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

@@ -1,4 +1,4 @@
-Bundler.require_env(:test)
+Bundler.require(:default, :runtime, :test)
 require File.join(File.dirname(__FILE__), '..', 'lib', '<%= name %>')
 require 'pp'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: singem
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -9,7 +9,7 @@ autorequire: singem
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -08:00
+date: 2010-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +28,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.3
     version: 
 description: A gem that provides generators for sinatra apps, ready to go with rack-test/webrat/randexp and others
 email: atmos@atmos.org