shackles 1.0.5 → 1.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2NhN2Y5OTQ2OTQwNWZjY2EzMWZmMjkwYTY2YzdiYjU5MTk4NmU3YQ==
+    MGZlYjI5ZDg0YmU2MDQ0MmI4YmRlYTc1ODQxODU3Zjg4NzBlNDhlOA==
   data.tar.gz: !binary |-
-    YWE3ZDY1NGM0MDA2ZjhjZGUxMzc5NDE4ODk1N2ZmMDE4MDgyOWM5Nw==
+    ODdmYzI1NGFhN2ZjNDZjNDdhY2VhMzJkN2VlNjJhZjg0OTBhOTEwNA==
 SHA512:
   metadata.gz: !binary |-
-    YWYxYzhjZTI2NDQzYjMwNjIxMzExNjZjZGUzODdmZTBjZDdmYjJlOTE5MTQ5
-    ODY0NzFmMGRlZjY1ZTc0MjM0YTc0ZjYwNzdhY2VkN2FiZWU5ZGIwZDU1MmZm
-    YTk5NmJjNWMzOTJiNDg3NzMzMWQwYmZlMGQxYjFiOGFjYWYxNzY=
+    Y2E0ZWMwY2M1ZmVlNzNmNjI3YTA1NDM4YTVlZGVlNDcwMmExMDIxNGE4ZTgw
+    MDczNjgwNGJkMDhmYTRhMjk4YjIxZjIyMDY2NTZiYzBjNWYyZmQ2ZWE5ZTQ5
+    MDcxMjYwZDYxZjAwMzg1OWQwYWJkOWRlN2YzMDY0YzZkYTFmNTg=
   data.tar.gz: !binary |-
-    MzdhZjY4MGVlYWRiZDNjZmJjYzVlMWI0M2VmN2Q5OThhOGUwNTlhNmZhMDdm
-    MTc4ODRlOTVmNDI3YWM1NWE2ODVlM2IwMzEzMjU3YzAzOTQwMmQyMWU0ZmVm
-    MzQ4MTdlMmM3MWYwYWJiNTkwMWNjNDA0YzcwNGVhYjAzMWNmNmU=
+    ZDA0ZDJiYmFhZTEwYzA5ZGI0NDkzYzYwMDU3YmUzNTQwNjA0ZjVkMTQ3NWQw
+    YWNmNzk4YWJlZjdkYWUyZmVkM2IxYzdmMTc3YTBiZWYxZDQwN2Y2MGI3YjBl
+    MTIxYTYzZjk5YmVmNmIyYjRhNTNlOTYyNDcyNWFhYmJjZDUxNzE=

data/lib/shackles/version.rb

@@ -1,3 +1,3 @@
 module Shackles
-  VERSION = "1.0.5"
+  VERSION = "1.0.7"
 end

data/lib/shackles.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Shackles
   class << self
     def environment
@@ -8,11 +10,17 @@ module Shackles
       @global_config ||= {}
     end
 
+    def activated_environments
+      @activated_environments ||= Set.new()
+    end
+
     # semi-private
     def initialize!
       require 'shackles/connection_handler'
       require 'shackles/connection_specification'
 
+      activated_environments << Shackles.environment
+
       ActiveRecord::ConnectionAdapters::ConnectionHandler.send(:include, ConnectionHandler)
       klass = Rails.version < '4' ? ActiveRecord::Base : ActiveRecord::ConnectionAdapters
       klass::ConnectionSpecification.send(:include, ConnectionSpecification)
@@ -52,6 +60,7 @@ module Shackles
       return yield if environment == self.environment
       begin
         old_environment = activate!(environment)
+        activated_environments << environment
         yield
       ensure
         @environment = old_environment

data/spec/shackles_spec.rb

@@ -112,6 +112,13 @@ describe Shackles do
       ActiveRecord::Base.connection.should == conn
     end
 
+    it "should track all activated environments" do
+      Shackles.activate(:slave) {}
+      Shackles.activate(:custom) {}
+      expected = Set.new([:master, :slave, :custom])
+      (Shackles.activated_environments & expected).should == expected
+    end
+
     context "non-transactional" do
       it "should really disconnect all envs" do
         ActiveRecord::Base.connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shackles
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Cody Cutrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.2'
     - - <
       - !ruby/object:Gem::Version
         version: '4.2'
@@ -26,24 +26,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.2'
     - - <
       - !ruby/object:Gem::Version
         version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: ActiveRecord database environment switching for slaves and least-privilege