bguthrie-awsymandias 0.1.1 → 0.2.0

data/README.rdoc

@@ -4,6 +4,23 @@
 
 Awsymandias is a library that helps you set up and tear down complicated AWS environments. In addition to offering a clean, fluent domain model for working with instances and groups of instances it allows you to persist role-to-instance-id mappings to SimpleDB, allowing you to manage your stack from multiple different machines. Eventually it will allow you to add arbitrary instance metadata and help you track instance running costs over time.
 
+  I met a hacker from an antique land
+  Who said: Two tall and heavy mounts of steel
+  Lie in a basement. Near them on a stand,
+  Recessed, a dark CRT lies, whose peel’d
+  Cracked shell of dullest beige, and blinkenlights,
+  Tell that its fact’ry well those old specs read
+  Which yet survive, inked on the lifeless thing,
+  The die that stamp’d them and the power that fed.
+  And on the burned-in screen these words appear:
+  “My name is Awsymandias, king of kings:
+  Look on my racks, ye Mighty, and despair!”
+  No bits at all remain. Not far away
+  A data center waits, its humming air
+  Host to a boundless cloud by th’hour to pay.
+  
+(Apologies to Shelley’s original sonnet. Die-hards will please note that it scans and attempts to follow the original meter and rhyme scheme wherever possible.)
+
 == Example
 
   # Give the stack a name, and describe its members.
@@ -13,7 +30,7 @@ Awsymandias is a library that helps you set up and tear down complicated AWS env
   end
 
   # Check if we're running by pulling stack description from SDB; if not, launch asynchronously.
-  stack.launch unless stack.running? 
+  stack.launch unless stack.launched? || stack.running? 
   until stack.running?
     sleep(5)
   end
@@ -26,6 +43,10 @@ Awsymandias is a library that helps you set up and tear down complicated AWS env
 
 This should allow you to re-launch and deploy that AWS stack from any one of several different workstations.
 
+== Contributors
+
+* Paul Gross (pgross@gmail.com)
+
 == License
 
 (The MIT License)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/awsymandias.gemspec

@@ -0,0 +1,63 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{awsymandias}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Brian Guthrie"]
+  s.date = %q{2009-07-14}
+  s.description = %q{A library for helping you set up, track, and tear down complicated deployment configurations in Amazon EC2.}
+  s.email = %q{btguthrie@gmail.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "awsymandias.gemspec",
+     "lib/awsymandias.rb",
+     "spec/awsymandias_spec.rb",
+     "vendor/aws-sdb/LICENSE",
+     "vendor/aws-sdb/README",
+     "vendor/aws-sdb/Rakefile",
+     "vendor/aws-sdb/lib/aws_sdb.rb",
+     "vendor/aws-sdb/lib/aws_sdb/error.rb",
+     "vendor/aws-sdb/lib/aws_sdb/service.rb",
+     "vendor/aws-sdb/spec/aws_sdb/service_spec.rb",
+     "vendor/aws-sdb/spec/spec_helper.rb"
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/bguthrie/awsymandias}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{A library for helping you set up, track, and tear down complicated deployment configurations in Amazon EC2.}
+  s.test_files = [
+    "spec/awsymandias_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
+      s.add_runtime_dependency(%q<activeresource>, [">= 2.3.0"])
+      s.add_runtime_dependency(%q<grempe-amazon-ec2>, [">= 0.4.2"])
+      s.add_runtime_dependency(%q<money>, [">= 2.1.3"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 2.3.0"])
+      s.add_dependency(%q<activeresource>, [">= 2.3.0"])
+      s.add_dependency(%q<grempe-amazon-ec2>, [">= 0.4.2"])
+      s.add_dependency(%q<money>, [">= 2.1.3"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 2.3.0"])
+    s.add_dependency(%q<activeresource>, [">= 2.3.0"])
+    s.add_dependency(%q<grempe-amazon-ec2>, [">= 0.4.2"])
+    s.add_dependency(%q<money>, [">= 2.1.3"])
+  end
+end

data/lib/awsymandias.rb

@@ -19,6 +19,25 @@ module Awsymandias
     end
   end
   
+  module Support
+    module Hash
+      # Ganked from ActiveResource 2.3.2.
+      def reformat_incoming_param_data(params)
+        case params.class.to_s
+          when "Hash"
+            params.inject({}) do |h,(k,v)|
+              h[k.to_s.underscore.tr("-", "_")] = reformat_incoming_param_data(v)
+              h
+            end
+          when "Array"
+            params.map { |v| reformat_incoming_param_data(v) }
+          else
+            params
+        end
+      end
+    end
+  end
+  
   module EC2
     class << self
       # Define the values for AMAZON_ACCESS_KEY_ID and AMAZON_SECRET_ACCESS_KEY_ID to allow for automatic
@@ -69,14 +88,22 @@ module Awsymandias
     # It wraps the simple hash structures returned by the EC2 gem with a domain model.
     # It inherits from ARes::B in order to provide simple XML <-> domain model mapping.
     class Instance < ActiveResource::Base
-      include ActiveSupport::CoreExtensions::Hash::Conversions::ClassMethods 
-      extend  ActiveSupport::CoreExtensions::Hash::Conversions::ClassMethods # unrename_keys
-    
+      include Awsymandias::Support::Hash
+      extend  Awsymandias::Support::Hash # reformat_incoming_param_data
+      
       self.site = "mu"
     
       def id;          instance_id;      end
       def public_dns;  dns_name;         end
       def private_dns; private_dns_name; end
+
+      def public_ip
+        dns_to_ip(public_dns)
+      end
+
+      def private_ip
+        dns_to_ip(private_dns)
+      end
     
       def pending?
         instance_state.name == "pending"
@@ -96,7 +123,7 @@ module Awsymandias
       end
     
       def reload
-        load(unrename_keys(
+        load(reformat_incoming_param_data(
           EC2.connection.describe_instances(:instance_id => [ self.instance_id ])["reservationSet"]["item"].
             first["instancesSet"]["item"].
             first # Good lord.
@@ -147,8 +174,10 @@ module Awsymandias
           if reservation_set.nil?
             []
           else
-            reservation_set["item"].first["instancesSet"]["item"].map do |item|
-              instantiate_record(unrename_keys(item))
+            reservation_set["item"].sum([]) do |item_set|
+              item_set["instancesSet"]["item"].map do |item|
+                instantiate_record(reformat_incoming_param_data(item))
+              end
             end
           end
         end
@@ -159,7 +188,7 @@ module Awsymandias
             raise ActiveResource::ResourceNotFound, "not found: #{id}"
           else
             reservation_set["item"].first["instancesSet"]["item"].map do |item|
-              instantiate_record(unrename_keys(item))
+              instantiate_record(reformat_incoming_param_data(item))
             end.first
           end
         end
@@ -174,6 +203,13 @@ module Awsymandias
           find(instance_id)
         end
       end
+
+      private
+
+      def dns_to_ip(dns)
+        match = dns.match(/(ec2|ip)-(\d+)-(\d+)-(\d+)-(\d+)/)
+        match.captures[1..-1].join(".")
+      end
     end
       
     # Goal:
@@ -241,13 +277,18 @@ module Awsymandias
       end
       
       def launched?
-        @instances.any? || restore_from_role_to_instance_id_mapping.any?
+        @instances.any? || ( @instances = retrieve_role_to_instance_id_mapping ).any?
       end
           
       def running?
         launched? && @instances.values.all?(&:running?)
       end
       
+      def running_cost
+        return Money.new(0) unless launched?
+        @instances.values.sum { |instance| instance.running_cost }
+      end
+      
       def inspect
         ( [ "Environment #{@name}, running? #{running?}" ] + roles.map do |role_name, opts|
           "** #{role_name}: #{opts.inspect}"
@@ -266,8 +307,8 @@ module Awsymandias
           Awsymandias::SimpleDB.delete @sdb_domain, @name
         end
         
-        def restore_from_role_to_instance_id_mapping
-          @instances = returning(Awsymandias::SimpleDB.get(@sdb_domain, @name)) do |mapping|
+        def retrieve_role_to_instance_id_mapping
+          returning(Awsymandias::SimpleDB.get(@sdb_domain, @name)) do |mapping|
             unless mapping.empty?
               live_instances = Awsymandias::EC2::Instance.find(:all, :instance_ids => mapping.values.flatten).index_by(&:instance_id)
               mapping.each do |role_name, instance_id|
@@ -312,5 +353,5 @@ module Awsymandias
           returning(domain) { connection.create_domain(domain) unless domain_exists?(domain) }
         end
     end
-  end
+  end  
 end

data/spec/awsymandias_spec.rb

@@ -18,11 +18,15 @@ describe Awsymandias do
     end
   end
   
-  describe Awsymandias::EC2 do
+  describe Awsymandias::EC2 do    
     def stub_connection_with(return_value)
       Awsymandias::EC2.stub!(:connection).and_return stub("a connection", :describe_instances => return_value)
     end
     
+    def zero_dollars
+      Money.new(0)
+    end
+    
     describe "connection" do
       it "should configure an instance of EC2::Base" do
         Awsymandias.access_key_id = "configured key"
@@ -93,12 +97,12 @@ describe Awsymandias do
               "launchTime" => "2009-04-20T01:30:35.000Z", 
               "instanceType" => "m1.large", 
               "imageId" => "ami-some-image", 
-              "privateDnsName" => nil, 
+              "privateDnsName" => "ip-10-244-226-239.ec2.internal", 
               "reason" => nil, 
               "placement" => { 
                 "availabilityZone" => "us-east-1c" 
               }, 
-              "dnsName" => nil, 
+              "dnsName" => "ec2-174-129-118-52.compute-1.amazonaws.com", 
               "instanceId" => "i-some-instance", 
               "instanceState" => {
                 "name" => "running", 
@@ -110,55 +114,78 @@ describe Awsymandias do
         "requestId" => "7bca5c7c-1b51-473e-a930-611e55920e39",
         "xmlns"=>"http://ec2.amazonaws.com/doc/2008-12-01/",
         "reservationSet" => {
-          "item" => [ {
-            "reservationId" => "r-db68e3b2", 
-            "requesterId" => "058890971305", 
-            "ownerId" => "358110980006",
-            "groupSet" => { "item" => [ { "groupId" => "default" } ] }, 
-            "instancesSet" => { "item" => [ 
-              {
-                "productCodes" => nil, 
-                "kernelId" => "aki-some-kernel", 
-                "amiLaunchIndex" => "0", 
-                "keyName" => "gsg-keypair", 
-                "ramdiskId" => "ari-b31cf9da", 
-                "launchTime" => "2009-04-20T01:30:35.000Z", 
-                "instanceType" => "m1.large", 
-                "imageId" => "ami-some-image", 
-                "privateDnsName" => nil, 
-                "reason" => nil, 
-                "placement" => { 
-                  "availabilityZone" => "us-east-1c" 
-                }, 
-                "dnsName" => nil, 
-                "instanceId" => "i-some-instance", 
-                "instanceState" => {
-                  "name" => "running", 
-                  "code"=>"0" 
-                } 
-              },
-              { 
-                "productCodes" => nil, 
-                "kernelId" => "aki-some-kernel", 
-                "amiLaunchIndex" => "0", 
-                "keyName" => "gsg-keypair", 
-                "ramdiskId" => "ari-b31cf9da", 
-                "launchTime" => "2009-04-20T01:30:35.000Z", 
-                "instanceType" => "m1.large", 
-                "imageId" => "ami-some-image", 
-                "privateDnsName" => nil, 
-                "reason" => nil, 
-                "placement" => { 
-                  "availabilityZone" => "us-east-1c" 
-                }, 
-                "dnsName" => nil, 
-                "instanceId" => "i-another-instance", 
-                "instanceState" => {
-                  "name" => "pending", 
-                  "code"=>"0" 
-                } 
-              } ] } } ] } 
-      }
+          "item" => [ 
+            { "reservationId"=>"r-5b226e32",
+              "ownerId"=>"423319072129",
+              "groupSet" => { "item" => [ {"groupId"=>"default" } ] },
+              "instancesSet" => { "item" => [
+                 { "productCodes"=>nil,
+                   "kernelId"=>"aki-some-kernel",
+                   "amiLaunchIndex"=>"0",
+                   "ramdiskId"=>"ari-b31cf9da",
+                   "launchTime"=>"2009-07-14T17:47:33.000Z",
+                   "instanceType"=>"c1.xlarge",
+                   "imageId"=>"ami-some-other-image",
+                   "privateDnsName"=>nil,
+                   "reason"=>nil,
+                   "placement" => {
+                     "availabilityZone"=>"us-east-1b"
+                   },
+                   "dnsName" => nil,
+                   "instanceId"=>"i-some-other-instance",
+                   "instanceState" => { 
+                     "name"=>"running", 
+                     "code"=>"16",
+                    }
+                  }
+                ] } },
+            { "reservationId" => "r-db68e3b2", 
+              "requesterId" => "058890971305", 
+              "ownerId" => "358110980006",
+              "groupSet" => { "item" => [ { "groupId" => "default" } ] }, 
+              "instancesSet" => { "item" => [ 
+                { "productCodes" => nil, 
+                  "kernelId" => "aki-some-kernel", 
+                  "amiLaunchIndex" => "0", 
+                  "keyName" => "gsg-keypair", 
+                  "ramdiskId" => "ari-b31cf9da", 
+                  "launchTime" => "2009-04-20T01:30:35.000Z", 
+                  "instanceType" => "m1.large", 
+                  "imageId" => "ami-some-image", 
+                  "privateDnsName" => nil, 
+                  "reason" => nil, 
+                  "placement" => { 
+                    "availabilityZone" => "us-east-1c" 
+                  }, 
+                  "dnsName" => nil, 
+                  "instanceId" => "i-some-instance", 
+                  "instanceState" => {
+                    "name" => "running", 
+                    "code"=>"0" 
+                  } },
+                { "productCodes" => nil, 
+                  "kernelId" => "aki-some-kernel", 
+                  "amiLaunchIndex" => "0", 
+                  "keyName" => "gsg-keypair", 
+                  "ramdiskId" => "ari-b31cf9da", 
+                  "launchTime" => "2009-04-20T01:30:35.000Z", 
+                  "instanceType" => "m1.large", 
+                  "imageId" => "ami-some-image", 
+                  "privateDnsName" => nil, 
+                  "reason" => nil, 
+                  "placement" => { 
+                    "availabilityZone" => "us-east-1c" 
+                  }, 
+                  "dnsName" => nil, 
+                  "instanceId" => "i-another-instance", 
+                  "instanceState" => {
+                    "name" => "pending", 
+                    "code"=>"0" 
+                  } 
+                } ] } }
+              ]
+            } 
+          }
   
       RUN_INSTANCES_SINGLE_RESULT_XML = {
         "reservationId" => "r-276ee54e", 
@@ -260,7 +287,9 @@ describe Awsymandias do
     
         it "should return more than one object if multiple IDs are requested" do
           stub_connection_with DESCRIBE_INSTANCES_MULTIPLE_RESULTS_RUNNING_XML
-          Instance.find(:all, :instance_ids => ["i-some-instance", "i-another-instance"]).map(&:instance_id).should == [ "i-some-instance", "i-another-instance" ]
+          Instance.find(:all, :instance_ids => ["i-some-other-instance", "i-some-instance", "i-another-instance"]).map do |instance|
+            instance.instance_id
+          end.should == ["i-some-other-instance", "i-some-instance", "i-another-instance"]
         end
     
         it "should map camelized XML properties to Ruby-friendly underscored method names" do
@@ -391,11 +420,39 @@ describe Awsymandias do
           instance.uptime.should == (time_now - instance.launch_time)
         end
       end
+
+      describe "public_dns" do
+        it "should return the public dns from the xml" do
+          stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_RUNNING_XML 
+          Awsymandias::EC2::Instance.find("i-some-instance").public_dns.should == "ec2-174-129-118-52.compute-1.amazonaws.com"
+        end
+      end
+      
+      describe "public_ip" do
+        it "should parse the public dns to get the public IP address" do
+          stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_RUNNING_XML 
+          Awsymandias::EC2::Instance.find("i-some-instance").public_ip.should == "174.129.118.52"
+        end
+      end
+
+      describe "private_dns" do
+        it "should return the private dns from the xml" do
+          stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_RUNNING_XML 
+          Awsymandias::EC2::Instance.find("i-some-instance").private_dns.should == "ip-10-244-226-239.ec2.internal"
+        end
+      end
+
+      describe "private_ip" do
+        it "should parse the private dns to get the private IP address" do
+          stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_RUNNING_XML 
+          Awsymandias::EC2::Instance.find("i-some-instance").private_ip.should == "10.244.226.239"
+        end
+      end
   
       describe "running_cost" do
         it "should be zero if the instance has not yet been launched" do
           stub_connection_with DESCRIBE_INSTANCES_SINGLE_RESULT_PENDING_XML
-          Awsymandias::EC2::Instance.find("i-some-instance").running_cost.should == Money.new(0)
+          Awsymandias::EC2::Instance.find("i-some-instance").running_cost.should == zero_dollars
         end
         
         it "should be a single increment if the instance was launched 5 minutes ago" do
@@ -673,6 +730,23 @@ describe Awsymandias do
           Awsymandias::SimpleDB.get(ApplicationStack::DEFAULT_SDB_DOMAIN, "test").should be_blank
         end
       end
+      
+      describe "running_cost" do
+        it "should be zero if the stack has not been launched" do
+          s = ApplicationStack.new("test") {|s| s.role "db1", :instance_type => Awsymandias::EC2::InstanceTypes::M1_LARGE}
+          s.running_cost.should == zero_dollars
+        end
+        
+        it "should be the sum total of the running cost of its constituent instances" do
+          stack = ApplicationStack.new "test"
+          stack.should_receive(:retrieve_role_to_instance_id_mapping).and_return({
+            :db  => mock(:instance, :running_cost => Money.new(10)),
+            :app => mock(:instance, :running_cost => Money.new(20))
+          })
+          
+          stack.running_cost.should == Money.new(30)
+        end
+      end
     end
   end
-end
+end

data/vendor/aws-sdb/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2007, 2008 Tim Dysinger
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/vendor/aws-sdb/README

@@ -0,0 +1 @@
+Amazon SDB API

data/vendor/aws-sdb/Rakefile

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'spec/rake/spectask'
+require 'rake/gempackagetask'
+
+Spec::Rake::SpecTask.new
+
+gem_spec = eval(IO.read(File.join(File.dirname(__FILE__), "aws-sdb.gemspec")))
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r aws_sdb.rb"
+end
+
+Rake::GemPackageTask.new(gem_spec) do |pkg|
+  pkg.gem_spec = gem_spec
+end
+
+task :install => [:package] do
+  sh %{sudo gem install pkg/#{gem_spec.name}-#{gem_spec.version}}
+end

data/vendor/aws-sdb/lib/aws_sdb.rb

@@ -0,0 +1,3 @@
+require 'aws_sdb/error'
+require 'aws_sdb/service'
+

data/vendor/aws-sdb/lib/aws_sdb/error.rb

@@ -0,0 +1,42 @@
+module AwsSdb
+
+  class Error < RuntimeError ; end
+
+  class RequestError < Error
+    attr_reader :request_id
+
+    def initialize(message, request_id=nil)
+      super(message)
+      @request_id = request_id
+    end
+  end
+
+  class InvalidDomainNameError < RequestError ; end
+  class InvalidParameterValueError < RequestError ; end
+  class InvalidNextTokenError < RequestError ; end
+  class InvalidNumberPredicatesError < RequestError ; end
+  class InvalidNumberValueTestsError < RequestError ; end
+  class InvalidQueryExpressionError < RequestError ; end
+  class MissingParameterError < RequestError ; end
+  class NoSuchDomainError < RequestError ; end
+  class NumberDomainsExceededError < RequestError ; end
+  class NumberDomainAttributesExceededError < RequestError ; end
+  class NumberDomainBytesExceededError < RequestError ; end
+  class NumberItemAttributesExceededError < RequestError ; end
+  class RequestTimeoutError < RequestError ; end
+
+  class FeatureDeprecatedError < RequestError ; end
+
+  class ConnectionError < Error
+    attr_reader :response
+
+    def initialize(response)
+      super(
+        "#{response.code} \
+         #{response.message if response.respond_to?(:message)}"
+      )
+      @response = response
+    end
+  end
+
+end

data/vendor/aws-sdb/lib/aws_sdb/service.rb

@@ -0,0 +1,191 @@
+require 'logger'
+require 'time'
+require 'cgi'
+require 'uri'
+require 'net/http'
+require 'base64'
+require 'openssl'
+require 'rexml/document'
+require 'rexml/xpath'
+
+module AwsSdb
+
+  class Service
+    def initialize(options={})
+      @access_key_id = options[:access_key_id] || ENV['AMAZON_ACCESS_KEY_ID']
+      @secret_access_key = options[:secret_access_key] || ENV['AMAZON_SECRET_ACCESS_KEY']
+      @base_url = options[:url] || 'http://sdb.amazonaws.com'
+      @logger = options[:logger] || Logger.new("aws_sdb.log")
+    end
+
+    def list_domains(max = nil, token = nil)
+      params = { 'Action' => 'ListDomains' }
+      params['NextToken'] =
+        token unless token.nil? || token.empty?
+      params['MaxNumberOfDomains'] =
+        max.to_s unless max.nil? || max.to_i == 0
+      doc = call(:get, params)
+      results = []
+      REXML::XPath.each(doc, '//DomainName/text()') do |domain|
+        results << domain.to_s
+      end
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
+    end
+
+    def create_domain(domain)
+      call(:post, { 'Action' => 'CreateDomain', 'DomainName'=> domain.to_s })
+      nil
+    end
+
+    def delete_domain(domain)
+      call(
+        :delete,
+        { 'Action' => 'DeleteDomain', 'DomainName' => domain.to_s }
+      )
+      nil
+    end
+    # <QueryWithAttributesResult><Item><Name>in-c2ffrw</Name><Attribute><Name>code</Name><Value>in-c2ffrw</Value></Attribute><Attribute><Name>date_created</Name><Value>2008-10-31</Value></Attribute></Item><Item>
+    def query_with_attributes(domain, query, max = nil, token = nil)
+      params = {
+        'Action' => 'QueryWithAttributes',
+        'QueryExpression' => query,
+        'DomainName' => domain.to_s
+      }
+      params['NextToken'] =
+        token unless token.nil? || token.empty?
+      params['MaxNumberOfItems'] =
+        max.to_s unless max.nil? || max.to_i == 0
+
+      doc = call(:get, params)
+      results = []
+      REXML::XPath.each(doc, "//Item") do |item|
+        name = REXML::XPath.first(item, './Name/text()').to_s
+
+
+        attributes = {'Name' => name}
+        REXML::XPath.each(item, "./Attribute") do |attr|
+          key = REXML::XPath.first(attr, './Name/text()').to_s
+          value = REXML::XPath.first(attr, './Value/text()').to_s
+          ( attributes[key] ||= [] ) << value
+        end
+        results << attributes
+      end
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
+    end
+
+    # <QueryResult><ItemName>in-c2ffrw</ItemName><ItemName>in-72yagt</ItemName><ItemName>in-52j8gj</ItemName>
+    def query(domain, query, max = nil, token = nil)
+      params = {
+        'Action' => 'Query',
+        'QueryExpression' => query,
+        'DomainName' => domain.to_s
+      }
+      params['NextToken'] =
+        token unless token.nil? || token.empty?
+      params['MaxNumberOfItems'] =
+        max.to_s unless max.nil? || max.to_i == 0
+
+
+      doc = call(:get, params)
+      results = []
+      REXML::XPath.each(doc, '//ItemName/text()') do |item|
+        results << item.to_s
+      end
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
+
+    end
+
+    def put_attributes(domain, item, attributes, replace = true)
+      params = {
+        'Action' => 'PutAttributes',
+        'DomainName' => domain.to_s,
+        'ItemName' => item.to_s
+      }
+      count = 0
+      attributes.each do | key, values |
+        ([]<<values).flatten.each do |value|
+          params["Attribute.#{count}.Name"] = key.to_s
+          params["Attribute.#{count}.Value"] = value.to_s
+          params["Attribute.#{count}.Replace"] = replace
+          count += 1
+        end
+      end
+      call(:put, params)
+      nil
+    end
+
+    def get_attributes(domain, item)
+      doc = call(
+        :get,
+        {
+          'Action' => 'GetAttributes',
+          'DomainName' => domain.to_s,
+          'ItemName' => item.to_s
+        }
+      )
+      attributes = {}
+      REXML::XPath.each(doc, "//Attribute") do |attr|
+        key = REXML::XPath.first(attr, './Name/text()').to_s
+        value = REXML::XPath.first(attr, './Value/text()').to_s
+        ( attributes[key] ||= [] ) << value
+      end
+      attributes
+    end
+
+    def delete_attributes(domain, item)
+      call(
+        :delete,
+        {
+          'Action' => 'DeleteAttributes',
+          'DomainName' => domain.to_s,
+          'ItemName' => item.to_s
+        }
+      )
+      nil
+    end
+
+    protected
+
+    def call(method, params)
+      params.merge!( {
+          'Version' => '2007-11-07',
+          'SignatureVersion' => '1',
+          'AWSAccessKeyId' => @access_key_id,
+          'Timestamp' => Time.now.gmtime.iso8601
+        }
+      )
+      data = ''
+      query = []
+      params.keys.sort_by { |k| k.upcase }.each do |key|
+        data << "#{key}#{params[key].to_s}"
+        query << "#{key}=#{CGI::escape(params[key].to_s)}"
+      end
+      digest = OpenSSL::Digest::Digest.new('sha1')
+      hmac = OpenSSL::HMAC.digest(digest, @secret_access_key, data)
+      signature = Base64.encode64(hmac).strip
+      query << "Signature=#{CGI::escape(signature)}"
+      query = query.join('&')
+      url = "#{@base_url}?#{query}"
+      uri = URI.parse(url)
+      @logger.debug("#{url}") if @logger
+      response =
+        Net::HTTP.new(uri.host, uri.port).send_request(method, uri.request_uri)
+      @logger.debug("#{response.code}\n#{response.body}") if @logger
+      raise(ConnectionError.new(response)) unless (200..400).include?(
+        response.code.to_i
+      )
+      doc = REXML::Document.new(response.body)
+      error = doc.get_elements('*/Errors/Error')[0]
+      raise(
+        Module.class_eval(
+          "AwsSdb::#{error.get_elements('Code')[0].text}Error"
+        ).new(
+          error.get_elements('Message')[0].text,
+          doc.get_elements('*/RequestID')[0].text
+        )
+      ) unless error.nil?
+      doc
+    end
+  end
+
+end

data/vendor/aws-sdb/spec/aws_sdb/service_spec.rb

@@ -0,0 +1,183 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+require 'digest/sha1'
+require 'net/http'
+require 'rexml/document'
+
+require 'rubygems'
+require 'uuidtools'
+
+include AwsSdb
+
+describe Service, "when creating a new domain" do
+  before(:all) do
+    @service = AwsSdb::Service.new
+    @domain = "test-#{UUID.random_create.to_s}"
+    domains = @service.list_domains[0]
+    domains.each do |d|
+      @service.delete_domain(d) if d =~ /^test/
+    end
+  end
+
+  after(:all) do
+    @service.delete_domain(@domain)
+  end
+
+  it "should not raise an error if a valid new domain name is given" do
+    lambda {
+      @service.create_domain("test-#{UUID.random_create.to_s}")
+    }.should_not raise_error
+  end
+
+  it "should not raise an error if the domain name already exists" do
+    domain = "test-#{UUID.random_create.to_s}"
+    lambda {
+      @service.create_domain(domain)
+      @service.create_domain(domain)
+    }.should_not raise_error
+  end
+
+  it "should raise an error if an a nil or '' domain name is given" do
+    lambda {
+      @service.create_domain('')
+    }.should raise_error(InvalidParameterValueError)
+    lambda {
+      @service.create_domain(nil)
+    }.should raise_error(InvalidParameterValueError)
+    lambda {
+      @service.create_domain('     ')
+    }.should raise_error(InvalidParameterValueError)
+  end
+
+  it "should raise an error if the domain name length is < 3 or > 255" do
+    lambda {
+      @service.create_domain('xx')
+    }.should raise_error(InvalidParameterValueError)
+    lambda {
+      @service.create_domain('x'*256)
+    }.should raise_error(InvalidParameterValueError)
+  end
+
+  it "should only accept domain names with a-z, A-Z, 0-9, '_', '-', and '.' " do
+    lambda {
+      @service.create_domain('@$^*()')
+    }.should raise_error(InvalidParameterValueError)
+  end
+
+  it "should only accept a maximum of 100 domain names"
+
+  it "should not have to call amazon to determine domain name correctness"
+end
+
+describe Service, "when listing domains" do
+  before(:all) do
+    @service = AwsSdb::Service.new
+    @domain = "test-#{UUID.random_create.to_s}"
+    @service.list_domains[0].each do |d|
+      @service.delete_domain(d) if d =~ /^test/
+    end
+    @service.create_domain(@domain)
+  end
+
+  after(:all) do
+    @service.delete_domain(@domain)
+  end
+
+  it "should return a complete list" do
+    result = nil
+    lambda { result = @service.list_domains[0] }.should_not raise_error
+    result.should_not be_nil
+    result.should_not be_empty
+    result.include?(@domain).should == true
+  end
+end
+
+describe Service, "when deleting domains" do
+  before(:all) do
+    @service = AwsSdb::Service.new
+    @domain = "test-#{UUID.random_create.to_s}"
+    @service.list_domains[0].each do |d|
+      @service.delete_domain(d) if d =~ /^test/
+    end
+    @service.create_domain(@domain)
+  end
+
+  after do
+    @service.delete_domain(@domain)
+  end
+
+  it "should be able to delete an existing domain" do
+    lambda { @service.delete_domain(@domain) }.should_not raise_error
+  end
+
+  it "should not raise an error trying to delete a non-existing domain" do
+    lambda {
+      @service.delete_domain(UUID.random_create.to_s)
+    }.should_not raise_error
+  end
+end
+
+describe Service, "when managing items" do
+  before(:all) do
+    @service = AwsSdb::Service.new
+    @domain = "test-#{UUID.random_create.to_s}"
+    @service.list_domains[0].each do |d|
+      @service.delete_domain(d) if d =~ /^test/
+    end
+    @service.create_domain(@domain)
+    @item = "test-#{UUID.random_create.to_s}"
+    @attributes = {
+      :question => 'What is the answer?',
+      :answer => [ true, 'testing123', 4.2, 42, 420 ]
+    }
+  end
+
+  after(:all) do
+     @service.delete_domain(@domain)
+  end
+
+  it "should be able to put attributes" do
+    lambda {
+      @service.put_attributes(@domain, @item, @attributes)
+    }.should_not raise_error
+  end
+
+  it "should be able to get attributes" do
+    result = nil
+    lambda {
+      result = @service.get_attributes(@domain, @item)
+    }.should_not raise_error
+    result.should_not be_nil
+    result.should_not be_empty
+    result.has_key?('answer').should == true
+    @attributes[:answer].each do |v|
+      result['answer'].include?(v.to_s).should == true
+    end
+  end
+
+  it "should be able to query" do
+    result = nil
+    lambda {
+      result = @service.query(@domain, "[ 'answer' = '42' ]")[0]
+    }.should_not raise_error
+    result.should_not be_nil
+    result.should_not be_empty
+    result.should_not be_nil
+    result.include?(@item).should == true
+  end
+
+  it "should be able to query with attributes"
+
+  it "should be able to delete attributes" do
+    lambda {
+      @service.delete_attributes(@domain, @item)
+    }.should_not raise_error
+  end
+end
+
+# TODO Pull the specs from the amazon docs and write more rspec
+# 100 attributes per each call
+# 256 total attribute name-value pairs per item
+# 250 million attributes per domain
+# 10 GB of total user data storage per domain
+# ...etc...

data/vendor/aws-sdb/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+$TESTING=true
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'aws_sdb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bguthrie-awsymandias
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Brian Guthrie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-07 00:00:00 -07:00
+date: 2009-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,24 +33,24 @@ dependencies:
         version: 2.3.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hungryblank-aws-sdb
+  name: grempe-amazon-ec2
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 0.4.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: grempe-amazon-ec2
+  name: money
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.2
+        version: 2.1.3
     version: 
 description: A library for helping you set up, track, and tear down complicated deployment configurations in Amazon EC2.
 email: btguthrie@gmail.com
@@ -65,8 +65,17 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- awsymandias.gemspec
 - lib/awsymandias.rb
 - spec/awsymandias_spec.rb
+- vendor/aws-sdb/LICENSE
+- vendor/aws-sdb/README
+- vendor/aws-sdb/Rakefile
+- vendor/aws-sdb/lib/aws_sdb.rb
+- vendor/aws-sdb/lib/aws_sdb/error.rb
+- vendor/aws-sdb/lib/aws_sdb/service.rb
+- vendor/aws-sdb/spec/aws_sdb/service_spec.rb
+- vendor/aws-sdb/spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/bguthrie/awsymandias
 post_install_message: