awsam 0.0.2 → 0.0.3

data/lib/awsam/account.rb

@@ -56,7 +56,9 @@ module Awsam
         "AWS_SECRET_KEY"           => @params[:secret_key],
 
         "AMAZON_AWS_ID"            => @params[:aws_id],
-        "AWS_DEFAULT_REGION"       => @params[:aws_region]
+        "AWS_DEFAULT_REGION"       => @params[:aws_region],
+
+        "EC2_URL"                  => ec2_url
       }
 
       Utils::bash_environ(envs)
@@ -132,6 +134,10 @@ module Awsam
       @params[:aws_region]
     end
 
+    def ec2_url
+      "https://ec2.#{aws_region}.amazonaws.com"
+    end
+
 private
 
     def conf_file(file = nil)

data/lib/awsam/ec2.rb

@@ -14,7 +14,9 @@ module Awsam
 
     def self.find_instance(acct, instance_id)
       logger = Logger.new(File.open("/dev/null", "w"))
-      ec2 = RightAws::Ec2.new(acct.access_key, acct.secret_key, :logger => logger, :region => acct.aws_region)
+      ec2 = RightAws::Ec2.new(acct.access_key, acct.secret_key,
+                              :logger => logger,
+                              :endpoint_url => acct.ec2_url)
       
       unless ec2
         puts "Unable to connect to EC2"
@@ -84,9 +86,11 @@ module Awsam
 
         results.each_with_index do |elem, i|
           inst = rmap[elem[:resource_id]]
-          puts "%d) %s (%s, %s, %s)" %
+          puts "%d) %s (%s, %s, %s, %s)" %
             [i, elem[:value], inst[:aws_instance_id],
-             inst[:aws_instance_type], inst[:aws_launch_time]]
+             inst[:aws_instance_type],
+             inst[:aws_availability_zone],
+             inst[:aws_launch_time]]
         end
         puts "q) Quit"
         puts

data/lib/awsam/version.rb

@@ -1,3 +1,3 @@
 module Awsam
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsam
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1303385006306844615
+      hash: -207219964221159059
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1303385006306844615
+      hash: -207219964221159059
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2