piculet 0.0.1 → 0.0.2

data/README.md

@@ -1,8 +1,10 @@
 # Piculet
 
-Piculet is a tool to manage Security Group.
+Piculet is a tool to manage EC2 Security Group.
 
-It defines the state of Security Group using DSL, and updates Security Group according to DSL.
+It defines the state of EC2 Security Group using DSL, and updates EC2 Security Group according to DSL.
+
+[![Build Status](https://drone.io/bitbucket.org/winebarrel/piculet/status.png)](https://drone.io/bitbucket.org/winebarrel/piculet/latest)
 
 ## Installation
 
@@ -20,17 +22,18 @@ Or install it yourself as:
 
 ## Usage
 
-```
-shell> export AWS_ACCESS_KEY_ID='...'
-shell> export AWS_SECRET_ACCESS_KEY='...'
-shell> export AWS_REGION='ap-northeast-1'
-shell> piculet -e -o Groupfile
-shell> vi Groupfile
-shell> piculet -a --dry-run
-shell> piculet -a
+```sh
+export AWS_ACCESS_KEY_ID='...'
+export AWS_SECRET_ACCESS_KEY='...'
+export AWS_REGION='ap-northeast-1'
+#export AWS_OWNER_ID='123456789012'
+piculet -e -o Groupfile
+vi Groupfile
+piculet -a --dry-run
+piculet -a
 ```
 
-## Routefile example
+## Groupfile example
 
 ```ruby
 require 'other/groupfile'

data/bin/piculet

@@ -19,9 +19,11 @@ ARGV.options do |opt|
   begin
     access_key = nil
     secret_key = nil
+    region = nil
 
     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('',   '--dry-run')               {|v| options[:dry_run]            = true    }
@@ -34,10 +36,12 @@ ARGV.options do |opt|
     opt.parse!
 
     if access_key and secret_key
-      AWS.config({
+      aws_opts = {
         :access_key_id     => access_key,
         :secret_access_key => secret_key,
-      })
+      }
+      aws_opts[:region] = region if region
+      AWS.config(aws_opts)
     elsif (access_key and !secret_key) or (!access_key and secret_key) or mode.nil?
       puts opt.help
       exit 1

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

@@ -39,39 +39,32 @@ module AWS
 
     def random_security_group_owner_id(security_group)
       owner_id = nil
-      exception = nil
 
-      DESC_OWNER_ID_RETRY_TIMES.times do
+      (1..DESC_OWNER_ID_RETRY_TIMES).each do |i|
         begin
           owner_id = security_group.owner_id
           break
         rescue => e
-          exception = e
+          raise e unless i < DESC_OWNER_ID_RETRY_TIMES
         end
 
         sleep DESC_OWNER_ID_RETRY_WAIT
       end
 
-      raise exception if exception
-
       return owner_id
     end
 
     def delete_random_security_group(security_group)
-      exception = nil
-
-      DESC_OWNER_ID_RETRY_TIMES.times do
+      (1..DESC_OWNER_ID_RETRY_TIMES).each do |i|
         begin
           security_group.delete
           break
         rescue => e
-          exception = e
+          raise e unless i < DESC_OWNER_ID_RETRY_TIMES
         end
 
         sleep DESC_OWNER_ID_RETRY_WAIT
       end
-
-      raise exception if exception
     end
 
     def random_security_group_name

data/lib/piculet/logger.rb

@@ -25,7 +25,7 @@ module Piculet
         message = "[#{level.to_s.upcase}] #{message}" unless level == :info
         message << ": #{log_id}" if log_id
         message << ' (dry-run)' if @options && @options.dry_run
-        logger = Piculet::Logger.instance
+        logger = (@options && @options.logger) || Piculet::Logger.instance
         logger.send(level, message.send(color))
       end
     end # ClientHelper

data/lib/piculet/version.rb

@@ -1,5 +1,5 @@
 module Piculet
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 
 Version = Piculet::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piculet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -76,23 +76,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: Piculet is a tool to manage Security Group. It defines the state of Security
-  Group using DSL, and updates Security Group according to DSL.
+        version: 2.14.1
+description: 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.
 email:
 - sgwr_dts@yahoo.co.jp
 executables:
@@ -134,16 +134,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 535241775
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 535241775
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Piculet is a tool to manage Security Group.
+summary: Piculet is a tool to manage EC2 Security Group.
 test_files: []