piculet 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35c298f7269b6ac63e128e3eb6fc20d21ab354f2
-  data.tar.gz: bfcaa543bba0f3169d1bc356c33298d77b6d042e
+  metadata.gz: e5ddbcfcd3525e89ab78aac1a919fdfc3205ee08
+  data.tar.gz: 6d0dd75cd7d3c921c5612e2307c2f13845c1612d
 SHA512:
-  metadata.gz: c37cb0e2c593006952085d12e4cb9f9a7c1e934c1076a6c17b617c5c71411c1f8961dd5357a9317b0d24321ba2d92185537acbf604afbbf335bb18c1a9189edc
-  data.tar.gz: 77ee7caa9d2942021b6ff0639e72121ec85615d35fca63a306fd24c0159e10fa9cc2104aa171de61ae00921971bbd535acdf6a29de406b2edac1bb999ac9cab7
+  metadata.gz: d8d86a9858bda0dd333e7a2770b2678186e173066d87d98215089f5475228b79023e283e584ed38969d04ab5ff5d720e0cf2a8bddeffa41e35e2685e90b83815
+  data.tar.gz: dc6104babf9ee3f6e4c7b32cf41457f3f58c4e5c0c94d0d0ebc847686157e450d4bbd5f69242554d665100af39f7dd83fc0f5ef9fbc1adec943eda9733e23f49

data/bin/piculet

@@ -4,6 +4,8 @@ require 'rubygems'
 require 'piculet'
 require 'optparse'
 
+Version = Piculet::VERSION
+
 mode = nil
 file = 'Groupfile'
 output_file = '-'

data/lib/piculet.rb

@@ -1,3 +1,29 @@
-require 'piculet/version'
-require 'piculet/client'
+require 'forwardable'
+require 'logger'
+require 'ostruct'
+require 'set'
+require 'singleton'
+require 'term/ansicolor'
+
+require 'aws-sdk'
+
+require 'piculet/ext/ec2-owner-id-ext'
+require 'piculet/ext/security-group'
+require 'piculet/ext/ip-permission-collection-ext'
+require 'piculet/ext/string-ext'
+
 require 'piculet/logger'
+require 'piculet/client'
+require 'piculet/dsl'
+require 'piculet/dsl/converter'
+require 'piculet/dsl/ec2'
+require 'piculet/dsl/permission'
+require 'piculet/dsl/permissions'
+require 'piculet/dsl/security-group'
+require 'piculet/exporter'
+require 'piculet/version'
+require 'piculet/wrapper/ec2-wrapper'
+require 'piculet/wrapper/permission'
+require 'piculet/wrapper/permission-collection'
+require 'piculet/wrapper/security-group'
+require 'piculet/wrapper/security-group-collection'

data/lib/piculet/client.rb

@@ -1,10 +1,3 @@
-require 'aws-sdk'
-require 'piculet/dsl'
-require 'piculet/exporter'
-require 'piculet/ext/ec2-owner-id-ext'
-require 'piculet/wrapper/ec2-wrapper'
-require 'piculet/logger'
-
 module Piculet
   class Client
     include Logger::ClientHelper

data/lib/piculet/dsl.rb

@@ -1,7 +1,3 @@
-require 'ostruct'
-require 'piculet/dsl/ec2'
-require 'piculet/dsl/converter'
-
 module Piculet
   class DSL
     class << self

data/lib/piculet/dsl/converter.rb

@@ -79,7 +79,7 @@ end
         ].select {|i| i }.join.strip
 
         ip_ranges_groups.insert(0, "\n        ") unless ip_ranges_groups.empty?
-        
+
         <<-EOS
       permission #{args}do#{
         ip_ranges_groups}
@@ -105,7 +105,14 @@ end
           name_or_id = i[:name] || i[:id]
           owner_id = i[:owner_id]
 
-          arg = @owner_id == owner_id ? name_or_id : [owner_id, i[:id]]
+          if AWS::EC2::SecurityGroup.elb?(owner_id)
+            arg = AWS::EC2::SecurityGroup.elb_sg
+          elsif @owner_id == owner_id
+            arg = name_or_id
+          else
+            arg = [owner_id, i[:id]]
+          end
+
           arg.inspect
         }.join(",\n          ")
 

data/lib/piculet/dsl/ec2.rb

@@ -1,6 +1,3 @@
-require 'set'
-require 'piculet/dsl/security-group'
-
 module Piculet
   class DSL
     class EC2

data/lib/piculet/dsl/permission.rb

@@ -1,5 +1,3 @@
-require 'ostruct'
-
 module Piculet
   class DSL
     class EC2
@@ -42,7 +40,7 @@ module Piculet
 
               @result.ip_ranges = values
             end
- 
+
             def groups(*values)
               if values.empty?
                 raise ArgumentError, "SecurityGroup `#{@security_group}`: #{@direction}: #{@protocol_prot_range}: `groups`: wrong number of arguments (0 for 1..)"

data/lib/piculet/dsl/permissions.rb

@@ -1,6 +1,3 @@
-require 'ostruct'
-require 'piculet/dsl/permission'
-
 module Piculet
   class DSL
     class EC2

data/lib/piculet/dsl/security-group.rb

@@ -1,6 +1,3 @@
-require 'ostruct'
-require 'piculet/dsl/permissions'
-
 module Piculet
   class DSL
     class EC2

data/lib/piculet/exporter.rb

@@ -1,5 +1,3 @@
-require 'piculet/ext/ip-permission-collection-ext'
-
 module Piculet
   class Exporter
     class << self

data/lib/piculet/ext/ec2-owner-id-ext.rb

@@ -1,5 +1,3 @@
-require 'aws-sdk'
-
 module AWS
   class EC2
     DESC_OWNER_ID_RETRY_TIMES   = 3

data/lib/piculet/ext/ip-permission-collection-ext.rb

@@ -1,6 +1,3 @@
-require 'aws-sdk'
-require 'ostruct'
-
 module AWS
   class EC2
     class SecurityGroup
@@ -28,7 +25,6 @@ module AWS
               sleep DESC_SECURITY_GROUP_RETRY_WAIT
             end
           end
-          
 
           aggregated.map do |key, attrs|
             protocol, port_range = key

data/lib/piculet/ext/security-group.rb

@@ -0,0 +1,28 @@
+module AWS
+  class EC2
+    class SecurityGroup
+      ELB_OWNER = 'amazon-elb'
+      ELB_NAME = 'amazon-elb-sg'
+
+      def elb?
+        self.class.elb?(self.owner_id)
+      end
+
+      alias name_orig name
+
+      def name
+        self.elb? ? ELB_NAME : name_orig
+      end
+
+      class << self
+        def elb_sg
+          "#{ELB_OWNER}/#{ELB_NAME}"
+        end
+
+        def elb?(owner_or_name)
+          [ELB_OWNER, self.elb_sg].include?(owner_or_name)
+        end
+      end # of class methods
+    end # SecurityGroup
+  end # EC2
+end # AWS

data/lib/piculet/ext/string-ext.rb

@@ -1,5 +1,3 @@
-require 'term/ansicolor'
-
 class String
   @@colorize = false
 
@@ -13,11 +11,11 @@ class String
     end
   end # of class methods
 
-  Term::ANSIColor::Attribute.named_attributes.map do |attr|
+  Term::ANSIColor::Attribute.named_attributes.map do |attribute|
     class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-      def #{attr.name}
+      def #{attribute.name}
         if @@colorize
-          Term::ANSIColor.send(#{attr.name.inspect}, self)
+          Term::ANSIColor.send(#{attribute.name.inspect}, self)
         else
           self
         end

data/lib/piculet/logger.rb

@@ -1,7 +1,3 @@
-require 'logger'
-require 'singleton'
-require 'piculet/ext/string-ext'
-
 module Piculet
   class Logger < ::Logger
     include Singleton

data/lib/piculet/version.rb

@@ -1,5 +1,3 @@
 module Piculet
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end
-
-Version = Piculet::VERSION

data/lib/piculet/wrapper/ec2-wrapper.rb

@@ -1,5 +1,3 @@
-require 'piculet/wrapper/security-group-collection'
-
 module Piculet
   class EC2Wrapper
     def initialize(ec2, options)

data/lib/piculet/wrapper/permission-collection.rb

@@ -1,7 +1,3 @@
-require 'piculet/logger'
-require 'piculet/ext/ip-permission-collection-ext'
-require 'piculet/wrapper/permission'
-
 module Piculet
   class EC2Wrapper
     class SecurityGroupCollection
@@ -96,23 +92,30 @@ module Piculet
               when Array
                 owner_id, group = src
 
-                unless group =~ /\Asg-[0-9a-f]+\Z/
-                  sg_coll = @options.ec2.security_groups.filter('group-name', group)
-
-                  if @options.ec2.own?(owner_id)
-                    sg_coll = sg_coll.filter('vpc-id', @security_group.vpc_id) if @security_group.vpc?
-                  else
-                    sg_coll = sg_coll.filter('owner-id', owner_id)
+                if src.any? {|i| AWS::EC2::SecurityGroup.elb?(i) }
+                  normalized << {
+                    :user_id    => AWS::EC2::SecurityGroup::ELB_OWNER,
+                    :group_name => AWS::EC2::SecurityGroup::ELB_NAME
+                  }
+                else
+                  unless group =~ /\Asg-[0-9a-f]+\Z/
+                    sg_coll = @options.ec2.security_groups.filter('group-name', group)
+
+                    if @options.ec2.own?(owner_id)
+                      sg_coll = sg_coll.filter('vpc-id', @security_group.vpc_id) if @security_group.vpc?
+                    else
+                      sg_coll = sg_coll.filter('owner-id', owner_id)
+                    end
+
+                    unless (sg = sg_coll.first)
+                      raise "Can't find SecurityGroup: #{owner_id}/#{group} in #{@security_group.vpc_id || :classic}"
+                    end
+
+                    group = sg.id
                   end
 
-                  unless (sg = sg_coll.first)
-                    raise "Can't find SecurityGroup: #{owner_id}/#{group} in #{@security_group.vpc_id || :classic}"
-                  end
-
-                  group = sg.id
+                  normalized << {:user_id => owner_id, :group_id => group}
                 end
-
-                normalized << {:user_id => owner_id, :group_id => group}
               end
             end
 

data/lib/piculet/wrapper/permission.rb

@@ -1,6 +1,3 @@
-require 'forwardable'
-require 'piculet/logger'
-
 module Piculet
   class EC2Wrapper
     class SecurityGroupCollection
@@ -68,7 +65,13 @@ module Piculet
             def normalize_attrs(dsl)
               dsl_ip_ranges = (dsl.ip_ranges || []).sort
               dsl_groups = (dsl.groups || []).map {|i|
-                i.kind_of?(Array) ? i : [@options.ec2.owner_id, i]
+                if i.kind_of?(Array)
+                  i
+                elsif AWS::EC2::SecurityGroup.elb?(i)
+                  [AWS::EC2::SecurityGroup::ELB_OWNER, AWS::EC2::SecurityGroup::ELB_NAME]
+                else
+                  [@options.ec2.owner_id, i]
+                end
               }.sort
 
               self_ip_ranges, self_groups = normalize_self_attrs

data/lib/piculet/wrapper/security-group-collection.rb

@@ -1,7 +1,3 @@
-require 'ostruct'
-require 'piculet/logger'
-require 'piculet/wrapper/security-group'
-
 module Piculet
   class EC2Wrapper
     class SecurityGroupCollection

data/lib/piculet/wrapper/security-group.rb

@@ -1,7 +1,3 @@
-require 'forwardable'
-require 'piculet/logger'
-require 'piculet/wrapper/permission-collection'
-
 module Piculet
   class EC2Wrapper
     class SecurityGroupCollection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piculet
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -115,6 +115,7 @@ files:
 - lib/piculet/exporter.rb
 - lib/piculet/ext/ec2-owner-id-ext.rb
 - lib/piculet/ext/ip-permission-collection-ext.rb
+- lib/piculet/ext/security-group.rb
 - lib/piculet/ext/string-ext.rb
 - lib/piculet/logger.rb
 - lib/piculet/version.rb