fog 1.0.0 → 1.1.0

data/lib/fog/dnsmadeeasy/models/dns/record.rb

@@ -58,11 +58,12 @@ module Fog
 
           if id.nil?
             data = connection.create_record(zone.domain, name, type, value, options).body
+            merge_attributes(data)
           else
-            data = connection.update_record(zone.domain, id, options).body
+            options.merge!(:name => name, :type => type, :data => value)
+            connection.update_record(zone.domain, id, options).body
           end
 
-          merge_attributes(data)
           true
         end
 

data/lib/fog/dynect/dns.rb

@@ -26,6 +26,8 @@ module Fog
       request :post_zone
       request :put_zone
 
+      class JobIncomplete < Error; end
+
       class Mock
         def initialize(options={})
           @dynect_customer = options[:dynect_customer]
@@ -80,18 +82,23 @@ module Fog
 
         def request(params)
           begin
+            # any request could redirect to a job
+            params[:expects] = Array(params[:expects]) | [307]
+
             params[:headers] ||= {}
             params[:headers]['Content-Type'] = 'application/json'
             params[:headers]['API-Version'] = @version
             params[:headers]['Auth-Token'] = auth_token unless params[:path] == "Session"
-            params[:path] = "#{@path}/#{params[:path]}"
+            params[:path] = "#{@path}/#{params[:path]}" unless params[:path] =~ %r{^#{Regexp.escape(@path)}/}
             response = @connection.request(params.merge!({:host => @host}))
 
-            unless response.body.empty?
+            if response.status == 307
+              response = poll_job(response)
+            elsif !response.body.empty?
               response.body = MultiJson.decode(response.body)
             end
-            response
 
+            response
           rescue Excon::Errors::HTTPStatusError => error
             if @auth_token && error.message =~ /login: (Bad or expired credentials|inactivity logout)/
               @auth_token = nil
@@ -103,6 +110,21 @@ module Fog
 
           response
         end
+
+        def poll_job(response, time_to_wait = 10)
+          job_location = response.headers['Location']
+
+          Fog.wait_for(time_to_wait) do
+            response = request(:expects => 200, :method => :get, :path => job_location)
+            response.body['status'] != 'incomplete'
+          end
+
+          if response.body['status'] == 'incomplete'
+            raise JobIncomplete.new("Job #{response.body['job_id']} is still incomplete")
+          end
+
+          response
+        end
       end
 
     end

data/lib/fog/ecloud/compute.rb

@@ -18,11 +18,7 @@ module Fog
 
       def check_href!(opts = {})
         unless href
-          if opts.is_a?(String)
-            t = Hash.new
-            t[:parent] = opts
-            opts = t
-          end
+          opts = { :parent => opts } if opts.is_a?(String)
           msg = ":href missing, call with a :href pointing to #{if opts[:message]
                   opts[:message]
                 elsif opts[:parent]
@@ -1065,7 +1061,7 @@ module Fog
         end
 
         def self.data_reset
-          Fog::Logger.warning("#{self} => #data_reset is deprecated, use #reset instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("#{self} => #data_reset is deprecated, use #reset instead [light_black](#{caller.first})[/]")
           self.reset
         end
 

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

@@ -16,7 +16,7 @@ module Fog
         def grid_server_power(server, power)
           request(
             :path     => 'grid/server/power',
-            :query    => {'server' => server}
+            :query    => {'server' => server, 'power' => power}
           )
         end
 

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

@@ -106,7 +106,7 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           if options != {}
-            Fog::Logger.warning("options param is deprecated, use acl= instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("options param is deprecated, use acl= instead [light_black](#{caller.first})[/]")
           end
           options['x-goog-acl'] ||= @acl if @acl
           options['Cache-Control'] = cache_control if cache_control

data/lib/fog/google/requests/storage/get_object_url.rb

@@ -18,7 +18,7 @@ module Fog
         # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         def get_object_url(bucket_name, object_name, expires)
-          Fog::Logger.warning("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})")
+          Fog::Logger.deprecation("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})")
           get_object_https_url(bucket_name, object_name, expires)
         end
 
@@ -27,7 +27,7 @@ module Fog
       class Mock # :nodoc:all
 
         def get_object_url(bucket_name, object_name, expires)
-          Fog::Logger.warning("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})")
+          Fog::Logger.deprecation("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})")
           get_object_https_url(bucket_name, object_name, expires)
         end
 

data/lib/fog/google/storage.rb

@@ -45,7 +45,7 @@ module Fog
         end
 
         def url(params, expires)
-          Fog::Logger.warning("Fog::Storage::Google => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::Storage::Google => #url is deprecated, use #https_url instead [light_black](#{caller.first})[/]")
           https_url(params, expires)
         end
 

data/lib/fog/libvirt/models/compute/uri.rb

@@ -126,9 +126,13 @@ module Fog
         # http://libvirt.org/remote.html
         private
         def value(name)
-          params=CGI.parse(@parsed_uri.query)
-          if params.has_key?(name)
-            return params[name].first
+          unless @parsed_uri.query.nil?
+            params=CGI.parse(@parsed_uri.query)
+            if params.has_key?(name)
+              return params[name].first
+            else
+              return nil
+            end
           else
             return nil
           end

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

@@ -5,14 +5,24 @@ module Fog
     class Linode
       class Server < Fog::Compute::Server
         attr_reader :stack_script
+        attr_accessor :private_key, :username
         identity :id
         attribute :name
         attribute :status
 
+        def initialize(attributes={})
+          super
+          self.username = 'root'
+        end
+
         def ips
           Fog::Compute::Linode::Ips.new :server => self, :connection => connection
         end
 
+        def public_ip_address
+          ips.find{|ip| ip.ip !~ /^192/}.ip
+        end
+
         def disks
           Fog::Compute::Linode::Disks.new :server => self, :connection => connection
         end

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

@@ -13,7 +13,7 @@ module Fog
         attribute :objectid,        :aliases => :ObjectID
 
         def body
-          attributes[:body] ||= if last_modified
+          attributes[:body] ||= if objectid
             collection.get(identity).body
           else
             ''
@@ -73,13 +73,15 @@ module Fog
           options[:headers] ||= {}
           options[:headers]['Content-Type'] = content_type if content_type
           options[:body] = body
-          if objectid
-            # pre-existing file, do a PUT
-            data = connection.put_namespace(ns, options)
-          else
-            # new file, POST
+          begin
             data = connection.post_namespace(ns, options)
             self.objectid = data.headers['location'].split('/')[-1]
+          rescue => error
+            if error.message =~ /The resource you are trying to create already exists./
+              data = connection.put_namespace(ns, options)
+            else
+              raise error
+            end
           end
           # merge_attributes(data.headers)
           true

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

@@ -51,12 +51,13 @@ module Fog
 
         def head(key, options = {})
           requires :directory
-          data = connection.head_object(directory.key, key)
+          data = connection.head_namespace(directory.key + key, :parse => false)
           file_data = data.headers.merge({
+            :body => data.body,
             :key => key
           })
           new(file_data)
-        rescue Fog::Storage::Rackspace::NotFound
+        rescue Fog::Storage::Ninefold::NotFound
           nil
         end
 

data/lib/fog/ninefold/requests/storage/head_namespace.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Storage
+    class Ninefold
+      class Real
+
+        def head_namespace(namespace = '', options = {})
+          options = options.reject {|key, value| value.nil?}
+          request({
+                    :expects  => 200,
+                    :method   => 'HEAD',
+                    :path     => "namespace/" + namespace,
+                    :query    => {},
+                    :parse => true
+                  }.merge(options))
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/ninefold/storage.rb

@@ -20,6 +20,7 @@ module Fog
       request_path 'fog/ninefold/requests/storage'
       # request :delete_container
       request :get_namespace
+      request :head_namespace
       request :post_namespace
       request :put_namespace
       request :delete_namespace
@@ -107,9 +108,10 @@ module Fog
 
           customheaders = {}
           params[:headers].each { |key,value|
-            if key == "x-emc-date"
+            case key
+            when 'x-emc-date', 'x-emc-signature'
               #skip
-            elsif key =~ /^x-emc-/
+            when /^x-emc-/
               customheaders[ key.downcase ] = value
             end
           }

data/lib/fog/openstack.rb

@@ -88,12 +88,13 @@ module Fog
 
       response = connection.request({
         :expects  => [200, 204],
-        :body  => req_body,
+        :headers => {'Content-Type' => 'application/json'},
+        :body  => MultiJson.encode(req_body),
         :host     => uri.host,
-        :method   => 'GET',
+        :method   => 'POST',
         :path     =>  (uri.path and not uri.path.empty?) ? uri.path : 'v2.0'
       })
-      body=response.body
+      body=MultiJson.decode(response.body)
      
       if body['auth']['serviceCatalog'] and body['auth']['serviceCatalog'][@compute_service_name] and body['auth']['serviceCatalog'][@compute_service_name][0] then
         mgmt_url = body['auth']['serviceCatalog'][@compute_service_name][0]['publicURL']

data/lib/fog/openstack/compute.rb

@@ -6,8 +6,8 @@ module Fog
   module Compute
     class OpenStack < Fog::Service
 
-      requires :openstack_api_key, :openstack_username, :openstack_auth_url, :openstack_tenant
-      recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_compute_service_name
+      requires :openstack_api_key, :openstack_username, :openstack_auth_url
+      recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_compute_service_name, :openstack_tenant
 
       model_path 'fog/openstack/models/compute'
       model       :flavor
@@ -167,7 +167,7 @@ module Fog
               :openstack_tenant => @openstack_tenant,
               :openstack_compute_service_name => @openstack_compute_service_name
             }
-            if @openstack_auth_url =~ /.*v2.0\/?$/
+            if @openstack_auth_url =~ /\/v2.0\//
               credentials = Fog::OpenStack.authenticate_v2(options, @connection_options)
             else
               credentials = Fog::OpenStack.authenticate_v1(options, @connection_options)
@@ -181,8 +181,11 @@ module Fog
           end
           @host   = uri.host
           @path   = uri.path
-          # Force URL into v1.1 namespace (what this binding supports)
-          @path.sub!(/\/.*\/?/, '/v1.1/')
+          @path.sub!(/\/$/, '')
+          unless @path.match(/1\.1/)
+            raise Fog::Compute::OpenStack::ServiceUnavailable.new(
+                    "OpenStack binding only supports version 1.1")
+          end
           # Add tenant
           @path += @openstack_tenant if @openstack_tenant
           @port   = uri.port

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

@@ -20,6 +20,8 @@ module Fog
         attribute :progress
         attribute :accessIPv4
         attribute :accessIPv6
+        attribute :availability_zone
+        attribute :user_data_encoded
         attribute :state,       :aliases => 'status'
 
         attr_reader :password
@@ -27,6 +29,7 @@ module Fog
 
         def initialize(attributes={})
           @connection = attributes[:connection]
+          attributes[:metadata] = {}
           super
         end
 
@@ -45,6 +48,10 @@ module Fog
           metadata.load(metas)
         end
 
+        def user_data=(ascii_userdata)
+          self.user_data_encoded = [ascii_userdata].pack('m')
+        end
+
         def destroy
           requires :id
           connection.delete_server(id)
@@ -152,7 +159,9 @@ module Fog
             'metadata'    => meta_hash,
             'personality' => personality,
             'accessIPv4' => accessIPv4,
-            'accessIPv6' => accessIPv6
+            'accessIPv6' => accessIPv6,
+            'availability_zone' => availability_zone,
+            'user_data' => user_data_encoded
           }
           options = options.reject {|key, value| value.nil?}
           data = connection.create_server(name, image_ref, flavor_ref, options)

data/lib/fog/openstack/requests/compute/create_server.rb

@@ -12,15 +12,12 @@ module Fog
             }
           }
 
-          if options['metadata']
-            data['server']['metadata'] = options['metadata']
-          end
-          if options['accessIPv4']
-            data['server']['accessIPv4'] = options['accessIPv4']
-          end
-          if options['accessIPv6']
-            data['server']['accessIPv6'] = options['accessIPv6']
+          vanilla_options = ['metadata', 'accessIPv4', 'accessIPv6',
+                             'availability_zone', 'user_data']
+          vanilla_options.select{|o| options[o]}.each do |key|
+            data['server'][key] = options[key]
           end
+
           if options['personality']
             data['server']['personality'] = []
             for file in options['personality']
@@ -30,6 +27,7 @@ module Fog
               }
             end
           end
+
           request(
             :body     => MultiJson.encode(data),
             :expects  => [200, 202],

data/lib/fog/rackspace/load_balancers.rb

@@ -16,6 +16,7 @@ module Fog
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url
       recognizes :rackspace_auth_token
+      recognizes :rackspace_lb_endpoint
 
       model_path 'fog/rackspace/models/load_balancers'
       collection :load_balancers

data/lib/fog/rackspace/models/dns/callback.rb

@@ -11,7 +11,7 @@ module Fog
           response = nil
           Fog.wait_for(timeout, interval) do
             response = connection.callback job_id
-            if response.status != 202
+            if response.body['status'] != 'RUNNING'
               true
             elsif retries == 0
               raise Fog::Errors::Error.new("Wait on job #{job_id} took too long")

data/lib/fog/rackspace/models/dns/record.rb

@@ -51,7 +51,7 @@ module Fog
           }
 
           response = wait_for_job connection.add_records(@zone.identity, [options]).body['jobId']
