fog-bouncer 0.2.5 → 0.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a2efd35d9c752f00569ed323f3daff266881c120
+  data.tar.gz: d0b9a15c0055b4d08dd74e8dde43bdeaa7013a9f
+SHA512:
+  metadata.gz: 515bb6caa2296ff0cea02c516df77772f7f0414ce38246a2867e3bd6e6bf650243cf6e9e245a007eae9ba181e23fd6d7d58dc5815dc9fa93c471c8cb44c0a543
+  data.tar.gz: 8dac91669d76a6e591b2cc718e9f70fd63bf3fbaef056675ae8e9fb96c3510f66a3f2e2cfff461d35bdcf33a5191cf394c3a7df277318d8c6afd23e8224f18a2

data/.travis.yml

@@ -1,47 +1,28 @@
 env:
   global:
-    - NO_SIMPLECOV=true
-    - secure: "hBuPzm8oDPYwDzutnwwOkc2cwMNPHuCcTqw9ZHnSJlPyKAIGLBvDca+Nqu/v\niqVS+H8p2vn8/Dj+Y4+OouyL83ibH5PLsMLGqFYQqJ2glj/8qozoq0EB1C5x\n2k7/EtK1fft4oJhyWvEOd92q5/kDYAwRsQYZqBn7E9Yu7D4zfnQ="
-    - secure: "UXDtqnEW0BUtATes/xYIHFFXwGsIJbxMs4dNb6yC2KplHUSenx/RhgVMnRhF\nvSBCFuTPXHHHQKg8SgrxRJe3M841sKZxfSkRJ2PYMoW1qNEhF86EMxvrMDfg\nQ6PM5SDRk3u1PiGNdVlgeRVKFKOTnBaySTGDRVBnTZmK/iYHv5A="
-    - secure: "jzm0Mn03H2wVsJbk+JxbZ0y2ptrMXKdfAs243W9Bd2PVg/no+CFxw7CDlvcT\n5IEB/3CFPTnbbFj0BMGa5hZFa6eSG4V4vKPRe5M10dx6807nho0G1xWHIj5b\nOok5u1YvDHuaZ6aGwo/oprMBRKh68mhgSYS/KfuFEdj689QVae4="
+  - NO_SIMPLECOV=true
+  - secure: Ys71anAIjNI1caD4vzbe8rchDxW01pYq7VPd+BNZl7L3XSeNh6BOKoB61Mxul2uxe+cmuOtgu2kWJaG8Q/2dc2Uk1WIlwPtDLI0RGkaXi1nxcA38wBzE/x5nWqnuO2IC8sH7dnJoCGJh6l3Wh1fa6atM+AumE+opMVmpjzv1XEE=
+  - secure: RRszwiF6zjaFdt9ChebyyxJhya4PVepnCVYn8AgBHsvpYtItn4y/1W5hyRvCAaqg+Fw7OXzjS+bDb0amln8PwEX7dbB8OIX0srRXlEmqZsxvp1aZO4QJE8mBU1SGeDz975/riEqM+WrUs0I3P+YoS0rzYAfDdrgOsZuMOXMv3RQ=
+  - secure: UvtPU/JRExEq0ZR5XclUxIsDw0TdYY2RXRRkrwghBm1od4OasFzv9lPnG3OSCxO9rTG/dxs7P2bzsCA9Z1wcvFvhudcp/uTAHhRh/Bs0iebpRzjXno51dvs86RfXdSuN2gsDhd8mehji8hqmlhwpSznujEekp3Vvtuca40aA/Tk=
   matrix:
-    - FOG_REAL=false
-    - FOG_REAL=true
-
+  - FOG_REAL=false
+  - FOG_REAL=true
 matrix:
   exclude:
-    - rvm: 1.9.2
-      env:
-        - FOG_REAL=true
-        - NO_SIMPLECOV=true
-        - secure: "hBuPzm8oDPYwDzutnwwOkc2cwMNPHuCcTqw9ZHnSJlPyKAIGLBvDca+Nqu/v\niqVS+H8p2vn8/Dj+Y4+OouyL83ibH5PLsMLGqFYQqJ2glj/8qozoq0EB1C5x\n2k7/EtK1fft4oJhyWvEOd92q5/kDYAwRsQYZqBn7E9Yu7D4zfnQ="
-        - secure: "UXDtqnEW0BUtATes/xYIHFFXwGsIJbxMs4dNb6yC2KplHUSenx/RhgVMnRhF\nvSBCFuTPXHHHQKg8SgrxRJe3M841sKZxfSkRJ2PYMoW1qNEhF86EMxvrMDfg\nQ6PM5SDRk3u1PiGNdVlgeRVKFKOTnBaySTGDRVBnTZmK/iYHv5A="
-        - secure: "jzm0Mn03H2wVsJbk+JxbZ0y2ptrMXKdfAs243W9Bd2PVg/no+CFxw7CDlvcT\n5IEB/3CFPTnbbFj0BMGa5hZFa6eSG4V4vKPRe5M10dx6807nho0G1xWHIj5b\nOok5u1YvDHuaZ6aGwo/oprMBRKh68mhgSYS/KfuFEdj689QVae4="
-    - rvm: jruby-19mode
-      env:
-        - FOG_REAL=true
-        - NO_SIMPLECOV=true
-        - secure: "hBuPzm8oDPYwDzutnwwOkc2cwMNPHuCcTqw9ZHnSJlPyKAIGLBvDca+Nqu/v\niqVS+H8p2vn8/Dj+Y4+OouyL83ibH5PLsMLGqFYQqJ2glj/8qozoq0EB1C5x\n2k7/EtK1fft4oJhyWvEOd92q5/kDYAwRsQYZqBn7E9Yu7D4zfnQ="
-        - secure: "UXDtqnEW0BUtATes/xYIHFFXwGsIJbxMs4dNb6yC2KplHUSenx/RhgVMnRhF\nvSBCFuTPXHHHQKg8SgrxRJe3M841sKZxfSkRJ2PYMoW1qNEhF86EMxvrMDfg\nQ6PM5SDRk3u1PiGNdVlgeRVKFKOTnBaySTGDRVBnTZmK/iYHv5A="
-        - secure: "jzm0Mn03H2wVsJbk+JxbZ0y2ptrMXKdfAs243W9Bd2PVg/no+CFxw7CDlvcT\n5IEB/3CFPTnbbFj0BMGa5hZFa6eSG4V4vKPRe5M10dx6807nho0G1xWHIj5b\nOok5u1YvDHuaZ6aGwo/oprMBRKh68mhgSYS/KfuFEdj689QVae4="
-    - rvm: rbx-19mode
-      env:
-        - FOG_REAL=true
-        - NO_SIMPLECOV=true
-        - secure: "hBuPzm8oDPYwDzutnwwOkc2cwMNPHuCcTqw9ZHnSJlPyKAIGLBvDca+Nqu/v\niqVS+H8p2vn8/Dj+Y4+OouyL83ibH5PLsMLGqFYQqJ2glj/8qozoq0EB1C5x\n2k7/EtK1fft4oJhyWvEOd92q5/kDYAwRsQYZqBn7E9Yu7D4zfnQ="
-        - secure: "UXDtqnEW0BUtATes/xYIHFFXwGsIJbxMs4dNb6yC2KplHUSenx/RhgVMnRhF\nvSBCFuTPXHHHQKg8SgrxRJe3M841sKZxfSkRJ2PYMoW1qNEhF86EMxvrMDfg\nQ6PM5SDRk3u1PiGNdVlgeRVKFKOTnBaySTGDRVBnTZmK/iYHv5A="
-        - secure: "jzm0Mn03H2wVsJbk+JxbZ0y2ptrMXKdfAs243W9Bd2PVg/no+CFxw7CDlvcT\n5IEB/3CFPTnbbFj0BMGa5hZFa6eSG4V4vKPRe5M10dx6807nho0G1xWHIj5b\nOok5u1YvDHuaZ6aGwo/oprMBRKh68mhgSYS/KfuFEdj689QVae4="
-
+  - rvm: 1.9.2
+    env: FOG_REAL=true
+  - rvm: 1.9.3
+    env: FOG_REAL=true
+  - rvm: jruby-19mode
+    env: FOG_REAL=true
 branches:
   only:
-    - master
-
+  - master
 language: ruby
-
+cache: bundler
 rvm:
-  - 1.9.2
-  - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
-
+- 2.1.1
+- 1.9.2
+- 1.9.3
+- jruby-19mode
 script: bundle exec rake test --trace

data/fog-bouncer.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Fog::Bouncer::VERSION
 
-  gem.add_dependency "clamp", "~> 0.3"
+  gem.add_dependency "clamp", "~> 0.5.0"
   gem.add_dependency "clarence", "1987.0.0"
   gem.add_dependency "fog", "~> 1.2"
   gem.add_dependency "ipaddress", "~> 0.8.0"

data/lib/fog/bouncer/group.rb

@@ -95,7 +95,7 @@ module Fog
 
         if remote? && permissions.any?
           log(revoke: true) do
-            remote.connection.revoke_security_group_ingress(name, "IpPermissions" => IPPermissions.from(permissions)) unless Fog::Bouncer.pretending?
+            remote.service.revoke_security_group_ingress(name, "IpPermissions" => IPPermissions.from(permissions)) unless Fog::Bouncer.pretending?
             permissions.each do |protocol|
               log({revoked: true}.merge(protocol.to_log))
               protocol.source.protocols.delete_if { |p| p == protocol } unless Fog::Bouncer.pretending?

data/lib/fog/bouncer/group_manager.rb

@@ -32,7 +32,7 @@ module Fog
           begin
             group.destroy
           rescue Fog::Compute::AWS::Error => exception
-            unless exception.message =~ /InvalidGroup.InUse/
+            unless exception.message =~ /InUse/
               raise
             end
             log group_in_use: true, group_name: group.name
@@ -56,7 +56,7 @@ module Fog
             begin
               group.destroy
             rescue Fog::Compute::AWS::Error => exception
-              unless exception.message =~ /InvalidGroup.InUse/
+              unless exception.message =~ /InUse/
                 raise
               end
               log group_in_use: true, group_name: group.name

data/lib/fog/bouncer/protocols.rb

@@ -72,7 +72,7 @@ module Fog
       class ICMP < Protocol
         ICMP_MAPPING = {
           all: -1,
-          ping: 8..0
+          ping: 0..8
         }
 
         ICMP_TYPE_RANGE = (-1..255)

data/lib/fog/bouncer/security.rb

@@ -37,10 +37,13 @@ module Fog
 
       def import_remote_groups
         Fog::Bouncer.fog.security_groups.each do |remote_group|
+          next if remote_group.vpc_id
           next if @specific_groups.any? && !@specific_groups.include?(remote_group.name)
           group = group(remote_group.name, remote_group.description)
           group.remote = remote_group
-          IPPermissions.to(group, remote_group.ip_permissions) if remote_group.ip_permissions
+          if remote_group.ip_permissions && remote_group.ip_permissions.all?{|p| %w[icmp tcp udp].include?(p["ipProtocol"]) }
+            IPPermissions.to(group, remote_group.ip_permissions)
+          end
         end
       end
 

data/lib/fog/bouncer/source_manager.rb

@@ -25,7 +25,7 @@ module Fog
 
       def create_missing_source_permissions
         if missing_source_permissions.any?
-          @group.remote.connection.authorize_security_group_ingress(@group.name, "IpPermissions" => IPPermissions.from(missing_source_permissions, :local_only => true)) unless Fog::Bouncer.pretending?
+          @group.remote.service.authorize_security_group_ingress(@group.name, "IpPermissions" => IPPermissions.from(missing_source_permissions, :local_only => true)) unless Fog::Bouncer.pretending?
           missing_source_permissions.each do |protocol|
             log({authorized: true}.merge(protocol.to_log))
             protocol.remote = true unless Fog::Bouncer.pretending?
@@ -41,7 +41,7 @@ module Fog
 
       def remove_extra_source_permissions
         if extra_source_permissions.any?
-          @group.remote.connection.revoke_security_group_ingress(@group.name, "IpPermissions" => IPPermissions.from(extra_source_permissions, :remote_only => true)) unless Fog::Bouncer.pretending?
+          @group.remote.service.revoke_security_group_ingress(@group.name, "IpPermissions" => IPPermissions.from(extra_source_permissions, :remote_only => true)) unless Fog::Bouncer.pretending?
           extra_source_permissions.each do |protocol|
             log({revoked: true}.merge(protocol.to_log))
             protocol.source.protocols.delete_if { |p| p == protocol } unless Fog::Bouncer.pretending?

data/lib/fog/bouncer/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Bouncer
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/spec/fog/bouncer/group_spec.rb

@@ -21,7 +21,7 @@ describe Fog::Bouncer do
 
     describe "use" do
       it "should include any source definition specified" do
-        @group.sources.find { |s| s.source == "0.0.0.0/0" && s.protocols.find { |p| p.type == "icmp" && p.from == 8 && p.to == 0 } }.wont_be_nil
+        @group.sources.find { |s| s.source == "0.0.0.0/0" && s.protocols.find { |p| p.type == "icmp" && p.from == 0 && p.to == 8 } }.wont_be_nil
       end
 
       it "should not create duplicate sources" do

data/spec/fog/bouncer/security_spec.rb

@@ -15,15 +15,15 @@ describe Fog::Bouncer::Security do
   describe "pretending" do
     before do
       Fog::Bouncer.pretend!
-      @groups = @fog.security_groups.all
-      @fog.security_groups.get('default').connection.authorize_security_group_ingress('default', "IpPermissions" => [{"Groups" => [], "IpRanges" => [{"CidrIp" => "0.0.0.0/0"}], "IpProtocol" => "icmp", "FromPort" => "-1", "ToPort" => "-1"}])
+      @groups = fog_security_groups
+      @fog.security_groups.get('default').service.authorize_security_group_ingress('default', "IpPermissions" => [{"Groups" => [], "IpRanges" => [{"CidrIp" => "0.0.0.0/0"}], "IpProtocol" => "icmp", "FromPort" => "-1", "ToPort" => "-1"}])
       @doorlist.sync
     end
 
     it "should not sync anything" do
       assert !@doorlist.groups.first.remote?
       @fog.security_groups.get('default').ip_permissions.wont_be_empty
-      @fog.security_groups.size.must_equal @groups.size
+      fog_security_groups.size.must_equal @groups.size
     end
   end
 
@@ -42,7 +42,7 @@ describe Fog::Bouncer::Security do
     end
 
     it "synchronises against AWS" do
-      @fog.security_groups.size.must_equal 4
+      fog_security_groups.size.must_equal 4
 
       fog_douchebag = @fog.security_groups.get('douchebag')
       douchebag = @doorlist.groups.find { |g| g.name == 'douchebag' }
@@ -91,8 +91,8 @@ describe Fog::Bouncer::Security do
     end
 
     it "removes all groups except default" do
-      @fog.security_groups.size.must_equal 1
-      @fog.security_groups.first.name.must_equal "default"
+      fog_security_groups.size.must_equal 1
+      fog_security_groups.first.name.must_equal "default"
     end
   end
 end

data/spec/helper.rb

@@ -27,8 +27,18 @@ def load_security(security)
   Fog::Bouncer.load File.dirname(__FILE__) + "/support/security/#{security}.rb"
 end
 
+def fog_security_groups
+  Fog::Bouncer.fog.security_groups.all.reject(&:vpc_id)
+end
+
 Fog.mock! unless ENV['FOG_REAL'] && ["1", "true"].include?(ENV['FOG_REAL'])
 
+class MiniTest::Spec
+  before :each do
+    Fog::Bouncer.pretend = false
+  end
+end
+
 MiniTest::Unit.after_tests do
   Fog::Bouncer.doorlists.each do |name, doorlist|
     doorlist.groups.each do |group|

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: fog-bouncer
 version: !ruby/object:Gem::Version
-  version: 0.2.5
-  prerelease: 
+  version: 0.2.6
 platform: ruby
 authors:
 - Dylan Egan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: clarence
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,81 +41,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: scrolls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple way to define and manage security groups for AWS with the backing
@@ -132,9 +117,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .simplecov
-- .travis.yml
+- ".gitignore"
+- ".simplecov"
+- ".travis.yml"
 - Gemfile
 - Makefile
 - README.md
@@ -165,27 +150,26 @@ files:
 - spec/support/security/private.rb
 homepage: https://github.com/dylanegan/fog-bouncer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A manage security.
 test_files:
 - spec/fog/bouncer/group_spec.rb