fog 0.8.2 → 0.9.0

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

@@ -0,0 +1,31 @@
+require 'fog/core/collection'
+require 'fog/compute/models/ninefold/server'
+
+module Fog
+  module Compute
+    class Ninefold
+
+      class Servers < Fog::Collection
+
+        model Fog::Compute::Ninefold::Server
+
+        def all
+          data = connection.list_virtual_machines
+          load(data)
+        end
+
+        def get(identifier)
+          return nil if identifier.nil? || identifier == ""
+          data = connection.list_virtual_machines(:id => identifier)
+          if data.empty?
+            nil
+          else
+            new(data[0])
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/compute/models/rackspace/flavor.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Rackspace
-    class Compute
+  module Compute
+    class Rackspace
 
       class Flavor < Fog::Model
 

data/lib/fog/compute/models/rackspace/flavors.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/rackspace/flavor'
 
 module Fog
-  module Rackspace
-    class Compute
+  module Compute
+    class Rackspace
 
       class Flavors < Fog::Collection
 
-        model Fog::Rackspace::Compute::Flavor
+        model Fog::Compute::Rackspace::Flavor
 
         def all
           data = connection.list_flavors_detail.body['flavors']
@@ -17,7 +17,7 @@ module Fog
         def get(flavor_id)
           data = connection.get_flavor_details(flavor_id).body['flavor']
           new(data)
-        rescue Fog::Rackspace::Compute::NotFound
+        rescue Fog::Compute::Rackspace::NotFound
           nil
         end
 

data/lib/fog/compute/models/rackspace/image.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Rackspace
-    class Compute
+  module Compute
+    class Rackspace
 
       class Image < Fog::Model
 

data/lib/fog/compute/models/rackspace/images.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/rackspace/image'
 
 module Fog
-  module Rackspace
-    class Compute
+  module Compute
+    class Rackspace
 
       class Images < Fog::Collection
 
-        model Fog::Rackspace::Compute::Image
+        model Fog::Compute::Rackspace::Image
 
         attribute :server
 
@@ -22,7 +22,7 @@ module Fog
         def get(image_id)
           data = connection.get_image_details(image_id).body['image']
           new(data)
-        rescue Fog::Rackspace::Compute::NotFound
+        rescue Fog::Compute::Rackspace::NotFound
           nil
         end
 

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

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Rackspace
-    class Compute
+  module Compute
+    class Rackspace
 
       class Server < Fog::Model
 
@@ -120,12 +120,12 @@ module Fog
           Fog::SSH.new(public_ip_address, username, options).run(commands)
         end
 
-        def scp(local_path, remote_path)
+        def scp(local_path, remote_path, upload_options = {})
           requires :public_ip_address, :username
 
-          options = {}
-          options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(public_ip_address, username, options).upload(local_path, remote_path)
+          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

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

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/rackspace/server'
 
 module Fog
-  module Rackspace
-    class Compute
+  module Compute
+    class Rackspace
 
       class Servers < Fog::Collection
 
-        model Fog::Rackspace::Compute::Server
+        model Fog::Compute::Rackspace::Server
 
         def all
           data = connection.list_servers_detail.body['servers']
@@ -25,7 +25,7 @@ module Fog
           if server = connection.get_server_details(server_id).body['server']
             new(server)
           end
-        rescue Fog::Rackspace::Compute::NotFound
+        rescue Fog::Compute::Rackspace::NotFound
           nil
         end
 

data/lib/fog/compute/models/slicehost/flavor.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Slicehost
-    class Compute
+  module Compute
+    class Slicehost
 
       class Flavor < Fog::Model
 

data/lib/fog/compute/models/slicehost/flavors.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/slicehost/flavor'
 
 module Fog
-  module Slicehost
-    class Compute
+  module Compute
+    class Slicehost
 
       class Flavors < Fog::Collection
 
-        model Fog::Slicehost::Compute::Flavor
+        model Fog::Compute::Slicehost::Flavor
 
         def all
           data = connection.get_flavors.body['flavors']

data/lib/fog/compute/models/slicehost/image.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Slicehost
-    class Compute
+  module Compute
+    class Slicehost
 
       class Image < Fog::Model
 

data/lib/fog/compute/models/slicehost/images.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/slicehost/image'
 
 module Fog
-  module Slicehost
-    class Compute
+  module Compute
+    class Slicehost
 
       class Images < Fog::Collection
 
-        model Fog::Slicehost::Compute::Image
+        model Fog::Compute::Slicehost::Image
 
         def all
           data = connection.get_images.body['images']

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

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module Slicehost
-    class Compute
+  module Compute
+    class Slicehost
 
       class Server < Fog::Model
 
@@ -110,12 +110,12 @@ module Fog
           Fog::SSH.new(addresses.first, username, options).run(commands)
         end
 
-        def scp(local_path, remote_path)
+        def scp(local_path, remote_path, upload_options = {})
           requires :addresses, :username
 
-          options = {}
-          options[:key_data] = [private_key] if private_key
-          Fog::SCP.new(addresses.first, username, options).upload(local_path, remote_path)
+          scp_options = {}
+          scp_options[:key_data] = [private_key] if private_key
+          Fog::SCP.new(addresses.first, username, scp_options).upload(local_path, remote_path, upload_options)
         end
 
         def username

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

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/slicehost/server'
 
 module Fog
-  module Slicehost
-    class Compute
+  module Compute
+    class Slicehost
 
       class Servers < Fog::Collection
 
-        model Fog::Slicehost::Compute::Server
+        model Fog::Compute::Slicehost::Server
 
         def all
           data = connection.get_slices.body['slices']

data/lib/fog/compute/models/storm_on_demand/balancer.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Balancer < Fog::Model
         

data/lib/fog/compute/models/storm_on_demand/balancers.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/storm_on_demand/balancer'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Balancers < Fog::Collection
 
-        model Fog::StormOnDemand::Compute::Balancer
+        model Fog::Compute::StormOnDemand::Balancer
 
         def all
           data = connection.list_balancers.body['loadbalancers']

data/lib/fog/compute/models/storm_on_demand/config.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Config < Fog::Model
         identity :id

data/lib/fog/compute/models/storm_on_demand/configs.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/storm_on_demand/config'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Configs < Fog::Collection
 
-        model Fog::StormOnDemand::Compute::Config
+        model Fog::Compute::StormOnDemand::Config
 
         def all
           data = connection.list_configs.body['configs']

data/lib/fog/compute/models/storm_on_demand/image.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Image < Fog::Model
         identity :id

data/lib/fog/compute/models/storm_on_demand/images.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/storm_on_demand/image'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Images < Fog::Collection
 
-        model Fog::StormOnDemand::Compute::Image
+        model Fog::Compute::StormOnDemand::Image
 
         def all
           data = connection.list_images.body['images']

data/lib/fog/compute/models/storm_on_demand/private_ip.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class PrivateIp < Fog::Model
         attribute :zone

data/lib/fog/compute/models/storm_on_demand/private_ips.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/storm_on_demand/private_ip'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class PrivateIps < Fog::Collection
 
-        model Fog::StormOnDemand::Compute::PrivateIp
+        model Fog::Compute::StormOnDemand::PrivateIp
 
         def all
           data = connection.list_private_ips.body['networks']

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

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Server < Fog::Model
         identity :uniq_id

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

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/storm_on_demand/server'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Servers < Fog::Collection
 
-        model Fog::StormOnDemand::Compute::Server
+        model Fog::Compute::StormOnDemand::Server
 
         def all
           data = connection.list_servers.body['servers']

data/lib/fog/compute/models/storm_on_demand/stat.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Stat < Fog::Model
         attribute :loadavg

data/lib/fog/compute/models/storm_on_demand/stats.rb

@@ -2,11 +2,11 @@ require 'fog/core/collection'
 require 'fog/compute/models/storm_on_demand/stat'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Stats < Fog::Collection
-        model Fog::StormOnDemand::Compute::Stat
+        model Fog::Compute::StormOnDemand::Stat
 
         def get(options)
           data = connection.get_stats(options).body

data/lib/fog/compute/models/storm_on_demand/template.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Template < Fog::Model
         identity :id

data/lib/fog/compute/models/storm_on_demand/templates.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/compute/models/storm_on_demand/template'
 
 module Fog
-  module StormOnDemand
-    class Compute
+  module Compute
+    class StormOnDemand
 
       class Templates < Fog::Collection
 
-        model Fog::StormOnDemand::Compute::Template
+        model Fog::Compute::StormOnDemand::Template
 
         def all
           data = connection.list_templates.body['templates']