fog 1.20.0 → 1.21.0

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

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/fogdocker/models/compute/server'
+
+module Fog
+  module Compute
+    class Fogdocker
+
+      class Servers < Fog::Collection
+
+        model Fog::Compute::Fogdocker::Server
+
+        def all(filters = {})
+          load service.container_all(filters)
+        end
+
+        def get(id)
+          new service.container_get(id)
+        end
+
+        def bootstrap(new_attributes = {})
+          server = create(new_attributes)
+          server
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/api_version.rb

@@ -0,0 +1,16 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+        def api_version
+          Docker.version
+        end
+      end
+      class Mock
+        def api_version
+          {'Version' => '1.6'}
+        end
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/container_action.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+
+        def container_action(options = {})
+          raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id
+          raise ArgumentError, "action is a required parameter" unless options.has_key? :action
+          container = Docker::Container.get(options[:id])
+          downcase_hash_keys container.send(options[:action]).info
+        end
+
+      end
+
+      class Mock
+
+        def container_action(options = {})
+          raise ArgumentError, "id is a required parameter" unless options.has_key? :id
+          raise ArgumentError, "action is a required parameter" unless options.has_key? :action
+          {'id' => 'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef3','state_running' => false}
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/container_all.rb

@@ -0,0 +1,38 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+        # filter options
+        # all – true or false, Show all containers. Only running containers are shown by default
+        # limit – Show limit last created containers, include non-running ones.
+        # since – Show only containers created since Id, include non-running ones.
+        # before – Show only containers created before Id, include non-running ones.
+        # size – true or false, Show the containers sizes
+        def container_all(filters = {})
+          Docker::Container.all(filters.merge(:all => true)).map do |container|
+            downcase_hash_keys(container.info)
+          end
+        end
+
+      end
+      class Mock
+        def container_all(filters = {})
+          [
+              {'id'         => '2ce79789656e4f7474624be6496dc6d988899af30d556574389a19aade2f9650',
+               'image'      => 'mattdm/fedora:f19',
+               'command'    => '/bin/bash',
+               'created'    => '1389876158',
+               'status'     => 'Up 45 hours',
+               'state_running' => true,
+               'ports'      =>  nil,
+               'sizerw'     =>  0,
+               'sizerootfs' =>  0,
+               'name'       => '123123123',
+               'names'      =>  ['/boring_engelbert']
+              }
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/container_commit.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+        def container_commit(options)
+          raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id
+          container = Docker::Container.get(options[:id])
+          downcase_hash_keys container.commit(camelize_hash_keys(options)).info
+        end
+      end
+
+      class Mock
+        def container_commit(options)
+          {'id'=>'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef3',
+           'repotags' => ['repo/other'],
+           'created' => 1389877693,
+           'size' => 3265536}
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/container_create.rb

@@ -0,0 +1,53 @@
+module Fog
+  module Compute
+    class Fogdocker
+      # Create attributes
+      #'Hostname' => '',
+      #'User' => '',
+      #'Memory' => 0,
+      #'MemorySwap' => 0,
+      #'AttachStdin' => false,
+      #'AttachStdout' => true,
+      #'AttachStderr' => true,
+      #'PortSpecs' => nil,
+      #'Tty' => false,
+      #'OpenStdin' => false,
+      #'StdinOnce' => false,
+      #'Env' => nil,
+      #'Cmd' => ['date'],
+      #'Dns' => nil,
+      #'Image' => 'base',
+      #'Volumes' => {
+      #    '/tmp' =>  {}
+      #},
+      #'VolumesFrom' => '',
+      #'WorkingDir' => '',
+      #'ExposedPorts' => {
+      #    '22/tcp' => {}
+      #}
+      class Real
+        def container_create(attrs)
+          downcase_hash_keys Docker::Container.create(camelize_hash_keys(attrs)).info
+        end
+      end
+
+      class Mock
+        def container_create(attrs)
+          {'id'         => '2ce79789656e4f7474624be6496dc6d988899af30d556574389a19aade2f9650',
+           'image'      => 'mattdm/fedora:f19',
+           'command'    => '/bin/bash',
+           'created'    => '1389876158',
+           'status'     => 'Up 45 hours',
+           'state'      => {'running' => 'true'},
+           'ports'      =>  nil,
+           'sizerw'     =>  0,
+           'sizerootfs' =>  0,
+           'name'       => '123123123',
+           'names'      =>  ['/boring_engelbert']
+          }
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/container_delete.rb

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+
+        def container_delete(options = {})
+          raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id
+          container = Docker::Container.get(options[:id])
+          container.delete()
+          true
+        end
+
+      end
+
+      class Mock
+        def container_delete(options = {})
+          raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id
+          true
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/container_get.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+        def container_get(id)
+          downcase_hash_keys Docker::Container.get(id).info
+        end
+
+      end
+      class Mock
+        def container_get(id)
+          {'id'         => '2ce79789656e4f7474624be6496dc6d988899af30d556574389a19aade2f9650',
+           'image'      => 'mattdm/fedora:f19',
+           'command'    => '/bin/bash',
+           'created'    => '1389876158',
+           'status'     => 'Up 45 hours',
+           'state_running'              => true,
+           'config_cpu_shares'          => '1',
+           'network_settings_ipaddress' => '172.17.0.2',
+           'config_memory'              => '1024',
+           'config_hostname'            => '21341234',
+           'ports'      =>  nil,
+           'sizerw'     =>  0,
+           'sizerootfs' =>  0,
+           'name'       => '123123123',
+           'names'      =>  ['/boring_engelbert']}
+        end
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/image_all.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+        def image_all(filters = {})
+          Docker::Image.all.map do |image|
+            downcase_hash_keys(image.info)
+          end
+        end
+      end
+      class Mock
+        def image_all(filters = {})
+          [
+            {'id'=>'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef2',
+             'repotags' => ['repo/one'],
+             'created' => 1389877693,
+             'size' => 3265536},
+            {'id'=>'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef3',
+             'repotags' => ['repo/other'],
+             'created' => 1389877693,
+             'size' => 3265536}
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/image_create.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Fogdocker
+
+      class Real
+        def image_create(attrs)
+          downcase_hash_keys Docker::Image.create(attrs).info
+        end
+      end
+
+      class Mock
+        def image_create(attrs)
+          {'id'=>'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef2'}
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/image_delete.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+
+        def image_delete(options = {})
+          raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id
+          image = Docker::Image.get(options[:id])
+          image.remove()
+        end
+
+      end
+
+      class Mock
+        def image_delete(options = {})
+          raise ArgumentError, "instance id is a required parameter" unless options.has_key? :id
+          "[{'Deleted':'b15c1423ba157d0f7ac83cba178390c421bb8d536e7e7857580fc10f2d53e1b9'}]"
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/fogdocker/requests/compute/image_get.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Fogdocker
+      class Real
+        def image_get(id)
+          downcase_hash_keys Docker::Image.get(id).info
+        end
+
+      end
+      class Mock
+        def image_get(id)
+          {'id'=>'a6b02c7ca29a22619f7d0e59062323247739bc0cd375d619f305f0b519af4ef3',
+           'repotags' => ['repo/other'],
+           'created' => 1389877693,
+           'size' => 3265536}
+        end
+      end
+    end
+  end
+end

data/lib/fog/glesys/compute.rb

@@ -79,7 +79,7 @@ module Fog
           @glesys_api_key     = options[:glesys_api_key] || Fog.credentials[:glesys_api_key]
           @connection_options = options[:connection_options] || {}
           @persistent         = options[:persistent] || false
-          @connection = Fog::Connection.new(@api_url, @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new(@api_url, @persistent, @connection_options)
         end
 
         def request(method_name, options = {})

data/lib/fog/glesys/core.rb

@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module Glesys

data/lib/fog/go_grid/compute.rb

@@ -1,5 +1,4 @@
 require 'fog/go_grid/core'
-require 'fog/compute'
 
 module Fog
   module Compute
@@ -69,7 +68,7 @@ module Fog
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload

data/lib/fog/go_grid/core.rb

@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module GoGrid

data/lib/fog/google/compute.rb

@@ -1,13 +1,11 @@
 require 'fog/google/core'
-require 'fog/compute'
 
 module Fog
   module Compute
     class Google < Fog::Service
 
       requires :google_project
-      requires :google_client_email
-      requires :google_key_location
+      recognizes :app_name, :app_version, :google_client_email, :google_key_location, :google_client
 
       request_path 'fog/google/requests/compute'
       request :list_servers
@@ -83,6 +81,9 @@ module Fog
         def shared_initialize(options = {})
           @project = options[:google_project]
           @api_version = 'v1'
+          base_url = 'https://www.googleapis.com/compute/'
+          @api_url = base_url + api_version + '/projects/'
+          @default_network = 'default'
         end
 
         def build_excon_response(body, status=200)
@@ -841,30 +842,77 @@ module Fog
         include Collections
         include Shared
 
-        attr_reader :client, :compute, :api_url
+        attr_accessor :client
+        attr_reader :compute, :api_url
 
         def initialize(options)
-          base_url = 'https://www.googleapis.com/compute/'
-          api_scope_url = 'https://www.googleapis.com/auth/compute'
-          shared_initialize(options)
-
-          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
           begin
             require 'google/api_client'
-          rescue LoadError
+          rescue LoadError => error
             Fog::Logger.warning("Please install the google-api-client gem before using this provider.")
+            raise error
           end
-          key = ::Google::APIClient::KeyUtils.load_from_pkcs12(File.expand_path(options[:google_key_location]), 'notasecret')
+          shared_initialize(options)
 
-          @client = ::Google::APIClient.new({
-            :application_name => "fog",
-            :application_version => Fog::VERSION,
-          })
+          if !options[:google_client].nil?
+            @client = options[:google_client]
+          end
+
+          if @client.nil?
+            if !options[:google_client_email].nil? and !options[:google_key_location].nil?
+              @client = self.new_pk12_google_client(
+                options[:google_client_email],
+                File.expand_path(options[:google_key_location]),
+                options[:app_name],
+                options[:app_verion])
+            else
+              Fog::Logger.debug("Fog::Compute::Google.client has not been initialized nor are the :google_client_email and :google_key_location options set, so we can not create one for you.")
+              raise ArgumentError.new("No Google API Client has been initialized.")
+            end
+          end
 
-          @client.authorization = Signet::OAuth2::Client.new({
+          # We want to always mention we're using Fog.
+          if @client.user_agent.nil? or @client.user_agent.empty?
+            @client.user_agent = ""
+          elsif !@client.user_agent.include? "fog"
+            @client.user_agent += "fog/#{Fog::VERSION}"
+          end
+
+          @compute = @client.discovered_api('compute', api_version)
+        end
+
+        # Public: Create a Google::APIClient with a pkcs12 key and a user email.
+        #
+        # google_client_email - an @developer.gserviceaccount.com email address to use.
+        # google_key_location - an absolute location to a pkcs12 key file.
+        # app_name - an optional string to set as the app name in the user agent.
+        # app_version - an optional string to set as the app version in the user agent.
+        #
+        # Returns a new Google::APIClient
+        def new_pk12_google_client(google_client_email, google_key_location, app_name=nil, app_version=nil)
+          # The devstorage scope is needed to be able to insert images
+          # devstorage.read_only scope is not sufficient like you'd hope
+          api_scope_url = 'https://www.googleapis.com/auth/compute https://www.googleapis.com/auth/devstorage.read_write'
+
+          user_agent = ""
+          if app_name
+            user_agent = "#{app_name}/#{app_version || '0.0.0'} "
+          end
+          user_agent += "fog/#{Fog::VERSION}"
+
+          api_client_options = {
+            # https://github.com/google/google-api-ruby-client/blob/master/lib/google/api_client.rb#L98
+            :application_name => "suppress warning",
+            # https://github.com/google/google-api-ruby-client/blob/master/lib/google/api_client.rb#L100
+            :user_agent => user_agent
+          }
+          local_client = ::Google::APIClient.new(api_client_options)
+
+          key = ::Google::APIClient::KeyUtils.load_from_pkcs12(google_key_location, 'notasecret')
+
+          local_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",
             :client_x509_cert_url => "https://www.googleapis.com/robot/v1/metadata/x509/#{google_client_email}",
@@ -874,9 +922,9 @@ module Fog
             :token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
           })
 
-          @client.authorization.fetch_access_token!
-          @compute = @client.discovered_api('compute', api_version)
-          @default_network = 'default'
+          local_client.authorization.fetch_access_token!
+
+          return local_client
         end
 
         def build_result(api_method, parameters, body_object=nil)
@@ -899,7 +947,6 @@ module Fog
         def build_response(result)
           build_excon_response(result.body.nil? ? nil : Fog::JSON.decode(result.body), result.status)
         end
-
       end
 
       RUNNING = 'RUNNING'