fog-bouncer 0.2.2 → 0.2.3

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 *.swp

data/.travis.yml

@@ -1,4 +1,36 @@
-env: NO_SIMPLECOV=true
+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="
+  matrix:
+    - 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="
 
 language: ruby
 

data/fog-bouncer.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Fog::Bouncer::VERSION
 
   gem.add_dependency "clamp", "~> 0.3.0"
+  gem.add_dependency "clarence", "1987.0.0"
   gem.add_dependency "fog", "~> 1.2"
   gem.add_dependency "ipaddress", "~> 0.8.0"
   gem.add_dependency "jruby-openssl", "~> 0.7.6" if RUBY_PLATFORM == "java"

data/lib/fog/bouncer/cli/diff.rb

@@ -20,8 +20,18 @@ module Fog
 
       class Diff
         class EC2
+          attr_reader :doorlist
+
           def self.diff(doorlist)
-            doorlist.groups.each do |group|
+            new(doorlist).diff
+          end
+
+          def initialize(doorlist)
+            @doorlist = doorlist
+          end
+
+          def diff
+            @doorlist.groups.each do |group|
               if group.local? && !group.remote?
                 puts "ec2-create-group #{group.name} -d '#{group.description}'"
               end
@@ -29,29 +39,9 @@ module Fog
               group.sources.each do |source|
                 source.protocols.each do |protocol|
                   if protocol.local? && !protocol.remote?
-                    authorize_cmd = "ec2-authorize #{protocol.group.name} -P #{protocol.type}"
-                    if protocol.type == "icmp"
-                      authorize_cmd << " -t #{protocol.from}:#{protocol.to}"
-                    else
-                      authorize_cmd << " -p #{protocol.from}-#{protocol.to}"
-                    end
-
-                    if source.is_a?(Fog::Bouncer::Sources::CIDR)
-                      authorize_cmd << " -s #{source.range}"
-                    else
-                      authorize_cmd << " -u #{source.user_id} -o #{source.name}"
-                    end
-
-                    puts authorize_cmd
+                    puts command(protocol, :authorize)
                   elsif !protocol.local? && protocol.remote?
-                    revoke_cmd = "ec2-revoke #{protocol.group.name} -P #{protocol.type}"
-                    if protocol.type == "icmp"
-                      revoke_cmd << " -t #{protocol.from}:#{protocol.to}"
-                    else
-                      revoke_cmd << " -p #{protocol.from}-#{protocol.to}"
-                    end
-
-                    puts revoke_cmd
+                    puts command(protocol, :revoke)
                   end
                 end
               end
@@ -61,6 +51,27 @@ module Fog
               end
             end
           end
+
+          private
+
+          def command(protocol, action)
+            cmd = "ec2-#{action} #{protocol.group.name} -P #{protocol.type}"
+            source = protocol.source
+
+            if protocol.type == "icmp"
+              cmd << " -t #{protocol.from}:#{protocol.to}"
+            else
+              cmd << " -p #{protocol.from}-#{protocol.to}"
+            end
+
+            if source.is_a?(Fog::Bouncer::Sources::CIDR)
+              cmd << " -s #{source.range}"
+            else
+              cmd << " -u #{source.user_id} -o #{source.name}"
+            end
+
+            cmd
+          end
         end
 
         FORMATS = {

data/lib/fog/bouncer/version.rb

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

data/spec/helper.rb

@@ -1,3 +1,8 @@
+if ENV['TRAVIS_PULL_REQUEST'] && ["1", "true"].include?(ENV['TRAVIS_PULL_REQUEST']) && ENV['FOG_REAL'] && ["1", "true"].include?(ENV['FOG_REAL'])
+  require "clarence"
+  Bitches.leave
+end
+
 require "simplecov" unless ENV['NO_SIMPLECOV']
 require 'minitest/autorun'
 
@@ -22,7 +27,7 @@ def load_security(security)
   Fog::Bouncer.load File.dirname(__FILE__) + "/support/security/#{security}.rb"
 end
 
-Fog.mock! unless ENV['FOG_REAL']
+Fog.mock! unless ENV['FOG_REAL'] && ["1", "true"].include?(ENV['FOG_REAL'])
 
 MiniTest::Unit.after_tests do
   Fog::Bouncer.doorlists.each do |name, doorlist|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-bouncer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: clarence
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1987.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1987.0.0
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement