fog 0.0.91 → 0.0.92

data/lib/fog/aws/s3.rb

@@ -9,6 +9,7 @@ module Fog
           require 'fog/aws/models/s3/directory'
           require 'fog/aws/models/s3/files'
           require 'fog/aws/models/s3/file'
+          require 'fog/aws/parsers/s3/access_control_list'
           require 'fog/aws/parsers/s3/copy_object'
           require 'fog/aws/parsers/s3/get_bucket'
           require 'fog/aws/parsers/s3/get_bucket_location'
@@ -18,12 +19,17 @@ module Fog
           require 'fog/aws/requests/s3/delete_bucket'
           require 'fog/aws/requests/s3/delete_object'
           require 'fog/aws/requests/s3/get_bucket'
+          require 'fog/aws/requests/s3/get_bucket_acl'
           require 'fog/aws/requests/s3/get_bucket_location'
           require 'fog/aws/requests/s3/get_object'
+          require 'fog/aws/requests/s3/get_object_acl'
+          require 'fog/aws/requests/s3/get_object_torrent'
+          require 'fog/aws/requests/s3/get_object_url'
           require 'fog/aws/requests/s3/get_request_payment'
           require 'fog/aws/requests/s3/get_service'
           require 'fog/aws/requests/s3/head_object'
           require 'fog/aws/requests/s3/put_bucket'
+          require 'fog/aws/requests/s3/put_bucket_acl'
           require 'fog/aws/requests/s3/put_object'
           require 'fog/aws/requests/s3/put_request_payment'
           @required = true
@@ -141,12 +147,12 @@ module Fog
 
         private
 
-        def request(params)
+        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)}"
 
-          response = @connection.request(params)
+          response = @connection.request(params, &block)
 
           response
         end

data/lib/fog/collection.rb

@@ -130,7 +130,7 @@ module Fog
 
     def new(attributes = {})
       model.new(
-        attributes.merge!(
+        attributes.merge(
           :collection => self,
           :connection => connection
         )

data/lib/fog/connection.rb

@@ -5,13 +5,15 @@ module Fog
       @excon = Excon.new(url)
     end
 
-    def request(params)
-      if parser = params.delete(:parser)
-        body = Nokogiri::XML::SAX::PushParser.new(parser)
-        params[:block] = lambda { |chunk| body << chunk }
+    def request(params, &block)
+      unless block_given?
+        if (parser = params.delete(:parser))
+          body = Nokogiri::XML::SAX::PushParser.new(parser)
+          block = lambda { |chunk| body << chunk }
+        end
       end
 
-      response = @excon.request(params)
+      response = @excon.request(params, &block)
 
       if parser
         body.finish

data/lib/fog/model.rb

@@ -91,8 +91,8 @@ module Fog
       if data = collection.get(identity)
         new_attributes = data.attributes
         merge_attributes(new_attributes)
+        self
       end
-      self
     end
 
     def requires(*args)
@@ -115,7 +115,10 @@ module Fog
 
     def wait_for(timeout = 600, &block)
       reload
-      Fog.wait_for(timeout) { reload && instance_eval(&block) }
+      Fog.wait_for(timeout) do
+        reload or raise StandardError.new("Reload failed, #{self.class} #{self.identity} went away.")
+        instance_eval(&block)
+      end
     end
 
     private

data/lib/fog/rackspace/files.rb

@@ -112,7 +112,7 @@ module Fog
           response
         end
 
-        def storage_request(params, parse_json = true)
+        def storage_request(params, parse_json = true, &block)
           @storage_connection = Fog::Connection.new("#{@storage_scheme}://#{@storage_host}:#{@storage_port}")
           response = @storage_connection.request({
             :body     => params[:body],
@@ -125,7 +125,7 @@ module Fog
             :method   => params[:method],
             :path     => "#{@storage_path}/#{params[:path]}",
             :query    => params[:query]
-          })
+          }, &block)
           if !response.body.empty? && parse_json
             response.body = JSON.parse(response.body)
           end

data/lib/fog/rackspace/requests/files/get_object.rb

@@ -15,7 +15,7 @@ module Fog
             :expects  => 200,
             :method   => 'GET',
             :path     => "#{CGI.escape(container)}/#{CGI.escape(object)}"
-          }, false)
+          }, false, &block)
           response
         end
 

data/lib/fog/terremark/parsers/shared/get_internet_services.rb

@@ -14,7 +14,7 @@ module Fog
           def start_element(name, attributes)
             super
             case name
-            when 'PublicIPAddress'
+            when 'PublicIpAddress'
               @in_public_ip_address = true
             end
           end
@@ -48,7 +48,7 @@ module Fog
               @internet_service = {}
             when 'Port', 'Timeout'
               @internet_service[name] = @value.to_i
-            when 'PublicIPAddress'
+            when 'PublicIpAddress'
               @in_public_ip_address = false
             end
           end

data/lib/fog/terremark/parsers/shared/get_node_services.rb

@@ -22,6 +22,9 @@ module Fog
               end
             when 'Id', 'Port'
               @node_service[name] = @value.to_i
+            when 'NodeService'
+              @response['NodeServices'] << @node_service
+              @node_service = {}
             end
           end
 

data/lib/fog/terremark/parsers/shared/vapp.rb

@@ -6,7 +6,9 @@ module Fog
         class Vapp < Fog::Parsers::Base
 
           def reset
-            @response = { 'Links' => [] }
+            @response = { 'Links' => [], 'VirtualHardware' => {}, 'OperatingSystem' => {} }
+            @in_operating_system = false
+            @resource_type = nil
           end
 
           def start_element(name, attributes)
@@ -18,7 +20,9 @@ module Fog
                   link[attributes.shift] = attributes.shift
                 end
                 @response['Links'] << link
-              when 'VApp'
+              when 'OperatingSystemSection'
+                @in_operating_system = true
+             when 'VApp'
                 vapp = {}
                 until attributes.empty?
                   if attributes.first.is_a?(Array)
@@ -29,13 +33,38 @@ module Fog
                   end
                 end
                 @response.merge!(vapp.reject {|key,value| !['href', 'name', 'size', 'status', 'type'].include?(key)})
-            end
+             end
           end
 
           def end_element(name)
             case name
             when 'IpAddress'
               @response['IpAddress'] = @value
+            when 'Description'
+              if @in_operating_system
+                @response['OperatingSystem'][name] = @value
+                @in_operating_system = false
+              end
+            when 'ResourceType'
+              @resource_type = @value
+              case @value
+              when '3'
+                @get_cpu = true # cpu
+              when '4'  # memory
+                @get_ram = true
+              when '17' # disks
+                @get_disks = true
+              end
+            when 'VirtualQuantity'
+              case @resource_type
+              when '3'
+                @response['VirtualHardware']['cpu'] = @value
+              when '4'
+                @response['VirtualHardware']['ram'] = @value
+              when '17'
+                @response['VirtualHardware']['disks'] ||= []
+                @response['VirtualHardware']['disks'] << @value
+              end
             end
           end
 
@@ -45,3 +74,4 @@ module Fog
     end
   end
 end
+

data/lib/fog/terremark/requests/shared/delete_internet_service.rb

@@ -8,18 +8,6 @@ module Fog
         # ==== Parameters
         # * internet_service_id<~Integer> - Id of service to destroy
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-
-        # FIXME
-
-        #     * 'CatalogItems'<~Array>
-        #       * 'href'<~String> - linke to item
-        #       * 'name'<~String> - name of item
-        #       * 'type'<~String> - type of item
-        #     * 'description'<~String> - Description of catalog
-        #     * 'name'<~String> - Name of catalog
         def delete_internet_service(internet_service_id)
           request(
             :expects  => 200,

data/lib/fog/terremark/requests/shared/delete_node_service.rb

@@ -8,18 +8,6 @@ module Fog
         # ==== Parameters
         # * node_service_id<~Integer> - Id of node to destroy
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-
-        # FIXME
-
-        #     * 'CatalogItems'<~Array>
-        #       * 'href'<~String> - linke to item
-        #       * 'name'<~String> - name of item
-        #       * 'type'<~String> - type of item
-        #     * 'description'<~String> - Description of catalog
-        #     * 'name'<~String> - Name of catalog
         def delete_node_service(node_service_id)
           request(
             :expects  => 200,

data/lib/fog/terremark/requests/shared/delete_vapp.rb

@@ -8,18 +8,6 @@ module Fog
         # ==== Parameters
         # * vapp_id<~Integer> - Id of vapp to destroy
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-
-        # FIXME
-
-        #     * 'CatalogItems'<~Array>
-        #       * 'href'<~String> - linke to item
-        #       * 'name'<~String> - name of item
-        #       * 'type'<~String> - type of item
-        #     * 'description'<~String> - Description of catalog
-        #     * 'name'<~String> - Name of catalog
         def delete_vapp(vapp_id)
           request(
             :expects  => 202,

data/lib/fog/terremark/shared.rb

@@ -5,7 +5,6 @@ module Fog
       # Commond methods shared by Real and Mock
       module Common
 
-        # TODO: bust cache on organization creation?
         def default_organization_id
           @default_organization_id ||= begin
             org_list = get_organizations.body['OrgList']

data/spec/aws/models/s3/file_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'Fog::AWS::S3::File' do
 
   before(:each) do
-    @directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
+    @directory = AWS[:s3].directories.create(:key => 'fogdirectoryname')
   end
 
   after(:each) do
@@ -53,7 +53,7 @@ describe 'Fog::AWS::S3::File' do
   describe "#copy" do
 
     it "should return a Fog::AWS::S3::File with matching attributes" do
-      other_directory = AWS[:s3].directories.create(:name => 'fogotherdirectoryname')
+      other_directory = AWS[:s3].directories.create(:key => 'fogotherdirectoryname')
       data = File.open(File.dirname(__FILE__) + '/../../../lorem.txt', 'r')
       file = @directory.files.create(:key => 'fogfilename', :body => data)
       other_file = file.copy('fogotherdirectoryname', 'fogotherfilename')

data/spec/aws/models/s3/files_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'Fog::AWS::S3::Files' do
 
   before(:each) do
-    @directory = AWS[:s3].directories.create(:name => 'fogdirectoryname')
+    @directory = AWS[:s3].directories.create(:key => 'fogdirectoryname')
   end
 
   after(:each) do
@@ -30,7 +30,7 @@ describe 'Fog::AWS::S3::Files' do
   describe "#all" do
 
     it "should return nil if the directory does not exist" do
-      directory = AWS[:s3].directories.new(:name => 'notadirectory')
+      directory = AWS[:s3].directories.new(:key => 'notadirectory')
       directory.files.all.should be_nil
     end
 

data/spec/aws/requests/ec2/get_console_output_spec.rb

@@ -4,16 +4,16 @@ describe 'EC2.get_console_output' do
   describe 'success' do
 
     before(:each) do
-      @instance_id = AWS[:ec2].run_instances(GENTOO_AMI, 1, 1).body['instancesSet'].first['instanceId']
-      AWS[:ec2].servers.get(@instance_id).wait_for { ready? }
+      @instance = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
+      @instance.wait_for { ready? }
     end
 
     after(:each) do
-      AWS[:ec2].terminate_instances([@instance_id])
+      @instance.destroy
     end
 
     it "should return proper attributes" do
-      actual = AWS[:ec2].get_console_output(@instance_id).body
+      actual = AWS[:ec2].get_console_output(@instance.id).body
       actual['instanceId'].should be_a(String)
       if actual['output']
         actual['output'].should be_a(String)

data/spec/aws/requests/s3/get_bucket_spec.rb

@@ -3,13 +3,13 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 describe 'S3.get_bucket' do
   describe 'success' do
 
-    before(:each) do
+    before(:all) do
       AWS[:s3].put_bucket('foggetbucket')
       AWS[:s3].put_object('foggetbucket', 'fog_object', lorem_file)
       AWS[:s3].put_object('foggetbucket', 'fog_other_object', lorem_file)
     end
 
-    after(:each) do
+    after(:all) do
       AWS[:s3].delete_object('foggetbucket', 'fog_object')
       AWS[:s3].delete_object('foggetbucket', 'fog_other_object')
       AWS[:s3].delete_bucket('foggetbucket')
@@ -18,10 +18,10 @@ describe 'S3.get_bucket' do
     it 'should return proper attributes' do
       actual = AWS[:s3].get_bucket('foggetbucket')
       actual.body['IsTruncated'].should == false
-      actual.body['Marker'].should be_a(String)
+      actual.body['Marker'].should be_nil
       actual.body['MaxKeys'].should be_an(Integer)
       actual.body['Name'].should be_a(String)
-      actual.body['Prefix'].should be_a(String)
+      actual.body['Prefix'].should be_nil
       actual.body['Contents'].should be_an(Array)
       actual.body['Contents'].length.should == 2
       object = actual.body['Contents'].first
@@ -41,7 +41,7 @@ describe 'S3.get_bucket' do
       actual.body['Marker'].should be_a(String)
       actual.body['MaxKeys'].should be_an(Integer)
       actual.body['Name'].should be_a(String)
-      actual.body['Prefix'].should be_a(String)
+      actual.body['Prefix'].should be_nil
       actual.body['Contents'].should be_an(Array)
       actual.body['Contents'].length.should == 1
       object = actual.body['Contents'].first
@@ -55,13 +55,13 @@ describe 'S3.get_bucket' do
       object['StorageClass'].should be_a(String)
     end
 
-    it 'should respect max-keys option' do
+    it 'should accept max-keys option' do
       actual = AWS[:s3].get_bucket('foggetbucket', 'max-keys' => 1)
       actual.body['IsTruncated'].should == true
-      actual.body['Marker'].should be_a(String)
+      actual.body['Marker'].should be_nil
       actual.body['MaxKeys'].should be_an(Integer)
       actual.body['Name'].should be_a(String)
-      actual.body['Prefix'].should be_a(String)
+      actual.body['Prefix'].should be_nil
       actual.body['Contents'].should be_an(Array)
       actual.body['Contents'].length.should == 1
       object = actual.body['Contents'].first
@@ -78,7 +78,7 @@ describe 'S3.get_bucket' do
     it 'should accept prefix option' do
       actual = AWS[:s3].get_bucket('foggetbucket', 'prefix' => 'fog_ob')
       actual.body['IsTruncated'].should == false
-      actual.body['Marker'].should be_a(String)
+      actual.body['Marker'].should be_nil
       actual.body['MaxKeys'].should be_an(Integer)
       actual.body['Name'].should be_a(String)
       actual.body['Prefix'].should be_a(String)

data/tests/aws/helper.rb

@@ -0,0 +1,105 @@
+# Boolean hax
+module Fog
+  module Boolean
+  end
+end
+FalseClass.send(:include, Fog::Boolean)
+TrueClass.send(:include, Fog::Boolean)
+
+module AWS
+
+  class << self
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        credentials = Fog.credentials.reject do |k, v|
+          ![:aws_access_key_id, :aws_secret_access_key].include?(k)
+        end
+        hash[key] = case key
+        when :ec2
+          Fog::AWS::EC2.new(credentials)
+        when :eu_s3
+          Fog::AWS::S3.new(credentials.merge!(:host => 's3-external-3.amazonaws.com'))
+        when :sdb
+          Fog::AWS::SimpleDB.new(credentials)
+        when :s3
+          Fog::AWS::S3.new(credentials)
+        end
+      end
+      @@connections[service]
+    end
+  end
+
+  module EC2
+
+    module Formats
+
+      ADDRESSES = {
+        'addressesSet' => [{
+          'instanceId'  => NilClass,
+          'publicIp'    => String
+        }],
+        'requestId' => String
+      }
+
+      BASIC = {
+        'requestId' => String,
+        'return'    => ::Fog::Boolean
+      }
+
+      SNAPSHOT = {
+        'description' => NilClass,
+        'ownerId'     => String,
+        'progress'    => String,
+        'snapshotId'  => String,
+        'startTime'   => Time,
+        'status'      => String,
+        'volumeId'    => String,
+        'volumeSize'  => Integer
+      }
+
+      SNAPSHOTS = {
+        'requestId'   => String,
+        'snapshotSet' => [SNAPSHOT]
+      }
+
+      VOLUME = {
+        'availabilityZone'  => String,
+        'createTime'        => Time,
+        'requestId'         => String,
+        'size'              => Integer,
+        'snapshotId'        => NilClass,
+        'status'            => String,
+        'volumeId'          => String
+      }
+
+      VOLUME_ATTACHMENT = {
+        'attachTime'  => Time,
+        'device'      => String,
+        'instanceId'  => String,
+        'requestId'   => String,
+        'status'      => String,
+        'volumeId'    => String
+      }
+
+      VOLUMES = {
+        'volumeSet' => [{
+          'availabilityZone'    => String,
+          'attachmentSet'       => [],
+          'createTime'          => Time,
+          'size'                => Integer,
+          'snapshotId'          => NilClass,
+          'status'              => String,
+          'volumeId'            => String
+        }],
+        'requestId' => String
+      }
+
+    end
+
+  end
+
+end
+
+unless defined?(GENTOO_AMI)
+  GENTOO_AMI = 'ami-5ee70037'
+end