fog 0.0.93 → 0.0.94

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://gemcutter.org'
 
 gem 'rake'
-gem 'excon', '>= 0.0.22'
+gem 'excon', '>= 0.0.24'
 gem 'formatador', ">= 0.0.10"
 gem 'json', ">= 0"
 gem 'mime-types', ">= 0"
@@ -10,3 +10,4 @@ gem 'nokogiri', ">= 0"
 gem 'ruby-hmac', ">= 0"
 gem 'rspec', '>= 0'
 gem 'shindo', '>= 0'
+gem 'builder', '>= 0'

data/Gemfile.lock

@@ -8,7 +8,7 @@ dependencies:
     group: 
     - :default
     version: ">= 0"
-  ruby-hmac: 
+  rspec: 
     group: 
     - :default
     version: ">= 0"
@@ -16,22 +16,26 @@ dependencies:
     group: 
     - :default
     version: ">= 0"
-  rspec: 
+  ruby-hmac: 
     group: 
     - :default
     version: ">= 0"
-  net-ssh: 
+  json: 
     group: 
     - :default
     version: ">= 0"
-  json: 
+  net-ssh: 
     group: 
     - :default
     version: ">= 0"
   excon: 
     group: 
     - :default
-    version: ">= 0.0.22"
+    version: ">= 0.0.24"
+  builder: 
+    group: 
+    - :default
+    version: ">= 0"
   shindo: 
     group: 
     - :default
@@ -43,8 +47,10 @@ dependencies:
 specs: 
 - rake: 
     version: 0.8.7
+- builder: 
+    version: 2.1.2
 - excon: 
-    version: 0.0.22
+    version: 0.0.24
 - formatador: 
     version: 0.0.14
 - gestalt: 
@@ -63,7 +69,7 @@ specs:
     version: 0.4.0
 - shindo: 
     version: 0.0.18
-hash: a39d842433b002231eebfd269d32fe72b489b62f
+hash: 9a6ccfd107913e3f8ca98af1fe437f5d2b7b112a
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/bin/fog

@@ -15,6 +15,7 @@ require 'fog/local/bin'
 require 'fog/rackspace/bin'
 require 'fog/slicehost/bin'
 require 'fog/terremark/bin'
+require 'fog/vcloud/bin'
 
 if ARGV.length > 1
   print(instance_eval(ARGV[1..-1].join(' ')).to_json)
@@ -37,6 +38,11 @@ else
   end
   print "Welcome to fog interactive!\n"
   print "Your '#{Fog.credential.to_s}' configuration provides access to #{available_services}.\n"
+  Fog.services.each do |service|
+    if service.respond_to?(:startup_notice)
+      service.send(:startup_notice)
+    end
+  end
 
   catch(:IRB_EXIT) { @irb.eval_input }
 

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.0.93'
-  s.date              = '2010-05-10'
+  s.version           = '0.0.94'
+  s.date              = '2010-05-13'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('excon', '>=0.0.23')
+  s.add_dependency('excon', '>=0.0.24')
   s.add_dependency('formatador', '>=0.0.10')
   s.add_dependency('json')
   s.add_dependency('mime-types')
@@ -126,6 +126,9 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/s3/copy_object.rb
     lib/fog/aws/parsers/s3/get_bucket.rb
     lib/fog/aws/parsers/s3/get_bucket_location.rb
+    lib/fog/aws/parsers/s3/get_bucket_logging.rb
+    lib/fog/aws/parsers/s3/get_bucket_object_versions.rb
+    lib/fog/aws/parsers/s3/get_bucket_versioning.rb
     lib/fog/aws/parsers/s3/get_request_payment.rb
     lib/fog/aws/parsers/s3/get_service.rb
     lib/fog/aws/parsers/simpledb/basic.rb
@@ -178,6 +181,9 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/s3/get_bucket.rb
     lib/fog/aws/requests/s3/get_bucket_acl.rb
     lib/fog/aws/requests/s3/get_bucket_location.rb
+    lib/fog/aws/requests/s3/get_bucket_logging.rb
+    lib/fog/aws/requests/s3/get_bucket_object_versions.rb
+    lib/fog/aws/requests/s3/get_bucket_versioning.rb
     lib/fog/aws/requests/s3/get_object.rb
     lib/fog/aws/requests/s3/get_object_acl.rb
     lib/fog/aws/requests/s3/get_object_torrent.rb
@@ -187,6 +193,8 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/s3/head_object.rb
     lib/fog/aws/requests/s3/put_bucket.rb
     lib/fog/aws/requests/s3/put_bucket_acl.rb
+    lib/fog/aws/requests/s3/put_bucket_logging.rb
+    lib/fog/aws/requests/s3/put_bucket_versioning.rb
     lib/fog/aws/requests/s3/put_object.rb
     lib/fog/aws/requests/s3/put_request_payment.rb
     lib/fog/aws/requests/simpledb/batch_put_attributes.rb
@@ -344,6 +352,25 @@ Gem::Specification.new do |s|
     lib/fog/terremark/requests/shared/power_shutdown.rb
     lib/fog/terremark/shared.rb
     lib/fog/terremark/vcloud.rb
+    lib/fog/vcloud.rb
+    lib/fog/vcloud/bin.rb
+    lib/fog/vcloud/parser.rb
+    lib/fog/vcloud/parsers/get_organization.rb
+    lib/fog/vcloud/parsers/get_vdc.rb
+    lib/fog/vcloud/parsers/get_versions.rb
+    lib/fog/vcloud/parsers/login.rb
+    lib/fog/vcloud/requests/get_organization.rb
+    lib/fog/vcloud/requests/get_vdc.rb
+    lib/fog/vcloud/requests/get_versions.rb
+    lib/fog/vcloud/requests/login.rb
+    lib/fog/vcloud/terremark/all.rb
+    lib/fog/vcloud/terremark/ecloud.rb
+    lib/fog/vcloud/terremark/ecloud/parsers/get_vdc.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb
+    lib/fog/vcloud/terremark/ecloud/requests/login.rb
+    lib/fog/vcloud/terremark/vcloud.rb
+    lib/fog/vcloud/terremark/vcloud/parsers/get_vdc.rb
+    lib/fog/vcloud/terremark/vcloud/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
@@ -420,6 +447,16 @@ Gem::Specification.new do |s|
     spec/slicehost/models/server_spec.rb
     spec/slicehost/models/servers_spec.rb
     spec/spec_helper.rb
+    spec/vcloud/bin_spec.rb
+    spec/vcloud/requests/get_organization_spec.rb
+    spec/vcloud/requests/get_vdc_spec.rb
+    spec/vcloud/requests/get_versions_spec.rb
+    spec/vcloud/requests/login_spec.rb
+    spec/vcloud/spec_helper.rb
+    spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
+    spec/vcloud/terremark/ecloud/requests/login_spec.rb
+    spec/vcloud/terremark/vcloud/requests/get_vdc_spec.rb
+    spec/vcloud/vcloud_spec.rb
     tests/aws/helper.rb
     tests/aws/requests/ec2/address_tests.rb
     tests/aws/requests/ec2/snapshot_tests.rb

data/lib/fog.rb

@@ -30,11 +30,12 @@ require 'fog/local'
 require 'fog/rackspace'
 require 'fog/slicehost'
 require 'fog/terremark'
+require 'fog/vcloud'
 
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.0.93'
+    VERSION = '0.0.94'
   end
 
   module Mock

data/lib/fog/aws.rb

@@ -46,6 +46,14 @@ module Fog
         sprintf("%0.10f", rand / 100).to_f
       end
 
