fog 0.6.0 → 0.7.0

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

@@ -0,0 +1,20 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+
+        def activate_console_server(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          request(
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/1.0/servers/#{identifier}/activate_console",
+            :headers  => {"Content-Type" => "application/json"},
+            :body     => options.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+
+        def add_listeners_load_balancer(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          request(
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/1.0/load_balancers/#{identifier}/add_listeners",
+            :headers  => {"Content-Type" => "application/json"},
+            :body     => options.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Fog
+  module Brightbox
+    class Compute
+      class Real
+
+        def remove_listeners_load_balancer(identifier, options = {})
+          return nil if identifier.nil? || identifier == ""
+          request(
+            :expects  => [202],
+            :method   => 'POST',
+            :path     => "/1.0/load_balancers/#{identifier}/remove_listeners",
+            :headers  => {"Content-Type" => "application/json"},
+            :body     => options.to_json
+          )
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/slicehost.rb

@@ -34,12 +34,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -49,6 +43,11 @@ module Fog
           end
 
           @slicehost_password = options[:slicehost_password]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@slicehost_password)
           @data = self.class.data[@slicehost_password]
         end
 

data/lib/fog/compute/virtual_box.rb

@@ -0,0 +1,48 @@
+module Fog
+  module VirtualBox
+    class Compute < Fog::Service
+
+      recognizes :provider # remove post deprecation
+
+      model_path 'fog/compute/models/virtual_box'
+      model       :medium
+      collection  :mediums
+      model       :medium_format
+      model       :nat_engine
+      model       :nat_redirect
+      collection  :nat_redirects
+      model       :network_adapter
+      collection  :network_adapters
+      model       :server
+      collection  :servers
+      model       :storage_controller
+      collection  :storage_controllers
+
+      class Mock
+
+        def initialize(options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          require 'virtualbox'
+          @connection = ::VirtualBox::Global.global.lib.virtualbox
+        end
+
+        # hack to provide 'requests'
+        def method_missing(method_sym, *arguments, &block)
+          if @connection.respond_to?(method_sym)
+            @connection.send(method_sym, *arguments)
+          else
+            super
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/voxel.rb

@@ -23,38 +23,41 @@ module Fog
         include Collections
 
         def self.data
-          @data ||= {
-            :last_modified => { :servers => {}, :statuses => {}, :images => {} },
-            :servers => [],
-            :statuses => {},
-            :images  => [
-              {'id' => 1,   'name' => "CentOS 4, 32-bit, base install"},
-              {'id' => 2,   'name' => "CentOS 4, 64-bit, base install"},
-              {'id' => 3,   'name' => "CentOS 5, 32-bit, base install"},
-              {'id' => 4,   'name' => "CentOS 5, 64-bit, base install"},
-              {'id' => 7,   'name' => "Fedora 10, 32-bit, base install"},
-              {'id' => 8,   'name' => "Fedora 10, 64-bit, base install"},
-              {'id' => 10,  'name' => "OpenSUSE 11, 64-bit, base install"},
-              {'id' => 11,  'name' => "Debian 5.0 \"lenny\", 32-bit, base install"},
-              {'id' => 12,  'name' => "Debian 5.0 \"lenny\", 64-bit, base install"},
-              {'id' => 13,  'name' => "Ubuntu 8.04 \"Hardy\", 32-bit, base install"},
-              {'id' => 14,  'name' => "Ubuntu 8.04 \"Hardy\", 64-bit, base install"},
-              {'id' => 15,  'name' => "Voxel Server Environment (VSE), 32-bit, base install"},
-              {'id' => 16,  'name' => "Voxel Server Environment (VSE), 64-bit, base install"},
-              {'id' => 32,  'name' => "Pantheon Official Mercury Stack for Drupal (based on VSE/64)"},
-              {'id' => 55,  'name' => "Ubuntu 10.04 \"Lucid\", 64-bit, base install"} ]
-        }
-        end
-
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :last_modified => { :servers => {}, :statuses => {}, :images => {} },
+              :servers => [],
+              :statuses => {},
+              :images  => [
+                {'id' => 1,   'name' => "CentOS 4, 32-bit, base install"},
+                {'id' => 2,   'name' => "CentOS 4, 64-bit, base install"},
+                {'id' => 3,   'name' => "CentOS 5, 32-bit, base install"},
+                {'id' => 4,   'name' => "CentOS 5, 64-bit, base install"},
+                {'id' => 7,   'name' => "Fedora 10, 32-bit, base install"},
+                {'id' => 8,   'name' => "Fedora 10, 64-bit, base install"},
+                {'id' => 10,  'name' => "OpenSUSE 11, 64-bit, base install"},
+                {'id' => 11,  'name' => "Debian 5.0 \"lenny\", 32-bit, base install"},
+                {'id' => 12,  'name' => "Debian 5.0 \"lenny\", 64-bit, base install"},
+                {'id' => 13,  'name' => "Ubuntu 8.04 \"Hardy\", 32-bit, base install"},
+                {'id' => 14,  'name' => "Ubuntu 8.04 \"Hardy\", 64-bit, base install"},
+                {'id' => 15,  'name' => "Voxel Server Environment (VSE), 32-bit, base install"},
+                {'id' => 16,  'name' => "Voxel Server Environment (VSE), 64-bit, base install"},
+                {'id' => 32,  'name' => "Pantheon Official Mercury Stack for Drupal (based on VSE/64)"},
+                {'id' => 55,  'name' => "Ubuntu 10.04 \"Lucid\", 64-bit, base install"} ]
+            }
           end
         end
 
         def initialize(options={})
-          @data = self.class.data
+          @voxel_api_key = options[:voxel_api_key]
+          reset_data
         end
+
+        def reset_data
+          self.class.data.delete(@voxel_api_key)
+          @data = self.class.data[@voxel_api_key]
+        end
+
       end
 
       class Real

data/lib/fog/core.rb

@@ -9,6 +9,7 @@ require 'rubygems'
 require 'base64'
 require 'cgi'
 require 'excon'
+require 'fileutils'
 require 'formatador'
 require 'time'
 require 'timeout'

data/lib/fog/core/attributes.rb

@@ -152,7 +152,9 @@ module Fog
       def requires(*args)
         missing = []
         for arg in [:connection] | args
-          missing << arg unless send("#{arg}")
+          unless send("#{arg}") || attributes.has_key?(arg)
+            missing << arg
+          end
         end
         unless missing.empty?
           if missing.length == 1

data/lib/fog/core/collection.rb

@@ -5,7 +5,7 @@ module Fog
     include Fog::Attributes::InstanceMethods
 
     Array.public_instance_methods(false).each do |method|
-      unless [:reject, :select].include?(method.to_sym)
+      unless [:reject, :select, :slice].include?(method.to_sym)
         class_eval <<-RUBY
           def #{method}(*args)
             unless @loaded
@@ -17,7 +17,7 @@ module Fog
       end
     end
 
-    %w[reject select].each do |method|
+    %w[reject select slice].each do |method|
       class_eval <<-RUBY
         def #{method}(*args)
           unless @loaded

data/lib/fog/core/credentials.rb

@@ -18,7 +18,7 @@ module Fog
 
   # @return [String] The path for configuration_file
   def self.credentials_path
-    @credential_path ||= File.expand_path(ENV["FOG_RC"] || '~/.fog')
+    @credential_path ||= File.expand_path(ENV["FOG_RC"] || (ENV['HOME'] && '~/.fog'))
   end
 
   # @return [String] The new path for credentials file
@@ -31,14 +31,24 @@ module Fog
   # @raise [LoadError] Configuration unavailable in configuration file
   def self.credentials
     @credentials  ||= begin
-      if File.exists?(credentials_path)
-        credentials = YAML.load_file(credentials_path)
+      if credentials_path && File.exists?(credentials_path)
+        credentials = self.symbolize_credentials(YAML.load_file(credentials_path))
         (credentials && credentials[credential]) or raise LoadError.new(missing_credentials)
       else
         {}
       end
     end
   end
+  
+  def self.symbolize_credentials(args)
+    if args.is_a? Hash
+      Hash[ args.collect do |key, value|
+        [key.to_sym, self.symbolize_credentials(value)]
+      end ]
+    else
+      args
+    end
+  end
 
 private
 

data/lib/fog/core/scp.rb

@@ -9,10 +9,6 @@ module Fog
       end
     end
 
-    def self.reset_data(keys=Mock.data.keys)
-      Mock.reset_data(keys)
-    end
-
     class Mock
 
       def self.data

data/lib/fog/core/service.rb

@@ -146,14 +146,6 @@ module Fog
         @recognized ||= []
       end
 
-      def reset_data(keys=Mock.data.keys)
-        Mock.reset_data(keys)
-      end
-
-      def reset_data(keys=Mock.data.keys)
-        Mock.reset_data(keys)
-      end
-
       def validate_options(options)
         missing = requirements - options.keys
         unless missing.empty?

data/lib/fog/core/ssh.rb

@@ -9,10 +9,6 @@ module Fog
       end
     end
 
-    def self.reset_data(keys=Mock.data.keys)
-      Mock.reset_data(keys)
-    end
-
     class Mock
 
       def self.data

data/lib/fog/dns.rb

@@ -10,6 +10,9 @@ module Fog
       when 'Bluebox'
         require 'fog/dns/bluebox'
         Fog::Bluebox::DNS.new(attributes)
+      when 'DNSimple'
+        require 'fog/dns/dnsimple'
+        Fog::DNSimple::DNS.new(attributes)
       when 'Linode'
         require 'fog/dns/linode'
         Fog::Linode::DNS.new(attributes)
@@ -19,9 +22,6 @@ module Fog
       when 'Zerigo'
         require 'fog/dns/zerigo'
         Fog::Zerigo::DNS.new(attributes)
-      when 'DNSimple'
-        require 'fog/dns/dnsimple'
-        Fog::DNSimple::DNS.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized dns provider")
       end

data/lib/fog/dns/aws.rb

@@ -33,12 +33,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -48,8 +42,14 @@ module Fog
           end
 
           require 'mime/types'
-          @aws_access_key_id = options[:aws_access_key_id]
-          @data = self.class.data[options[:region]][@aws_access_key_id]
+          @aws_access_key_id  = options[:aws_access_key_id]
+          @region             = options[:region]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data[@region].delete(@aws_access_key_id)
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def signature(params)

data/lib/fog/dns/bluebox.rb

@@ -30,12 +30,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -46,8 +40,12 @@ module Fog
 
           @bluebox_customer_id = options[:bluebox_customer_id]
           @bluebox_api_key = options[:bluebox_api_key]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@bluebox_customer_id)
           @data = self.class.data[@bluebox_customer_id]
-          @data = self.class.data[@bluebox_api_key]
         end
       end
 

data/lib/fog/dns/dnsimple.rb

@@ -21,6 +21,7 @@ module Fog
       request :list_records
       request :update_record
       request :delete_record
+      request :get_record
 
       class Mock
 
@@ -30,12 +31,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -47,8 +42,13 @@ module Fog
           @dnsimple_email = options[:dnsimple_email]
           @dnsimple_password  = options[:dnsimple_password]
           @data = self.class.data[@dnsimple_email]
-          @data = self.class.data[@dnsimple_password]
         end
+
+        def reset_data
+          self.class.data.delete(@dnsimple_email)
+          @data = self.class.data[@dnsimple_email]
+        end
+
       end
 
       class Real

data/lib/fog/dns/linode.rb

@@ -30,12 +30,6 @@ module Fog
           end
         end
 
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -45,6 +39,11 @@ module Fog
           end
 
           @linode_api_key = options[:linode_api_key]
+          reset_data
+        end
+
+        def reset_data
+          self.class.data.delete(@linode_api_key)
           @data = self.class.data[@linode_api_key]
         end