swirl 1.7.4 → 1.7.5

data/README.md

@@ -1,14 +1,13 @@
 Swirl
 =====
 
-Swirl is an EC2 version agnostic client for EC2 writtin in Ruby. It gets
+Swirl is an EC2 version agnostic client for EC2 written in Ruby. It gets
 out of your way.
 
 The secret is it's simple input extraction and output compacting.  Your
 input parameters and `expand`ed and EC2's (terrible) xml output is
 `compact`ed.
 
-
 Some simple examples:
 
     # Input
@@ -37,7 +36,7 @@ and
       }
     }
 
-and it's varations are now `compact`ed to:
+and it's variations are now `compact`ed to:
 
   {
     "reservationSet" => {
@@ -46,18 +45,17 @@ and it's varations are now `compact`ed to:
   }
 
 
-Some things worth noteing is that compact ignores Symbols.  This
+Some things worth noting is that compact ignores Symbols.  This
 allows you to pass the params into `call` and use them later
-without affecting the API call (i.e. chain of responsiblity); a
+without affecting the API call (i.e. chain of responsibility); a
 nifty trick we use in (Rack)[http://github.com/rack/rack]
 
 Use
 ---
 
-    require 'rubygems' # if you're using rubygems
     require 'swirl/aws'
 
-    ec2 = Swirl::EC2.new
+    ec2 = Swirl::AWS.new(:ec2)
 
     # Describe all instances
     ec2.call "DescribeInstances"
@@ -65,9 +63,19 @@ Use
     # Describe specific instances
     ec2.call "DescribeInstances", "InstanceId" => ["i-38hdk2f", "i-93nndch"]
 
+    # Talk to a different region
+    ec2_asia = Swirl::AWS.new(:ec2, :region => 'ap-southeast-1')
 
 Shell
 ---
+    $ swirl -h
+    Usage: swirl [options]
+        -a ACCOUT                        Account name (default is default)
+        -c FILE                          Swirl file (default is ~/.swirl)
+        -s service                       The AWS service to use (default is ec2)
+        -r region                        The AWS region to use (default is up to AWS)
+        -h, --help
+
 
     $ swirl
     >> c

data/bin/swirl

@@ -1,28 +1,24 @@
 #!/usr/bin/env ruby
 require 'irb'
 require 'yaml'
-require 'swirl'
+require 'swirl/aws'
 require 'optparse'
 
-interactive = false
 account = "default"
 etc = "#{ENV["HOME"]}/.swirl"
+service = :ec2
+region = nil
 
 ARGV.options do |o|
   o.on("-a ACCOUT", "Account name (default is default)") {|s| account = s }
   o.on("-c FILE", "Swirl file (default is ~/.swirl)") {|s| etc = s }
-  o.on("-i", "Interactive console") { interactive = true }
+  o.on("-s service", "The AWS service to use (default is ec2)") {|s| service = s }
+  o.on("-r region", "The AWS region to use (default is up to AWS)") {|s| region = s }
   o.on("-h", "--help") { puts o; exit }
   o.parse!
 end
 
-config = \
-if ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
-  {
-    :aws_access_key_id => ENV["AWS_ACCESS_KEY_ID"],
-    :aws_secret_access_key => ENV["AWS_SECRET_ACCESS_KEY"]
-  }
-else
+config = (
   account = account.to_sym
   data = YAML.load_file(etc)
   if data.key?(account)
@@ -30,38 +26,13 @@ else
   else
     abort("I don't see the account you're looking for")
   end
-end
+)
 
-c = Swirl::EC2.new config
+c = Swirl::AWS.new service.to_sym, config.merge(:region => region)
 
-# We can now start the interactive session
-# if requested
-if interactive
-  # Create sugar for working in the console.
-  # >> c.call "DescribeInstances", ...
-  Kernel.send(:define_method, :c) { c }
+# Create sugar for working in the console.
+# >> c.call "DescribeInstances", ...
+Kernel.send(:define_method, :c) { c }
 
-  # Start the interactive session
-  IRB.start
-else
-  begin
-    case cmd = ARGV[0] || "list"
-    when "list"
-      resvs = c.call("DescribeInstances")["reservationSet"]
-      insts = resvs.map {|r| r["instancesSet"] }.flatten
-      insts.each do |ins|
-        data = [
-            ins["instanceState"]["name"],
-            ins["instanceId"],
-            ins["availabilityZone"],
-            ins["dnsName"],
-            ins["privateDnsName"],
-            ins["launchTime"]
-        ]
-        puts data * "\t"
-      end
-    end
-  rescue => e
-    $stderr.puts "! " + e.to_s
-  end
-end
+# Start the interactive session
+IRB.start

data/lib/swirl/aws.rb

@@ -29,8 +29,10 @@ module Swirl
       @services[name] = { :url => url, :version => version }
     end
 
-    # Default Services
+    # Default Services (Region not included)
     service :ec2, "https://ec2.amazonaws.com", "2010-11-15"
+    service :elb, "https://elasticloadbalancing.amazonaws.com", "2010-07-01"
+    service :iam, "https://iam.amazonaws.com", "2010-05-08"
 
 
     def initialize(*args)
@@ -40,11 +42,14 @@ module Swirl
       service = self.class.services[name] || {}
       opts    = service.merge(opts)
 
-      @url = opts[:url] ||
+      @url = URI(opts[:url]) ||
         raise(ArgumentError, "No url given")
 
-      # Convert this here for future reference
-      @url = URI(@url)
+      if region = opts[:region]
+        parts = URI.split(@url.to_s)
+        parts[2] = parts[2].split('.').insert(1, region).join('.')
+        @url = URI::HTTPS.new(*parts)
+      end
 
       @version = opts[:version] ||
         raise(ArgumentError, "No version given")
@@ -62,6 +67,7 @@ module Swirl
       @hmac = HMAC::SHA256.new(@aws_secret_access_key)
     end
 
+
     def escape(value)
       CGI.escape(value).gsub(/\+/, "%20")
     end
@@ -92,7 +98,11 @@ module Swirl
         when 200
           response = compact(data)
         when 400...500
-          messages = Array(data["Response"]["Errors"]).map {|_, e| e["Message"] }
+          messages = if data["Response"]
+            Array(data["Response"]["Errors"]).map {|_, e| e["Message"] }
+          elsif data["ErrorResponse"]
+            Array(data["ErrorResponse"]["Error"]["Code"])
+          end
           raise InvalidRequest, messages.join(",")
         else
           msg = "unexpected response #{code} -> #{data.inspect}"

data/test/aws_test.rb

@@ -0,0 +1,15 @@
+require 'contest'
+require 'swirl/aws'
+
+class AwsTest < Test::Unit::TestCase
+
+  test "raises InvalidRequest on ErrorResponse" do
+    e = Swirl::AWS.new(:elb, :aws_access_key_id => 'AKIA', :aws_secret_access_key => 'secret')
+    def e.call!(*args, &blk)
+      doc = {"ErrorResponse"=>{"Error"=>{"Code"=>"CertificateNotFound", "Type"=>"Sender"}}}
+      blk.call [400, doc]
+    end
+    assert_raise(Swirl::InvalidRequest) { e.call "CreateLoadBalancer", {} }
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: swirl
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 7
-  - 4
-  version: 1.7.4
+  - 5
+  version: 1.7.5
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -82,6 +82,7 @@ files:
 - lib/swirl/ec2.rb
 - lib/swirl/helpers.rb
 - lib/swirl.rb
+- test/aws_test.rb
 - test/compactor_test.rb
 - test/expander_test.rb
 - test/slop_test.rb
@@ -126,6 +127,7 @@ signing_key:
 specification_version: 2
 summary: A version agnostic EC2 ruby driver
 test_files: 
+- test/aws_test.rb
 - test/compactor_test.rb
 - test/expander_test.rb
 - test/slop_test.rb