fog 0.3.13 → 0.3.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.13)
+    fog (0.3.14)
       builder
       excon (>= 0.2.4)
       formatador (>= 0.0.15)

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.3.13'
-  s.date              = '2010-10-20'
+  s.version           = '0.3.14'
+  s.date              = '2010-11-02'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -75,9 +75,11 @@ Gem::Specification.new do |s|
     lib/fog.rb
     lib/fog/aws.rb
     lib/fog/aws/bin.rb
+    lib/fog/aws/cdn.rb
     lib/fog/aws/compute.rb
     lib/fog/aws/ec2.rb
     lib/fog/aws/elb.rb
+    lib/fog/aws/iam.rb
     lib/fog/aws/models/compute/address.rb
     lib/fog/aws/models/compute/addresses.rb
     lib/fog/aws/models/compute/flavor.rb
@@ -100,6 +102,9 @@ Gem::Specification.new do |s|
     lib/fog/aws/models/storage/directory.rb
     lib/fog/aws/models/storage/file.rb
     lib/fog/aws/models/storage/files.rb
+    lib/fog/aws/parsers/cdn/distribution.rb
+    lib/fog/aws/parsers/cdn/get_distribution_list.rb
+    lib/fog/aws/parsers/cdn/post_invalidation.rb
     lib/fog/aws/parsers/compute/allocate_address.rb
     lib/fog/aws/parsers/compute/attach_volume.rb
     lib/fog/aws/parsers/compute/basic.rb
@@ -134,6 +139,9 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb
     lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb
     lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb
+    lib/fog/aws/parsers/iam/basic.rb
+    lib/fog/aws/parsers/iam/create_group.rb
+    lib/fog/aws/parsers/iam/list_groups.rb
     lib/fog/aws/parsers/simpledb/basic.rb
     lib/fog/aws/parsers/simpledb/domain_metadata.rb
     lib/fog/aws/parsers/simpledb/get_attributes.rb
@@ -148,6 +156,11 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/storage/get_bucket_versioning.rb
     lib/fog/aws/parsers/storage/get_request_payment.rb
     lib/fog/aws/parsers/storage/get_service.rb
+    lib/fog/aws/requests/cdn/delete_distribution.rb
+    lib/fog/aws/requests/cdn/get_distribution.rb
+    lib/fog/aws/requests/cdn/get_distribution_list.rb
+    lib/fog/aws/requests/cdn/post_distribution.rb
+    lib/fog/aws/requests/cdn/post_invalidation.rb
     lib/fog/aws/requests/compute/allocate_address.rb
     lib/fog/aws/requests/compute/associate_address.rb
     lib/fog/aws/requests/compute/attach_volume.rb
@@ -197,6 +210,9 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb
     lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb
     lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb
+    lib/fog/aws/requests/iam/create_group.rb
+    lib/fog/aws/requests/iam/delete_group.rb
+    lib/fog/aws/requests/iam/list_groups.rb
     lib/fog/aws/requests/simpledb/batch_put_attributes.rb
     lib/fog/aws/requests/simpledb/create_domain.rb
     lib/fog/aws/requests/simpledb/delete_attributes.rb
@@ -255,6 +271,7 @@ Gem::Specification.new do |s|
     lib/fog/core/attributes.rb
     lib/fog/core/bin.rb
     lib/fog/core/collection.rb
+    lib/fog/core/compute.rb
     lib/fog/core/connection.rb
     lib/fog/core/credentials.rb
     lib/fog/core/deprecation.rb
@@ -265,6 +282,7 @@ Gem::Specification.new do |s|
     lib/fog/core/provider.rb
     lib/fog/core/service.rb
     lib/fog/core/ssh.rb
+    lib/fog/core/storage.rb
     lib/fog/go_grid.rb
     lib/fog/go_grid/bin.rb
     lib/fog/go_grid/compute.rb
@@ -343,6 +361,7 @@ Gem::Specification.new do |s|
     lib/fog/new_servers/requests/compute/reboot_server.rb
     lib/fog/rackspace.rb
     lib/fog/rackspace/bin.rb
+    lib/fog/rackspace/cdn.rb
     lib/fog/rackspace/compute.rb
     lib/fog/rackspace/files.rb
     lib/fog/rackspace/models/compute/flavor.rb
@@ -355,6 +374,9 @@ Gem::Specification.new do |s|
     lib/fog/rackspace/models/storage/directory.rb
     lib/fog/rackspace/models/storage/file.rb
     lib/fog/rackspace/models/storage/files.rb
+    lib/fog/rackspace/requests/cdn/get_cdn_containers.rb
+    lib/fog/rackspace/requests/cdn/head_cdn_container.rb
+    lib/fog/rackspace/requests/cdn/put_cdn_container.rb
     lib/fog/rackspace/requests/compute/create_image.rb
     lib/fog/rackspace/requests/compute/create_server.rb
     lib/fog/rackspace/requests/compute/delete_image.rb
@@ -375,15 +397,12 @@ Gem::Specification.new do |s|
     lib/fog/rackspace/requests/compute/update_server.rb
     lib/fog/rackspace/requests/storage/delete_container.rb
     lib/fog/rackspace/requests/storage/delete_object.rb
-    lib/fog/rackspace/requests/storage/get_cdn_containers.rb
     lib/fog/rackspace/requests/storage/get_container.rb
     lib/fog/rackspace/requests/storage/get_containers.rb
     lib/fog/rackspace/requests/storage/get_object.rb
-    lib/fog/rackspace/requests/storage/head_cdn_container.rb
     lib/fog/rackspace/requests/storage/head_container.rb
     lib/fog/rackspace/requests/storage/head_containers.rb
     lib/fog/rackspace/requests/storage/head_object.rb
-    lib/fog/rackspace/requests/storage/put_cdn_container.rb
     lib/fog/rackspace/requests/storage/put_container.rb
     lib/fog/rackspace/requests/storage/put_object.rb
     lib/fog/rackspace/servers.rb
@@ -573,11 +592,6 @@ Gem::Specification.new do |s|
     spec/aws/requests/simpledb/list_domains_spec.rb
     spec/aws/requests/simpledb/put_attributes_spec.rb
     spec/aws/requests/simpledb/select_spec.rb
-    spec/aws/requests/storage/copy_object_spec.rb
-    spec/aws/requests/storage/get_bucket_location_spec.rb
-    spec/aws/requests/storage/get_bucket_spec.rb
-    spec/aws/requests/storage/get_request_payment_spec.rb
-    spec/aws/requests/storage/put_request_payment_spec.rb
     spec/bluebox/models/compute/flavors_spec.rb
     spec/bluebox/models/compute/server_spec.rb
     spec/bluebox/models/compute/servers_spec.rb
@@ -599,16 +613,6 @@ Gem::Specification.new do |s|
     spec/rackspace/models/compute/flavors_spec.rb
     spec/rackspace/models/compute/server_spec.rb
     spec/rackspace/models/compute/servers_spec.rb
-    spec/rackspace/requests/storage/delete_container_spec.rb
-    spec/rackspace/requests/storage/delete_object_spec.rb
-    spec/rackspace/requests/storage/get_container_spec.rb
-    spec/rackspace/requests/storage/get_containers_spec.rb
-    spec/rackspace/requests/storage/get_object_spec.rb
-    spec/rackspace/requests/storage/head_container_spec.rb
-    spec/rackspace/requests/storage/head_containers_spec.rb
-    spec/rackspace/requests/storage/head_object_spec.rb
-    spec/rackspace/requests/storage/put_container_spec.rb
-    spec/rackspace/requests/storage/put_object_spec.rb
     spec/shared_examples/flavors_examples.rb
     spec/shared_examples/server_examples.rb
     spec/shared_examples/servers_examples.rb
@@ -694,6 +698,8 @@ Gem::Specification.new do |s|
     tests/rackspace/requests/compute/flavor_tests.rb
     tests/rackspace/requests/compute/image_tests.rb
     tests/rackspace/requests/compute/server_tests.rb
+    tests/rackspace/requests/storage/container_tests.rb
+    tests/rackspace/requests/storage/object_tests.rb
     tests/slicehost/helper.rb
     tests/slicehost/requests/compute/backup_tests.rb
     tests/slicehost/requests/compute/flavor_tests.rb

data/lib/fog.rb

@@ -1,14 +1,8 @@
 require 'rubygems'
 require 'base64'
 require 'cgi'
-require 'digest/md5'
 require 'excon'
 require 'formatador'
-require 'json'
-require 'mime/types'
-require 'net/ssh'
-require 'nokogiri'
-require 'tempfile'
 require 'time'
 
 __DIR__ = File.dirname(__FILE__)
@@ -24,7 +18,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.13'
+    VERSION = '0.3.14'
   end
 
   module Mock
@@ -52,10 +46,6 @@ module Fog
     @bin = new_bin
   end
 
-  def self.credentials
-    {}
-  end
-
   def self.mock!
     @mocking = true
   end

data/lib/fog/aws.rb

@@ -1,12 +1,17 @@
+require 'nokogiri'
+require 'fog/core/parser'
+
 module Fog
   module AWS
 
     extend Fog::Provider
 
     service_path 'fog/aws'
+    service 'cdn'
     service 'compute'
     service 'ec2'
     service 'elb'
+    service 'iam'
     service 's3'
     service 'simpledb'
     service 'storage'

data/lib/fog/aws/bin.rb

@@ -4,6 +4,8 @@ class AWS < Fog::Bin
     def [](service)
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
+        when :cdn
+          Fog::AWS::CDN.new
         when :compute
           Fog::AWS::Compute.new
         when :ec2
