ec2ctl 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1f3627da0332ac03286a6ef7512e7cd4962939d
-  data.tar.gz: af12cc4e425a03feccc4cd9f57c740d133a1267d
+  metadata.gz: f5b98d7b9d9b2dd4e25ba115a464bbfc026a5bff
+  data.tar.gz: 815717a464313caf8711ac002e94abd894d187a2
 SHA512:
-  metadata.gz: 8be33c3f39923e42a43585419974eae0ff18c1e04cf1290da2d04ccd4fe660dccb724fd89c4f8d8e79fcdd7cd404158535d8d9591706b44d0629e7f42c82fe0e
-  data.tar.gz: 2ee01d8a31be5a245f504f47d8e389c20cf086a05365d0587555bfb3515c112603e9889a514a5517cd16758bc0f79e208b90ff2eb1a5a723156c1fa659e11c16
+  metadata.gz: f5deacc01b22e5668574e35bedeb9166fad61447cb8ee5c323fc334e3cffb62d91cb358ead0d3760b8f347abaae7bf61e59f3d1ca8fbe1aad86edca50e34cfdd
+  data.tar.gz: 830310f036cfa898145f3d46c6d25f548d5fcdde7d864c56960b2b5cb15cd435ce6545be8d1a11a94f44068d01ae646e4c87aba37c512c7bc08f4b5708fb7868

data/lib/ec2ctl/cli.rb

@@ -1,6 +1,7 @@
 require "commander"
 require "ec2ctl/logger"
 require "pathname"
+require "json"
 
 module EC2Ctl
   class CLI
@@ -8,7 +9,7 @@ module EC2Ctl
 
     OptionError = Class.new RuntimeError
 
-    USER_OPTION_FILE_PATH = Pathname.new(ENV["HOME"]) / ".ec2ctlrc"
+    OPTION_FILE_NAME = ".ec2ctlrc".freeze
 
     DEFAULT_OPTIONS = {
       "ec2 list" => {
@@ -167,7 +168,7 @@ module EC2Ctl
     private
 
     def init_client(options)
-      global_options = %i(
+      global_opt = %i(
         verbose
         pretty
         output
@@ -178,7 +179,7 @@ module EC2Ctl
         help
       )
 
-      @client = EC2Ctl::Client.new options.__hash__.reject {|k, v| global_options.include? k}.merge(logger: logger)
+      @client = EC2Ctl::Client.new options.__hash__.reject {|k, v| global_opt.include? k}.merge(logger: logger)
     end
 
     def logger
@@ -268,19 +269,12 @@ module EC2Ctl
 
     def handle_options(_command, opt)
       default_opt = DEFAULT_OPTIONS[_command.name]
+      file_opt    = options_from_file[_command.name]
 
-      user_options = if File.exists? USER_OPTION_FILE_PATH
-        require "json"
-        JSON.load(File.read(USER_OPTION_FILE_PATH))
+      [default_opt, file_opt].each do |o|
+        o.each {|k, v| opt.default k.intern => v} if o
       end
 
-      if user_options && user_options[_command.name]
-        user_options[_command.name].each do |k, v|
-          default_opt.update k.intern => v
-        end
-      end
-
-      opt.default default_opt if default_opt
       handle_global_options opt
     end
 
@@ -291,5 +285,20 @@ module EC2Ctl
       ENV["AWS_PROFILE"] = opt.profile if opt.profile
       ENV["AWS_REGION"]  = opt.region  if opt.region
     end
+
+    def options_from_file
+      pathnames = [
+        Pathname.new(Dir.pwd).ascend.to_a,
+        Pathname.new(Dir.home),
+      ].flatten.map do |pathname|
+        pathname + OPTION_FILE_NAME
+      end
+
+      pathnames.each do |pathname|
+        return JSON.load File.read(pathname) if File.exists? pathname
+      end
+
+      {}
+    end
   end
 end

data/lib/ec2ctl/version.rb

@@ -1,3 +1,3 @@
 module EC2Ctl
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2ctl
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Yoriki Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk