ec2-host 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab82e2af1189495aec002dcbce61337e9a0f0af5
-  data.tar.gz: 3c464dd9a3c42773f4acfa2e385d58152e9e15de
+  metadata.gz: 75292280f46832c3bd111dfd551e7a00f7c27835
+  data.tar.gz: 3b50f9114115995051b2fcd7a2936c0b6db5aafa
 SHA512:
-  metadata.gz: ebb7e3cb363e5d04a827bf9a89b46baa155e8b4e1a766c476dc2b74a95d03d1de9aeafb54e68a4a9588ae6189e8cc93e06403443191b49997071ba2e854b8c76
-  data.tar.gz: c1cc99a1c363d9f8568050fb458fd0ff1c0617d11501bd1d4d0357050063342c2e5c50d995a471d3aef73716d6fd74e7d725885d3f9a0dc49b2c5fe26f52d9c9
+  metadata.gz: 9b66044d377be0f98cbd525b60537861c2b342e753adb8abbb59de2bc5a1fd4b62bc61c18424fc2fc466a555a440e873657e883b52f053ca5e90936aaffe9ff5
+  data.tar.gz: 4784cd6f17633fc99f8387bed28baa80d011d902eb5144f82c71eff4a78819c0de97724154ce34f620341f654111783658f4c414c19823a7ad60989bd315e7b1

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.4.1 (2016/11/24)
+
+Enhancements:
+
+* Get AWS_REGION from ~/.aws/config as default
+* Fix default of AWS_PROFILE was set to 'nil' rather than nil
+
 # 0.4.0 (2016/11/24)
 
 Enhancements:

data/README.md

@@ -23,7 +23,7 @@ AWS SDK (CLI) parameters:
 
 * **AWS_ACCESS_KEY_ID**: AWS SDK (CLI) crendentials. Default loads a credentials file
 * **AWS_SECRET_ACCESS_KEY**: AWS SDK (CLI) credentials. Default load a credentials file
-* **AWS_DEFAULT_REGION** (**AWS_REGION**); AWS SDK (CLI) region such as `ap-northeast-1`, `us-east-1`. 
+* **AWS_DEFAULT_REGION** (**AWS_REGION**); AWS SDK (CLI) region such as `ap-northeast-1`, `us-east-1`. Default obtains from `$HOME/.aws/config` with profile `AWS_DEFAULT_PROFILE`.
 * **AWS_DEFAULT_PROFILE** (**AWS_PROFILE**): The profile key of the AWS SDK (CLI) credentails file. Default is `default`
 * **AWS_CREDENTIAL_FILE** (**AWS_CREDENTIALS_FILE**): Path of the AWS SDK (CLI) credentails file. Default is `$HOME/.aws/credentials`. See [Configuring the AWS Command Line Interface](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-started.html#cli-config-files) for details. 
 

data/ec2-host.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "ec2-host"
-  gem.version       = '0.4.0'
+  gem.version       = '0.4.1'
   gem.author        = ['Naotoshi Seo']
   gem.email         = ['sonots@gmail.com']
   gem.homepage      = 'https://github.com/sonots/ec2-host'
@@ -10,11 +10,13 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.bindir        = "exe"
+  gem.executables   = `git ls-files -- exe/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
   gem.add_runtime_dependency 'aws-sdk'
   gem.add_runtime_dependency 'dotenv'
+  gem.add_runtime_dependency 'inifile'
 
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'rdoc'

data/lib/ec2/host/config.rb

@@ -1,3 +1,4 @@
+require 'inifile'
 require 'dotenv'
 Dotenv.load
 
@@ -31,12 +32,13 @@ class EC2
       def self.aws_region
         @aws_region ||=
           ENV['AWS_REGION'] || config.fetch('AWS_REGION', nil) || # ref. old aws cli
-          ENV['AWS_DEFAULT_REGION'] || config.fetch('AWS_DEFAULT_REGION') # ref. aws cli and terraform
+          ENV['AWS_DEFAULT_REGION'] || config.fetch('AWS_DEFAULT_REGION', nil) || # ref. aws cli and terraform
+          aws_config['region'] || raise('AWS_REGION nor AWS_DEFAULT_REGION is not set')
       end
 
       def self.aws_profile
         @aws_profile ||=
-          ENV['AWS_PROFILE'] || config.fetch('AWS_PROFILE', 'nil') || # ref. old aws cli
+          ENV['AWS_PROFILE'] || config.fetch('AWS_PROFILE', nil) || # ref. old aws cli
           ENV['AWS_DEFAULT_PROFILE'] || config.fetch('AWS_DEFAULT_PROFILE', 'default') # ref. aws cli and terraform
       end
 
@@ -53,7 +55,25 @@ class EC2
       def self.aws_credential_file
         @aws_credential_file ||=
           ENV['AWS_CREDENTIALS_FILE'] || config.fetch('AWS_CREDENTIALS_FILE', nil) ||
-          ENV['AWS_CREDENTIAL_FILE'] || config.fetch('AWS_CREDENTIAL_FILE', nil) # ref. aws cli (supported lately)
+          ENV['AWS_CREDENTIAL_FILE'] || config.fetch('AWS_CREDENTIAL_FILE', nil) || # ref. aws cli (supported lately)
+          File.expand_path('~/.aws/credentials')
+      end
+
+      def self.aws_config_file
+        @aws_config_file ||= ENV['AWS_CONFIG_FILE'] || config.fetch('AWS_CONFIG_FILE', nil) || File.expand_path('~/.aws/config')
+      end
+
+      def self.aws_config
+        return @aws_config if @aws_config
+        if File.readable?(aws_config_file)
+          ini = IniFile.load(aws_config_file).to_h
+          if aws_profile == 'default'
+            @aws_config = ini['default']
+          else
+            @aws_config = ini["profile #{aws_profile}"]
+          end
+        end
+        @aws_config ||= {}
       end
 
       def self.log_level

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-11-24 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +179,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/ec2-host
 - docs/EC2.html
 - docs/EC2/Host.html
 - docs/EC2/Host/CLI.html
@@ -194,6 +207,7 @@ files:
 - example/aws-sdk.rb
 - example/example.conf
 - example/example.rb
+- exe/ec2-host
 - lib/ec2-host.rb
 - lib/ec2/host.rb
 - lib/ec2/host/cli.rb