fog 0.3.16 → 0.3.17

data/Gemfile.lock

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

data/README.rdoc

@@ -3,6 +3,7 @@ http://geemus.s3.amazonaws.com/fog.png
 fog is the Ruby cloud computing library.
 
 The quick and dirty, top to bottom:
+
 * Collections provide a simplified interface, making clouds easier to work with and switch between.
 * Requests allow power users to get the most out of the features of each individual cloud.
 * Mocks make testing and integrating a breeze.
@@ -25,16 +26,18 @@ Now just type 'fog' to trying stuff out, confident that fog should let you know
 == Collections
 
 A high level interface to each cloud is provided through collections, such as images and servers.
-You can see a list of available collections by calling #collections on the connection object.
-Some of these collections are shared across multiple providers.
-Shared collections for compute are: flavors, images and servers.
-Shared collections for storage are: directory and file.
+You can see a list of available collections by calling #collections on the connection object. You can try it out using the `fog` command:
+
+  >> server = AWS.collections
+  [:addresses, :directories, :files, :flavors, :images, :key_pairs, :security_groups, :servers, :snapshots, :volumes]
 
-Some common methods for all of these collections are:
-* #all - fetch every object of that type from the provider.
-* #create  initialize a new record locally and then persists it with the provider.
-* #get - fetch a single object by its identity from the provider.
-* #new - initialize a new record locally, but do not persist it to the provider.
+Some of these collections are available across multiple providers. For example, all compute providers have +flavors+, +images+ and +servers+, and storage providers have +directory+ and +file+. 
+
+Collections share most of the basic CRUD type operations, such as:
+* +#all+ - fetch every object of that type from the provider.
+* +#create+  initialize a new record locally and then persists it with the provider.
+* +#get+ - fetch a single object by its identity from the provider.
+* +#new+ - initialize a new record locally, but do not persist it to the provider.
 
 As an example, we'll try initializing and persisting a Rackspace Cloud server:
 
@@ -60,12 +63,14 @@ As an example, we'll try initializing and persisting a Rackspace Cloud server:
 == Models
 
 Many of the collection methods return individual objects, which also provide some common methods:
-* #destroy - will destroy the persisted object from the provider
-* #save - persist the object to the provider
-* #wait_for - takes a block and waits for either the block to return true for the object or for a timeout (defaults to 10 minutes)
+* +#destroy+ - will destroy the persisted object from the provider
+* +#save+ - persist the object to the provider
+* +#wait_for+ - takes a block and waits for either the block to return true for the object or for a timeout (defaults to 10 minutes)
 
 == Mocks
 
+As you might imagine, testing code using Fog could be feasibly slow and expensive to constantly be turning and and shutting down instances. Fortunately, fog includes support for mocking itself out.
+
 Mocking provides an in memory representation of the state of cloud resources as you make requests.
 Mocked calls to mimic the behavior of each provider while eliminating the cost and time needed to actually use cloud resources.
 Enabling mocking easy to use, before you run any other commands run:

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.16'
-  s.date              = '2010-11-04'
+  s.version           = '0.3.17'
+  s.date              = '2010-11-05'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -374,9 +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/cdn/get_containers.rb
+    lib/fog/rackspace/requests/cdn/head_container.rb
+    lib/fog/rackspace/requests/cdn/put_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
@@ -500,6 +500,7 @@ Gem::Specification.new do |s|
     lib/fog/vcloud/bin.rb
     lib/fog/vcloud/collection.rb
     lib/fog/vcloud/generators.rb
+    lib/fog/vcloud/mock_data_classes.rb
     lib/fog/vcloud/model.rb
     lib/fog/vcloud/models/vdc.rb
     lib/fog/vcloud/models/vdcs.rb
@@ -631,14 +632,17 @@ Gem::Specification.new do |s|
     spec/vcloud/terremark/ecloud/models/nodes_spec.rb
     spec/vcloud/terremark/ecloud/models/public_ip_spec.rb
     spec/vcloud/terremark/ecloud/models/public_ips_spec.rb
+    spec/vcloud/terremark/ecloud/models/server_spec.rb
     spec/vcloud/terremark/ecloud/models/vdc_spec.rb
     spec/vcloud/terremark/ecloud/models/vdcs_spec.rb
     spec/vcloud/terremark/ecloud/requests/add_internet_service_spec.rb
     spec/vcloud/terremark/ecloud/requests/add_node_spec.rb
     spec/vcloud/terremark/ecloud/requests/configure_internet_service_spec.rb
     spec/vcloud/terremark/ecloud/requests/configure_node_spec.rb
+    spec/vcloud/terremark/ecloud/requests/configure_vapp_spec.rb
     spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb
     spec/vcloud/terremark/ecloud/requests/delete_node_spec.rb
+    spec/vcloud/terremark/ecloud/requests/delete_vapp_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_catalog_item_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_catalog_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_customization_options_spec.rb
@@ -654,6 +658,7 @@ Gem::Specification.new do |s|
     spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
     spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb
     spec/vcloud/terremark/ecloud/requests/login_spec.rb
+    spec/vcloud/terremark/ecloud/requests/power_off_spec.rb
     spec/vcloud/terremark/ecloud/requests/power_on_spec.rb
     spec/vcloud/vcloud_spec.rb
     tests/aws/helper.rb

data/lib/fog.rb

@@ -18,7 +18,7 @@ module Fog
   @mocking = false
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.16'
+    VERSION = '0.3.17'
   end
 
   module Mock

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

@@ -61,6 +61,28 @@ module Fog
           @payer = new_payer
         end
 
+        def public=(new_public)
+          if new_public
+            @acl = 'public-read'
+          else
+            @acl = 'private'
+          end
+          new_public
+        end
+
+        def public_url
+          requires :key
+          if connection.get_bucket_acl(key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
+            if key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+              "https://#{key}.s3.amazonaws.com"
+            else
+              "https://s3.amazonaws.com/#{key}"
+            end
+          else
+            nil
+          end
+        end
+
         def save
           requires :key
           options = {}

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

@@ -60,6 +60,21 @@ module Fog
           end
         end
 
+        def public_url
+          requires :directory, :key
+          if directory.public_url
+            "#{directory.public_url}/#{key}"
+          elsif connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' && grant['Permission'] == 'READ'}
+            if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+              "https://#{directory.key}.s3.amazonaws.com/#{key}"
+            else
+              "https://s3.amazonaws.com/#{directory.key}/#{key}"
+            end
+          else
+            nil
+          end
+        end
+
         def save(options = {})
           requires :body, :directory, :key
           if options != {}

data/lib/fog/aws/storage.rb

@@ -38,6 +38,13 @@ module Fog
 
       module Utils
 
+        def cdn
+          @cdn ||= Fog::AWS::CDN.new(
+            :aws_access_key_id => @aws_access_key_id,
+            :aws_secret_access_key => @aws_secret_access_key
+          )
+        end
+
         def parse_data(data)
           metadata = {
             :body => nil,
@@ -93,6 +100,7 @@ module Fog
         def initialize(options={})
           require 'mime/types'
           @aws_access_key_id = options[:aws_access_key_id]
+          @aws_secret_access_key = options[:aws_secret_access_key]
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
           when 'eu-west-1'

data/lib/fog/core/collection.rb

@@ -5,19 +5,20 @@ module Fog
     include Fog::Attributes::InstanceMethods
 
     Array.public_instance_methods(false).each do |method|
-      class_eval <<-RUBY
-        def #{method}(*args)
-          unless @loaded
-            lazy_load
+      unless [:reject, :select].include?(method.to_sym)
+        class_eval <<-RUBY
+          def #{method}(*args)
+            unless @loaded
+              lazy_load
+            end
+            super
           end
-          super
-        end
-      RUBY
+        RUBY
+      end
     end
 
     %w[reject select].each do |method|
       class_eval <<-RUBY
-        # remove_method :#{method}
         def #{method}(*args)
           unless @loaded
             lazy_load

data/lib/fog/core/compute.rb

@@ -2,7 +2,7 @@ module Fog
   class Storage
 
     def self.new(attributes)
-      case attributes.delete(:provider)
+      case provider = attributes.delete(:provider)
       when 'AWS'
         require 'fog/aws'
         Fog::AWS::Compute.new(attributes)

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

@@ -39,11 +39,33 @@ module Fog
           end
         end
 
+        def public=(new_public)
+          if new_public
+            @acl = 'public-read'
+          else
+            @acl = 'private'
+          end
+          new_public
+        end
+
+        def public_url
+          requires :key
+          if connection.get_bucket_acl(key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
+            if key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+              "https://#{key}.commondatastorage.googleapis.com"
+            else
+              "https://commondatastorage.googleapis.com/#{key}"
+            end
+          else
+            nil
+          end
+        end
+
         def save
           requires :key
           options = {}
           if @acl
-            options['x-amz-acl'] = @acl
+            options['x-goog-acl'] = @acl
           end
           if @location
             options['LocationConstraint'] = @location

data/lib/fog/google/models/storage/file.rb

@@ -63,13 +63,28 @@ module Fog
           end
         end
 
+        def public_url
+          requires :directory, :key
+          if directory.public_url
+            "#{directory.public_url}/#{key}"
+          elsif connection.get_object_acl(directory.key, key).body['AccessControlList'].detect {|entry| entry['Scope']['type'] == 'AllUsers' && entry['Permission'] == 'READ'}
+            if directory.key.to_s =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
+              "https://#{directory.key}.commondatastorage.googleapis/#{key}"
+            else
+              "https://commondatastorage.googleapis.com/#{directory.key}/#{key}"
+            end
+          else
+            nil
+          end
+        end
+
         def save(options = {})
           requires :body, :directory, :key
           if options != {}
             Formatador.display_line("[yellow][WARN] options param is deprecated, use acl= instead[/] [light_black](#{caller.first})[/]")
           end
           if @acl
-            options['x-amz-acl'] ||= @acl
+            options['x-goog-acl'] ||= @acl
           end
           if content_type
             options['Content-Type'] = content_type

data/lib/fog/google/parsers/storage/access_control_list.rb

@@ -6,35 +6,37 @@ module Fog
         class AccessControlList < Fog::Parsers::Base
 
           def reset
-            @in_access_control_list = false
-            @grant = { 'Grantee' => {} }
+            @in_entries = false
+            @entry = { 'Scope' => {} }
             @response = { 'Owner' => {}, 'AccessControlList' => [] }
           end
 
           def start_element(name, attrs = [])
             super
-            if name == 'AccessControlList'
-              @in_access_control_list = true
+            case name
+            when 'Entries'
+              @in_entries = true
+            when 'Scope'
+              key, value = attrs
+              @entry['Scope'][key] = value
             end
           end
 
           def end_element(name)
             case name
-            when 'AccessControlList'
-              @in_access_control_list = false
-            when 'Grant'
-              @response['AccessControlList'] << @grant
-              @grant = { 'Grantee' => {} }
+            when 'Entries'
+              @in_entries = false
+            when 'Entry'
+              @response['AccessControlList'] << @entry
+              @entry = { 'Scope' => {} }
             when 'DisplayName', 'ID'
-              if @in_access_control_list
-                @grant['Grantee'][name] = @value
+              if @in_entries
+                @entry['Scope'][name] = @value
               else
                 @response['Owner'][name] = @value
               end
             when 'Permission'
-              @grant[name] = @value
-            when 'URI'
-              @grant['Grantee'][name] = @value
+              @entry[name] = @value
             end
           end
 

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

@@ -32,6 +32,14 @@ module Fog
           end
         end
 
+        def public=(new_public)
+          new_public
+        end
+
+        def public_url
+          nil
+        end
+
         def save
           requires :key
 

data/lib/fog/local/models/storage/file.rb

@@ -31,6 +31,10 @@ module Fog
           true
         end
 
+        def public_url
+          nil
+        end
+
         def save(options = {})
           requires :body, :directory, :key
           file = ::File.new(path, 'w')

data/lib/fog/rackspace/cdn.rb

@@ -7,9 +7,9 @@ module Fog
       model_path 'fog/rackspace/models/cdn'
 
       request_path 'fog/rackspace/requests/cdn'
-      request :get_cdn_containers
-      request :head_cdn_container
-      request :put_cdn_container
+      request :get_containers
+      request :head_container
+      request :put_container
 
       class Mock
 

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

@@ -32,9 +32,27 @@ module Fog
           end
         end
 
+        def public=(new_public)
+          @public = new_public
+        end
+
+        def public_url
+          requires :key
+          @public_url ||= begin
+            begin response = connection.cdn.head_container(key)
+              response.headers['X-CDN-URI']
+            rescue Fog::Service::NotFound
+              nil
+            end
+          end
+        end
+
         def save
           requires :key
           connection.put_container(key)
+          if @public
+            @public_url = connection.cdn.put_container(key).headers['X-CDN-URI']
+          end
           true
         end
 

data/lib/fog/rackspace/models/storage/file.rb

@@ -41,6 +41,13 @@ module Fog
           end
         end
 
+        def public_url
+          requires :directory, :key
+          if @directory.public_url
+            "#{@directory.public_url}/#{key}"
+          end
+        end
+
         def save(options = {})
           requires :body, :directory, :key
           data = connection.put_object(directory.key, @key, @body, options)

data/lib/fog/rackspace/requests/cdn/{get_cdn_containers.rb → get_containers.rb}

@@ -1,6 +1,6 @@
 module Fog
   module Rackspace
-    class Storage
+    class CDN
       class Real
 
         # List existing cdn-enabled storage containers
@@ -15,7 +15,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Array>:
         #     * container<~String>: Name of container
-        def get_cdn_containers(options = {})
+        def get_containers(options = {})
           response = request(
             :expects  => [200, 204],
             :method   => 'GET',
@@ -29,7 +29,7 @@ module Fog
 
       class Mock
 
-        def get_cdn_containers(options = {})
+        def get_containers(options = {})
           Fog::Mock.not_implemented
         end