+      def self.dns_name_for(ip_address)
+        "ec2-#{ip_address.gsub('.','-')}.compute-1.amazonaws.com"
+      end
+
+      def self.private_dns_name_for(ip_address)
+        "ip-#{ip_address.gsub('.','-')}.ec2.internal"
+      end
+
       def self.console_output
         'This is my console. There are many like it, but this one is mine. My console is my best friend. It is my life. I must master it as I master my life. My console, without me, is useless. Without my console, I am useless.'
       end
@@ -164,17 +172,13 @@ module Fog
       end
 
       def self.numbers(length)
-        random_selection(
-          '0123456789',
-          length
-        )
+        max = ('9' * length).to_i
+        rand(max).to_s
       end
 
       def self.hex(length)
-        random_selection(
-          '0123456789abcdef',
-          length
-        )
+        max = ('f' * length).to_i(16)
+        rand(max).to_s(16)
       end
 
       def self.base64(length)

data/lib/fog/aws/parsers/s3/get_bucket_logging.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Parsers
+    module AWS
+      module S3
+
+        class AccessControlList < Fog::Parsers::Base
+
+          def reset
+            @grant = { 'Grantee' => {} }
+            @response = { 'BucketLoggingStatus' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'DisplayName', 'ID'
+              if @in_access_control_list
+                @grant['Grantee'][name] = @value
+              else
+                @response['Owner'][name] = @value
+              end
+            when 'Grant'
+              @response['BucketLoggingStatus']['LoggingEnabled']['TargetGrants'] << @grant
+              @grant = { 'Grantee' => {} }
+            when 'LoggingEnabled'
+              @response['BucketLoggingStatus']['LoggingEnabled'] = { 'TargetGrants' => [] }
+            when 'Permission'
+              @grant[name] = @value
+            when 'TargetBucket', 'TargetPrefix'
+              @response['BucketLoggingStatus'][name] = @value
+            when 'URI'
+              @grant['Grantee'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/s3/get_bucket_object_versions.rb

@@ -0,0 +1,88 @@
+module Fog
+  module Parsers
+    module AWS
+      module S3
+
+        class GetBucketObjectVersions < Fog::Parsers::Base
+
+          def reset
+            @delete_marker = { 'Owner' => {} }
+            @version = { 'Owner' => {} }
+
+            @in_delete_marke = false
+            @in_version = false
+
+            @response = { 'Versions' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'DeleteMarker'
+              @in_delete_marker = true
+            when 'Version'
+              @in_version = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'DeleteMarker'
+              @response['Versions'] << {'DeleteMarker' => @delete_marker }
+              @delete_marker = { 'Owner' => {} }
+              @in_delete_marker = false
+            when 'Version'
+              @response['Versions'] << {'Version' => @version }
+              @version = { 'Owner' => {} }
+              @in_version = false
+            when 'DisplayName', 'ID'
+              if @in_delete_marker
+                @delete_marker
+              elsif @in_version
+                @version
+              end['Owner'][name] = @value
+            when 'ETag'
+              @version[name] = @value.gsub('"', '')
+            when 'IsLatest'
+              if @in_delete_marker
+                @delete_marker
+              elsif @in_version
+                @version
+              end['IsLatest'] = if @value == 'true'
+                true
+              else
+                false
+              end
+            when 'IsTruncated'
+              if @value == 'true'
+                @response['IsTruncated'] = true
+              else
+                @response['IsTruncated'] = false
+              end
+            when 'LastModified'
+              if @in_delete_marker
+                @delete_marker
+              elsif @in_version
+                @version
+              end['LastModified'] = Time.parse(@value)
+            when 'KeyMarker', 'Name', 'Prefix', 'VersionIdMarker'
+              @response[name] = @value
+            when 'MaxKeys'
+              @response['MaxKeys'] = @value.to_i
+            when 'Size'
+              @version['Size'] = @value.to_i
+            when 'Key', 'Name', 'StorageClass', 'VersionId'
+              if @in_delete_marker
+                @delete_marker
+              elsif @in_version
+                @version
+              end[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/s3/get_bucket_versioning.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Parsers
+    module AWS
+      module S3
+
+        class GetBucketVersioning < Fog::Parsers::Base
+
+          def reset
+            @response = { 'VersioningConfiguration' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'Status'
+              @response['VersioningConfiguration'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -34,6 +34,9 @@ module Fog
           address = @data[:addresses][public_ip]
           if instance && address
             address['instanceId'] = instance_id
+            instance['originalIpAddress'] = instance['ipAddress']
+            instance['ipAddress'] = public_ip
+            instance['dnsName'] = Fog::AWS::Mock.dns_name_for(public_ip)
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,

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

@@ -77,9 +77,10 @@ module Fog
               case instance['instanceState']['name']
               when 'pending'
                 if Time.now - instance['launchTime'] > Fog::Mock.delay
-                  instance['dnsName']           = "ec2-#{Fog::AWS::Mock.ip_address.gsub('.','-')}.compute-1.amazonaws.com"
+                  instance['ipAddress']         = Fog::AWS::Mock.ip_address
+                  instance['dnsName']           = Fog::AWS::Mock.dns_name_for(instance['ipAddress'])
                   instance['privateIpAddress']  = Fog::AWS::Mock.ip_address
-                  instance['privateDnsName']    = "ip-#{instance['privateIpAddress'].gsub('.','-')}.ec2.internal"
+                  instance['privateDnsName']    = Fog::AWS::Mock.private_dns_name_for(instance['privateIpAddress'])
                   instance['instanceState']     = { 'code' => 16, 'name' => 'running' }
                 end
               when 'rebooting'
@@ -105,7 +106,7 @@ module Fog
                   'ownerId'       => instance['ownerId'],
                   'reservationId' => instance['reservationId']
                 }
-                reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'blockDeviceMapping', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType'].include?(key)}
+                reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'blockDeviceMapping', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType'].include?(key)}
               end
             end
 

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

@@ -29,6 +29,10 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           if address = @data[:addresses][public_ip]
+            instance_id = address['instanceId']
+            instance = @data[:instances][instance_id]
+            instance['ipAddress']         = instance['originalIpAddress']
+            instance['dnsName']           = Fog::AWS::Mock.dns_name_for(instance['ipAddress'])
             address['instanceId'] = nil
             response.status = 200
             response.body = {

data/lib/fog/aws/requests/s3/get_bucket.rb

@@ -8,17 +8,18 @@ module Fog
         # ==== Parameters
         # * bucket_name<~String> - name of bucket to list object keys from
         # * options<~Hash> - config arguments for list.  Defaults to {}.
-        #   * 'prefix'<~String> - limits object keys to those beginning with its value.
+        #   * 'delimiter'<~String> - causes keys with the same string between the prefix
+        #     value and the first occurence of delimiter to be rolled up
         #   * 'marker'<~String> - limits object keys to only those that appear
         #     lexicographically after its value.
         #   * 'max-keys'<~Integer> - limits number of object keys returned
-        #   * 'delimiter'<~String> - causes keys with the same string between the prefix
-        #     value and the first occurence of delimiter to be rolled up
+        #   * 'prefix'<~String> - limits object keys to those beginning with its value.
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'Delimeter'<~String> - Delimiter specified for query
+        #     * 'IsTruncated'<~Boolean> - Whether or not the listing is truncated
         #     * 'Marker'<~String> - Marker specified for query
         #     * 'MaxKeys'<~Integer> - Maximum number of keys specified for query
         #     * 'Name'<~String> - Name of the bucket
@@ -32,14 +33,14 @@ module Fog
         #         * 'ID'<~String> - Id of object owner
         #       * 'Size'<~Integer> - Size of object
         #       * 'StorageClass'<~String> - Storage class of object
+        #
         def get_bucket(bucket_name, options = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
-          options.reject! {|key, value| !['prefix', 'marker', 'max-keys', 'delimiter'].include?(key)}
           query = ''
           for key, value in options
-            query << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')};"
+            query << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
           end
           query.chop!
           request({