fog 1.6.0 → 1.7.0

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

@@ -0,0 +1,14 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        def get_application(identifier)
+          return nil if identifier.nil? || identifier == ""
+          request("get", "/1.0/applications/#{identifier}", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+        # Requests details about authenticated user from the API
+        #
+        # === Returns:
+        #
+        # <tt>Hash</tt>:: The JSON response parsed to a Hash
+        #
+        def get_authenticated_user
+          request("get", "/1.0/user", [200])
+        end
+
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        # Requests details about currently scoped account
+        #
+        # === Returns:
+        #
+        # <tt>Hash</tt>:: The JSON response parsed to a Hash
+        #
+        def get_scoped_account
+          request("get", "/1.0/account", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -2,13 +2,36 @@ module Fog
   module Compute
     class Brightbox
       class Real
-
-        def get_user(identifier)
-          return nil if identifier.nil? || identifier == ""
-          request("get", "/1.0/users/#{identifier}", [200])
+        # Requests details about a user from the API
+        #
+        # === Parameters:
+        #
+        # <tt>identifier <String></tt>:: The identifier to request (Default is +nil+)
+        #
+        # === Returns:
+        #
+        # <tt>Hash</tt>:: The JSON response parsed to a Hash
+        #
+        # === Notes:
+        #
+        # This also supports a deprecated form where if an identifier is not
+        # passed then the requesting user is returned instead. This should not
+        # be used in new code. Use #get_authenticated_user instead.
+        #
+        # === Reference:
+        #
+        # https://api.gb1.brightbox.com/1.0/#user_get_user
+        #
+        def get_user(identifier = nil)
+          if identifier.nil? || identifier == ""
+            Fog::Logger.deprecation("get_user() without a parameter is deprecated, use get_authenticated_user instead [light_black](#{caller.first})[/]")
+            get_authenticated_user
+          else
+            request("get", "/1.0/users/#{identifier}", [200])
+          end
         end
 
       end
     end
   end
-end
+end

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

@@ -0,0 +1,13 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        def list_accounts
+          request("get", "/1.0/accounts", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        def list_applications
+          request("get", "/1.0/applications", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        def reset_secret_application(identifier)
+          return nil if identifier.nil? || identifier == ""
+          request("post", "/1.0/applications/#{identifier}/reset_secret", [200])
+        end
+
+      end
+    end
+  end
+end

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

@@ -3,12 +3,60 @@ module Fog
     class Brightbox
       class Real
 
-        def update_account(options)
+        # Requests an update to the currently scoped account
+        #
+        # === Parameters:
+        #
+        # <tt>identifier <String></tt>:: The identifier to request (Default is +nil+)
+        # <tt>options <Hash></tt>:: Hash of options for update
+        #
+        # === Options:
+        #
+        # <tt>name</tt>:: Account name
+        # <tt>address_1</tt>:: First line of address
+        # <tt>address_2</tt>:: Second line of address
+        # <tt>city</tt>:: City part of address
+        # <tt>county</tt>:: County part of address
+        # <tt>postcode</tt>:: Postal code
+        # <tt>country_code</tt>:: ISO 3166-1 two letter code (example: +GB+)
+        # <tt>vat_registration_number</tt>:: Valid EU VAT Number or +nil+
+        # <tt>telephone_number</tt>:: Valid International telephone number in E.164 format prefixed with ’+’
+        #
+        # === Returns:
+        #
+        # <tt>Hash</tt>:: The JSON response parsed to a Hash
+        # <tt>nil</tt>:: If no options were passed to update
+        #
+        # === Notes:
+        #
+        # This also supports a deprecated form where if an identifier is not
+        # passed then the scoping account is updated instead. This should not
+        # be used in new code. Use #update_scoped_account instead.
+        #
+        # === Reference:
+        #
+        # https://api.gb1.brightbox.com/1.0/#account_update_account
+        #
+        def update_account(*args)
+          if args.size == 2
+            identifier = args[0]
+            options = args[1]
+          elsif args.size == 1
+            options = args[0]
+          else
+            raise ArgumentError, "wrong number of arguments (0 for 2)"
+          end
+
           return nil if options.empty? || options.nil?
-          request("put", "/1.0/account", [200], options)
+          if identifier.nil? || identifier.empty?
+            Fog::Logger.deprecation("update_account() without a parameter is deprecated, use update_scoped_account instead [light_black](#{caller.first})[/]")
+            update_scoped_account(options)
+          else
+            request("put", "/1.0/accounts/#{identifier}", [200], options)
+          end
         end
 
       end
     end
   end
-end
+end

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

@@ -0,0 +1,15 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        def update_application(identifier, options)
+          return nil if identifier.nil? || identifier == ""
+          return nil if options.empty? || options.nil?
+          request("put", "/1.0/applications/#{identifier}", [200], options)
+        end
+
+      end
+    end
+  end
+end

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

@@ -3,8 +3,10 @@ module Fog
     class Brightbox
       class Real
 
-        def update_firewall_rule(id, options)
-          request("put", "/1.0/firewall_rules/#{id}", [202], options)
+        def update_firewall_rule(identifier, options)
+          return nil if identifier.nil? || identifier == ""
+          return nil if options.empty? || options.nil?
+          request("put", "/1.0/firewall_rules/#{identifier}", [202], options)
         end
 
       end

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

@@ -0,0 +1,37 @@
+module Fog
+  module Compute
+    class Brightbox
+      class Real
+
+        # Requests an update to the currently scoped account
+        #
+        # === Parameters:
+        #
+        # <tt>options</tt>:: Hash of options for update
+        #
+        # === Options:
+        #
+        # <tt>name</tt>:: Account name
+        # <tt>address_1</tt>:: First line of address
+        # <tt>address_2</tt>:: Second line of address
+        # <tt>city</tt>:: City part of address
+        # <tt>county</tt>:: County part of address
+        # <tt>postcode</tt>:: Postal code
+        # <tt>country_code</tt>:: ISO 3166-1 two letter code (example: +GB+)
+        # <tt>vat_registration_number</tt>:: Valid EU VAT Number or +nil+
+        # <tt>telephone_number</tt>:: Valid International telephone number in E.164 format prefixed with ’+’
+        #
+        # === Returns:
+        #
+        # <tt>Hash</tt>:: The JSON response parsed to a Hash
+        # <tt>nil</tt>:: If no options were passed to update
+        #
+        def update_scoped_account(options)
+          return nil if options.empty? || options.nil?
+          request("put", "/1.0/account", [200], options)
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,19 +1,19 @@
-require 'fog/core/model'
+require 'fog/compute/models/server'
 
 module Fog
   module Compute
     class Clodo
 
-      class Server < Fog::Model
+      class Server < Fog::Compute::Server
 
         identity :id
 
         attribute :addresses
         attribute :name
         attribute :image_id,    :aliases => 'imageId'
-	attribute :type
+        attribute :type
         attribute :state,       :aliases => 'status'
-	attribute :type
+        attribute :type
         attribute :vps_memory
         attribute :vps_memory_max
         attribute :vps_os_title
@@ -40,8 +40,6 @@ module Fog
         attribute :vps_user_pass
         attribute :vps_vnc_pass
 
-        attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
-
         def initialize(attributes={})
           self.image_id   ||= attributes[:vps_os] ? attributes[:vps_os] : 666
           super attributes
@@ -62,15 +60,6 @@ module Fog
           nil
         end
 
-        def private_key_path
-          @private_key_path ||= Fog.credentials[:private_key_path]
-          @private_key_path &&= File.expand_path(@private_key_path)
-        end
-
-        def private_key
-          @private_key ||= private_key_path && File.read(private_key_path)
-        end
-
         def public_ip_address
           pubaddrs = addresses && addresses['public'] ? addresses['public'].select {|ip| ip['primary_ip']} : nil
           pubaddrs && !pubaddrs.empty? ? pubaddrs.first['ip'] : nil
@@ -88,15 +77,6 @@ module Fog
           connection.delete_ip_address(id, ip_address)
         end
 
-        def public_key_path
-          @public_key_path ||= Fog.credentials[:public_key_path]
-          @public_key_path &&= File.expand_path(@public_key_path)
-        end
-
-        def public_key
-          @public_key ||= public_key_path && File.read(public_key_path)
-        end
-
         def ready?
           self.state == 'is_running'
         end
@@ -129,28 +109,11 @@ module Fog
         end
 
         def ssh(commands)
-          requires :public_ip_address, :identity, :username
-
-          options = {}
-          options[:key_data] = [private_key] if private_key
-          options[:password] = password if password
-          Fog::SSH.new(public_ip_address, username, options).run(commands)
-        end
-
-        def scp(local_path, remote_path, upload_options = {})
-          requires :public_ip_address, :username
-
-          scp_options = {}
-          scp_options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
-        end
-
-        def username
-          @username ||= 'root'
+          super(commands, password ? {:password => password} : {})
         end
 
-	def password
-	 vps_root_pass
+        def password
+          vps_root_pass
         end
 
         private

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

@@ -4,10 +4,31 @@ module Fog
   module Compute
     class Server < Fog::Model
 
-      def private_key=(key_data)
-        @private_key = key_data
+      attr_writer :username, :private_key, :private_key_path, :public_key, :public_key_path
+
+      def username
+        @username ||= 'root'
+      end
+
+      def private_key_path
+        @private_key_path ||= Fog.credentials[:private_key_path]
+        @private_key_path &&= File.expand_path(@private_key_path)
+      end
+
+      def private_key
+        @private_key ||= private_key_path && File.read(private_key_path)
       end
 
+      def public_key_path
+        @public_key_path ||= Fog.credentials[:public_key_path]
+        @public_key_path &&= File.expand_path(@public_key_path)
+      end
+
+      def public_key
+        @public_key ||= public_key_path && File.read(public_key_path)
+      end
+
+
       def scp(local_path, remote_path, upload_options = {})
         require 'net/scp'
         requires :public_ip_address, :username

data/lib/fog/core/time.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Fog
   class Time < ::Time
 

data/lib/fog/core/wait_for.rb

@@ -1,5 +1,4 @@
 module Fog
-
   def self.wait_for(timeout=Fog.timeout, interval=1, &block)
     duration = 0
     start = Time.now
@@ -13,5 +12,4 @@ module Fog
       { :duration => duration }
     end
   end
-  
 end

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

@@ -13,8 +13,10 @@ module Fog
           data = connection.get_servers(href).body
           if data.keys.include?(:VirtualMachines)
             data = data[:VirtualMachines][:VirtualMachine]
-          else
+          elsif data[:VirtualMachine]
             data = data[:VirtualMachine]
+          else
+            data = []
           end
           load(data)
         end

data/lib/fog/ecloud/requests/compute/get_servers.rb

@@ -3,7 +3,7 @@ module Fog
     class Ecloud
 
       class Real
-        basic_request :get_tasks
+        basic_request :get_servers
       end
 
     end