fog 1.12.1 → 1.13.0

data/lib/fog/brightbox/requests/compute/destroy_user_collaboration.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Ends an existing 'accepted' collaboration
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] The JSON response parsed to a Hash
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#user_collaboration_destroy_user_collaboration
+        #
+        def destroy_user_collaboration(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("delete", "/1.0/user/collaborations/#{identifier}", [200])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/get_collaboration.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Shows details of one collaboration
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#collaboration_get_collaboration
+        #
+        def get_collaboration(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("get", "/1.0/collaborations/#{identifier}", [200])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/get_user_collaboration.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Shows details of one collaboration
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#user_collaboration_get_user_collaboration
+        #
+        def get_user_collaboration(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("get", "/1.0/user/collaborations/#{identifier}", [200])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/list_collaborations.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Lists all the account collaborations
+        #
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#collaboration_list_collaborations
+        #
+        def list_collaborations
+          wrapped_request("get", "/1.0/collaborations", [200])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/list_user_collaborations.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Lists all collaborations the user is involved with
+        #
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#user_collaboration_list_user_collaborations
+        #
+        def list_user_collaborations
+          wrapped_request("get", "/1.0/user/collaborations", [200])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/reject_user_collaboration.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Rejects the collaboration and removes the offer
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#user_collaboration_reject_user_collaboration
+        #
+        def reject_user_collaboration(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("post", "/1.0/user/collaborations/#{identifier}/reject", [200])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/brightbox/requests/compute/resend_collaboration.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Resends the invitation email to the collaborator
+        #
+        # @param [String] identifier Unique reference to identify the resource
+        #
+        # @return [Hash] if successful Hash version of JSON object
+        #
+        # @see https://api.gb1.brightbox.com/1.0/#collaboration_resend_collaboration
+        #
+        def resend_collaboration(identifier)
+          return nil if identifier.nil? || identifier == ""
+          wrapped_request("post", "/1.0/collaborations/#{identifier}/resend", [200])
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/cloudsigma/docs/getting_started.md

@@ -0,0 +1,59 @@
+# Getting Started with Fog on CloudSigma
+
+## Requirements
+
+In order to use CloudSigma with Fog, you must use Fog version 1.12.0 or later.
+
+## Setting credentials
+
+Fog uses `~/.fog` to store credentials. To add CloudSigma as your default provider, simply add the following:
+
+    :default:
+      :cloudsigma_username: user@example.com
+      :cloudsigma_password: SomeRandomPassword
+      :cloudsigma_host: zrh.cloudsigma.com
+
+Please note that you need to specify the host. If you're on the Zurich-based cloud, you will need to enter `zrh.cloudsigma.com` and if you're on the Las Vegas cloud, you'll need to enter `lvs.cloudsigma.com`.
+
+
+## Creating a server
+
+You can of course interact with Fog directly from your Ruby application, but in this example, we'll simply use the `fog` CLI tool. In the example below, we'll first create a 5GB disk, then we create server with 2Ghz CPU and 2GB RAM. Finally we attach the drive and boot up the server.
+
+    $ fog
+    > cs = Compute[:CloudSigma]
+    > drive = cs.volumes.create(:name => 'fog_drive', :size => '5368709120', :media => 'disk')
+    > server = cs.servers.create(:name => 'fog_server', :cpu => '2000', :mem => '2147483648', :vnc_password => 'foobar')
+    > server.mount_volume(drive.uuid)
+    > server.update
+    > server.start
+
+Now, this wasn't very useful by itself since the drive we created was just a blank drive (as a result it cannot boot). It does however illustrate a minimal work flow.
+
+To make this a bit more useful, let's try to attach an ISO image (in this case Ubuntu 12.04 LTS), and boot into the installer. To do this, we'll run the following commands (assuming you haven't closed the session from above). You can either upload your own installer image, or you can use one from the drives library. In either case, you need to pass the UUID for the drive.
+
+    > server.stop
+    > ubuntu_image_uuid = '41d848c2-44e4-4428-9406-84e95bb1288d'
+    > server.unmount(drive.uuid)
+    > server.mount_volume(ubuntu_image_uuid, 'ide', '0:0', 1)
+    > server.mount_volume(drive.uuid, 'virtio', '0:0', 2)
+    > server.update
+    > server.start
+
+What this does is to stop the server, unmount the previous drive, then we attach the Ubuntu installation drive as an IDE device (on bus 0:0), with the boot order 1 (first). We then mount the system drive as Virtio device (on bus 0:0) with the boot order 2. Finally we push the changes to the server and start it. This will bring you into the Ubuntu installation.
+
+In order to actually run the installer, you need to open a VNC session to the server. This can be done bye issue the following command:
+
+    > server.open_vnc
+
+That will print out the VNC URL, among with other data. You can simply pass the value of 'vnc_url' into your VNC client. When opening the session, you also need to provide the password, which we set to 'foobar' during the server creation.
+
+After you're done with the installation, you can unmount the Ubuntu installation disk by running the following command:
+
+    > server.unmount(ubuntu_image_uuid)
+
+You might also want to close the VNC session to increase security. This can be done by running:
+
+    > server.close_vnc
+
+That's it. You've now set up a fully working Ubuntu server on CloudSigma using fog.

data/lib/fog/core.rb

@@ -19,11 +19,9 @@ require 'fog/core/current_machine'
 require 'fog/core/deprecation'
 require 'fog/core/errors'
 require 'fog/core/hmac'
-require 'fog/core/json'
 require 'fog/core/logger'
 require 'fog/core/model'
 require 'fog/core/mock'
-require 'fog/core/parser' # FIXME: would be better to only load when nokogiri is required
 require 'fog/core/provider'
 require 'fog/core/service'
 require 'fog/core/ssh'
@@ -32,6 +30,13 @@ require 'fog/core/time'
 require 'fog/core/timeout'
 require 'fog/core/wait_for'
 
+# data exchange specific (to be extracted and used on a per provider basis)
+require 'fog/xml'
+require 'fog/json'
+
+# deprecation wrappers
+require 'fog/core/deprecated/connection'
+
 # service wrappers
 require 'fog/compute'
 require 'fog/identity'

data/lib/fog/core/connection.rb

@@ -1,40 +1,73 @@
 module Fog
-  class Connection
+  module Core
 
-    def initialize(url, persistent=false, params={})
-      unless params.has_key?(:debug_response)
-        params[:debug_response] = true
-      end
-      params[:headers] ||= {}
-      params[:headers]['User-Agent'] ||= "fog/#{Fog::VERSION}"
-      @excon = Excon.new(url, params)
-      @persistent = persistent
-    end
-
-    def request(params, &block)
-      unless @persistent
-        reset
-      end
-      unless block_given?
-        if (parser = params.delete(:parser))
-          body = Nokogiri::XML::SAX::PushParser.new(parser)
-          params[:response_block] = lambda { |chunk, remaining, total| body << chunk }
+    # Fog::Core::Connection is a generic class to contain a HTTP link to an API.
+    #
+    # It is intended to be subclassed by providers who can then add their own
+    # modifications such as authentication or response object.
+    #
+    class Connection
+      # Prepares the connection and sets defaults for any future requests.
+      #
+      # @param [String] url The destination URL
+      # @param persistent [Boolean]
+      # @param [Hash] params
+      # @option params [String] :body Default text to be sent over a socket. Only used if :body absent in Connection#request params
+      # @option params [Hash<Symbol, String>] :headers The default headers to supply in a request. Only used if params[:headers] is not supplied to Connection#request
+      # @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
+      # @option params [String] :path Default path; appears after 'scheme://host:port/'. Only used if params[:path] is not supplied to Connection#request
+      # @option params [Fixnum] :port The port on which to connect, to the destination host
+      # @option params [Hash]   :query Default query; appended to the 'scheme://host:port/path/' in the form of '?key=value'. Will only be used if params[:query] is not supplied to Connection#request
+      # @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
+      # @option params [String] :proxy Proxy server; e.g. 'http://myproxy.com:8888'
+      # @option params [Fixnum] :retry_limit Set how many times we'll retry a failed request.  (Default 4)
+      # @option params [Class] :instrumentor Responds to #instrument as in ActiveSupport::Notifications
+      # @option params [String] :instrumentor_name Name prefix for #instrument events.  Defaults to 'excon'
+      #
+      def initialize(url, persistent=false, params={})
+        unless params.has_key?(:debug_response)
+          params[:debug_response] = true
         end
+        params[:headers] ||= {}
+        params[:headers]['User-Agent'] ||= "fog/#{Fog::VERSION}"
+        @excon = Excon.new(url, params)
+        @persistent = persistent
       end
 
-      response = @excon.request(params, &block)
-
-      if parser
-        body.finish
-        response.body = parser.response
+      # Makes a request using the connection using Excon
+      #
+      # @param [Hash] params
+      # @option params [String] :body text to be sent over a socket
+      # @option params [Hash<Symbol, String>] :headers The default headers to supply in a request
+      # @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
+      # @option params [String] :path appears after 'scheme://host:port/'
+      # @option params [Fixnum] :port The port on which to connect, to the destination host
+      # @option params [Hash]   :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
+      # @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
+      # @option params [Proc] :response_block
+      #
+      # @return [Excon::Response]
+      #
+      # @raise [Excon::Errors::StubNotFound]
+      # @raise [Excon::Errors::Timeout]
+      # @raise [Excon::Errors::SocketError]
+      #
+      def request(params, &block)
+        reset unless @persistent
+        @excon.request(params, &block)
       end
 
-      response
-    end
+      # Make {#request} available even when it has been overidden by a subclass
+      # to allow backwards compatibility.
+      #
+      alias_method :original_request, :request
+      protected :original_request
 
-    def reset
-      @excon.reset
+      # Closes the connection
+      #
+      def reset
+        @excon.reset
+      end
     end
-
   end
 end

data/lib/fog/core/deprecated/connection.rb

@@ -0,0 +1,24 @@
+require "fog/xml"
+
+module Fog
+
+  # @deprecated Use {Fog::Core::Connection} or {XML::SAXParserConnection} if you
+  #   require the response body to be parsed.
+  #
+  # The Connection class is a wrapper around an instance of Excon::Connection
+  # supporting {#request} and {#reset} only.
+  #
+  # {#request} includes an option to perform SAX parsing for XML APIs.
+  #
+  # @see https://github.com/geemus/excon/blob/master/lib/excon/connection.rb
+  #
+  class Connection < Fog::XML::SAXParserConnection
+    def request(params, &block)
+      if (parser = params.delete(:parser))
+        super(parser, params)
+      else
+        original_request(params)
+      end
+    end
+  end
+end

data/lib/fog/core/parser.rb

@@ -1,4 +1,4 @@
-require 'nokogiri'
+require "nokogiri"
 
 module Fog
   module Parsers

data/lib/fog/digitalocean/examples/getting_started.md

@@ -22,7 +22,7 @@ First, create a connection to the host:
 ```ruby
 require 'fog'
 
-do = Fog::Compute.new({
+docean = Fog::Compute.new({
   :provider => 'DigitalOcean',
   :digitalocean_api_key   => 'poiuweoruwoeiuroiwuer', # your API key here
   :digitalocean_client_id => 'lkjasoidfuoiu'          # your client key here

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

@@ -76,12 +76,12 @@ module Fog
         #
         # Usually called by Fog::Collection#create
         #
-        #   do = Fog::Compute.new({
+        #   docean = Fog::Compute.new({
         #     :provider => 'DigitalOcean',
         #     :digitalocean_api_key   => 'key-here',      # your API key here
         #     :digitalocean_client_id => 'client-id-here' # your client key here
         #   })
-        #   do.servers.create :name => 'foobar',
+        #   docean.servers.create :name => 'foobar',
         #                     :image_id  => image_id_here,
         #                     :flavor_id => flavor_id_here,
         #                     :region_id => region_id_here

data/lib/fog/google/compute.rb

@@ -41,6 +41,8 @@ module Fog
       request :insert_network
       request :insert_server
 
+      request :set_metadata
+
       model_path 'fog/google/models/compute'
       model :server
       collection :servers
@@ -51,6 +53,9 @@ module Fog
       model :flavor
       collection :flavors
 
+      model :disk
+      collection :disks
+
       class Mock
         include Collections
 
@@ -66,16 +71,15 @@ module Fog
         attr_reader :project
 
         def initialize(options)
-
-
           base_url = 'https://www.googleapis.com/compute/'
-          api_version = 'v1beta14'
+          api_version = 'v1beta15'
           api_scope_url = 'https://www.googleapis.com/auth/compute'
 
           @project = options[:google_project]
           google_client_email = options[:google_client_email]
           @api_url = base_url + api_version + '/projects/'
-          #NOTE: loaded here to avoid requiring this as a core Fog dependency
+
+          # NOTE: loaded here to avoid requiring this as a core Fog dependency
           begin
             require 'google/api_client'
           rescue LoadError
@@ -87,6 +91,7 @@ module Fog
             :application_name => "fog",
             :application_version => Fog::VERSION,
           })
+
           @client.authorization = Signet::OAuth2::Client.new({
             :audience => 'https://accounts.google.com/o/oauth2/token',
             :auth_provider_x509_cert_url => "https://www.googleapis.com/oauth2/v1/certs",
@@ -96,15 +101,14 @@ module Fog
             :signing_key => key,
             :token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
           })
-          @client.authorization.fetch_access_token!
 
+          @client.authorization.fetch_access_token!
           @compute = @client.discovered_api('compute', api_version)
           @default_network = 'default'
         end
 
         def build_result(api_method, parameters, body_object=nil)
           if body_object
-            #p api_method, parameters
             result = @client.execute(
               :api_method => api_method,
               :parameters => parameters,
@@ -123,15 +127,35 @@ module Fog
           response.body = Fog::JSON.decode(result.body)
           if response.body["error"]
             response.status = response.body["error"]["code"]
+
+            response.body["error"]["errors"].each do |error|
+              raise Fog::Errors::Error.new(error["message"])
+            end
           else
             response.status = 200
           end
           response
         end
 
+        def backoff_if_unfound(&block)
+          retries_remaining = 10
+          begin
+            result = block.call
+          rescue Exception => msg
+            if msg.to_s.include? 'was not found' and retries_remaining > 0
+              retries_remaining -= 1
+              sleep 0.1
+              retry
+            else
+              raise msg
+            end
+          end
+          result
+        end
+
       end
 
-      RUNNING_STATE = 'RUNNING'
+      RUNNING = 'RUNNING'
 
     end
   end