fog-bouncer 0.2.3 → 0.2.4

data/.travis.yml

@@ -32,6 +32,10 @@ matrix:
         - secure: "UXDtqnEW0BUtATes/xYIHFFXwGsIJbxMs4dNb6yC2KplHUSenx/RhgVMnRhF\nvSBCFuTPXHHHQKg8SgrxRJe3M841sKZxfSkRJ2PYMoW1qNEhF86EMxvrMDfg\nQ6PM5SDRk3u1PiGNdVlgeRVKFKOTnBaySTGDRVBnTZmK/iYHv5A="
         - secure: "jzm0Mn03H2wVsJbk+JxbZ0y2ptrMXKdfAs243W9Bd2PVg/no+CFxw7CDlvcT\n5IEB/3CFPTnbbFj0BMGa5hZFa6eSG4V4vKPRe5M10dx6807nho0G1xWHIj5b\nOok5u1YvDHuaZ6aGwo/oprMBRKh68mhgSYS/KfuFEdj689QVae4="
 
+branches:
+  only:
+    - master
+
 language: ruby
 
 rvm:

data/lib/fog/bouncer/group.rb

@@ -88,11 +88,10 @@ module Fog
               unless Fog::Bouncer.pretending?
                 remote.destroy
                 @remote = nil
-                @security.groups.delete_if { |g| g.name == name }
               end
             end
           else
-            log(destroy: false, group_name: name)
+            log(destroy: false)
           end
         end
       end

data/lib/fog/bouncer/group_manager.rb

@@ -23,10 +23,12 @@ module Fog
 
       def clear
         @security.groups.each do |group|
+          log clear: true, revoke: true, group_name: group.name
           group.revoke
         end
 
         @security.groups.each do |group|
+          log clear: true, destroy: true, group_name: group.name
           begin
             group.destroy
           rescue Fog::Compute::AWS::Error => exception

data/lib/fog/bouncer/security.rb

@@ -60,6 +60,13 @@ module Fog
         GroupManager.new(self).clear
       end
 
+      def clear_remote!
+        log clear_remote!: true
+        until groups.select { |g| g.remote? }.size == 1
+          clear_remote
+        end
+      end
+
       private
 
       def account(name, account_id)
@@ -88,6 +95,14 @@ module Fog
 
         group
       end
+
+      def self.log(data, &block)
+        Fog::Bouncer.log({ security: true }.merge(data), &block)
+      end
+
+      def log(data, &block)
+        self.class.log({ name: name }.merge(data), &block)
+      end
     end
   end
 end

data/lib/fog/bouncer/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Bouncer
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/spec/fog/bouncer/security_spec.rb

@@ -82,4 +82,17 @@ describe Fog::Bouncer::Security do
       @doorlist.clear_remote
     end
   end
+
+  describe "#clear_remote!" do
+    before do
+      @doorlist.sync
+      @doorlist.clear_remote!
+      @fog.security_groups.reload
+    end
+
+    it "removes all groups except default" do
+      @fog.security_groups.size.must_equal 1
+      @fog.security_groups.first.name.must_equal "default"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-bouncer
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp