awsam 0.0.2 → 0.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/awsam/account.rb +7 -1
- data/lib/awsam/ec2.rb +7 -3
- data/lib/awsam/version.rb +1 -1
- metadata +4 -4
data/lib/awsam/account.rb
CHANGED
|
@@ -56,7 +56,9 @@ module Awsam
|
|
|
56
56
|
"AWS_SECRET_KEY" => @params[:secret_key],
|
|
57
57
|
|
|
58
58
|
"AMAZON_AWS_ID" => @params[:aws_id],
|
|
59
|
-
"AWS_DEFAULT_REGION" => @params[:aws_region]
|
|
59
|
+
"AWS_DEFAULT_REGION" => @params[:aws_region],
|
|
60
|
+
|
|
61
|
+
"EC2_URL" => ec2_url
|
|
60
62
|
}
|
|
61
63
|
|
|
62
64
|
Utils::bash_environ(envs)
|
|
@@ -132,6 +134,10 @@ module Awsam
|
|
|
132
134
|
@params[:aws_region]
|
|
133
135
|
end
|
|
134
136
|
|
|
137
|
+
def ec2_url
|
|
138
|
+
"https://ec2.#{aws_region}.amazonaws.com"
|
|
139
|
+
end
|
|
140
|
+
|
|
135
141
|
private
|
|
136
142
|
|
|
137
143
|
def conf_file(file = nil)
|
data/lib/awsam/ec2.rb
CHANGED
|
@@ -14,7 +14,9 @@ module Awsam
|
|
|
14
14
|
|
|
15
15
|
def self.find_instance(acct, instance_id)
|
|
16
16
|
logger = Logger.new(File.open("/dev/null", "w"))
|
|
17
|
-
ec2 = RightAws::Ec2.new(acct.access_key, acct.secret_key,
|
|
17
|
+
ec2 = RightAws::Ec2.new(acct.access_key, acct.secret_key,
|
|
18
|
+
:logger => logger,
|
|
19
|
+
:endpoint_url => acct.ec2_url)
|
|
18
20
|
|
|
19
21
|
unless ec2
|
|
20
22
|
puts "Unable to connect to EC2"
|
|
@@ -84,9 +86,11 @@ module Awsam
|
|
|
84
86
|
|
|
85
87
|
results.each_with_index do |elem, i|
|
|
86
88
|
inst = rmap[elem[:resource_id]]
|
|
87
|
-
puts "%d) %s (%s, %s, %s)" %
|
|
89
|
+
puts "%d) %s (%s, %s, %s, %s)" %
|
|
88
90
|
[i, elem[:value], inst[:aws_instance_id],
|
|
89
|
-
inst[:aws_instance_type],
|
|
91
|
+
inst[:aws_instance_type],
|
|
92
|
+
inst[:aws_availability_zone],
|
|
93
|
+
inst[:aws_launch_time]]
|
|
90
94
|
end
|
|
91
95
|
puts "q) Quit"
|
|
92
96
|
puts
|
data/lib/awsam/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: awsam
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.3
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2015-
|
|
12
|
+
date: 2015-12-28 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: right_aws
|
|
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
119
119
|
version: '0'
|
|
120
120
|
segments:
|
|
121
121
|
- 0
|
|
122
|
-
hash: -
|
|
122
|
+
hash: -207219964221159059
|
|
123
123
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
124
124
|
none: false
|
|
125
125
|
requirements:
|
|
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
128
128
|
version: '0'
|
|
129
129
|
segments:
|
|
130
130
|
- 0
|
|
131
|
-
hash: -
|
|
131
|
+
hash: -207219964221159059
|
|
132
132
|
requirements: []
|
|
133
133
|
rubyforge_project:
|
|
134
134
|
rubygems_version: 1.8.23.2
|