switchman 1.3.8 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f9aba599d3ef529a78c94fd5e94c2f204b7ccc
-  data.tar.gz: 5bf0f3c88787aec47ed93c41069cc7ad06054423
+  metadata.gz: c73ebcdb49c218c7550f44ec2087c7feb091ef45
+  data.tar.gz: e3e8e34ff693c05204617ba9e2c747db0a5fbc39
 SHA512:
-  metadata.gz: b44289cf27c475ffacc928e691c6e0698b771ebc840d742ffab6e7e926bf728ebff2c574bb403df221cbf51bfc46eeea18b2a62bde62e1a847972228eefb9b65
-  data.tar.gz: bb774752360b5b84cfa665b8c13f1dd3bba7fe5a4bd09007d453309d8003699c8e0917e17e3452222410746aaee6088d95b1d9cbc3aa2e5bcdf76ffd260afafd
+  metadata.gz: 86b7f9cc5f2453465a963bf13c9252556e12750f91ee2a9474eea826a13bde2f7c04c271ad91d2fc3f97b0046deb5ce38c285914f62d3fa4bf9e94d617889076
+  data.tar.gz: e365daa2f0fe7ba8de97d29a44d832200b7256dca79378bca1d341ea1696c32320ae06390c486bd25030081e8fe966f76115518a33a031a8c721c33b3d420d1d

data/lib/switchman/r_spec_helper.rb

@@ -12,6 +12,7 @@ module Switchman
   module RSpecHelper
     @@keep_the_shards = false
     @@shard1 = nil
+    @@sharding_failed = false
 
     def self.included_in?(klass)
       klass.parent_groups.any? { |group| group.included_modules.include?(self) }
@@ -27,6 +28,7 @@ module Switchman
       root_group = klass.parent_groups.last
       root_group.prepend_before(:all) do |group|
         next if @@shard1
+        next if @@sharding_failed
         # if we aren't actually going to run a sharding group/example,
         # don't set it up after all
         groups = group.class.descendant_filtered_examples.map(&:example_group).uniq
@@ -49,9 +51,21 @@ module Switchman
             else
               @@shard3 = @@shard1.database_server.create_new_shard
             end
-          rescue
+          rescue => e
+            $stderr.puts "Sharding setup FAILED!:"
+            while e
+              $stderr.puts "\n#{e}\n"
+              $stderr.puts e.backtrace
+              e = e.respond_to?(:cause) ? e.cause : nil
+            end
+            @@sharding_failed = true
+            (@@shard1.drop_database if @@shard1) rescue nil
+            (@@shard2.drop_database if @@shard3) rescue nil
+            (@@shard3.drop_database if @@shard3) rescue nil
             @@shard1 = @@shard2 = @@shard3 = nil
-            raise
+            Shard.delete_all
+            Shard.default(true)
+            next
           end
         end
         # we'll re-persist in the group's `before :all`; we don't want them to exist
@@ -81,6 +95,7 @@ module Switchman
       end
 
       klass.before(:all) do
+        next if @@sharding_failed
         dup = @@default_shard.dup
         dup.id = @@default_shard.id
         dup.save!
@@ -101,6 +116,7 @@ module Switchman
       end
 
       klass.before do
+        raise "Sharding did not set up correctly" if @@sharding_failed
         Shard.clear_cache
         if use_transactional_fixtures
           Shard.default(true)
@@ -130,6 +146,7 @@ module Switchman
       end
 
       klass.after do
+        next if @@sharding_failed
         if use_transactional_fixtures
           shards = [@shard2]
           shards << @shard1 unless @shard1.database_server == Shard.default.database_server

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties