piculet 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2YwYTA3MWY5YTBlYzNlZDY0MTBiZjA0OTRkYzVmMDVhNTNiODg0OQ==
-  data.tar.gz: !binary |-
-    ZTgzYWIxZjBhODE1ZjBmNzZkZTg2YWM5ODBjZjYxOGQ5MmRjYzc4NA==
+SHA1:
+  metadata.gz: b7be7c72108966fd702024bbf57244efd91de9a7
+  data.tar.gz: 885ae36b3897675d9255e56c9efcd79756c10963
 SHA512:
-  metadata.gz: !binary |-
-    NTM5YzcwNDY1Mzc3YWViNWNmNWI4ZTVlNTg2MWQ3MDc1NDdiNGU5NDU4MTA4
-    NWNjMGRmNDM0ZTZmM2I3NjBhYjFjNjI5NWI2MjkyYTcwMWVlN2RmZWY1NjJk
-    OWY3ZTFjNDBlZTFlNjM2ODczODNhYzExNTliMzc4Yjc0NDg2MGQ=
-  data.tar.gz: !binary |-
-    MjdiNmM0ZjJmMjM3YWZjN2I1NmZhZjU5YzI5MDA4NzhjYzc5NmExY2QzZGU2
-    OTFjOWM3MGUyMjE1ZGFkNGExNTkwNGY1MGE0MzMwNWU4YWJiM2RjYjI5OTc5
-    MzFlY2Y2ODIxMWFiYWQxMTkxMWNkZWYyYjRkODg2NzRjZTdlZjQ=
+  metadata.gz: ac5cf7f08e29eb902cdc5b60b3b0c104f5d44f84131a20d5132c2836f7d8db3621f22530c8faac1814fef25212b36f0ec133b9cedc4a3f2b44243a4fa6e48bed
+  data.tar.gz: 465276c6d0464a38ee8cf6e51e57584f52b25543596f7040dc1137729cb339fab54d7e323a147419aa4841954112e3c2810523360325eb0379e38ce5f9fd7f0d

data/README.md

@@ -4,6 +4,7 @@ Piculet is a tool to manage EC2 Security Group.
 
 It defines the state of EC2 Security Group using DSL, and updates EC2 Security Group according to DSL.
 
+[![Gem Version](https://badge.fury.io/rb/piculet.png)](http://badge.fury.io/rb/piculet)
 [![Build Status](https://drone.io/bitbucket.org/winebarrel/piculet/status.png)](https://drone.io/bitbucket.org/winebarrel/piculet/latest)
 
 ## Installation
@@ -124,6 +125,3 @@ ec2 "vpc-XXXXXXXX" do
   end
 end
 ```
-
-## Link
-* [RubyGems.org site](http://rubygems.org/gems/piculet)

data/bin/piculet

@@ -26,6 +26,8 @@ ARGV.options do |opt|
     opt.on('-r', '--region REGION')         {|v| region                       = v       }
     opt.on('-a', '--apply')                 {|v| mode                         = :apply  }
     opt.on('-f', '--file FILE')             {|v| file                         = v       }
+    opt.on('-n', '--names SG_LIST', Array)  {|v| options[:sg_names]           = v       }
+    opt.on('',   '--ec2s VPC_IDS', Array)   {|v| options[:ec2s]               = v       }
     opt.on('',   '--dry-run')               {|v| options[:dry_run]            = true    }
     opt.on('-e', '--export')                {|v| mode                         = :export }
     opt.on('-o', '--output FILE')           {|v| output_file                  = v       }
@@ -73,7 +75,7 @@ begin
       output_file = 'Groupfile' if output_file == '-'
       requires = []
 
-      client.export do |exported, converter|
+      client.export(options) do |exported, converter|
         exported.each do |vpc, security_groups|
           group_file = File.join(File.dirname(output_file), "#{vpc || :classic}.group")
           requires << group_file
@@ -96,10 +98,10 @@ begin
     else
       if output_file == '-'
         logger.info('# Export SecurityGroup')
-        puts client.export
+        puts client.export(options)
       else
         logger.info("Export SecurityGroup to `#{output_file}`")
-        open(output_file, 'wb') {|f| f.puts client.export }
+        open(output_file, 'wb') {|f| f.puts client.export(options) }
       end
     end
   when :apply

data/lib/piculet/client.rb

@@ -19,8 +19,10 @@ module Piculet
       AWS.memoize { walk(file) }
     end
 
-    def export
-      exported = AWS.memoize { Exporter.export(@options.ec2) }
+    def export(options = {})
+      exported = AWS.memoize do
+        Exporter.export(@options.ec2, options)
+      end
 
       if block_given?
         converter = proc do |src|
@@ -57,6 +59,10 @@ module Piculet
       end
 
       dsl_ec2s.each do |vpc, ec2_dsl|
+        if @options.ec2s
+          next unless @options.ec2s.any? {|i| (i == 'classic' and vpc.nil?) or i == vpc }
+        end
+
         ec2_aws = aws_ec2s[vpc]
 
         if ec2_aws
@@ -75,6 +81,11 @@ module Piculet
 
       sg_list_dsl.each do |key, sg_dsl|
         name = key[0]
+
+        if @options.sg_names
+          next unless @options.sg_names.include?(name)
+        end
+
         sg_aws = sg_list_aws[key]
 
         unless sg_aws
@@ -85,16 +96,33 @@ module Piculet
 
       sg_list_dsl.each do |key, sg_dsl|
         name = key[0]
+
+        if @options.sg_names
+          next unless @options.sg_names.include?(name)
+        end
+
         sg_aws = sg_list_aws.delete(key)
         walk_security_group(sg_dsl, sg_aws)
       end
 
       sg_list_aws.each do |key, sg_aws|
+        name = key[0]
+
+        if @options.sg_names
+          next unless @options.sg_names.include?(name)
+        end
+
         sg_aws.ingress_ip_permissions.each {|i| i.delete }
         sg_aws.egress_ip_permissions.each {|i| i.delete } if vpc
       end
 
       sg_list_aws.each do |key, sg_aws|
+        name = key[0]
+
+        if @options.sg_names
+          next unless @options.sg_names.include?(name)
+        end
+
         sg_aws.delete
       end
     end

data/lib/piculet/exporter.rb

@@ -3,21 +3,31 @@ require 'piculet/ext/ip-permission-collection-ext'
 module Piculet
   class Exporter
     class << self
-      def export(ec2)
-        self.new(ec2).export
+      def export(ec2, options = {})
+        self.new(ec2, options).export
       end
     end # of class methods
 
-    def initialize(ec2)
+    def initialize(ec2, options = {})
       @ec2 = ec2
+      @options = options
     end
 
     def export
       result = {}
+      ec2s = @options[:ec2s]
+      sg_names = @options[:sg_names]
+      sgs = @ec2.security_groups
+      sgs = sgs.filter('group-name', *sg_names) if sg_names
 
-      @ec2.security_groups.each do |sg|
+      sgs.each do |sg|
         vpc = sg.vpc
         vpc = vpc.id if vpc
+
+        if ec2s
+          next unless ec2s.any? {|i| (i == 'classic' and vpc.nil?) or i == vpc }
+        end
+
         result[vpc] ||= {}
         result[vpc][sg.id] = export_security_group(sg)
       end

data/lib/piculet/version.rb

@@ -1,5 +1,5 @@
 module Piculet
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end
 
 Version = Piculet::VERSION

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: piculet
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Piculet is a tool to manage EC2 Security Group.