fog 1.10.0 → 1.10.1

data/lib/fog/aws/requests/storage/get_object.rb

@@ -14,6 +14,7 @@ module Fog
         # @option options If-Unmodified-Since [Time] Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
         # @option options Range [String] Range of object to download
         # @option options versionId [String] specify a particular version to retrieve
+        # @option options query[Hash] specify additional query string
         #
         # @return [Excon::Response] response:
         #   * body [String]- Contents of object
@@ -34,8 +35,11 @@ module Fog
           end
 
           params = { :headers => {} }
+
+          params[:query] = options.delete('query') || {}
+
           if version_id = options.delete('versionId')
-            params[:query] = {'versionId' => version_id}
+            params[:query] = params[:query].merge({'versionId' => version_id})
           end
           params[:headers].merge!(options)
           if options['If-Modified-Since']
@@ -54,7 +58,7 @@ module Fog
             :host     => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method   => 'GET',
-            :path     => CGI.escape(object_name),
+            :path     => CGI.escape(object_name)
           }))
         end
 

data/lib/fog/aws/storage.rb

@@ -7,7 +7,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style
 
       secrets    :aws_secret_access_key, :hmac
 
@@ -294,6 +294,7 @@ module Fog
             @persistent = options.fetch(:persistent, false)
             @port       = options[:port]        || 443
             @scheme     = options[:scheme]      || 'https'
+            @path_style = options[:path_style]  || false
           end
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
@@ -324,11 +325,12 @@ DATA
           string_to_sign << canonical_amz_headers
 
           subdomain = params[:host].split(".#{@host}").first
-          unless subdomain =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-            Fog::Logger.warning("fog: the specified s3 bucket name(#{subdomain}) is not a valid dns name, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
+          valid_dns = !!(subdomain =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/)
+          if !valid_dns || @path_style
+            Fog::Logger.warning("fog: the specified s3 bucket name(#{subdomain}) is not a valid dns name, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html") unless valid_dns
             params[:host] = params[:host].split("#{subdomain}.")[-1]
             if params[:path]
-              params[:path] = "#{subdomain}/#{params[:path]}"
+              params[:path] = "#{subdomain}/#{params[:path]}" unless subdomain == @host
             else
               params[:path] = subdomain
             end

data/lib/fog/aws/sts.rb

@@ -114,7 +114,7 @@ module Fog
 
             response
           rescue Excon::Errors::HTTPStatusError => error
-            if match = error.message.match(/<Code>(.*)<\/Code>(?:.*<Message>(.*)<\/Message>)?/m)
+            if match = error.message.match(/(?:.*<Code>(.*)<\/Code>)(?:.*<Message>(.*)<\/Message>)/m)
               case match[1]
               when 'EntityAlreadyExists', 'KeyPairMismatch', 'LimitExceeded', 'MalformedCertificate', 'ValidationError'
                 raise Fog::AWS::STS.const_get(match[1]).slurp(error, match[2])

data/lib/fog/bin.rb

@@ -63,6 +63,7 @@ require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
 require 'fog/bin/cloudstack'
 require 'fog/bin/clodo'
+require 'fog/bin/digitalocean'
 require 'fog/bin/dnsimple'
 require 'fog/bin/dnsmadeeasy'
 require 'fog/bin/dreamhost'
@@ -81,6 +82,7 @@ require 'fog/bin/local'
 require 'fog/bin/bare_metal_cloud'
 require 'fog/bin/ninefold'
 require 'fog/bin/rackspace'
+require 'fog/bin/riakcs'
 require 'fog/bin/openstack'
 require 'fog/bin/ovirt'
 require 'fog/bin/serverlove'

data/lib/fog/bin/digitalocean.rb

@@ -0,0 +1,31 @@
+class DigitalOcean < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::DigitalOcean
+      else
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Logger.warning("DigitalOcean[:compute] is not recommended, use Compute[:digitalocean] for portability")
+          Fog::Compute.new(:provider => 'DigitalOcean')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::DigitalOcean.services
+    end
+
+  end
+end

data/lib/fog/bin/riakcs.rb

@@ -0,0 +1,27 @@
+class RiakCS < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :provisioning
+        Fog::RiakCS::Provisioning
+      when :usage
+        Fog::RiakCS::Usage
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = class_for(key)
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::RiakCS.services
+    end
+
+  end
+end

data/lib/fog/cloudstack/compute.rb

@@ -33,6 +33,8 @@ module Fog
       collection :security_group_rules
       model :volume
       collection :volumes
+      model :snapshot
+      collection :snapshots
       model :zone
       collection :zones
 
@@ -420,6 +422,7 @@ module Fog
               :jobs            => {},
               :volumes         => {},
               :security_groups => {},
+              :snapshots       => {}
             }
           end
         end

data/lib/fog/cloudstack/models/compute/snapshot.rb

