fog 0.1.0 → 0.1.1

data/Gemfile

@@ -9,5 +9,5 @@ gem 'net-ssh', ">= 0"
 gem 'nokogiri', ">= 0"
 gem 'ruby-hmac', ">= 0"
 gem 'rspec', '>= 0'
-gem 'shindo', '>= 0'
+gem 'shindo', '>= 0.1.2'
 gem 'builder', '>= 0'

data/Gemfile.lock

@@ -39,7 +39,7 @@ dependencies:
   shindo: 
     group: 
     - :default
-    version: ">= 0"
+    version: ">= 0.1.2"
   nokogiri: 
     group: 
     - :default
@@ -54,7 +54,7 @@ specs:
 - formatador: 
     version: 0.0.14
 - gestalt: 
-    version: 0.0.6
+    version: 0.0.11
 - json: 
     version: 1.4.3
 - mime-types: 
@@ -68,8 +68,8 @@ specs:
 - ruby-hmac: 
     version: 0.4.0
 - shindo: 
-    version: 0.0.18
-hash: 9a6ccfd107913e3f8ca98af1fe437f5d2b7b112a
+    version: 0.1.2
+hash: 4e55927c1be02ee00fc3353e71caecdebd9d4817
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/benchs/fog_vs.rb

@@ -5,20 +5,20 @@ require 'right_aws'
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 
-data = File.open(File.join(File.dirname(__FILE__), '..', 'spec', 'credentials.yml')).read
-config = YAML.load(data)
+data = File.open(File.expand_path('~/.fog')).read
+config = YAML.load(data)[:default]
 fog = Fog::AWS::S3.new(
-  :aws_access_key_id     => config['aws_access_key_id'],
-  :aws_secret_access_key => config['aws_secret_access_key']
+  :aws_access_key_id     => config[:aws_access_key_id],
+  :aws_secret_access_key => config[:aws_secret_access_key]
 )
 raws = RightAws::S3Interface.new(
-  config['aws_access_key_id'],
-  config['aws_secret_access_key']
+  config[:aws_access_key_id],
+  config[:aws_secret_access_key]
 )
 raws.logger.level = 3 # ERROR
 awss3 = AWS::S3::Base.establish_connection!(
-  :access_key_id     => config['aws_access_key_id'],
-  :secret_access_key => config['aws_secret_access_key'],
+  :access_key_id     => config[:aws_access_key_id],
+  :secret_access_key => config[:aws_secret_access_key],
   :persistent        => true
 )
 
@@ -104,32 +104,3 @@ Benchmark.bmbm(25) do |bench|
     end
   end
 end
-
-# Rehearsal ------------------------------------------------------------
-# fog.put_bucket             0.010000   0.000000   0.010000 (  4.981517)
-# raws.create_bucket         0.030000   0.040000   0.070000 ( 10.035029)
-# awss3::Bucket.create       0.020000   0.020000   0.040000 (  7.402162)
-# fog.put_object             0.080000   0.080000   0.160000 (  8.757062)
-# raws.put                   0.180000   0.080000   0.260000 ( 12.307371)
-# awss3::S3Object.create     0.170000   0.070000   0.240000 ( 14.028887)
-# fog.delete_object          0.080000   0.050000   0.130000 (  5.481744)
-# raws.delete                0.140000   0.070000   0.210000 (  7.709116)
-# awss3::S3Object.delete     0.100000   0.040000   0.140000 (  5.533884)
-# fog.delete_bucket          0.010000   0.010000   0.020000 (  1.861061)
-# raws.delete_bucket         0.030000   0.020000   0.050000 (  3.146836)
-# awss3::Bucket.delete       0.050000   0.010000   0.060000 (  1.877064)
-# --------------------------------------------------- total: 1.390000sec
-# 
-#                                user     system      total        real
-# fog.put_bucket             0.010000   0.020000   0.030000 (  1.949933)
-# raws.create_bucket         0.030000   0.020000   0.050000 (  4.766058)
-# awss3::Bucket.create       0.010000   0.010000   0.020000 (  2.093764)
-# fog.put_object             0.090000   0.080000   0.170000 (  9.352868)
-# raws.put                   0.150000   0.080000   0.230000 ( 12.981112)
-# awss3::S3Object.create     0.130000   0.070000   0.200000 ( 14.442972)
-# fog.delete_object          0.060000   0.060000   0.120000 (  5.657752)
-# raws.delete                0.130000   0.050000   0.180000 (  6.598221)
-# awss3::S3Object.delete     0.110000   0.030000   0.140000 (  5.709799)
-# fog.delete_bucket          0.010000   0.010000   0.020000 (  1.864573)
-# raws.delete_bucket         0.040000   0.030000   0.070000 (  4.120572)
-# awss3::Bucket.delete       0.020000   0.000000   0.020000 (  1.947711)

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.1.0'
-  s.date              = '2010-05-18'
+  s.version           = '0.1.1'
+  s.date              = '2010-05-23'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -388,20 +388,10 @@ Gem::Specification.new do |s|
     spec/aws/models/s3/directory_spec.rb
     spec/aws/models/s3/file_spec.rb
     spec/aws/models/s3/files_spec.rb
