Permalink
Browse files

Fix up gem dependencies; don't require newgem via bundler; do it via …

…hoe plugin
  • Loading branch information...
1 parent b010811 commit 48adca86346d9c11ea3e27254afadcd6f59a9388 @drnic committed Jul 5, 2010
Showing with 19 additions and 9 deletions.
  1. +5 −4 Gemfile
  2. +9 −1 Gemfile.lock
  3. +2 −2 Rakefile
  4. +3 −2 spec/spec_helper.rb
View
@@ -5,23 +5,24 @@ gem 'builder','>= 2.1.2'
group :newgem do
gem 'hoe', '>= 2.6.1'
- gem 'newgem', '>= 1.5.2'
+ gem 'newgem', '>= 1.5.2', :require => nil
gem 'awesome_print'
end
group :development do
- gem "rspec", ">= 2.0.0.beta"
+ gem 'bundler'
+ gem 'rspec', ">= 2.0.0.beta"
gem 'cucumber', '0.8.3'
gem 'awesome_print'
end
group :spec do
- gem "rspec", ">= 2.0.0.beta"
+ gem 'rspec', ">= 2.0.0.beta"
gem 'awesome_print'
end
group :cucumber do
- gem "rspec", ">= 2.0.0.beta"
+ gem 'rspec', ">= 2.0.0.beta"
gem 'cucumber', '0.8.3'
gem 'awesome_print'
end
View
@@ -4,6 +4,8 @@ dependencies:
group:
- :newgem
version: ">= 1.5.2"
+ require: []
+
rspec:
group:
- :cucumber
@@ -12,6 +14,10 @@ dependencies:
group:
- :cucumber
version: ">= 0"
+ bundler:
+ group:
+ - :development
+ version: ">= 0"
cucumber:
group:
- :cucumber
@@ -35,6 +41,8 @@ specs:
version: 0.2.1
- builder:
version: 2.1.2
+- bundler:
+ version: 0.9.26
- diff-lcs:
version: 1.1.2
- trollop:
@@ -65,7 +73,7 @@ specs:
version: 2.0.0.beta.15
- rspec:
version: 2.0.0.beta.15
-hash: d84dcad7b0afc6afeef553ec4526e83650dd11ed
+hash: 4d2974262eac096880337a200d2ecb85b5ac2478
sources:
- Rubygems:
uri: http://gemcutter.org
View
@@ -5,11 +5,11 @@ Bundler.require :newgem
Hoe.plugin :newgem
Hoe.plugin :cucumberfeatures
-Hoe.spec 'choctop' do
+h = Hoe.spec 'choctop' do
developer 'Dr Nic Williams', 'drnicwilliams@gmail.com'
developer 'Chris Bailey', 'chris@cobaltedge.com'
developer 'Patrick Huesler', 'patrick.huesler@gmail.com'
- add_bundler_dependencies
end
+h.spec.add_bundler_dependencies
task :default => [:features, :spec]
View
@@ -1,5 +1,6 @@
-require 'rubygems'
-require 'spec'
+require "bundler"
+Bundler.setup
+Bundler.require :spec
$:.unshift(File.dirname(__FILE__) + '/../lib')
require 'choctop'

0 comments on commit 48adca8

Please sign in to comment.