@@ -0,0 +1,46 @@
+module Fog
+  module Compute
+    class Cloudstack
+      class Snapshot < Fog::Model
+        identity  :id,                         :aliases => 'id'
+
+        attribute :name,                       :aliases => 'name'
+        attribute :volume_type,                :aliases => 'volumetype'
+        attribute :volume_name,                :aliases => 'volumename'
+        attribute :volume_id,                  :aliases => 'volumeid'
+        attribute :created,                    :aliases => 'created'
+        attribute :state,                      :aliases => 'state'
+        attribute :account,                    :aliases => 'account'
+        attribute :domain_id,                  :aliases => 'domainid'
+        attribute :domain,                     :aliases => 'domain'
+        attribute :snapshot_type,              :aliases => 'snapshot_type'
+        attribute :interval_type,              :aliases => 'interval_type'
+
+        def save
+          requires :volume_id
+
+          options = {
+            'volumeid'      => volume_id,
+            'domainid'      => domain_id
+          }
+          data = service.create_snapshot(options)
+          merge_attributes(data['createsnapshotresponse'])
+        end
+
+        def ready?
+          state == 'BackedUp'
+        end
+
+        def volume
+          service.volumes.get(volume_id) if volume_id
+        end
+
+        def destroy
+          requires :id
+          service.delete_snapshot('id' => id)
+          true
+        end
+      end # Snapshot
+    end # Cloudstack
+  end # Compute
+end # Fog

data/lib/fog/cloudstack/models/compute/snapshots.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/cloudstack/models/compute/snapshot'
+
+module Fog
+  module Compute
+    class Cloudstack
+
+      class Snapshots < Fog::Collection
+
+        model Fog::Compute::Cloudstack::Snapshot
+
+        def all
+          data = service.list_snapshots["listsnapshotsresponse"]["snapshot"] || []
+          load(data)
+        end
+
+        def get(snapshot_id)
+          snapshot = service.list_snapshots('id' => snapshot_id)["listsnapshotsresponse"]["snapshot"].first
+          new(snapshot) if snapshot
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/cloudstack/requests/compute/create_snapshot.rb

@@ -15,6 +15,30 @@ module Fog
         end
 
       end
+
+      class Mock
+        def create_snapshot(options={})
+          snapshot_id = Fog::Cloudstack.uuid
+
+          unless volume_id = options['volumeid']
+            raise Fog::Compute::Cloudstack::BadRequest.new('Unable to execute API command createsnapshot due to missing parameter volumeid')
+          end
+
+          snapshot = {
+             "id"                      => snapshot_id,
+             "name"                    => "ROOT-6",
+             "created"                 => "2013-05-22T14:52:55-0500",
+             "state"                   => "BackedUp",
+             "account"                 => "accountname",
+             "domainid"                => "6023b6fe-5bef-4358-bc76-9f4e75afa52f",
+             "domain"                  => "ROOT",
+             "intervaltype"            => "weekly"
+          }
+
+          self.data[:snapshots][snapshot_id]= snapshot
+          {'createsnapshotresponse' => snapshot}
+        end
+      end
     end
   end
 end

data/lib/fog/compute.rb

@@ -35,6 +35,9 @@ module Fog
       when :stormondemand
         require 'fog/storm_on_demand/compute'
         Fog::Compute::StormOnDemand.new(attributes)
+      when :vcloud
+        require 'fog/vcloud/compute'
+        Fog::Vcloud::Compute.new(attributes)
       else
         if self.providers.include?(provider)
           require "fog/#{provider}/compute"

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

@@ -4,7 +4,7 @@ module Fog
   module Compute
     class Server < Fog::Model
 
-      attr_writer :username, :private_key, :private_key_path, :public_key, :public_key_path
+      attr_writer :username, :private_key, :private_key_path, :public_key, :public_key_path, :ssh_port
 
       def username
         @username ||= 'root'
@@ -28,6 +28,9 @@ module Fog
         @public_key ||= public_key_path && File.read(public_key_path)
       end
 
+      def ssh_port
+        @ssh_port ||= 22
+      end
 
       def scp(local_path, remote_path, upload_options = {})
         require 'net/scp'
@@ -58,12 +61,8 @@ module Fog
         Fog::SSH.new(public_ip_address, username, options).run(commands, &blk)
       end
 
-      def ssh_port
-        22
-      end
-
-      def sshable?
-        ready? && !public_ip_address.nil? && !!Timeout::timeout(8) { ssh 'pwd' }
+      def sshable?(options={})
+        ready? && !public_ip_address.nil? && !!Timeout::timeout(8) { ssh('pwd', options) }
       rescue SystemCallError, Net::SSH::AuthenticationFailed, Timeout::Error
         false
       end

data/lib/fog/core.rb

@@ -1,8 +1,3 @@
-__LIB_DIR__ = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-$LOAD_PATH.unshift __LIB_DIR__ unless
-  $LOAD_PATH.include?(__LIB_DIR__)
-
 # external core dependencies
 require 'base64'
 require 'cgi'
@@ -36,3 +31,13 @@ require 'fog/core/scp'
 require 'fog/core/time'
 require 'fog/core/timeout'
 require 'fog/core/wait_for'
+
+# service wrappers
+require 'fog/compute'
+require 'fog/identity'
+require 'fog/image'
+require 'fog/volume'
+require 'fog/cdn'
+require 'fog/dns'
+require 'fog/network'
+require 'fog/storage'

data/lib/fog/core/errors.rb

@@ -71,6 +71,8 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :rackspace_username:
   :rackspace_servicenet:
   :rackspace_cdn_ssl:
+  :riakcs_access_key_id:
+  :riakcs_secret_access_key:
   :stormondemand_username:
   :stormondemand_password:
   :terremark_username:

data/lib/fog/core/scp.rb

@@ -66,11 +66,11 @@ module Fog
         @options  = { :paranoid => false }.merge(options)
       end
 
-      def upload(local_path, remote_path, upload_options = {})
+      def upload(local_path, remote_path, upload_options = {}, &block)
         begin
           Net::SCP.start(@address, @username, @options) do |scp|
             scp.upload!(local_path, remote_path, upload_options) do |ch, name, sent, total|
-              # TODO: handle progress display?
+              block.call(ch, name, sent, total) if block
             end
           end
         rescue Exception => error
@@ -82,7 +82,7 @@ module Fog
         begin
           Net::SCP.start(@address, @username, @options) do |scp|
             scp.download!(remote_path, local_path, download_options) do |ch, name, sent, total|
-              # TODO: handle progress display?
+              block.call(ch, name, sent, total) if block
             end
           end
         rescue Exception => error

data/lib/fog/core/ssh.rb

@@ -46,7 +46,7 @@ module Fog
           raise ArgumentError.new(':key_data, :keys, :password or a loaded ssh-agent is required to initialize SSH')
         end
 
-        options[:timeout] = 30
+        options[:timeout] ||= 30
         if options[:key_data] || options[:keys]
           options[:keys_only] = true
           #Explicitly set these so net-ssh doesn't add the default keys

data/lib/fog/digitalocean.rb

@@ -0,0 +1,9 @@
+require 'fog/core'
+
+module Fog
+  module DigitalOcean
+    extend Fog::Provider
+    service(:compute, 'digitalocean/compute', 'Compute')
+  end
+end
+

data/lib/fog/digitalocean/CHANGELOG.md

@@ -0,0 +1,6 @@
+# 1.11.0 2013/04/04
+
+* Initial release
+
+  Getting started example: https://github.com/fog/fog/blob/master/lib/fog/digitalocean/examples/getting_started.md
+

data/lib/fog/digitalocean/compute.rb

@@ -0,0 +1,107 @@
+require 'fog/digitalocean'
+require 'fog/compute'
+
+module Fog
+  module Compute
+    class DigitalOcean < Fog::Service
+
+      requires     :digitalocean_api_key
+      requires     :digitalocean_client_id
+
+      recognizes   :digitalocean_api_url
+
+      model_path   'fog/digitalocean/models/compute'
+      model        :server
+      collection   :servers
+      model        :flavor
+      collection   :flavors
+      model        :image
+      collection   :images
+      model        :region
+      collection   :regions
+      model        :ssh_key
+      collection   :ssh_keys
+      
+      request_path 'fog/digitalocean/requests/compute'
+      request      :list_servers
+      request      :list_images
+      request      :list_regions
+      request      :list_flavors
+      request      :get_server_details
+      request      :create_server
+      request      :destroy_server
+      request      :reboot_server
+      request      :power_cycle_server
+      request      :power_off_server
+      request      :power_on_server
+      request      :shutdown_server
+      request      :list_ssh_keys
+      request      :create_ssh_key
+      request      :get_ssh_key
+      request      :destroy_ssh_key
+
+      # request :digitalocean_resize      
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :servers => [],
+              :ssh_keys => []
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @digitalocean_api_key = options[:digitalocean_api_key]
+        end
+
+        def data
+          self.class.data[@digitalocean_api_key]
+        end
+
+        def reset_data
+          self.class.data.delete(@digitalocean_api_key)
+        end
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          @digitalocean_api_key   = options[:digitalocean_api_key]
+          @digitalocean_client_id = options[:digitalocean_client_id]
+          @digitalocean_api_url   = options[:digitalocean_api_url] || \
+                                            "https://api.digitalocean.com"
+          @connection             = Fog::Connection.new(@digitalocean_api_url)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params)
+          params[:query] ||= {}
+          params[:query].merge!(:api_key   => @digitalocean_api_key)
+          params[:query].merge!(:client_id => @digitalocean_client_id)
+
+          response = @connection.request(params)
+
+          unless response.body.empty?
+            response.body = Fog::JSON.decode(response.body)
+            if response.body['status'] != 'OK'
+              raise Fog::Errors::Error.new response.body.to_s
+            end
+          end
+          response
+        end
+
+      end
+    end
+  end
+end