-    spec/aws/requests/ec2/authorize_security_group_ingress_spec.rb
-    spec/aws/requests/ec2/create_key_pair_spec.rb
-    spec/aws/requests/ec2/create_security_group_spec.rb
-    spec/aws/requests/ec2/delete_key_pair_spec.rb
-    spec/aws/requests/ec2/delete_security_group_spec.rb
-    spec/aws/requests/ec2/describe_availability_zones_spec.rb
     spec/aws/requests/ec2/describe_images_spec.rb
     spec/aws/requests/ec2/describe_instances_spec.rb
-    spec/aws/requests/ec2/describe_key_pairs_spec.rb
-    spec/aws/requests/ec2/describe_regions_spec.rb
-    spec/aws/requests/ec2/describe_security_groups_spec.rb
     spec/aws/requests/ec2/get_console_output_spec.rb
     spec/aws/requests/ec2/reboot_instances_spec.rb
-    spec/aws/requests/ec2/revoke_security_group_ingress_spec.rb
     spec/aws/requests/ec2/run_instances_spec.rb
     spec/aws/requests/ec2/terminate_instances_spec.rb
     spec/aws/requests/s3/copy_object_spec.rb
@@ -459,6 +449,10 @@ Gem::Specification.new do |s|
     spec/vcloud/vcloud_spec.rb
     tests/aws/helper.rb
     tests/aws/requests/ec2/address_tests.rb
+    tests/aws/requests/ec2/availability_zone_tests.rb
+    tests/aws/requests/ec2/key_pair_tests.rb
+    tests/aws/requests/ec2/region_tests.rb
+    tests/aws/requests/ec2/security_group_tests.rb
     tests/aws/requests/ec2/snapshot_tests.rb
     tests/aws/requests/ec2/volume_tests.rb
     tests/helper.rb

data/lib/fog.rb

@@ -35,7 +35,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 
   module Mock

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

@@ -15,9 +15,10 @@ module Fog
         #     * 'return'<~Boolean> - success?
         def delete_key_pair(key_name)
           request(
-            'Action'  => 'DeleteKeyPair',
-            'KeyName' => key_name,
-            :parser   => Fog::Parsers::AWS::EC2::Basic.new
+            'Action'    => 'DeleteKeyPair',
+            'KeyName'   => key_name,
+            :idempotent => true,
+            :parser     => Fog::Parsers::AWS::EC2::Basic.new
           )
         end
 

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

@@ -50,8 +50,8 @@ module Fog
               case volume['status']
               when 'attaching'
                 if Time.now - volume['attachmentSet'].first['attachTime'] > Fog::Mock.delay
-                  volume['attachmentSet'].first['status'] = 'attached'
-                  volume['status'] = 'attached'
+                  volume['attachmentSet'].first['status'] = 'in-use'
+                  volume['status'] = 'in-use'
                 end
               when 'creating'
                 if Time.now - volume['createTime'] > Fog::Mock.delay

data/lib/fog/aws/s3.rb

@@ -64,7 +64,7 @@ module Fog
           unless (mime_types = MIME::Types.of(filename)).empty?
             metadata[:headers]['Content-Type'] = mime_types.first.content_type
           end
-          metadata[:body] = data.read
+          metadata[:body] = data
           metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
         end
         # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
@@ -151,12 +151,16 @@ module Fog
             end
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
+          reset
+        end
+
+        def reset
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
         end
 
         private
 
         def request(params, &block)
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
           params[:headers]['Date'] = Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
           params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
 
@@ -181,8 +185,8 @@ DATA
             end
           end
           amz_headers = amz_headers.sort {|x, y| x[0] <=> y[0]}
-          for pair in amz_headers
-            canonical_amz_headers << "#{pair[0]}:#{pair[1]}\n"
+          for key, value in amz_headers
+            canonical_amz_headers << "#{key}:#{value}\n"
           end
           string_to_sign << "#{canonical_amz_headers}"
 

data/lib/fog/rackspace/models/servers/image.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :name
         attribute :created_at,  'created'
         attribute :updated_at,  'updated'
+        attribute :progress
         attribute :status
         attribute :server_id,   'serverId'
 
@@ -27,6 +28,10 @@ module Fog
           true
         end
 
+        def ready?
+          status == 'ACTIVE'
+        end
+
         def save
           requires :server_id
 

data/tests/aws/helper.rb

@@ -41,11 +41,44 @@ module AWS
         'requestId' => String
       }
 
+      AVAILABILITY_ZONES = {
+        'availabilityZoneInfo'  => [{
+          'regionName'  => String,
+          'zoneName'    => String,
+          'zoneState'   => String
+        }],
+        'requestId'             => String
+      }
+
       BASIC = {
         'requestId' => String,
         'return'    => ::Fog::Boolean
       }
 
+      REGIONS = {
+        'regionInfo'  => [{
+          'regionEndpoint'  => String,
+          'regionName'      => String
+        }],
+        'requestId'   => String
+      }
+
+      SECURITY_GROUPS = {
+        'requestId'           => String,
+        'securityGroupInfo' => [{
+          'groupDescription'  => String,
+          'groupName'         => String,
+          'ipPermissions'     => [{
+            'fromPort'    => Integer,
+            'groups'      => [{ 'groupName' => String, 'userId' => String }],
+            'ipProtocol'  => String,
+            'ipRanges'    => [],
+            'toPort'      => Integer,
+          }],
+          'ownerId'           => String
+        }]
+      }
+
       SNAPSHOT = {
         'description' => NilClass,
         'ownerId'     => String,

data/tests/aws/requests/ec2/address_tests.rb

@@ -8,43 +8,46 @@ Shindo.tests('AWS::EC2 | address requests', ['aws']) do
 
     @public_ip = nil
 
-    test('#allocate_address') do
-      @data = AWS[:ec2].allocate_address.body
-      @public_ip = @data['publicIp']
-      has_format(
-        @data,
-        {
-          'publicIp'  => String,
-          'requestId' => String
-        }
-      )
+    tests('#allocate_address').formats({'publicIp' => String, 'requestId' => String}) do
+      data = AWS[:ec2].allocate_address.body
+      @public_ip = data['publicIp']
+      data
     end
 
-    test("#describe_addresses") do
-      @data = AWS[:ec2].describe_addresses.body
-      has_format(@data, AWS::EC2::Formats::ADDRESSES)
+    tests('#describe_addresses').formats(AWS::EC2::Formats::ADDRESSES) do
+      AWS[:ec2].describe_addresses.body
     end
 
-    test("#describe_addresses('#{@public_ip}')") do
-      @data = AWS[:ec2].describe_addresses(@public_ip).body
-      has_format(@data, AWS::EC2::Formats::ADDRESSES)
+    tests("#describe_addresses('#{@public_Ip}')").formats(AWS::EC2::Formats::ADDRESSES) do
+      AWS[:ec2].describe_addresses(@public_ip).body
     end
 
-    test("#associate_address('#{@server.identity}', '#{@public_ip}')") do
-      @data = AWS[:ec2].associate_address(@server.identity, @public_ip).body
-      has_format(@data, AWS::EC2::Formats::BASIC)
-      @server.reload.ip_address == @public_ip
+    tests("#associate_addresses('#{@server.identity}', '#{@public_Ip}')") do
+
+      formats(AWS::EC2::Formats::BASIC) do
+        AWS[:ec2].associate_address(@server.identity, @public_ip).body
+      end
+
+      tests('server.ip_address').returns(@public_ip) do
+        @server.reload.ip_address
+      end
+
     end
 
-    test("#disassociate_address('#{@public_ip}')") do
-      @data = AWS[:ec2].disassociate_address(@public_ip).body
-      has_format(@data, AWS::EC2::Formats::BASIC)
-      @server.reload.ip_address == @ip_address
+    tests("#dissassociate_address('#{@public_ip}')") do
+
+      formats(AWS::EC2::Formats::BASIC) do
+        AWS[:ec2].disassociate_address(@public_ip).body
+      end
+
+      test("server.ip_address is not #{@public_ip}") do
+        @server.reload.ip_address != @public_ip
+      end
+
     end
 
-    test("#release_address('#{@public_ip}')") do
-      @data = AWS[:ec2].release_address(@public_ip).body
-      has_format(@data, AWS::EC2::Formats::BASIC)
+    tests("#release_address('#{@public_ip}')").formats(AWS::EC2::Formats::BASIC) do
+      AWS[:ec2].release_address(@public_ip).body
     end
 
   end
@@ -52,34 +55,24 @@ Shindo.tests('AWS::EC2 | address requests', ['aws']) do
 
     @address = AWS[:ec2].addresses.create
 
-    test("#describe_addresses('127.0.0.1') raises BadRequest error") do
-      has_error(Excon::Errors::BadRequest) do
-        AWS[:ec2].describe_addresses('127.0.0.1')
-      end
+    tests("#describe_addresses('127.0.0.1')").raises(Excon::Errors::BadRequest) do
+      AWS[:ec2].describe_addresses('127.0.0.1')
     end
 
-    test("#associate_addresses('i-00000000', '#{@address.identity}') raises BadRequest error") do
-      has_error(Excon::Errors::BadRequest) do
-        AWS[:ec2].associate_address('i-00000000', @address.identity)
-      end
+    tests("#associate_addresses('i-00000000', '#{@address.identity}')").raises(Excon::Errors::BadRequest) do
+      AWS[:ec2].associate_address('i-00000000', @address.identity)
     end
 
-    test("#associate_addresses('#{@server.identity}', '127.0.0.1') raises BadRequest error") do
-      has_error(Excon::Errors::BadRequest) do
-        AWS[:ec2].associate_address(@server.identity, '127.0.0.1')
-      end
+    tests("#associate_addresses('#{@server.identity}', '127.0.0.1')").raises(Excon::Errors::BadRequest) do
+      AWS[:ec2].associate_address(@server.identity, '127.0.0.1')
     end
 
-    test("#disassociate_addresses('127.0.0.1') raises BadRequest error") do
-      has_error(Excon::Errors::BadRequest) do
-        AWS[:ec2].disassociate_address('127.0.0.1')
-      end
+    tests("#disassociate_addresses('127.0.0.1') raises BadRequest error").raises(Excon::Errors::BadRequest) do
+      AWS[:ec2].disassociate_address('127.0.0.1')
     end
 
-    test("#release_address('127.0.0.1') raises BadRequest error") do
-      has_error(Excon::Errors::BadRequest) do
-        AWS[:ec2].release_address('127.0.0.1')
-      end
+    tests("#release_address('127.0.0.1')").raises(Excon::Errors::BadRequest) do
+      AWS[:ec2].release_address('127.0.0.1')
     end
 
     @address.destroy

data/tests/aws/requests/ec2/availability_zone_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests('AWS::EC2 | availability zone requests', ['aws']) do
+
+  tests('success') do
+
+    tests('#describe_availability_zones').formats(AWS::EC2::Formats::AVAILABILITY_ZONES) do
+      AWS[:ec2].describe_availability_zones.body
+    end
+
+    tests("#describe_availability_zones('us-east-1a')").formats(AWS::EC2::Formats::AVAILABILITY_ZONES) do
+      AWS[:ec2].describe_availability_zones('us-east-1a').body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#describe_availability_zones('not-a-zone')").raises(Excon::Errors::BadRequest) do
+      AWS[:ec2].describe_availability_zones('not-a-zone')
+    end
+
+  end
+
+end

data/tests/aws/requests/ec2/key_pair_tests.rb

@@ -0,0 +1,44 @@
+Shindo.tests('AWS::EC2 | key pair requests', ['aws']) do
+
+  tests('success') do
+
+    @key_pair_name = 'fog_key_pair'
+
+    tests("#create_key_pair('#{@key_pair_name}')").formats({ 'keyFingerprint' => String, 'keyMaterial' => String, 'keyName' => String, 'requestId' => String }) do
+      AWS[:ec2].create_key_pair(@key_pair_name).body
+    end
+
+    tests('#describe_key_pairs').formats({ 'keySet' => [{'keyFingerprint' => String, 'keyName' => String}], 'requestId' => String }) do
+      AWS[:ec2].describe_key_pairs.body
+    end
+
+    tests("#describe_key_pairs(#{@key_pair_name})").formats({ 'keySet' => [{'keyFingerprint' => String, 'keyName' => String}], 'requestId' => String }) do
+      AWS[:ec2].describe_key_pairs(@key_pair_name).body
+    end
+
+    tests("#delete_key_pair('#{@key_pair_name}')").formats(AWS::EC2::Formats::BASIC) do
+      AWS[:ec2].delete_key_pair(@key_pair_name).body
+    end
+
+    tests("#delete_key_pair('not_a_key_name')").succeeds do
+      AWS[:ec2].delete_key_pair('not_a_key_name')
+    end
+
+  end
+  tests('failure') do
+
+    @key_pair = AWS[:ec2].key_pairs.create(:name => 'fog_key_pair')
+
+    tests("duplicate #create_key_pair('#{@key_pair.name}')").raises(Excon::Errors::BadRequest) do
+      AWS[:ec2].create_key_pair(@key_pair.name)
+    end
+
+    tests("#describe_key_pair('not_a_key_name')").raises(Excon::Errors::BadRequest) do
+      AWS[:ec2].describe_key_pairs('not_a_key_name').body
+    end
+
+    @key_pair.destroy
+
+  end
+
+end