fog 0.9.0 → 0.10.0

data/lib/fog/bin.rb

@@ -69,6 +69,7 @@ require 'fog/bin/rackspace'
 require 'fog/bin/slicehost'
 require 'fog/bin/stormondemand'
 require 'fog/bin/terremark'
+require 'fog/bin/vcloud'
 require 'fog/bin/virtual_box'
 require 'fog/bin/voxel'
 require 'fog/bin/zerigo'

data/lib/fog/bin/aws.rb

@@ -3,10 +3,14 @@ class AWS < Fog::Bin
 
     def class_for(key)
       case key
+      when :auto_scaling
+        Fog::AWS::AutoScaling
       when :cdn
         Fog::CDN::AWS
       when :cloud_formation
         Fog::AWS::CloudFormation
+      when :cloud_watch
+        Fog::AWS::CloudWatch
       when :compute
         Fog::Compute::AWS
       when :dns
@@ -19,10 +23,14 @@ class AWS < Fog::Bin
         Fog::AWS::SimpleDB
       when :ses
         Fog::AWS::SES
+      when :sqs
+        Fog::AWS::SQS
       when :eu_storage, :storage
         Fog::Storage::AWS
       when :rds
         Fog::AWS::RDS
+      when :sns
+        Fog::AWS::SNS
       else
         # @todo Replace most instances of ArgumentError with NotImplementedError
         # @todo For a list of widely supported Exceptions, see:
@@ -34,11 +42,15 @@ class AWS < Fog::Bin
     def [](service)
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
+        when :auto_scaling
+          Fog::AWS::AutoScaling.new
         when :cdn
           Formatador.display_line("[yellow][WARN] AWS[:cdn] is deprecated, use CDN[:aws] instead[/]")
           Fog::CDN.new(:provider => 'AWS')
         when :cloud_formation
           Fog::AWS::CloudFormation.new
+        when :cloud_watch
+          Fog::AWS::CloudWatch.new
         when :compute
           Formatador.display_line("[yellow][WARN] AWS[:compute] is deprecated, use Compute[:aws] instead[/]")
           Fog::Compute.new(:provider => 'AWS')
@@ -57,9 +69,13 @@ class AWS < Fog::Bin
           Fog::AWS::SimpleDB.new
         when :ses
           Fog::AWS::SES.new
+        when :sqs
+          Fog::AWS::SQS.new
         when :storage
           Formatador.display_line("[yellow][WARN] AWS[:storage] is deprecated, use Storage[:aws] instead[/]")
           Fog::Storage.new(:provider => 'AWS')
+        when :sns
+          Fog::AWS::SNS.new
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end

data/lib/fog/bin/brightbox.rb

@@ -14,7 +14,7 @@ class Brightbox < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Formatador.display_line("[yellow][WARN] Brightbox[:compute] is deprecated, use Brightbox[:aws] instead[/]")
+          Formatador.display_line("[yellow][WARN] Brightbox[:compute] is deprecated, use Compute[:brightbox] instead[/]")
           Fog::Compute.new(:provider => 'Brightbox')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/ninefold.rb

@@ -5,6 +5,8 @@ class Ninefold < Fog::Bin
       case key
       when :compute
         Fog::Compute::Ninefold
+      when :storage
+        Fog::Storage::Ninefold
       else
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
@@ -16,6 +18,9 @@ class Ninefold < Fog::Bin
         when :compute
           Formatador.display_line("[yellow][WARN] Ninefold[:compute] is deprecated, use Compute[:ninefold] instead[/]")
           Fog::Compute.new(:provider => 'Ninefold')
+        when :storage
+          Formatador.display_line("[yellow][WARN] Ninefold[:storage] is deprecated, use Storage[:ninefold] instead[/]")
+          Fog::Storage.new(:provider => 'Ninefold')
         else
           raise ArgumentError, "Unrecognized service: #{service}"
         end

data/lib/fog/bin/vcloud.rb

@@ -0,0 +1,30 @@
+class Vcloud < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Vcloud::Compute
+      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 => 'Vcloud')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Vcloud.services
+    end
+
+  end
+end

data/lib/fog/bin/virtual_box.rb

@@ -24,7 +24,11 @@ module VirtualBox # deviates from other bin stuff to accomodate gem
     end
 
     def available?
-      availability = !Gem.source_index.find_name('virtualbox').empty?
+      availability = if Gem::Specification.respond_to?(:find_all_by_name)
+        !Gem::Specification.find_all_by_name('virtualbox').empty? # newest rubygems
+      else
+        !Gem.source_index.find_name('virtualbox').empty? # legacy
+      end
       if availability
         for service in services
           for collection in self.class_for(service).collections

data/lib/fog/cdn/rackspace.rb

