fog-bouncer 0.0.6 → 0.0.8

data/fog-bouncer.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["dylanegan@gmail.com"]
   gem.description   = %q{A simple way to define and manage security groups for AWS with the backing support of fog.}
   gem.summary       = %q{A manage security.}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/dylanegan/fog-bouncer"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

data/lib/fog/bouncer/group.rb

@@ -128,7 +128,9 @@ module Fog
         return if @using.empty?
 
         @using.each do |definition|
-          add_source(definition[:source], &definition[:block])
+          definition[:sources].each do |source|
+            add_source(source, &definition[:block])
+          end
         end
       end
 

data/lib/fog/bouncer/security.rb

@@ -17,9 +17,9 @@ module Fog
         @accounts ||= { 'amazon-elb' => 'amazon-elb', 'self' => Fog::Bouncer.aws_account_id }
       end
 
-      def define(name, source, &block)
+      def define(name, sources, &block)
         raise SourceBlockRequired unless block_given?
-        @definitions[name] = { source: source, block: block }
+        @definitions[name] = { sources: Array(sources), block: block }
       end
 
       def definitions(name)
@@ -69,7 +69,9 @@ module Fog
 
         @using.each do |definition|
           @groups.each do |group|
-            group.add_source(definition[:source], &definition[:block])
+            definition[:sources].each do |source|
+              group.add_source(source, &definition[:block])
+            end
           end
         end
       end

data/lib/fog/bouncer/sources.rb

@@ -5,16 +5,23 @@ module Fog
   module Bouncer
     module Sources
       def self.for(source, group, &block)
-        if source =~ /^\d+\.\d+\.\d+.\d+\/\d+$/
+        begin
           CIDR.new(source, group, &block)
-        else
-          Group.new(source, group, &block)
+        rescue ArgumentError => e
+          if e.message =~ /Invalid IP/
+            Group.new(source, group, &block)
+          else
+            raise e
+          end
         end
       end
 
       class CIDR < Fog::Bouncer::Source
+        attr_reader :ip
+
         def initialize(source, group, &block)
-          source = IPAddress::IPv4.new(source).to_string
+          @ip = IPAddress::IPv4.new(source)
+          source = @ip.to_string
           super
         end
 

data/lib/fog/bouncer/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Bouncer
-    VERSION = "0.0.6"
+    VERSION = "0.0.8"
   end
 end

data/spec/support/security/private.rb

@@ -5,7 +5,7 @@ Fog::Bouncer.security :private do
     icmp :ping
   end
 
-  define :ssh, "0.0.0.0/0" do
+  define :ssh, ["0.0.0.0/0", "1.1.1.1/1"] do
     tcp 22
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-bouncer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -144,7 +144,7 @@ files:
 - spec/fog/bouncer_spec.rb
 - spec/helper.rb
 - spec/support/security/private.rb
-homepage: ''
+homepage: https://github.com/dylanegan/fog-bouncer
 licenses: []
 post_install_message: 
 rdoc_options: []