-          merge_attributes(response.body['records'].first)
+          merge_attributes(response.body['response']['records'].select {|record| record['name'] == self.name && record['type'] == self.type && record['data'] == self.value}.first)
           true
         end
 

data/lib/fog/rackspace/models/dns/zone.rb

@@ -52,7 +52,7 @@ module Fog
           response = connection.create_domains([data])
 
           response = wait_for_job response.body['jobId']
-          merge_attributes(response.body['domains'].first)
+          merge_attributes(response.body['response']['domains'].select {|domain| domain['name'] == self.domain}.first)
         end
 
         def update

data/lib/fog/slicehost/dns.rb

@@ -23,6 +23,7 @@ module Fog
       request :get_records
       request :get_zone
       request :get_zones
+      request :update_record
 
       class Mock
 

data/lib/fog/slicehost/models/dns/record.rb

@@ -12,7 +12,7 @@ module Fog
         identity :id
 
         attribute :active
-        attribute :value,       :aliases => 'ip'
+        attribute :value,       :aliases => ['ip', 'data']
         attribute :name
         attribute :description, :aliases => 'aux'
         attribute :ttl
@@ -45,13 +45,17 @@ module Fog
         end
 
         def save
-          raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if identity
+          
           requires :name, :type, :value, :zone
           options = {}
           options[:active]  = active ? 'Y' : 'N'
           options[:aux]     = description if description
           options[:ttl]     = ttl if ttl
-          data = connection.create_record(type, zone.id, name, value, options)
+          if identity
+            data = connection.update_record(identity, type, zone.id, name, value, options)
+          else
+            data = connection.create_record(type, zone.id, name, value, options)
+          end
           merge_attributes(data.body)
           true
         end