@@ -16,6 +18,8 @@ class AWS < Fog::Bin
           Fog::AWS::ELB.new
         when :eu_storage
           Fog::AWS::Storage.new(:region => 'eu-west-1')
+        when :iam
+          Fog::AWS::IAM.new
         when :sdb
           Fog::AWS::SimpleDB.new
         when :s3
@@ -32,7 +36,7 @@ class AWS < Fog::Bin
     end
 
     def services
-      [:compute, :elb, :sdb, :storage]
+      [:cdn, :compute, :elb, :iam, :sdb, :storage]
     end
 
   end

data/lib/fog/aws/cdn.rb

@@ -0,0 +1,98 @@
+module Fog
+  module AWS
+    class CDN < Fog::Service
+
+      requires :aws_access_key_id, :aws_secret_access_key
+
+      model_path 'fog/aws/models/cdn'
+
+      request_path 'fog/aws/requests/cdn'
+      request 'delete_distribution'
+      request 'get_distribution'
+      request 'get_distribution_list'
+      request 'post_distribution'
+      request 'post_invalidation'
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :buckets => {}
+              }
+            end
+          end
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          require 'mime/types'
+          @aws_access_key_id = options[:aws_access_key_id]
+          @data = self.class.data[options[:region]][@aws_access_key_id]
+        end
+
+        def signature(params)
+          "foo"
+        end
+      end
+
+      class Real
+
+        # Initialize connection to Cloudfront
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   cdn = Fog::AWS::CDN.new(
+        #     :aws_access_key_id => your_aws_access_key_id,
+        #     :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #
+        # ==== Returns
+        # * cdn object with connection to aws.
+        def initialize(options={})
+          @aws_access_key_id = options[:aws_access_key_id]
+          @aws_secret_access_key = options[:aws_secret_access_key]
+          @hmac     = Fog::HMAC.new('sha1', @aws_secret_access_key)
+          @host     = options[:host]      || 'cloudfront.amazonaws.com'
+          @path     = options[:path]      || '/'
+          @port     = options[:port]      || 443
+          @scheme   = options[:scheme]    || 'https'
+          @version  = options[:version]  || '2010-08-01'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def request(params, &block)
+          params[:headers] ||= {}
+          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)}"
+          params[:path] = "/#{@version}/#{params[:path]}" 
+          @connection.request(params, &block)
+        end
+
+        def signature(params)
+          string_to_sign = params[:headers]['Date']
+          signed_string = @hmac.sign(string_to_sign)
+          signature = Base64.encode64(signed_string).chomp!
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/iam.rb

@@ -0,0 +1,86 @@
+module Fog
+  module AWS
+    class IAM < Fog::Service
+
+      requires :aws_access_key_id, :aws_secret_access_key
+
+      request_path 'fog/aws/requests/iam'
+      request :create_group
+      request :delete_group
+      request :list_groups
+
+      class Mock
+
+        def initialize(options={})
+        end
+
+      end
+
+      class Real
+
+        # Initialize connection to IAM
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   iam = IAM.new(
+        #    :aws_access_key_id => your_aws_access_key_id,
+        #    :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #
+        # ==== Returns
+        # * IAM object with connection to AWS.
+        def initialize(options={})
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @host       = options[:host]      || 'iam.amazonaws.com'
+          @path       = options[:path]      || '/'
+          @port       = options[:port]      || 443
+          @scheme     = options[:scheme]    || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def request(params)
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          body = AWS.signed_params(
+            params,
+            {
+              :aws_access_key_id  => @aws_access_key_id,
+              :hmac               => @hmac,
+              :host               => @host,
+              :path               => @path,
+              :version            => '2010-05-08'
+            }
+          )
+
+          response = @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :idempotent => idempotent,
+            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :host       => @host,
+            :method     => 'POST',
+            :parser     => parser
+          })
+
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/models/compute/volume.rb

@@ -91,6 +91,16 @@ module Fog
           end
         end
 
+        def force_detach
+          @server = nil
+          @server_id = nil
+          unless new_record?
+            connection.detach_volume(@id, 'Force' => true)
+            reload
+          end
+        end
+
+
       end
 
     end

data/lib/fog/aws/models/storage/directory.rb

@@ -14,6 +14,14 @@ module Fog
 
         attribute :creation_date, :aliases => 'CreationDate'
 
+        def acl=(new_acl)
+          valid_acls = ['private', 'public-read', 'public-read-write', 'authenticated-read']
+          unless valid_acls.include?(new_acl)
+            raise ArgumentError.new("acl must be one of [#{valid_acls.join(', ')}]")
+          end
+          @acl = new_acl
+        end
+
         def destroy
           requires :key
           connection.delete_bucket(key)
@@ -56,6 +64,9 @@ module Fog
         def save
           requires :key
           options = {}
+          if @acl
+            options['x-amz-acl'] = @acl
+          end
           if @location
             options['LocationConstraint'] = @location
           end