fog 0.3.7 → 0.3.8

data/lib/fog/go_grid/requests/compute/grid_server_power.rb

@@ -13,7 +13,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Array>:
         # TODO: docs
-        def grid_server_delete(server, power)
+        def grid_server_power(server, power)
           request(
             :path     => 'grid/server/power',
             :query    => {'server' => server}
@@ -24,7 +24,7 @@ module Fog
 
       class Mock
 
-        def grid_server_delete(server)
+        def grid_server_power(server)
           Fog::Mock.not_implemented
         end
 

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/google/models/storage/directory'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 require 'fog/google/models/storage/files'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Google
@@ -8,7 +8,7 @@ module Fog
 
         identity  :key,             :aliases => 'Key'
 
-        attr_accessor :body
+        attr_writer :body
         attribute :content_length,  :aliases => 'Content-Length'
         attribute :content_type,    :aliases => 'Content-Type'
         attribute :etag,            :aliases => ['Etag', 'ETag']
@@ -53,6 +53,7 @@ module Fog
           true
         end
 
+        remove_method :owner=
         def owner=(new_owner)
           if new_owner
             @owner = {

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/google/models/storage/file'
 
 module Fog
@@ -81,12 +81,6 @@ module Fog
           super({ :directory => directory }.merge!(attributes))
         end
 
-        private
-
-        def directory=(new_directory)
-          @directory = new_directory
-        end
-
       end
 
     end

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

@@ -33,7 +33,7 @@ module Fog
               @response['MaxKeys'] = @value.to_i
             when 'Size'
               @object['Size'] = @value.to_i
-            when 'Delimeter', 'Key', 'Name', 'StorageClass'
+            when 'Delimeter', 'Key', 'StorageClass'
               @object[name] = @value
             end
           end

data/lib/fog/linode/requests/compute/avail_linodeplans.rb

@@ -9,7 +9,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~Array>:
         # TODO: docs
-        def avail_linodeplans(linodeplan_id=nil)
+        def avail_linodeplans(linodeplan_id = nil)
           options = {}
           if linodeplan_id
             options.merge!(:planId => linodeplan_id)
@@ -25,7 +25,7 @@ module Fog
 
       class Mock
 
-        def avail_linodeplans
+        def avail_linodeplans(linodeplan_id = nil)
           Fog::Mock.not_implemented
         end
 

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/local/models/storage/directory'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 require 'fog/local/models/storage/files'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Local
@@ -8,7 +8,7 @@ module Fog
 
         identity  :key,             :aliases => 'Key'
 
-        attr_accessor :body
+        attr_writer :body
         attribute :content_length,  :aliases => 'Content-Length'
         # attribute :content_type,    :aliases => 'Content-Type'
         attribute :last_modified,   :aliases => 'Last-Modified'

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/local/models/storage/file'
 
 module Fog
@@ -45,10 +45,7 @@ module Fog
               file.close
               new(data)
             else
-              body = nil
-              ::File.open(path) do |file|
-                body = file.read
-              end
+              body = ::File.read(path)
               new(data.merge!(:body => body))
             end
           else

data/lib/fog/local/storage.rb

@@ -1,6 +1,6 @@
 module Fog
   module Local
-  class Storage < Fog::Service
+    class Storage < Fog::Service
 
       requires :local_root
 

data/lib/fog/new_servers/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/parser'
+require 'fog/core/parser'
 
 module Fog
   module NewServers

data/lib/fog/rackspace/models/compute/flavor.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Rackspace
@@ -8,8 +8,6 @@ module Fog
 
         identity :id
 
-        attribute :bits
-        attribute :cores
         attribute :disk
         attribute :name
         attribute :ram

data/lib/fog/rackspace/models/compute/flavors.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/rackspace/models/compute/flavor'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Rackspace
@@ -33,6 +33,7 @@ module Fog
         end
 
         def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :server_id
 
           data = connection.create_image(@server_id, 'name' => name)

data/lib/fog/rackspace/models/compute/images.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/rackspace/models/compute/image'
 
 module Fog

data/lib/fog/rackspace/models/compute/server.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Rackspace
@@ -47,16 +47,6 @@ module Fog
           connection.images(:server => self)
         end
 
-        def ready?
-          @status == 'ACTIVE'
-        end
-
-        def reboot(type = 'SOFT')
-          requires :id
-          connection.reboot_server(@id, type)
-          true
-        end
-
         def private_key_path
           File.expand_path(@private_key_path ||= Fog.credentials[:private_key_path])
         end
@@ -73,7 +63,18 @@ module Fog
           @public_key ||= File.read(public_key_path)
         end
 
+        def ready?
+          @status == 'ACTIVE'
+        end
+
+        def reboot(type = 'SOFT')
+          requires :id
+          connection.reboot_server(@id, type)
+          true
+        end
+
         def save
+          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
           requires :flavor_id, :image_id, :name
           options = {
             'metadata'    => @metadata,

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/rackspace/models/compute/server'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/rackspace/models/storage/directory'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 require 'fog/rackspace/models/storage/files'
 
 module Fog

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

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Rackspace
@@ -8,7 +8,7 @@ module Fog
 
         identity  :key,             :aliases => 'Key'
 
-        attr_accessor :body
+        attr_writer :body
         attribute :content_length,  :aliases => 'Content-Length'
         attribute :content_type,    :aliases => 'Content-Type'
         attribute :etag,            :aliases => 'Etag'
@@ -41,9 +41,9 @@ module Fog
           end
         end
 
-        def save
+        def save(options = {})
           requires :body, :directory, :key
-          data = connection.put_object(directory.name, @key, @body)
+          data = connection.put_object(directory.name, @key, @body, options)
           @etag = data.headers['ETag']
           true
         end

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

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/rackspace/models/storage/file'
 
 module Fog

data/lib/fog/rackspace/requests/compute/create_image.rb

@@ -47,12 +47,12 @@ module Fog
             'name'      => options['name'] || '',
             'serverId'  => server_id,
             'status'    => 'SAVING',
-            'updated'   => now,
+            'updated'   => now.to_s,
           }
 
           @data[:last_modified][:images][data['id']] = now
           @data[:images][data['id']] = data
-          response.body = { 'image' => data.reject {|key, value| !['id', 'name', 'serverId'].include?(key)} }
+          response.body = { 'image' => data.reject {|key, value| !['id', 'name', 'serverId', 'status', 'updated'].include?(key)} }
           response
         end
 

data/lib/fog/rackspace/requests/compute/delete_image.rb

@@ -22,7 +22,7 @@ module Fog
 
         def delete_image(image_id)
           response = Excon::Response.new
-          if image = list_images_detail.body['images'].detect {|image| image['id'] == image_id}
+          if image = list_images_detail.body['images'].detect {|_| _['id'] == image_id}
             if image['status'] == 'SAVING'
               response.status = 409
               raise(Excon::Errors.status_error({:expects => 202}, response))

data/lib/fog/rackspace/requests/compute/delete_server.rb

@@ -22,7 +22,7 @@ module Fog
 
         def delete_server(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             if server['status'] == 'BUILD'
               response.status = 409
               raise(Excon::Errors.status_error({:expects => 202}, response))

data/lib/fog/rackspace/requests/compute/get_server_details.rb

@@ -37,7 +37,7 @@ module Fog
 
         def get_server_details(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             response.status = [200, 203][rand(1)]
             response.body = { 'server' => server }
             response

data/lib/fog/rackspace/requests/compute/list_addresses.rb

@@ -28,7 +28,7 @@ module Fog
 
         def list_addresses(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             response.status = [200, 203][rand(1)]
             response.body = { 'addresses' => server['addresses'] }
             response

data/lib/fog/rackspace/requests/compute/list_images_detail.rb

@@ -32,14 +32,14 @@ module Fog
           for image in images
             case image['status']
             when 'SAVING'
-              if Time.now - @data[:last_modified][:images][image['id']] > 2
+              if Time.now - @data[:last_modified][:images][image['id']] > Fog::Mock.delay
                 image['status'] = 'ACTIVE'
               end
             end
           end
 
           response.status = [200, 203][rand(1)]
-          response.body = { 'images' => images }
+          response.body = { 'images' => images.map {|image| image.reject {|key, value| !['id', 'name', 'status', 'updated'].include?(key)}} }
           response
         end
 

data/lib/fog/rackspace/requests/compute/list_private_addresses.rb

@@ -26,7 +26,7 @@ module Fog
 
         def list_private_addresses(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             response.status = [200, 203][rand(1)]
             response.body = { 'private' => server['addresses']['private'] }
             response

data/lib/fog/rackspace/requests/compute/list_public_addresses.rb

@@ -26,7 +26,7 @@ module Fog
 
         def list_public_addresses(server_id)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             response.status = [200, 203][rand(1)]
             response.body = { 'public' => server['addresses']['public'] }
             response

data/lib/fog/rackspace/requests/compute/update_server.rb

@@ -25,7 +25,7 @@ module Fog
 
         def update_server(server_id, options)
           response = Excon::Response.new
-          if server = list_servers_detail.body['servers'].detect { |server| server['id'] == server_id }
+          if server = list_servers_detail.body['servers'].detect {|_| _['id'] == server_id}
             if options['adminPass']
               server['adminPass'] = options['adminPass']
             end

data/lib/fog/rackspace/requests/storage/put_object.rb

@@ -8,12 +8,13 @@ module Fog
         # ==== Parameters
         # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
         #
-        def put_object(container, object, data)
+        def put_object(container, object, data, options = {})
           data = parse_data(data)
+          headers = data[:headers].merge!(options)
           response = storage_request(
             :body     => data[:body],
             :expects  => 201,
-            :headers  => data[:headers],
+            :headers  => headers,
             :method   => 'PUT',
             :path     => "#{CGI.escape(container)}/#{CGI.escape(object)}"
           )
@@ -24,7 +25,7 @@ module Fog
 
       class Mock
 
-        def put_object(container, object, data)
+        def put_object(container, object, data, options = {})
           Fog::Mock.not_implemented
         end
 

data/lib/fog/slicehost/models/compute/flavor.rb

@@ -1,4 +1,4 @@
-require 'fog/model'
+require 'fog/core/model'
 
 module Fog
   module Slicehost

data/lib/fog/slicehost/models/compute/flavors.rb

@@ -1,4 +1,4 @@
-require 'fog/collection'
+require 'fog/core/collection'
 require 'fog/slicehost/models/compute/flavor'
 
 module Fog