ec2ctl 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10f21431c2984ee435c8c10d01117df3b250e5fb
-  data.tar.gz: b3663c38dd7e16453dd1572f504ff06b35d64d5c
+  metadata.gz: 3d7a6433b5c621fa7c9fee1cc099f4982b2373bf
+  data.tar.gz: 794818375ced3f00fd1cee3fe28107f2b6d854fd
 SHA512:
-  metadata.gz: 22c80abc9c7515dacc42919dbcfb8b892e91a92299091de9349d5218098e0d884347e5247ac475f25c96b24acd9b1419b2922f95a5c4b02878dfd5f346837b6c
-  data.tar.gz: 897298be82f07d1053047e6ffa8c7f3e199620cf90e72a30603085c1db32f72b79f59b7fbe688f2327a2eeda437364749606b1d6393e1d138fc17ccefbfd8195
+  metadata.gz: a7c5657494083f21c8283ab76c84dba0a745b9d7d55169bdc9b91842142c4d64cfc9f544d9e7350aadfc8dd1c2be941534c09b86580b47ba1f1e6728043b8d2f
+  data.tar.gz: b2ccbf0e10a90f4013a8aff487a51789c98c9775b802836e70e8c82002ec5e873b42109ce2e3218e2196d70c68317e6a523354abfb3b09f1d0f37d78c7f99180

data/ec2ctl.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor"
+  spec.add_dependency "nokogiri"
   spec.add_dependency "aws-sdk-v1"
+  spec.add_dependency "aws-sdk"
   spec.add_dependency "net-ssh"
   spec.add_dependency "colorize"
   spec.add_dependency "terminal-table"

data/lib/ec2ctl/version.rb

@@ -1,3 +1,3 @@
 module Ec2ctl
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/ec2ctl.rb

@@ -2,6 +2,8 @@ require "ec2ctl/version"
 
 require "thor"
 require "aws-sdk-v1"
+require "aws-sdk"
+require "aws"
 require "net/ssh"
 require "net/http"
 require "colorize"
@@ -164,21 +166,24 @@ module Ec2ctl
 
     private
 
+    def get_profile_name
+      profile_name = (options[:profile] == nil) ? "default" : options[:profile]
+      profile_name
+    end
+
     def aws_config
       hash = {}
 
-      if options[:profile]
-        config = AWSConfig.profiles[options[:profile]]
-
-        if config
-          hash.update config.config_hash
-        else
-          provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new profile_name: options[:profile]
-          hash.update credential_provider: provider
-        end
+      if options[:access_key_id] && options[:secret_access_key]
+        hash.update access_key_id: options[:access_key_id]
+        hash.update secret_access_key: options[:secret_access_key]
       else
-        hash.update access_key_id: options[:access_key_id] if options[:access_key_id]
-        hash.update secret_access_key: options[:secret_access_key] if options[:secret_access_key]
+        provider = AWS::Core::CredentialProviders::SharedCredentialFileProvider.new profile_name: get_profile_name
+        #config.update credential_provider: provider
+
+        # aws credential bug fix
+        hash = provider.get_credentials
+        hash[:access_key_id].strip!
       end
 
       hash.update region: options[:region] if options[:region]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2ctl
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - y13i
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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: aws-sdk-v1
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  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: net-ssh
   requirement: !ruby/object:Gem::Requirement