swirl 1.5.0 → 1.5.2
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/bin/swirl +23 -5
- data/lib/swirl/ec2.rb +2 -2
- metadata +2 -2
data/bin/swirl
CHANGED
|
@@ -1,11 +1,29 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
require 'irb'
|
|
3
|
+
require 'yaml'
|
|
3
4
|
require 'swirl'
|
|
4
5
|
|
|
5
|
-
def
|
|
6
|
-
|
|
6
|
+
def options(account)
|
|
7
|
+
config = File.expand_path("~/.swirl")
|
|
8
|
+
if account && File.exists?(config)
|
|
9
|
+
account = account.to_sym
|
|
10
|
+
data = YAML.load_file(config)
|
|
11
|
+
if data.key?(account)
|
|
12
|
+
data[account]
|
|
13
|
+
else
|
|
14
|
+
abort("I don't see the account you're looking for")
|
|
15
|
+
end
|
|
16
|
+
else
|
|
17
|
+
{
|
|
18
|
+
:aws_access_key_id => ENV["AWS_ACCESS_KEY_ID"],
|
|
19
|
+
:aws_secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"]
|
|
20
|
+
}
|
|
21
|
+
end
|
|
7
22
|
end
|
|
8
23
|
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
24
|
+
C = Swirl::EC2.new options(ARGV.shift) \
|
|
25
|
+
rescue abort("unable to find keys")
|
|
26
|
+
|
|
27
|
+
def c ; C ; end
|
|
28
|
+
|
|
29
|
+
IRB.start
|
data/lib/swirl/ec2.rb
CHANGED
|
@@ -22,10 +22,10 @@ module Swirl
|
|
|
22
22
|
def initialize(options)
|
|
23
23
|
@aws_access_key_id =
|
|
24
24
|
options[:aws_access_key_id] ||
|
|
25
|
-
raise ArgumentError, "no aws_access_key_id provided"
|
|
25
|
+
(raise ArgumentError, "no aws_access_key_id provided")
|
|
26
26
|
@aws_secret_access_key =
|
|
27
27
|
options[:aws_secret_access_key] ||
|
|
28
|
-
raise ArgumentError, "no aws_secret_access_key provided"
|
|
28
|
+
(raise ArgumentError, "no aws_secret_access_key provided")
|
|
29
29
|
|
|
30
30
|
@hmac = HMAC::SHA256.new(@aws_secret_access_key)
|
|
31
31
|
@version = options[:version] || "2009-11-30"
|