@@ -42,16 +42,24 @@ module Fog
       class Real
 
         def initialize(options={})
-          require 'json'
+          require 'multi_json'
           credentials = Fog::Rackspace.authenticate(options)
           @auth_token = credentials['X-Auth-Token']
+          @enabled = false
+
+          if credentials['X-CDN-Management-Url']
+            uri = URI.parse(credentials['X-CDN-Management-Url'])
+            @host   = uri.host
+            @path   = uri.path
+            @port   = uri.port
+            @scheme = uri.scheme
+            @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+            @enabled = true
+          end
+        end
 
-          uri = URI.parse(credentials['X-CDN-Management-Url'])
-          @host   = uri.host
-          @path   = uri.path
-          @port   = uri.port
-          @scheme = uri.scheme
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+        def enabled?
+          @enabled
         end
 
         def reload
@@ -77,7 +85,7 @@ module Fog
             end
           end
           if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
-            response.body = JSON.parse(response.body)
+            response.body = MultiJson.decode(response.body)
           end
           response
         end

data/lib/fog/compute.rb

@@ -41,7 +41,10 @@ module Fog
       when :stormondemand
         require 'fog/compute/storm_on_demand'
         Fog::Compute::StormOnDemand.new(attributes)
-      when :virtualbox
+      when :vcloud
+        require 'fog/compute/vcloud'
+        Fog::Vcloud::Compute.new(attributes)
+      when 'VirtualBox'
         require 'fog/compute/virtual_box'
         Fog::Compute::VirtualBox.new(attributes)
       when :voxel

data/lib/fog/compute/aws.rb

@@ -24,21 +24,28 @@ module Fog
       collection  :tags
       model       :volume
       collection  :volumes
+      model       :spot_request
+      collection  :spot_requests
 
       request_path 'fog/compute/requests/aws'
       request :allocate_address
       request :associate_address
       request :attach_volume
       request :authorize_security_group_ingress
+      request :cancel_spot_instance_requests
       request :create_image
       request :create_key_pair
+      request :create_placement_group
       request :create_security_group
       request :create_snapshot
+      request :create_spot_datafeed_subscription
       request :create_tags
       request :create_volume
       request :delete_key_pair
       request :delete_security_group
+      request :delete_placement_group
       request :delete_snapshot
+      request :delete_spot_datafeed_subscription
       request :delete_tags
       request :delete_volume
       request :deregister_image
@@ -48,10 +55,14 @@ module Fog
       request :describe_instances
       request :describe_reserved_instances
       request :describe_key_pairs
+      request :describe_placement_groups
       request :describe_regions
       request :describe_reserved_instances_offerings
       request :describe_security_groups
       request :describe_snapshots
+      request :describe_spot_datafeed_subscription
+      request :describe_spot_instance_requests
+      request :describe_spot_price_history
       request :describe_tags
       request :describe_volumes
       request :detach_volume
@@ -61,9 +72,11 @@ module Fog
       request :import_key_pair
       request :modify_image_attributes
       request :modify_snapshot_attribute
+      request :purchase_reserved_instances_offering
       request :reboot_instances
       request :release_address
       request :register_image
+      request :request_spot_instances
       request :revoke_security_group_ingress
       request :run_instances
       request :terminate_instances
@@ -83,6 +96,7 @@ module Fog
                 :addresses  => {},
                 :images     => {},
                 :instances  => {},
+                :reserved_instances => {},
                 :key_pairs  => {},
                 :limits     => { :addresses => 5 },
                 :owner_id   => owner_id,
@@ -129,8 +143,6 @@ module Fog
         end
 
         def initialize(options={})
-          require 'fog/compute/parsers/aws/basic'
-
           @aws_access_key_id = options[:aws_access_key_id]
 
           @region = options[:region] || 'us-east-1'
@@ -249,7 +261,7 @@ module Fog
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2010-08-31'
+              :version            => '2011-05-15'
             }
           )
 
@@ -266,7 +278,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
               raise case match[1].split('.').last
-              when 'NotFound'
+              when 'NotFound', 'Unknown'
                 Fog::Compute::AWS::NotFound.slurp(error, match[2])
               else
                 Fog::Compute::AWS::Error.slurp(error, "#{match[1]} => #{match[2]}")

data/lib/fog/compute/bluebox.rb

@@ -53,7 +53,7 @@ module Fog
       class Real
 
         def initialize(options={})
-          require 'json'
+          require 'multi_json'
           @bluebox_api_key      = options[:bluebox_api_key]
           @bluebox_customer_id  = options[:bluebox_customer_id]
           @host   = options[:bluebox_host]    || "boxpanel.bluebox.net"
@@ -83,7 +83,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = JSON.parse(response.body)
+            response.body = MultiJson.decode(response.body)
           end
           response
         end

data/lib/fog/compute/brightbox.rb

@@ -88,7 +88,7 @@ module Fog
       class Real
 
         def initialize(options)
-          require "json"
+          require 'multi_json'
           # Currently authentication and api endpoints are the same but may change
           @auth_url = options[:brightbox_auth_url] || Fog.credentials[:brightbox_auth_url] || API_URL
           @api_url = options[:brightbox_api_url] || Fog.credentials[:brightbox_api_url] || API_URL
@@ -106,7 +106,7 @@ module Fog
             response = authenticated_request(params)
           end
           unless response.body.empty?
-            response = JSON.parse(response.body)
+            response = MultiJson.decode(response.body)
           end
         end
 
@@ -119,7 +119,7 @@ module Fog
           auth_url = options[:brightbox_auth_url] || @auth_url
 
           connection = Fog::Connection.new(auth_url)
-          @authentication_body = {'client_id' => @brightbox_client_id, 'grant_type' => 'none'}.to_json
+          @authentication_body = MultiJson.encode({'client_id' => @brightbox_client_id, 'grant_type' => 'none'})
 
           response = connection.request({
             :path => "/token",
@@ -131,7 +131,7 @@ module Fog
             :method   => 'POST',
             :body     => @authentication_body
           })
-          @oauth_token = JSON.parse(response.body)["access_token"]
+          @oauth_token = MultiJson.decode(response.body)["access_token"]
           return @oauth_token
         end
 

data/lib/fog/compute/go_grid.rb

@@ -58,7 +58,7 @@ module Fog
 
         def initialize(options={})
           require 'digest/md5'
-          require 'json'
+          require 'multi_json'
           @go_grid_api_key = options[:go_grid_api_key]
           @go_grid_shared_secret = options[:go_grid_shared_secret]
           @host   = options[:host]    || "api.gogrid.com"
@@ -100,7 +100,7 @@ module Fog
           end
 
           unless response.body.empty?
-            response.body = JSON.parse(response.body)
+            response.body = MultiJson.decode(response.body)
           end
 
           response

data/lib/fog/compute/linode.rb

@@ -77,7 +77,7 @@ module Fog
       class Real
 
         def initialize(options={})
-          require 'json'
+          require 'multi_json'
           @linode_api_key = options[:linode_api_key]
           @host   = options[:host]    || "api.linode.com"
           @port   = options[:port]    || 443
@@ -96,7 +96,7 @@ module Fog
           response = @connection.request(params.merge!({:host => @host}))
 
           unless response.body.empty?
-            response.body = JSON.parse(response.body)
+            response.body = MultiJson.decode(response.body)
             if data = response.body['ERRORARRAY'].first
               error = case data['ERRORCODE']
               when 5

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

@@ -12,7 +12,7 @@ module Fog
 
         attr_accessor :architecture
         attribute :ami_launch_index,      :aliases => 'amiLaunchIndex'
-        attribute :availability_zone,     :aliases => ['availabilityZone', 'placement'], :squash => 'availabilityZone'
+        attribute :availability_zone,     :aliases => 'availabilityZone'
         attribute :block_device_mapping,  :aliases => 'blockDeviceMapping'
         attribute :client_token,          :aliases => 'clientToken'
         attribute :dns_name,              :aliases => 'dnsName'
@@ -24,6 +24,7 @@ module Fog
         attribute :key_name,              :aliases => 'keyName'
         attribute :created_at,            :aliases => 'launchTime'
         attribute :monitoring,            :squash => 'state'
+        attribute :placement_group,       :aliases => 'groupName'
         attribute :product_codes,         :aliases => 'productCodes'
         attribute :private_dns_name,      :aliases => 'privateDnsName'
         attribute :private_ip_address,    :aliases => 'privateIpAddress'
@@ -35,6 +36,7 @@ module Fog
         attribute :state,                 :aliases => 'instanceState', :squash => 'name'
         attribute :state_reason,          :aliases => 'stateReason'
         attribute :subnet_id,             :aliases => 'subnetId'
+        attribute :tenancy
         attribute :tags,                  :aliases => 'tagSet'
         attribute :user_data
 
@@ -145,6 +147,8 @@ module Fog
             'KeyName'                     => key_name,
             'Monitoring.Enabled'          => monitoring,
             'Placement.AvailabilityZone'  => availability_zone,
+            'Placement.GroupName'         => placement_group,
+            'Placement.Tenancy'           => tenancy,
             'RamdiskId'                   => ramdisk_id,
             'SecurityGroup'               => groups,
             'SubnetId'                    => subnet_id,
@@ -168,12 +172,12 @@ module Fog
 
         def setup(credentials = {})
           requires :identity, :public_ip_address, :username
-          require 'json'
+          require 'multi_json'
 
           commands = [
             %{mkdir .ssh},
             %{passwd -l #{username}},
-            %{echo "#{attributes.to_json}" >> ~/attributes.json}
+            %{echo "#{MultiJson.encode(attributes)}" >> ~/attributes.json}
           ]
           if public_key
             commands << %{echo "#{public_key}" >> ~/.ssh/authorized_keys}
@@ -249,6 +253,16 @@ module Fog
           self.monitoring = new_monitor
         end
 
+        private
+
+        def placement=(new_placement)
+          if new_placement.is_a?(Hash)
+            merge_attributes(new_placement)
+          else
+            self.attributes[:placement] = new_placement
+          end
+        end
+
       end
 
     end

data/lib/fog/compute/models/aws/spot_request.rb

@@ -0,0 +1,93 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class AWS
+      
+      class SpotRequest < Fog::Model
+
+        identity :id,                          :aliases => 'spotInstanceRequestId'
+
+        attribute :price,                      :aliases => 'spotPrice'
+        attribute :request_type,               :aliases => 'type'
+        attribute :created_at,                 :aliases => 'createTime'
+        attribute :instance_count,             :aliases => 'instanceCount'
+        attribute :instance_id,                :aliases => 'instanceId'
+        attribute :state
+
+        attribute :valid_from,                 :aliases => 'validFrom'
+        attribute :valid_until,                :aliases => 'validUntil'
+        attribute :launch_group,               :aliases => 'launchGroup'
+        attribute :availability_zone_group,    :aliases => 'availabilityZoneGroup'
+        attribute :product_description,        :aliases => 'productDescription'
+
+        attribute :groups,                     :aliases => 'LaunchSpecification.SecurityGroup'
+        attribute :key_name,                   :aliases => 'LaunchSpecification.KeyName'
+        attribute :availability_zone,          :aliases => 'LaunchSpecification.Placement.AvailabilityZone'
+        attribute :flavor_id,                  :aliases => 'LaunchSpecification.InstanceType'
+        attribute :image_id,                   :aliases => 'LaunchSpecification.ImageId'
+        attribute :monitoring,                 :aliases => 'LaunchSpecification.Monitoring'
+        attribute :block_device_mapping,       :aliases => 'LaunchSpecification.BlockDeviceMapping'
+        attribute :tags,                       :aliases => 'tagSet'
+        attribute :fault,                      :squash  => 'message'
+        attribute :user_data
+
+        attr_writer :username
+
+        def initialize(attributes={})
+          self.groups ||= ["default"]
+          self.flavor_id ||= 't1.micro'
+          self.image_id   ||= begin
+            self.username = 'ubuntu'
+            case attributes[:connection].instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
+            when 'ap-northeast-1'
+              'ami-5e0fa45f'
+            when 'ap-southeast-1'
+              'ami-f092eca2'
+            when 'eu-west-1'
+              'ami-3d1f2b49'
+            when 'us-east-1'
+              'ami-3202f25b'
+            when 'us-west-1'
+              'ami-f5bfefb0'
+            end
+          end
+          super
+        end
+
+        def save
+          requires :image_id, :flavor_id, :price
+
+          options = {
+            'AvailabilityZoneGroup'                          => availability_zone_group,
+            'InstanceCount'                                  => instance_count,
+            'LaunchGroup'                                    => launch_group,
+            'LaunchSpecification.BlockDeviceMapping'         => block_device_mapping,
+            'LaunchSpecification.KeyName'                    => key_name,
+            'LaunchSpecification.Monitoring.Enabled'         => monitoring,
+            'LaunchSpecification.Placement.AvailabilityZone' => availability_zone,
+            'LaunchSpecification.SecurityGroup'              => groups,
+            'LaunchSpecification.UserData'                   => user_data,
+            'Type'                                           => request_type,
+            'ValidFrom'                                      => valid_from,
+            'ValidUntil'                                     => valid_until }
+          options.delete_if {|key, value| value.nil?}
+
+          data = connection.request_spot_instances(image_id, flavor_id, price, options).body
+          spot_instance_request = data['spotInstanceRequestSet'].first
+          spot_instance_request['launchSpecification'].each do |name,value|
+            spot_instance_request['LaunchSpecification.' + name[0,1].upcase + name[1..-1]] = value
+          end
+          spot_instance_request.merge(:groups => spot_instance_request['LaunchSpecification.GroupSet'])
+          spot_instance_request.merge(options)
+          merge_attributes( spot_instance_request )
+        end
+
+        def ready?
+          state == 'active'
+        end
+
+      end
+    end
+  end
+end