ec2-host 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0bc795de2c9dd28b237cf8a442d13434532d13e
-  data.tar.gz: 417e73f78134b37a660bc614dfc07e74ebfd1890
+  metadata.gz: 71fdb977a6c700081fd8af2f3274b70778854458
+  data.tar.gz: 380fbcf200f1fb57fca95d1b8a8a1f5f8a431873
 SHA512:
-  metadata.gz: 19efa5260b4e445e9f3024c7228a02e8477736feb678aa52ed6596846551b520f74c97f82c04044fa93d4f3b52b2322179379db63841f1622c2001daca2f12fc
-  data.tar.gz: 720fa2e40471c42fd373a6bba4a00dd16eb596d548f325e376fa693da6cb6d54e0610537190d6d9a26d82d6e3bca99e8b16cba4b44524aa6f426103a65264ffc
+  metadata.gz: b9deed0d8a1921c188193536c519f3be9f918767c174e4cf2116517a5ae1bc8403d33d5f82d434e0b2d7d62236f8f4a2686be45fab71ba40823289d15e2b991c
+  data.tar.gz: 901615c730d1a69786586c864a55a53f1e00d6da90c0f8e924cd02f4fedabc3deaf8a4e0e6410f9a9e920b0e5ba5b8f4254772701ec1ce6fd763329e325fecc9

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.1.1 (2015/08/11)
+
+Changes:
+
+* Rename `--json` to `--line-delimited-json`. Alias is kept as `-j`.
+* Add `--json` which returns an arrayed json
+* Add `--pretty-json` which returns json in pretty print
+
+Fixes:
+
+* Stop using Aws.config.update, it changes the default config
+
 # 0.1.0 (2015/08/11)
 
 Enhancements:

data/ec2-host.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "ec2-host"
-  gem.version       = '0.1.0'
+  gem.version       = '0.1.1'
   gem.author        = ['Naotoshi Seo']
   gem.email         = ['sonots@gmail.com']
   gem.homepage      = 'https://github.com/sonots/ec2-host'

data/lib/ec2/host/cli.rb

@@ -49,33 +49,44 @@ class EC2
       option :info,
         :aliases => %w[-i],
         :type => :boolean,
-        :desc => "show host info, not only hostname"
-      option :json,
+        :desc => "show host info"
+      option :line_delimited_json,
         :aliases => %w[-j],
         :type => :boolean,
-        :desc => "show detailed host info in json"
+        :desc => "show host info in line delimited json"
+      option :json,
+        :type => :boolean,
+        :desc => "show host info in json"
+      option :pretty_json,
+        :type => :boolean,
+        :desc => "show host info in pretty json"
       option :debug,
         :type => :boolean,
         :desc => "debug mode"
       def get_hosts
+        hosts = EC2::Host.new(condition)
         if options[:info]
-          EC2::Host.new(condition).each do |host|
+          hosts.each do |host|
             $stdout.puts host.info
           end
-        elsif options[:json]
-          EC2::Host.new(condition).each do |host|
-            $stdout.puts host.json
+        elsif options[:line_delimited_json]
+          hosts.each do |host|
+            $stdout.puts host.to_hash.to_json
           end
+        elsif options[:json]
+          $stdout.puts hosts.map(&:to_hash).to_json
+        elsif options[:pretty_json]
+          $stdout.puts JSON.pretty_generate(hosts.map(&:to_hash))
         elsif options[:private_ip]
-          EC2::Host.new(condition).each do |host|
+          hosts.each do |host|
             $stdout.puts host.private_ip_address
           end
         elsif options[:public_ip]
-          EC2::Host.new(condition).each do |host|
+          hosts.each do |host|
             $stdout.puts host.public_ip_address
           end
         else
-          EC2::Host.new(condition).each do |host|
+          hosts.each do |host|
             $stdout.puts host.hostname
           end
         end
@@ -85,7 +96,7 @@ class EC2
 
       def condition
         return @condition if @condition
-        _condition = HashUtil.except(options, :info, :json, :debug, :private_ip, :public_ip)
+        _condition = HashUtil.except(options, :info, :line_delimited_json, :json, :pretty_json, :debug, :private_ip, :public_ip)
         @condition = {}
         _condition.each do |key, val|
           if tag = Config.optional_options[key.to_s]

data/lib/ec2/host/client_util.rb

@@ -6,8 +6,7 @@ class EC2
     class ClientUtil
       def self.ec2(reload = false)
         if @ec2.nil? || reload
-          Aws.config.update(region: Config.aws_region, credentials: Config.aws_credentials)
-          @ec2 = Aws::EC2::Client.new
+          @ec2 = Aws::EC2::Client.new(region: Config.aws_region, credentials: Config.aws_credentials)
         end
         @ec2
       end

data/lib/ec2/host/host_data.rb

@@ -71,19 +71,19 @@ class EC2
           info << "{#{service}}" unless service.empty?
           info
         else
-          HashUtil.except(self, :instance).to_s
+          to_hash.to_s
         end
       end
 
-      def json
-        HashUtil.except(self, :instance).merge(
+      def to_hash
+        HashUtil.except(self, :instance).to_h.merge(
           instance_id: instance_id,
           private_ip_address: private_ip_address,
           public_ip_address: public_ip_address,
           launch_time: launch_time,
           state: state,
           monitoring: monitoring,
-        ).to_json
+        )
       end
 
       # private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk