awssh 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bc5aa5b09ca6745986bc0179e4838b5b9f472b9
-  data.tar.gz: 42106ce073453191487fc13421dbb938720512fc
+  metadata.gz: b721718bef949156d98ecbc27718d89e54ed5062
+  data.tar.gz: b172e413246a458f6f39cb45ea3cae0d2c1d9276
 SHA512:
-  metadata.gz: c73f7d73551c51ea64445c02139030091fcec46b2623370534f4fd3cc10f946db20df10e3772d644519dc83dfaec423c09619be6becd51db24205f8f374f33f5
-  data.tar.gz: b9330ee423e263a465cf35e9760b732939c60949c2537b6ac22f3333f716df2721f27df474905bad8b6b1a333660ebb43c9379a34f3c3fb26325a052f48a1d99
+  metadata.gz: 3a4f48b1d3d5a741595263c810ad7afba86bb63528a264319c2e84fa719eb2f3973be0d2bad33c1adedd9ffb604653cdd32e34e355094317e3f5a62b614238c0
+  data.tar.gz: ca16f4960dd7b2fbfd2224633608b459f88ba23e0c1fc91b691f092326522b7533fdb628c4978fcfd1294fa440837fc3e5859ba70937a4a2ab4c5f09e9e0a272

data/awssh.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'fog', '~> 1.30.0'
+  # spec.add_dependency 'fog', '~> 1.30.0'
+  spec.add_dependency 'aws-sdk', '~> 2.1.31'
   spec.add_dependency 'dotenv', '~> 2.0.1'
   spec.add_dependency 'activesupport'
 

data/bin/awssh

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fog'
+require 'aws-sdk'
 require 'optparse'
 require 'active_support/all'
 require 'awssh'

data/lib/awssh/cloud.rb

@@ -4,6 +4,7 @@ module Awssh
       def connect(key, secret, region)
         @instance = new(key, secret, region)
       end
+
       def instance
         raise "not connected?" unless @instance
         @instance
@@ -14,21 +15,28 @@ module Awssh
       @key = key
       @secret = secret
       @region = region
-      @fog = Fog::Compute.new(provider: 'AWS', aws_access_key_id: @key, aws_secret_access_key: @secret, region: @region)
     end
 
     def servers
       puts "requesting servers..."
-      list = @fog.servers.all({'instance-state-name' => 'running'})
-      list.inject([]) do |a, e|
+      Aws.config.update({region: @region, credentials: Aws::Credentials.new(@key, @secret)})
+      aws = Aws::EC2::Resource.new
+      aws.instances(filters:[{name: 'instance-state-name', values: ['running']}]).inject([]) do |a, instance|
+        tags = tags(instance)
         a << {
-          id: e.id,
-          name: e.tags['Name']||e.id,
-          tags: e.tags.inject({}) {|h, e| (k,v) = e; h[k.downcase] = (v ? v.downcase : ""); h},
-          private: e.private_ip_address,
-          public: e.public_ip_address,
+            id: instance.id,
+            name: tags['Name'] || instance.id,
+            tags: tags,
+            private: instance.private_ip_address,
+            public: instance.public_ip_address,
         }
       end
     end
+
+    private
+
+    def tags(instance)
+      instance.tags.inject({}) {|h, e| h[e.key.downcase]=e.value.downcase; h}
+    end
   end
 end

data/lib/awssh/config.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'yaml'
 
 module Awssh
   class Config

data/lib/awssh/version.rb

@@ -1,8 +1,8 @@
 module Awssh
   module Version
     MAJOR = 0
-    MINOR = 2
-    TINY  = 5
+    MINOR = 3
+    TINY  = 0
     TAG   = nil
     LIST  = [MAJOR, MINOR, TINY, TAG].compact
     STRING = LIST.join('.')

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: awssh
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-22 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.0
+        version: 2.1.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.30.0
+        version: 2.1.31
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement