fog 0.0.43 → 0.0.44

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 43
+:patch: 44
 :build: 

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.43"
+  s.version = "0.0.44"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-02-18}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
      "lib/fog/aws/parsers/ec2/describe_instances.rb",
      "lib/fog/aws/parsers/ec2/describe_key_pairs.rb",
      "lib/fog/aws/parsers/ec2/describe_regions.rb",
+     "lib/fog/aws/parsers/ec2/describe_reserved_instances.rb",
      "lib/fog/aws/parsers/ec2/describe_security_groups.rb",
      "lib/fog/aws/parsers/ec2/describe_snapshots.rb",
      "lib/fog/aws/parsers/ec2/describe_volumes.rb",
@@ -99,6 +100,7 @@ Gem::Specification.new do |s|
      "lib/fog/aws/requests/ec2/describe_instances.rb",
      "lib/fog/aws/requests/ec2/describe_key_pairs.rb",
      "lib/fog/aws/requests/ec2/describe_regions.rb",
+     "lib/fog/aws/requests/ec2/describe_reserved_instances.rb",
      "lib/fog/aws/requests/ec2/describe_security_groups.rb",
      "lib/fog/aws/requests/ec2/describe_snapshots.rb",
      "lib/fog/aws/requests/ec2/describe_volumes.rb",
@@ -215,6 +217,7 @@ Gem::Specification.new do |s|
      "lib/fog/terremark/requests/get_vdc.rb",
      "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
+     "spec/aws/models/ec2/flavors_spec.rb",
      "spec/aws/models/ec2/key_pair_spec.rb",
      "spec/aws/models/ec2/key_pairs_spec.rb",
      "spec/aws/models/ec2/security_group_spec.rb",
@@ -281,6 +284,7 @@ Gem::Specification.new do |s|
      "spec/aws/requests/simpledb/select_spec.rb",
      "spec/compact_progress_bar_formatter.rb",
      "spec/lorem.txt",
+     "spec/rackspace/models/servers/flavors_spec.rb",
      "spec/rackspace/models/servers/server_spec.rb",
      "spec/rackspace/models/servers/servers_spec.rb",
      "spec/rackspace/requests/files/delete_container_spec.rb",
@@ -308,8 +312,10 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/list_servers_spec.rb",
      "spec/rackspace/requests/servers/reboot_server_spec.rb",
      "spec/rackspace/requests/servers/update_server_spec.rb",
+     "spec/shared_examples/flavors_examples.rb",
      "spec/shared_examples/server_examples.rb",
      "spec/shared_examples/servers_examples.rb",
+     "spec/slicehost/models/flavors_spec.rb",
      "spec/slicehost/models/server_spec.rb",
      "spec/slicehost/models/servers_spec.rb",
      "spec/slicehost/requests/create_slice_spec.rb",
@@ -366,6 +372,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/aws/models/ec2/address_spec.rb",
      "spec/aws/models/ec2/addresses_spec.rb",
+     "spec/aws/models/ec2/flavors_spec.rb",
      "spec/aws/models/ec2/key_pair_spec.rb",
      "spec/aws/models/ec2/key_pairs_spec.rb",
      "spec/aws/models/ec2/security_group_spec.rb",
@@ -431,6 +438,7 @@ Gem::Specification.new do |s|
      "spec/aws/requests/simpledb/put_attributes_spec.rb",
      "spec/aws/requests/simpledb/select_spec.rb",
      "spec/compact_progress_bar_formatter.rb",
+     "spec/rackspace/models/servers/flavors_spec.rb",
      "spec/rackspace/models/servers/server_spec.rb",
      "spec/rackspace/models/servers/servers_spec.rb",
      "spec/rackspace/requests/files/delete_container_spec.rb",
@@ -458,8 +466,10 @@ Gem::Specification.new do |s|
      "spec/rackspace/requests/servers/list_servers_spec.rb",
      "spec/rackspace/requests/servers/reboot_server_spec.rb",
      "spec/rackspace/requests/servers/update_server_spec.rb",
+     "spec/shared_examples/flavors_examples.rb",
      "spec/shared_examples/server_examples.rb",
      "spec/shared_examples/servers_examples.rb",
+     "spec/slicehost/models/flavors_spec.rb",
      "spec/slicehost/models/server_spec.rb",
      "spec/slicehost/models/servers_spec.rb",
      "spec/slicehost/requests/create_slice_spec.rb",

data/lib/fog/aws/ec2.rb

@@ -47,6 +47,7 @@ module Fog
           "fog/aws/parsers/ec2/describe_availability_zones.rb",
           "fog/aws/parsers/ec2/describe_images.rb",
           "fog/aws/parsers/ec2/describe_instances.rb",
+          "fog/aws/parsers/ec2/describe_reserved_instances.rb",
           "fog/aws/parsers/ec2/describe_key_pairs.rb",
           "fog/aws/parsers/ec2/describe_regions.rb",
           "fog/aws/parsers/ec2/describe_security_groups.rb",
@@ -72,6 +73,7 @@ module Fog
           "fog/aws/requests/ec2/describe_availability_zones.rb",
           "fog/aws/requests/ec2/describe_images.rb",
           "fog/aws/requests/ec2/describe_instances.rb",
+          "fog/aws/requests/ec2/describe_reserved_instances.rb",
           "fog/aws/requests/ec2/describe_key_pairs.rb",
           "fog/aws/requests/ec2/describe_regions.rb",
           "fog/aws/requests/ec2/describe_security_groups.rb",

data/lib/fog/aws/parsers/ec2/describe_reserved_instances.rb

@@ -0,0 +1,36 @@
+module Fog
+  module Parsers
+    module AWS
+      module EC2
+
+        class DescribeReservedInstances < Fog::Parsers::Base
+
+          def reset
+            @reserved_instance = {}
+            @response = { 'reservedInstancesSet' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'availabilityZone', 'instanceType', 'productDescription', 'reservedInstancesId', 'state'
+              @reserved_instance[name] = @value
+            when 'duration', 'instanceCount'
+              @reserved_instance[name] = @value.to_i
+            when 'fixedPrice', 'usagePrice'
+              @reserved_instance[name] = @value.to_f
+            when 'item'
+              @response['reservedInstancesSet'] << @reserved_instance
+              @reserved_instance = {}
+            when 'requestId'
+              @response[name] = @value
+            when 'start'
+              @response[name] = Time.parse(@value)
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ec2/describe_reserved_instances.rb

@@ -0,0 +1,52 @@
+unless Fog.mocking?
+
+  module Fog
+    module AWS
+      class EC2
+
+        # Describe all or specified reserved instances
+        #
+        # ==== Parameters
+        # * reserved_instances_id<~Array> - List of reserved instance ids to describe, defaults to all
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'reservedInstancesSet'<~Array>:
+        #       * 'availabilityZone'<~String> - availability zone of the instance
+        #       * 'duration'<~Integer> - duration of reservation, in seconds
+        #       * 'fixedPrice'<~Float> - purchase price of reserved instance
+        #       * 'instanceType'<~String> - type of instance
+        #       * 'instanceCount'<~Integer> - number of reserved instances
+        #       * 'productDescription'<~String> - reserved instance description
+        #       * 'reservedInstancesId'<~String> - id of the instance
+        #       * 'start'<~Time> - start time for reservation
+        #       * 'state'<~String> - state of reserved instance purchase, in .[pending-payment, active, payment-failed, retired]
+        #       * 'usagePrice"<~Float> - usage price of reserved instances, per hour
+        def describe_reserved_instances(reserved_instances_id = [])
+          params = AWS.indexed_param('ReservedInstancesId', reserved_instances_id)
+          request({
+            'Action' => 'DescribeReservedInstances'
+          }.merge!(params), Fog::Parsers::AWS::EC2::DescribeReservedInstances.new)
+        end
+
+      end
+    end
+  end
+
+else
+
+  module Fog
+    module AWS
+      class EC2
+
+        def describe_reserved_instances(reserved_instances_id = {})
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+    end
+  end
+
+end

data/spec/aws/models/ec2/flavors_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/flavors_examples'
+
+describe 'Fog::AWS::EC2::Flavors' do
+
+  it_should_behave_like "Flavors"
+
+  subject { @flavor = @flavors.all.first }
+
+  before(:each) do
+    @flavors = AWS[:ec2].flavors
+  end
+
+end

data/spec/aws/models/ec2/snapshot_spec.rb

@@ -83,11 +83,11 @@ describe 'Fog::AWS::EC2::Snapshots' do
       end
     end
 
-    it "should not exist in addresses before save" do
+    it "should not exist in snapshots before save" do
       AWS[:ec2].snapshots.get(@snapshot.id).should be_nil
     end
 
-    it "should exist in buckets after save" do
+    it "should exist in snapshots after save" do
       @snapshot.save
       AWS[:ec2].snapshots.get(@snapshot.id).should_not be_nil
       @snapshot.destroy

data/spec/rackspace/models/servers/flavors_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/flavors_examples'
+
+describe 'Fog::AWS::Rackspace::Flavors' do
+
+  it_should_behave_like "Flavors"
+
+  subject { @flavor = @flavors.all.first }
+
+  before(:each) do
+    @flavors = Rackspace[:servers].flavors
+  end
+
+end

data/spec/shared_examples/flavors_examples.rb

@@ -0,0 +1,16 @@
+shared_examples_for "Flavors" do
+
+  describe "#get" do
+
+    it "should return a matching flavor if one exists" do
+      get = @flavors.get(subject.id)
+      subject.attributes.should == get.attributes
+    end
+
+    it "should return nil if no matching server exists" do
+      @flavors.get('0').should be_nil
+    end
+
+  end
+
+end

data/spec/slicehost/models/flavors_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../shared_examples/flavors_examples'
+
+describe 'Fog::AWS::Slicehost::Flavors' do
+
+  it_should_behave_like "Flavors"
+
+  subject { @flavor = @flavors.all.first }
+
+  before(:each) do
+    @flavors = Slicehost[:slices].flavors
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -08:00
+date: 2010-02-18 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,6 +127,7 @@ files:
 - lib/fog/aws/parsers/ec2/describe_instances.rb
 - lib/fog/aws/parsers/ec2/describe_key_pairs.rb
 - lib/fog/aws/parsers/ec2/describe_regions.rb
+- lib/fog/aws/parsers/ec2/describe_reserved_instances.rb
 - lib/fog/aws/parsers/ec2/describe_security_groups.rb
 - lib/fog/aws/parsers/ec2/describe_snapshots.rb
 - lib/fog/aws/parsers/ec2/describe_volumes.rb
@@ -162,6 +163,7 @@ files:
 - lib/fog/aws/requests/ec2/describe_instances.rb
 - lib/fog/aws/requests/ec2/describe_key_pairs.rb
 - lib/fog/aws/requests/ec2/describe_regions.rb
+- lib/fog/aws/requests/ec2/describe_reserved_instances.rb
 - lib/fog/aws/requests/ec2/describe_security_groups.rb
 - lib/fog/aws/requests/ec2/describe_snapshots.rb
 - lib/fog/aws/requests/ec2/describe_volumes.rb
@@ -278,6 +280,7 @@ files:
 - lib/fog/terremark/requests/get_vdc.rb
 - spec/aws/models/ec2/address_spec.rb
 - spec/aws/models/ec2/addresses_spec.rb
+- spec/aws/models/ec2/flavors_spec.rb
 - spec/aws/models/ec2/key_pair_spec.rb
 - spec/aws/models/ec2/key_pairs_spec.rb
 - spec/aws/models/ec2/security_group_spec.rb
@@ -344,6 +347,7 @@ files:
 - spec/aws/requests/simpledb/select_spec.rb
 - spec/compact_progress_bar_formatter.rb
 - spec/lorem.txt
+- spec/rackspace/models/servers/flavors_spec.rb
 - spec/rackspace/models/servers/server_spec.rb
 - spec/rackspace/models/servers/servers_spec.rb
 - spec/rackspace/requests/files/delete_container_spec.rb
@@ -371,8 +375,10 @@ files:
 - spec/rackspace/requests/servers/list_servers_spec.rb
 - spec/rackspace/requests/servers/reboot_server_spec.rb
 - spec/rackspace/requests/servers/update_server_spec.rb
+- spec/shared_examples/flavors_examples.rb
 - spec/shared_examples/server_examples.rb
 - spec/shared_examples/servers_examples.rb
+- spec/slicehost/models/flavors_spec.rb
 - spec/slicehost/models/server_spec.rb
 - spec/slicehost/models/servers_spec.rb
 - spec/slicehost/requests/create_slice_spec.rb
@@ -450,6 +456,7 @@ summary: fog = clouds + you
 test_files: 
 - spec/aws/models/ec2/address_spec.rb
 - spec/aws/models/ec2/addresses_spec.rb
+- spec/aws/models/ec2/flavors_spec.rb
 - spec/aws/models/ec2/key_pair_spec.rb
 - spec/aws/models/ec2/key_pairs_spec.rb
 - spec/aws/models/ec2/security_group_spec.rb
@@ -515,6 +522,7 @@ test_files:
 - spec/aws/requests/simpledb/put_attributes_spec.rb
 - spec/aws/requests/simpledb/select_spec.rb
 - spec/compact_progress_bar_formatter.rb
+- spec/rackspace/models/servers/flavors_spec.rb
 - spec/rackspace/models/servers/server_spec.rb
 - spec/rackspace/models/servers/servers_spec.rb
 - spec/rackspace/requests/files/delete_container_spec.rb
@@ -542,8 +550,10 @@ test_files:
 - spec/rackspace/requests/servers/list_servers_spec.rb
 - spec/rackspace/requests/servers/reboot_server_spec.rb
 - spec/rackspace/requests/servers/update_server_spec.rb
+- spec/shared_examples/flavors_examples.rb
 - spec/shared_examples/server_examples.rb
 - spec/shared_examples/servers_examples.rb
+- spec/slicehost/models/flavors_spec.rb
 - spec/slicehost/models/server_spec.rb
 - spec/slicehost/models/servers_spec.rb
 - spec/slicehost/requests/create_slice_spec.rb