piculet 0.2.8.beta → 0.2.8.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 964c624907487d13b2db743957f28a4d6e20e94c
-  data.tar.gz: 744750153bd12e4cda705d5c8b66042a17246d05
+  metadata.gz: 40ae2c7f93e346be9dfd8441fc3eed416119e780
+  data.tar.gz: 14b694efdd59ac8c639405d80e64c6bda1215f1c
 SHA512:
-  metadata.gz: d2a3df7fed7c6ca29e38f197ed03e2de54b00f305bdb76b014b0b42ff1cdc4f257e4209f8c33d5fda0347383774bb92eb1a8d97159f2d530880fe93568de2947
-  data.tar.gz: 651d72e1ed2e96c8a04288b1494748c6f006369891993cf2f3d6cd40b5fa4da3a7e64b88abc5ce18aecb3f047b04bff531823cd29742a4af4d2f5702783d82c4
+  metadata.gz: 31a6daa0c72c14312432bb19e91508bc80fa6a87277ed324b6bbb9358bb36f64901fa9254b1d64709c7ec483b2d79186aeffca0d30fedbe225ce9850ca67b954
+  data.tar.gz: 683ad448de1d67ad28cdf2f0d0ba38726c392e34e0c22090bee86b7f48eedf6c6834619b939a1aa6b31863a19dd8415c8e885704fe02c5846c910d66ecd97843

data/bin/piculet

@@ -16,10 +16,10 @@ MAGIC_COMMENT = <<-EOS
 EOS
 
 options = {
-  :dry_run     => false,
-  :format      => :json,
-  :color       => true,
-  :debug       => false,
+  :dry_run => false,
+  :format  => :ruby,
+  :color   => true,
+  :debug   => false,
 }
 
 ARGV.options do |opt|
@@ -29,24 +29,25 @@ ARGV.options do |opt|
     region = nil
     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('-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('',   '--format=FORMAT', [:ruby, :json]) {|v| options[:format]             = v       }
-    opt.on(''  , '--no-color')                      {    options[:color]              = false   }
-    opt.on(''  , '--debug')                         {    options[:debug]              = true    }
+    format_passed = false
+
+    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('',   '--format=FORMAT', [:ruby, :json]) {|v| format_passed = true; options[:format] = v }
+    opt.on(''  , '--no-color')                      {    options[:color]              = false       }
+    opt.on(''  , '--debug')                         {    options[:debug]              = true        }
     opt.parse!
 
     aws_opts = {}
@@ -76,6 +77,9 @@ ARGV.options do |opt|
       end
     end
 
+    if not format_passed and [file, output_file].any? {|i| i =~ /\.json\z/ }
+      options[:format] = :json
+    end
   rescue => e
     $stderr.puts("[ERROR] #{e.message}")
     exit 1

data/lib/piculet.rb

@@ -5,7 +5,7 @@ require 'set'
 require 'singleton'
 require 'term/ansicolor'
 
-require 'aws-sdk'
+require 'aws-sdk-v1'
 
 require 'piculet/ext/ec2-owner-id-ext'
 require 'piculet/ext/security-group'

data/lib/piculet/version.rb

@@ -1,3 +1,3 @@
 module Piculet
-  VERSION = "0.2.8.beta"
+  VERSION = "0.2.8.beta2"
 end

metadata

@@ -1,25 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: piculet
 version: !ruby/object:Gem::Version
-  version: 0.2.8.beta
+  version: 0.2.8.beta2
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.48.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.48.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement