awsssh 2.0.1 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzVmZmEzNDNkNDZjNzMzZDEwNjZmOGZiYjA1NGZkN2UzYTM2Nzc2Yg==
+    MDM3MTZlNjg5OWM0YzMyMjkzMzdjYzQzNTAyOWJkODkzZjA5YzAxNQ==
   data.tar.gz: !binary |-
-    YmIzNjlkMzE2ZDVhZjBhZGRjMDk3ZmZlZmQxMjE2YTVmYjc5N2E4ZQ==
+    MGE1NjAxYWIzZDE2YTRjMjlhNWY2YzM5OGM2ZDFjODhjMjE3OWQwZg==
 SHA512:
   metadata.gz: !binary |-
-    OTg3NzFjOGJjN2UxM2NiZmU4ODdiNTU1MmQyMTlhZmRlM2Q4YzY2YWE2OWQw
-    YTQzMjliMzVhMThkNzEwZDQ4NDNkNDIzNTM1MWYxOWIwNDIyZjUyZWE3Njg2
-    Nzk3MGQ3YWQ3YTNjODc5YjQ5NmVkZmI3ZDBhMjBhNWYwYWMzYWI=
+    MmQ4MjRkNGUzNjUxMjVhNmQxNjllYzQ3Yjg5NGExZDRjYzA2OTQ4YzA4MTVl
+    OTE0OTliYWE1MDQwODJhMzRlNGQ1ZTYxZjEzN2YzODI5OTE5YmQ0YjhjZDhm
+    NmU5M2Y3ODIxOWY5MTM5Mzc3MWUxNDFhOGM5OGQwM2RlM2Q4ZmM=
   data.tar.gz: !binary |-
-    M2M1ZjkyYTM4ZmQyZDU3NzQ5NzgyZTgyYjlmZmJkMDhlMjc5ZDRiOGIwOWE2
-    ODkxNTVlZTI2YzQ2ZTEwZjA1YmZiYjM2ZmNjODQ2NjE2Yjk2YWI5MDAxYzhj
-    YzEzZjE4NjY3NDQwODBiOWJhMmM5YWJiOGVmMDc0MWM4MWUyM2M=
+    OGE5NzdiM2FhYjE3MWIyOGI3OGNhZGZjNWVjNGI2M2JiM2ZlYzU5NzFiM2U2
+    ZGUwOGY5ZTg3YzM1Y2U1MWJkYWZkYjE3YjM5ZmE3OWMwMTFlNDg5ZjRjMGM3
+    Y2YwZTM2NmMxODczNDg0YjQyOGFhMDRhYTQ3OTA5YTkwNzVmNDc=

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/awsssh.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'awsssh'
-  s.version     = '2.0.1'
+  s.version     = '2.1.0'
   s.date        = '2014-02-27'
   s.summary     = "Connects you with OpsWorks EC2"
   s.description = "This will connects you with an EC3 instace"
@@ -13,4 +13,6 @@ Gem::Specification.new do |s|
 
 
   s.add_runtime_dependency "net-ssh", "2.7.0"
+  s.add_runtime_dependency "inifile", "2.0.2"
+  s.add_runtime_dependency "aws-sdk", "1.35.0"
 end

data/lib/awsssh.rb

@@ -2,8 +2,13 @@
 require 'rubygems'
 require 'net/ssh'
 require 'json'
+require "aws-sdk"
+# require "pry"
+require "inifile"
 
 class Awsssh
+  CONFIG_DIR = ENV['AWSSSH_CONFIG_DIR'] || "/Users/#{ENV['USER']}/.aws/"
+  CONF_FILE = ENV['AWSSSH_CONFIG_FILE'] || "aws_config_"
 
   def do_start
     if ARGV[0] == "--list-accounts"
@@ -17,8 +22,6 @@ class Awsssh
     end
   end
 
-  CONFIG_DIR = "/Users/#{ENV['USER']}/.aws/"
-  CONF_FILE = "aws_config_"
   ##
   # Renders the Help
   #
@@ -52,11 +55,11 @@ class Awsssh
   #   - [Array] StackIDs
 
   def list_stacks(account)
-    awscfg(account)
-    stacks = JSON.parse(`aws opsworks describe-stacks`)
+    ow = awscfg(account)
+    stacks = ow.client.describe_stacks[:stacks]
     stack_ids = []
-    stacks['Stacks'].each do |stack|
-      stack_ids << stack['StackId']
+    stacks.each do |stack|
+      stack_ids << stack[:stack_id]
     end
     return stack_ids
   end
@@ -74,9 +77,9 @@ class Awsssh
   #
 
   def read_stack(stackid, account)
-    # `awscfg #{account}`
-    awscfg(account)
-    JSON.parse(`aws opsworks describe-instances --stack-id #{stackid}`)
+    ow = awscfg(account)
+    ow.client.describe_instances({:stack_id => stackid})
+    # JSON.parse(`aws opsworks describe-instances --stack-id #{stackid}`)
   end
 
   ##
@@ -94,7 +97,7 @@ class Awsssh
     config_files.each do |file|
       if file[0,CONF_FILE.length] == CONF_FILE
         file_part = file.split("_")
-        unless file_part[2].nil?
+        unless file_part.last.nil?
           printf "\t- %-#{length}s\n", file_part[2]
         end
       end
@@ -112,8 +115,8 @@ class Awsssh
   #     - <servername> (<status>)
 
   def server_name(stack)
-    stack["Instances"].each do |instance|
-      printf "\t- %-20s %s\n", instance["Hostname"], instance["Status"]
+    stack[:instances].each do |instance|
+      printf "\t- %-20s %s\n", instance[:hostname], instance[:status]
     end
   end
 
@@ -145,9 +148,9 @@ class Awsssh
     stack_ids = list_stacks host[0]
     stack_ids.each do |stack_id|
       stack = read_stack(stack_id, host[0])
-      stack["Instances"].each do |i|
-        if i["Hostname"] == server
-          public_dns = i["PublicDns"]
+      stack.instances.each do |i|
+        if i[:hostname] == server
+          public_dns = i[:public_dns]
           break
         end
       end
@@ -166,8 +169,12 @@ class Awsssh
   end
 
   def awscfg(account)
-    if File.exists?(CONFIG_DIR + CONF_FILE + account)
-      `awscfg #{account}`
+    if cnf = IniFile.load(CONFIG_DIR + CONF_FILE + account)['default']
+      return AWS::OpsWorks.new(
+        access_key_id: cnf['aws_access_key_id'], 
+        secret_access_key: cnf['aws_secret_access_key'], 
+        region: cnf['region']
+      )
     else
       puts "No config #{CONF_FILE}#{account} found"
       exit -1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsssh
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Sebastian Thiele
@@ -24,6 +24,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.35.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.35.0
 description: This will connects you with an EC3 instace
 email:
 - Sebastian.Thiele@infopark.de
@@ -32,6 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - README.md
 - awsssh.gemspec
 - bin/awsssh