piculet 0.2.6 → 0.2.7.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3746bec51eeb9809fced50bd28a1d855fca9a57c
-  data.tar.gz: 89da5f8f15a27ff91a3f2f77b2cabc37237b6941
+  metadata.gz: 7d9cafe5310dd7b6df5016c66c85dfc47f9a04c1
+  data.tar.gz: a261ba1ff4378fdf62dd876b90f57c71a0d56689
 SHA512:
-  metadata.gz: c6eb3eb1da6212073d27fdb4b9eb7c5fab351046d1fb2c70327d0df6b5d1c1b92213257e06a26f8c1a58654255cacd3aa8e9329162e601683ea6ef0422b4f893
-  data.tar.gz: 2ec0377fe861a5447b385c412e0f7ce6d040c6475be06099e250874fede57807a1e8a0cfe01023c53bd32d7436aa30c6675cec9631344a2fff463175c4ad07f2
+  metadata.gz: f1f778f163c7d3da3b924d9f9e313ca925b27d3967bd39549f2e405518067ea8681f43ef3cf3440f7ef1bfeeece5d1c8cb1c76d7276d22140d13ccbd4de0da19
+  data.tar.gz: 44f11549930395ba2ab2b28bbd035be43c1589b45ccf7b4369129ec96202cf555bcdd692b8e0f4b8581551fbd342b962f9661bea0975a3f0d899141f18807676

data/README.md

@@ -47,6 +47,7 @@ Usage: piculet [options]
     -a, --apply
     -f, --file FILE
     -n, --names SG_LIST
+    -x, --exclude SG_LIST
         --ec2s VPC_IDS
         --dry-run
     -e, --export

data/bin/piculet

@@ -29,21 +29,22 @@ ARGV.options do |opt|
     profile_name = nil
     credentials_path = nil
 
-    opt.on('-p', '--profile PROFILE_NAME')  {|v| profile_name                 = v       }
-    opt.on(''  , '--credentials-path PATH') {|v| credentials_path             = v       }
-    opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key                   = v       }
-    opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key                   = v       }
-    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       }
-    opt.on('',   '--split')                 {|v| split                        = true    }
-    opt.on(''  , '--no-color')              {    options[:color]              = false   }
-    opt.on(''  , '--debug')                 {    options[:debug]              = true    }
+    opt.on('-p', '--profile PROFILE_NAME')   {|v| profile_name                 = v       }
+    opt.on(''  , '--credentials-path PATH')  {|v| credentials_path             = v       }
+    opt.on('-k', '--access-key ACCESS_KEY')  {|v| access_key                   = v       }
+    opt.on('-s', '--secret-key SECRET_KEY')  {|v| secret_key                   = v       }
+    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('-x', '--exclude SG_LIST', Array) {|v| options[:exclude_sgs]        = 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       }
+    opt.on('',   '--split')                  {|v| split                        = true    }
+    opt.on(''  , '--no-color')               {    options[:color]              = false   }
+    opt.on(''  , '--debug')                  {    options[:debug]              = true    }
     opt.parse!
 
     aws_opts = {}
@@ -65,6 +66,14 @@ ARGV.options do |opt|
 
     aws_opts[:region] = region if region
     AWS.config(aws_opts)
+
+    # Remap groups to exclude to regular expressions (if they're surrounded by '/')
+    if options[:exclude_sgs]
+      options[:exclude_sgs].map! do |name|
+        name =~ /\A\/(.*)\/\z/ ? Regexp.new($1) : Regexp.new("\A#{Regexp.escape(name)}\z")
+      end
+    end
+
   rescue => e
     $stderr.puts("[ERROR] #{e.message}")
     exit 1

data/lib/piculet/client.rb

@@ -80,6 +80,10 @@ module Piculet
           next unless @options.sg_names.include?(name)
         end
 
+        if @options.exclude_sgs
+          next if @options.exclude_sgs.any? {|regex| name =~ regex}
+        end
+
         sg_aws = sg_list_aws[key]
 
         unless sg_aws
@@ -100,6 +104,10 @@ module Piculet
           next unless @options.sg_names.include?(name)
         end
 
+        if @options.exclude_sgs
+          next if @options.exclude_sgs.any? {|regex| name =~ regex}
+        end
+
         sg_aws = sg_list_aws.delete(key)
         walk_security_group(sg_dsl, sg_aws)
       end
@@ -111,6 +119,10 @@ module Piculet
           next unless @options.sg_names.include?(name)
         end
 
+        if @options.exclude_sgs
+          next if @options.exclude_sgs.any? {|regex| name =~ regex}
+        end
+
         sg_aws.ingress_ip_permissions.each {|i| i.delete }
         sg_aws.egress_ip_permissions.each {|i| i.delete } if vpc
       end
@@ -122,6 +134,10 @@ module Piculet
           next unless @options.sg_names.include?(name)
         end
 
+        if @options.exclude_sgs
+          next if @options.exclude_sgs.any? {|regex| name =~ regex}
+        end
+
         sg_aws.delete
       end
     end

data/lib/piculet/version.rb

@@ -1,3 +1,3 @@
 module Piculet
-  VERSION = "0.2.6"
+  VERSION = "0.2.7.beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piculet
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7.beta
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -146,9 +146,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14