From ed47f08c6a8e183bf0638a3529da932753702fdb Mon Sep 17 00:00:00 2001 From: Ben Mabey Date: Sun, 30 May 2010 21:18:57 -0600 Subject: [PATCH] adds bundler support Conflicts: .gitignore spec/spec_helper.rb --- .gitignore | 1 - Gemfile | 16 ++++++++++++++++ Rakefile | 4 ++++ spec/spec_helper.rb | 9 +++++++-- 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 Gemfile diff --git a/.gitignore b/.gitignore index 167cb6c..f6ff313 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,3 @@ pkg bundled_gems/ examples/db/*.db examples/config/database.yml -Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..7203a0f --- /dev/null +++ b/Gemfile @@ -0,0 +1,16 @@ +source "http://rubygems.org" +group :development do + gem "mysql" + gem "rspec", "1.3.0" + gem "cucumber" + gem "jeweler" + gem "mongo" + gem "mongo_ext" + gem "mongo_mapper" + gem "datamapper" + gem "couch_potato" + gem "activerecord" + gem "rake" + gem "ruby-debug" +end + diff --git a/Rakefile b/Rakefile index 8228022..593948d 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,7 @@ +require "rubygems" +require "bundler" +Bundler.setup + require 'rake' begin diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index e306a34..351be18 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,12 +1,17 @@ -require 'rubygems' +require "rubygems" +require "bundler" +Bundler.setup + require 'spec' #require 'active_record' #require 'mongo_mapper' $:.unshift(File.dirname(__FILE__) + '/../lib') require 'database_cleaner' -Spec::Runner.configure do |config| + +Spec::Runner.configure do |config| + end alias running lambda