switchman 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3506567faae98c3df18544db429163ea0aed03
-  data.tar.gz: 8f354e57d9ce1342ce2f369a13fe485f92f6dcfa
+  metadata.gz: dd6a78ff6974c70fd495154833ff83a7b1408d89
+  data.tar.gz: a6ba5ec6032e7b82d808115cc09ce37d10a89b09
 SHA512:
-  metadata.gz: 4a9c5fb4a816d4e76f2991b5d39b23182c055d34771016edaeb181dda77c1f0c99c542d23fad4629b7d3ccc2202fa7954faf38b0006f76a333817a7b6e6dbd7b
-  data.tar.gz: 2e05febfa8a714552cbb27cdb0fb223d5c8442de344fb3cba606a5c4a566cac6a47df34d362991524ed5a0591a6d3e188666a33cbf3ab7b0874187488c2035d9
+  metadata.gz: 9a3a696130257d94b959fd6ef57e200196fe9993aa066a356b6ebde4ef56076ac342bbd8bc866eb45e1e0c9cd3229201972b039a02f209b258ecc2788fabfa6a
+  data.tar.gz: ce87fe2d582572246d05c7761b61fd3b4b1ce7dc49d90e0cf9037de78edfd73e67ba7641c87e6737320aca0b2ac30e8191d570f45ca82454ff045fc77dfc6158

data/app/models/switchman/shard.rb

@@ -8,4 +8,4 @@ ActiveRecord::Base
 # we need to make sure we define the class someone wanted (in which case
 # AR's on_load hook won't be called either yet, and establish_connection
 # will be safe)
-require 'switchman/shard_internal'
+require_dependency 'switchman/shard_internal'

data/lib/switchman/engine.rb

@@ -2,7 +2,7 @@ module Switchman
   class Engine < ::Rails::Engine
     isolate_namespace Switchman
 
-    config.autoload_once_paths << File.expand_path(File.join(__FILE__, "../../../app/models"))
+    config.autoload_once_paths << File.expand_path("app/models", config.paths.path)
 
     def self.lookup_stores(cache_store_config)
       result = {}
@@ -87,7 +87,7 @@ module Switchman
         require "switchman/call_super"
         require "switchman/rails"
         require "switchman/shackles/relation"
-        require "switchman/shard_internal"
+        require_dependency "switchman/shard_internal"
         require "switchman/standard_error"
 
         ::StandardError.include(StandardError)

data/lib/switchman/r_spec_helper.rb

@@ -118,7 +118,7 @@ module Switchman
       klass.before do
         raise "Sharding did not set up correctly" if @@sharding_failed
         Shard.clear_cache
-        if use_transactional_fixtures
+        if (::Rails.version >= '5' && use_transactional_tests) || use_transactional_fixtures
           Shard.default(true)
           @shard1 = Shard.find(@shard1.id)
           @shard2 = Shard.find(@shard2.id)
@@ -134,7 +134,7 @@ module Switchman
 
       klass.after do
         next if @@sharding_failed
-        if use_transactional_fixtures
+        if (::Rails.version >= '5' && use_transactional_tests) || use_transactional_fixtures
           shards = [@shard2]
           shards << @shard1 unless @shard1.database_server == Shard.default.database_server
           shards.each do |shard|

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.9.2"
+  VERSION = "1.9.3"
 end

data/lib/tasks/switchman.rake

@@ -60,21 +60,23 @@ module Switchman
         end
 
         ::Shackles.activate(:deploy) do
-          begin
-            categories = categories.call if categories.respond_to?(:call)
-            Shard.with_each_shard(scope, categories, options) do
-              shard = Shard.current
-              puts "#{shard.id}: #{shard.description}"
-              ::ActiveRecord::Base.connection_pool.spec.config[:shard_name] = Shard.current.name
-              ::ActiveRecord::Base.configurations[::Rails.env] = ::ActiveRecord::Base.connection_pool.spec.config.stringify_keys
-              shard.database_server.unshackle do
-                old_actions.each { |action| action.call(*task_args) }
+          Shard.default.database_server.unshackle do
+            begin
+              categories = categories.call if categories.respond_to?(:call)
+              Shard.with_each_shard(scope, categories, options) do
+                shard = Shard.current
+                puts "#{shard.id}: #{shard.description}"
+                ::ActiveRecord::Base.connection_pool.spec.config[:shard_name] = Shard.current.name
+                ::ActiveRecord::Base.configurations[::Rails.env] = ::ActiveRecord::Base.connection_pool.spec.config.stringify_keys
+                shard.database_server.unshackle do
+                  old_actions.each { |action| action.call(*task_args) }
+                end
+                nil
               end
-              nil
+            rescue => e
+              puts "Exception from #{e.current_shard.id}: #{e.current_shard.description}" if options[:parallel] != 0
+              raise
             end
-          rescue => e
-            puts "Exception from #{e.current_shard.id}: #{e.current_shard.description}" if options[:parallel] != 0
-            raise
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
 description: Sharding
 email:
 - cody@instructure.com
@@ -256,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic