swirl 1.5.0 → 1.5.2

data/bin/swirl

@@ -1,11 +1,29 @@
 #!/usr/bin/env ruby
 require 'irb'
+require 'yaml'
 require 'swirl'
 
-def c
-  @c ||= Swirl::EC2.new
+def options(account)
+  config = File.expand_path("~/.swirl")
+  if account && File.exists?(config)
+    account = account.to_sym
+    data = YAML.load_file(config)
+    if data.key?(account)
+      data[account]
+    else
+      abort("I don't see the account you're looking for")
+    end
+  else
+    {
+      :aws_access_key_id => ENV["AWS_ACCESS_KEY_ID"],
+      :aws_secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"]
+    }
+  end
 end
 
-if $0 =~ %r|/swirl|
-  IRB.start(__FILE__)
-end
+C = Swirl::EC2.new options(ARGV.shift) \
+  rescue abort("unable to find keys")
+
+def c ; C ; end
+
+IRB.start

data/lib/swirl/ec2.rb

@@ -22,10 +22,10 @@ module Swirl
     def initialize(options)
       @aws_access_key_id =
         options[:aws_access_key_id] ||
-        raise ArgumentError, "no aws_access_key_id provided"
+        (raise ArgumentError, "no aws_access_key_id provided")
       @aws_secret_access_key =
         options[:aws_secret_access_key] ||
-        raise ArgumentError, "no aws_secret_access_key provided"
+        (raise ArgumentError, "no aws_secret_access_key provided")
 
       @hmac = HMAC::SHA256.new(@aws_secret_access_key)
       @version = options[:version] || "2009-11-30"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Blake Mizerany