Updated gem dependencies, migrated to database_cleaner 0.6.x

andriusch · Feb 10, 2011 · 6d8fdb9 · 6d8fdb9
1 parent 1c3e152
commit 6d8fdb9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     blueprints (0.9.0)
       activesupport (>= 2.3.0)
-      database_cleaner (~> 0.5.0)
+      database_cleaner (~> 0.6.1)
 
 GEM
   remote: http://rubygems.org/
@@ -20,8 +20,8 @@ GEM
     activesupport (3.0.4)
     addressable (2.2.4)
     arel (2.0.8)
-    bson (1.2.0)
-    bson_ext (1.2.0)
+    bson (1.2.1)
+    bson_ext (1.2.1)
     builder (2.1.2)
     cucumber (0.10.0)
       builder (>= 2.1.2)
@@ -31,7 +31,7 @@ GEM
       term-ansicolor (~> 1.0.5)
     data_objects (0.10.3)
       addressable (~> 2.1)
-    database_cleaner (0.5.2)
+    database_cleaner (0.6.3)
     diff-lcs (1.1.2)
     dm-core (1.0.2)
       addressable (~> 2.2)
@@ -57,8 +57,8 @@ GEM
     json (1.4.6)
     mocha (0.9.11)
       rake
-    mongo (1.2.0)
-      bson (>= 1.2.0)
+    mongo (1.2.1)
+      bson (>= 1.2.1)
     mongo_mapper (0.8.6)
       activesupport (>= 2.3.4)
       jnunemaker-validatable (~> 1.8.4)
@@ -95,7 +95,7 @@ DEPENDENCIES
   bson_ext (>= 1.1.4)
   bundler (>= 1.0.0)
   cucumber (>= 0.7.0)
-  database_cleaner (~> 0.5.0)
+  database_cleaner (~> 0.6.1)
   dm-migrations (>= 1.0.0)
   dm-mysql-adapter (>= 1.0.0)
   dm-transactions (>= 1.0.0)

diff --git a/blueprints.gemspec b/blueprints.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
 
   s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
-  s.add_runtime_dependency(%q<database_cleaner>, ["~> 0.5.0"])
+  s.add_runtime_dependency(%q<database_cleaner>, ["~> 0.6.1"])
   s.add_development_dependency(%q<rspec>, ["~> 2.0"])
   s.add_development_dependency(%q<mysql2>)
   s.add_development_dependency(%q<activerecord>, [">= 2.3.0"])

diff --git a/lib/blueprints.rb b/lib/blueprints.rb
@@ -11,7 +11,7 @@
 require 'set'
 
 files = %w{
-configuration context buildable namespace root_namespace blueprint helper errors dependency extensions database_cleaner_fix
+configuration context buildable namespace root_namespace blueprint helper errors dependency extensions
 }
 files.each { |f| require "blueprints/#{f}" }
 
@@ -144,6 +144,6 @@ def self.enumerator_class
 
   def self.if_orm
     yield
-  rescue DatabaseCleaner::NoORMDetected, DatabaseCleaner::NoStrategySetError
+  rescue DatabaseCleaner::NoORMDetected
   end
 end
diff --git a/lib/blueprints/database_cleaner_fix.rb b/lib/blueprints/database_cleaner_fix.rb