fog 1.1.2 → 1.2.0

data/lib/fog/aws/storage.rb

@@ -19,11 +19,13 @@ module Fog
       request :complete_multipart_upload
       request :copy_object
       request :delete_bucket
+      request :delete_bucket_lifecycle
       request :delete_bucket_policy
       request :delete_bucket_website
       request :delete_object
       request :get_bucket
       request :get_bucket_acl
+      request :get_bucket_lifecycle
       request :get_bucket_location
       request :get_bucket_logging
       request :get_bucket_object_versions
@@ -45,6 +47,7 @@ module Fog
       request :post_object_hidden_fields
       request :put_bucket
       request :put_bucket_acl
+      request :put_bucket_lifecycle
       request :put_bucket_logging
       request :put_bucket_policy
       request :put_bucket_versioning
@@ -95,7 +98,7 @@ module Fog
           query << "AWSAccessKeyId=#{@aws_access_key_id}"
           query << "Signature=#{Fog::AWS.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
-          "#{@host}/#{params[:path]}?#{query.join('&')}"
+          "#{params[:host]}/#{params[:path]}?#{query.join('&')}"
         end
 
       end
@@ -189,24 +192,10 @@ module Fog
           @aws_secret_access_key = options[:aws_secret_access_key]
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            's3-ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            's3-ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            's3-eu-west-1.amazonaws.com'
           when 'us-east-1'
             's3.amazonaws.com'
-          when 'sa-east-1'
-            's3-sa-east-1.amazonaws.com'
-          when 'us-west-1'
-            's3-us-west-1.amazonaws.com'
-          when 'us-west-2'
-            's3-us-west-2.amazonaws.com'
-          when 'sa-east-1'
-            's3-sa-east-1.amazonaws.com'
           else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+            "s3-#{options[:region]}.amazonaws.com"
           end
           @region = options[:region]
         end
@@ -267,22 +256,10 @@ module Fog
           else
             options[:region] ||= 'us-east-1'
             @host = options[:host] || case options[:region]
-            when 'ap-northeast-1'
-              's3-ap-northeast-1.amazonaws.com'
-            when 'ap-southeast-1'
-              's3-ap-southeast-1.amazonaws.com'
-            when 'eu-west-1'
-              's3-eu-west-1.amazonaws.com'
             when 'us-east-1'
               's3.amazonaws.com'
-            when 'sa-east-1'
-              's3-sa-east-1.amazonaws.com'
-            when 'us-west-1'
-              's3-us-west-1.amazonaws.com'
-            when 'us-west-2'
-              's3-us-west-2.amazonaws.com'
             else
-              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+              "s3-#{options[:region]}.amazonaws.com"
             end
             @path       = options[:path]        || '/'
             @persistent = options[:persistent]  || true
@@ -338,6 +315,7 @@ DATA
           for key in (params[:query] || {}).keys.sort
             if %w{
               acl
+              lifecycle
               location
               logging
               notification

data/lib/fog/{new_servers.rb → bare_metal_cloud.rb}

@@ -1,11 +1,11 @@
 require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
 
 module Fog
-  module NewServers
+  module BareMetalCloud
 
     extend Fog::Provider
 
-    service(:compute, 'new_servers/compute', 'Compute')
+    service(:compute, 'bare_metal_cloud/compute', 'Compute')
 
   end
 end

data/lib/fog/{new_servers → bare_metal_cloud}/compute.rb

@@ -1,16 +1,16 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'new_servers'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'bare_metal_cloud'))
 require 'fog/compute'
 
 module Fog
   module Compute
-    class NewServers < Fog::Service
+    class BareMetalCloud < Fog::Service
 
-      requires :new_servers_password, :new_servers_username
+      requires :bare_metal_cloud_password, :bare_metal_cloud_username
       recognizes :host, :port, :scheme, :persistent
 
-      model_path 'fog/new_servers/models/compute'
+      model_path 'fog/bare_metal_cloud/models/compute'
 
-      request_path 'fog/new_servers/requests/compute'
+      request_path 'fog/bare_metal_cloud/requests/compute'
       request :add_server
       request :cancel_server
       request :get_server
@@ -32,15 +32,15 @@ module Fog
         end
 
         def initialize(options={})
-          @new_server_username = options[:new_servers_username]
+          @bare_metal_cloud_username = options[:bare_metal_cloud_username]
         end
 
         def data
-          self.class.data[@new_server_username]
+          self.class.data[@bare_metal_cloud_username]
         end
 
         def reset_data
-          self.class.data.delete(@new_server_username)
+          self.class.data.delete(@bare_metal_cloud_username)
         end
 
       end
@@ -50,10 +50,10 @@ module Fog
         def initialize(options={})
           require 'fog/core/parser'
 
-          @new_servers_password = options[:new_servers_password]
-          @new_servers_username = options[:new_servers_username]
+          @bare_metal_cloud_password = options[:bare_metal_cloud_password]
+          @bare_metal_cloud_username = options[:bare_metal_cloud_username]
           @connection_options = options[:connection_options] || {}
-          @host       = options[:host]        || "noc.newservers.com"
+          @host       = options[:host]        || "noc.baremetalcloud.com"
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
@@ -67,8 +67,8 @@ module Fog
         def request(params)
           params[:query] ||= {}
           params[:query].merge!({
-            :password => @new_servers_password,
-            :username => @new_servers_username
+            :password => @bare_metal_cloud_password,
+            :username => @bare_metal_cloud_username
           })
           params[:headers] ||= {}
           case params[:method]
@@ -83,7 +83,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::Compute::NewServers::NotFound.slurp(error)
+              Fog::Compute::BareMetalCloud::NotFound.slurp(error)
             else
               error
             end

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/add_server.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # Boot a new server

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/cancel_server.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # Shutdown a running server

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/get_server.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # List servers

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/list_images.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # List images

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/list_plans.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # List available plans

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/list_servers.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # List servers

data/lib/fog/{new_servers → bare_metal_cloud}/requests/compute/reboot_server.rb

@@ -1,6 +1,6 @@
 module Fog
   module Compute
-    class NewServers
+    class BareMetalCloud
       class Real
 
         # Reboot a running server

data/lib/fog/bin.rb

@@ -55,6 +55,7 @@ end
 require 'fog/bin/aws'
 require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
+require 'fog/bin/cloudstack'
 require 'fog/bin/clodo'
 require 'fog/bin/dnsimple'
 require 'fog/bin/dnsmadeeasy'
@@ -63,13 +64,15 @@ require 'fog/bin/ecloud'
 require 'fog/bin/glesys'
 require 'fog/bin/go_grid'
 require 'fog/bin/google'
+require 'fog/bin/joyent'
 require 'fog/bin/libvirt'
 require 'fog/bin/linode'
 require 'fog/bin/local'
-require 'fog/bin/new_servers'
+require 'fog/bin/bare_metal_cloud'
 require 'fog/bin/ninefold'
 require 'fog/bin/rackspace'
 require 'fog/bin/openstack'
+require 'fog/bin/ovirt'
 require 'fog/bin/slicehost'
 require 'fog/bin/stormondemand'
 require 'fog/bin/terremark'

data/lib/fog/bin/aws.rb

@@ -5,6 +5,8 @@ class AWS < Fog::Bin
       case key
       when :auto_scaling
         Fog::AWS::AutoScaling
+      when :beanstalk
+        Fog::AWS::ElasticBeanstalk
       when :cdn
         Fog::CDN::AWS
       when :cloud_formation
@@ -13,6 +15,8 @@ class AWS < Fog::Bin
         Fog::AWS::CloudWatch
       when :compute
         Fog::Compute::AWS
+      when :ddb, :dynamodb
+        Fog::AWS::DynamoDB
       when :dns
         Fog::DNS::AWS
       when :elasticache
@@ -58,8 +62,10 @@ class AWS < Fog::Bin
         when :cloud_watch
           Fog::AWS::CloudWatch.new
         when :compute
-          Fog::Logger.warning("AWS[:compute] is not recommended, use Comptue[:aws] for portability")
+          Fog::Logger.warning("AWS[:compute] is not recommended, use Compute[:aws] for portability")
           Fog::Compute.new(:provider => 'AWS')
+        when :ddb, :dynamodb
+          Fog::AWS::DynamoDB.new
         when :dns
           Fog::Logger.warning("AWS[:dns] is not recommended, use DNS[:aws] for portability")
           Fog::DNS.new(:provider => 'AWS')
@@ -86,6 +92,8 @@ class AWS < Fog::Bin
           Fog::Storage.new(:provider => 'AWS')
         when :sns
           Fog::AWS::SNS.new
+        when :sts
+          Fog::AWS::STS.new
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end

data/lib/fog/bin/{new_servers.rb → bare_metal_cloud.rb}

@@ -1,10 +1,10 @@
-class NewServers < Fog::Bin
+class BareMetalCloud < Fog::Bin
   class << self
 
     def class_for(key)
       case key
       when :compute
-        Fog::Compute::NewServers
+        Fog::Compute::BareMetalCloud
       else 
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -14,8 +14,8 @@ class NewServers < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("NewServers[:compute] is not recommended, use Compute[:newservers] for portability")
-          Fog::Compute.new(:provider => 'NewServers')
+          Fog::Logger.warning("BareMetalCloud[:compute] is not recommended, use Compute[:baremetalcloud] for portability")
+          Fog::Compute.new(:provider => 'BareMetalCloud')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end
@@ -24,7 +24,7 @@ class NewServers < Fog::Bin
     end
 
     def services
-      Fog::NewServers.services
+      Fog::BareMetalCloud.services
     end
 
   end

data/lib/fog/bin/cloudstack.rb

@@ -0,0 +1,30 @@
+class Cloudstack < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Cloudstack
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Compute.new(:provider => 'Cloudstack')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Cloudstack.services
+    end
+
+  end
+end

data/lib/fog/bin/joyent.rb

@@ -0,0 +1,31 @@
+class Joyent < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Joyent
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Logger.warning("Joyent[:compute] is not recommended, use Compute[:joyent] for portability")
+          Fog::Compute.new(:provider => 'Joyent')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Joyent.services
+    end
+
+  end
+end

data/lib/fog/bin/ovirt.rb

@@ -0,0 +1,30 @@
+class Ovirt < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Ovirt
+      else
+        raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+                    when :compute
+                      Fog::Compute.new(:provider => 'Ovirt')
+                    else
+                      raise ArgumentError, "Unrecognized service: #{key.inspect}"
+                    end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Ovirt.services
+    end
+
+  end
+end

data/lib/fog/bin/voxel.rb

@@ -14,7 +14,7 @@ class Voxel < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Voxel[:comupte] is not recommended, use Compute[:voxel]] for portability")
+          Fog::Logger.warning("Voxel[:compute] is not recommended, use Compute[:voxel] for portability")
           Fog::Compute.new(:provider => 'Voxel')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bluebox/compute.rb

@@ -15,12 +15,16 @@ module Fog
       collection  :images
       model       :server
       collection  :servers
+      model       :location
+      collection  :locations
 
       request_path 'fog/bluebox/requests/compute'
       request :create_block
       request :destroy_block
       request :get_block
       request :get_blocks
+      request :get_location
+      request :get_locations
       request :get_product
       request :get_products
       request :get_template