fog 0.2.0 → 0.2.1

data/Gemfile

@@ -1,13 +1,13 @@
 source 'http://gemcutter.org'
 
 gem 'rake'
-gem 'excon', '>= 0.0.26'
+gem 'excon',      '>= 0.1.2'
 gem 'formatador', ">= 0.0.10"
-gem 'json', ">= 0"
+gem 'json',       ">= 0"
 gem 'mime-types', ">= 0"
-gem 'net-ssh', ">= 0"
-gem 'nokogiri', ">= 0"
-gem 'rspec', '>= 0'
-gem 'ruby-hmac', '>= 0'
-gem 'shindo', '>= 0.1.6'
-gem 'builder', '>= 0'
+gem 'net-ssh',    ">= 0"
+gem 'nokogiri',   ">= 0"
+gem 'rspec',      '>= 0'
+gem 'ruby-hmac',  '>= 0'
+gem 'shindo',     '>= 0.1.6'
+gem 'builder',    '>= 0'

data/Gemfile.lock

@@ -31,7 +31,7 @@ dependencies:
   excon: 
     group: 
     - :default
-    version: ">= 0.0.26"
+    version: ">= 0.1.2"
   builder: 
     group: 
     - :default
@@ -50,7 +50,7 @@ specs:
 - builder: 
     version: 2.1.2
 - excon: 
-    version: 0.0.26
+    version: 0.1.2
 - formatador: 
     version: 0.0.14
 - gestalt: 
@@ -69,7 +69,7 @@ specs:
     version: 0.4.0
 - shindo: 
     version: 0.1.6
-hash: 83b7c53965ec61f532d9a504fcd8f5f67a285293
+hash: 5799aef7324bea69e03170607cb33bea95a3e975
 sources: 
 - Rubygems: 
     uri: http://gemcutter.org

data/bin/fog

@@ -3,20 +3,12 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'fog')
 require 'irb'
 require 'yaml'
 require File.join('fog', 'credentials')
-require File.join('fog', 'bin')
-
-Fog.credential = ARGV.first  ? :"#{ARGV.first}" : :default
+Fog.credential = ARGV.first ? :"#{ARGV.first}" : :default
 unless Fog.credentials
   exit
 end
 
-require File.join('fog', 'aws', 'bin')
-require File.join('fog', 'local', 'bin')
-require File.join('fog', 'rackspace', 'bin')
-require File.join('fog', 'slicehost', 'bin')
-require File.join('fog', 'terremark', 'bin')
-require File.join('fog', 'vcloud', 'bin')
-require File.join('fog', 'bluebox', 'bin')
+require 'fog/bin'
 
 if ARGV.length > 1
   print(instance_eval(ARGV[1..-1].join(' ')).to_json)

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.2.0'
-  s.date              = '2010-06-18'
+  s.version           = '0.2.1'
+  s.date              = '2010-06-27'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -42,13 +42,14 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('excon', '>=0.0.24')
+  s.add_dependency('excon', '>=0.1.2')
   s.add_dependency('formatador', '>=0.0.10')
   s.add_dependency('json')
   s.add_dependency('mime-types')
   s.add_dependency('net-ssh')
   s.add_dependency('nokogiri')
   s.add_dependency('ruby-hmac')
+  s.add_dependency('builder')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
@@ -242,6 +243,15 @@ Gem::Specification.new do |s|
     lib/fog/local/models/file.rb
     lib/fog/local/models/files.rb
     lib/fog/model.rb
+    lib/fog/new_servers.rb
+    lib/fog/new_servers/bin.rb
+    lib/fog/new_servers/requests/add_server.rb
+    lib/fog/new_servers/requests/cancel_server.rb
+    lib/fog/new_servers/requests/get_server.rb
+    lib/fog/new_servers/requests/list_images.rb
+    lib/fog/new_servers/requests/list_plans.rb
+    lib/fog/new_servers/requests/list_servers.rb
+    lib/fog/new_servers/requests/reboot_server.rb
     lib/fog/parser.rb
     lib/fog/rackspace.rb
     lib/fog/rackspace/bin.rb
@@ -378,51 +388,66 @@ Gem::Specification.new do |s|
     lib/fog/vcloud.rb
     lib/fog/vcloud/bin.rb
     lib/fog/vcloud/collection.rb
+    lib/fog/vcloud/extension.rb
+    lib/fog/vcloud/generators.rb
     lib/fog/vcloud/model.rb
     lib/fog/vcloud/models/vdc.rb
     lib/fog/vcloud/models/vdcs.rb
-    lib/fog/vcloud/parser.rb
-    lib/fog/vcloud/parsers/get_organization.rb
-    lib/fog/vcloud/parsers/get_vdc.rb
-    lib/fog/vcloud/parsers/get_versions.rb
-    lib/fog/vcloud/parsers/login.rb
-    lib/fog/vcloud/parsers/network.rb
     lib/fog/vcloud/requests/get_network.rb
     lib/fog/vcloud/requests/get_organization.rb
     lib/fog/vcloud/requests/get_vdc.rb
     lib/fog/vcloud/requests/get_versions.rb
     lib/fog/vcloud/requests/login.rb
-    lib/fog/vcloud/terremark/all.rb
     lib/fog/vcloud/terremark/ecloud.rb
+    lib/fog/vcloud/terremark/ecloud/models/catalog.rb
+    lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb
     lib/fog/vcloud/terremark/ecloud/models/internet_service.rb
     lib/fog/vcloud/terremark/ecloud/models/internet_services.rb
     lib/fog/vcloud/terremark/ecloud/models/ip.rb
     lib/fog/vcloud/terremark/ecloud/models/ips.rb
     lib/fog/vcloud/terremark/ecloud/models/network.rb
     lib/fog/vcloud/terremark/ecloud/models/networks.rb
+    lib/fog/vcloud/terremark/ecloud/models/node.rb
+    lib/fog/vcloud/terremark/ecloud/models/nodes.rb
     lib/fog/vcloud/terremark/ecloud/models/public_ip.rb
     lib/fog/vcloud/terremark/ecloud/models/public_ips.rb
+    lib/fog/vcloud/terremark/ecloud/models/server.rb
+    lib/fog/vcloud/terremark/ecloud/models/servers.rb
+    lib/fog/vcloud/terremark/ecloud/models/task.rb
+    lib/fog/vcloud/terremark/ecloud/models/tasks.rb
     lib/fog/vcloud/terremark/ecloud/models/vdc.rb
     lib/fog/vcloud/terremark/ecloud/models/vdcs.rb
-    lib/fog/vcloud/terremark/ecloud/parsers/get_internet_services.rb
-    lib/fog/vcloud/terremark/ecloud/parsers/get_public_ip.rb
-    lib/fog/vcloud/terremark/ecloud/parsers/get_public_ips.rb
-    lib/fog/vcloud/terremark/ecloud/parsers/get_vdc.rb
-    lib/fog/vcloud/terremark/ecloud/parsers/internet_service.rb
-    lib/fog/vcloud/terremark/ecloud/parsers/network.rb
-    lib/fog/vcloud/terremark/ecloud/parsers/network_ips.rb
     lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb
+    lib/fog/vcloud/terremark/ecloud/requests/add_node.rb
     lib/fog/vcloud/terremark/ecloud/requests/configure_internet_service.rb
+    lib/fog/vcloud/terremark/ecloud/requests/configure_network.rb
+    lib/fog/vcloud/terremark/ecloud/requests/configure_network_ip.rb
+    lib/fog/vcloud/terremark/ecloud/requests/configure_node.rb
+    lib/fog/vcloud/terremark/ecloud/requests/configure_vapp.rb
     lib/fog/vcloud/terremark/ecloud/requests/delete_internet_service.rb
+    lib/fog/vcloud/terremark/ecloud/requests/delete_node.rb
+    lib/fog/vcloud/terremark/ecloud/requests/delete_vapp.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_catalog.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_catalog_item.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_customization_options.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_internet_services.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_network.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_network_extensions.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_network_ip.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_network_ips.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_node.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_nodes.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_public_ip.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_public_ips.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_task.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_task_list.rb
+    lib/fog/vcloud/terremark/ecloud/requests/get_vapp.rb
     lib/fog/vcloud/terremark/ecloud/requests/get_vdc.rb
-    lib/fog/vcloud/terremark/ecloud/requests/login.rb
+    lib/fog/vcloud/terremark/ecloud/requests/power_off.rb
+    lib/fog/vcloud/terremark/ecloud/requests/power_on.rb
+    lib/fog/vcloud/terremark/ecloud/requests/power_reset.rb
+    lib/fog/vcloud/terremark/ecloud/requests/power_shutdown.rb
     lib/fog/vcloud/terremark/vcloud.rb
-    lib/fog/vcloud/terremark/vcloud/parsers/get_vdc.rb
     lib/fog/vcloud/terremark/vcloud/requests/get_vdc.rb
     spec/aws/models/ec2/address_spec.rb
     spec/aws/models/ec2/addresses_spec.rb
@@ -511,13 +536,13 @@ Gem::Specification.new do |s|
     spec/vcloud/terremark/ecloud/requests/configure_internet_service_spec.rb
     spec/vcloud/terremark/ecloud/requests/delete_internet_service_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_internet_services_spec.rb
+    spec/vcloud/terremark/ecloud/requests/get_network_ip_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_network_ips_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_network_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_public_ip_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_public_ips_spec.rb
     spec/vcloud/terremark/ecloud/requests/get_vdc_spec.rb
     spec/vcloud/terremark/ecloud/requests/login_spec.rb
-    spec/vcloud/terremark/vcloud/requests/get_vdc_spec.rb
     spec/vcloud/vcloud_spec.rb
     tests/aws/helper.rb
     tests/aws/requests/ec2/address_tests.rb

data/lib/fog.rb

@@ -30,6 +30,7 @@ require 'fog/ssh'
 require 'fog/aws'
 require 'fog/bluebox'
 require 'fog/local'
+require 'fog/new_servers'
 require 'fog/rackspace'
 require 'fog/slicehost'
 require 'fog/terremark'
@@ -38,7 +39,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 
   module Mock

data/lib/fog/attributes.rb

@@ -55,13 +55,43 @@ module Fog
         when :time
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
-              @#{name} = Time.parse(new_#{name})
+              if !new_#{name}.is_a?(Time)
+                @#{name} = Time.parse(new_#{name})
+              else
+                @#{name} = new_#{name}
+              end
             end
           EOS
-        else
+        when :array
           class_eval <<-EOS, __FILE__, __LINE__
-            attr_writer :#{name}
+          def #{name}=(new_#{name})
+            @#{name} = if new_#{name}.is_a?(Array)
+              new_#{name}
+            else
+              @#{name} = [ new_#{name} ]
+            end
+          end
           EOS
+        else
+          if squash = options[:squash]
+            class_eval <<-EOS, __FILE__, __LINE__
+              def #{name}=(new_data)
+                if new_data.is_a?(Hash)
+                  if new_data[:#{squash}]
+                    @#{name} = new_data[:#{squash}]
+                  else
+                    @#{name} = [ new_data ]
+                  end
+                else
+                  @#{name} = new_data
+                end
+              end
+            EOS
+          else
+            class_eval <<-EOS, __FILE__, __LINE__
+              attr_writer :#{name}
+            EOS
+          end
         end
         @attributes ||= []
         @attributes |= [name]
@@ -72,7 +102,15 @@ module Fog
 
       def identity(name, other_names = [])
         @identity = name
-        self.attribute(name, other_names)
+        self.attribute(name, {:aliases => other_names})
+      end
+
+      def ignore_attributes(*args)
+        @ignored_attributes = args
+      end
+
+      def ignored_attributes
+        @ignored_attributes ||= []
       end
 
     end
@@ -101,10 +139,12 @@ module Fog
 
       def merge_attributes(new_attributes = {})
         for key, value in new_attributes
-          if aliased_key = self.class.aliases[key]
-            send("#{aliased_key}=", value)
-          else
-            send("#{key}=", value)
+          unless self.class.ignored_attributes.include?(key)
+            if aliased_key = self.class.aliases[key]
+              send("#{aliased_key}=", value)
+            else
+              send("#{key}=", value)
+            end
           end
         end
         self

data/lib/fog/aws/ec2.rb

@@ -160,13 +160,16 @@ module Fog
             end
           @port   = options[:port]      || 443
           @scheme = options[:scheme]    || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+        end
+
+        def reload
+          @connection.reset
         end
 
         private
 
         def request(params)
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
-
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 

data/lib/fog/aws/elb.rb

@@ -63,13 +63,16 @@ module Fog
           end
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+        end
+
+        def reload
+          @connection.reset
         end
 
         private
 
         def request(params)
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
-
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 

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

@@ -31,7 +31,7 @@ module Fog
         attribute :state,                 'instanceState'
         attribute :user_data
 
-        def initialize(attributes)
+        def initialize(attributes={})
           @groups ||= ["default"]
           @flavor_id ||= 'm1.small'
           super

data/lib/fog/aws/requests/simpledb/put_attributes.rb

@@ -15,30 +15,61 @@ module Fog
         #   and values may use any UTF-8 characters valid in xml. Control characters
         #   and sequences not allowed in xml are not valid.  Each name and value can
         #   be up to 1024 bytes long.
+        # * options<~Hash> - Accepts the following keys.
+        #   :replace => [Array of keys to replace]
+        #   :expect => {name/value pairs for performing conditional put}
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
         #     * 'BoxUsage'
         #     * 'RequestId'
-        def put_attributes(domain_name, item_name, attributes, replace_attributes = [])
-          batch_put_attributes(
-            domain_name,
-            { item_name => attributes },
-            { item_name => replace_attributes }
-          )
+        def put_attributes(domain_name, item_name, attributes, options = {})
+          options[:expect] = {} unless options[:expect]
+          options[:replace] = [] unless options[:replace]
+          request({
+            'Action'      => 'PutAttributes',
+            'DomainName'  => domain_name,
+            :parser       => Fog::Parsers::AWS::SimpleDB::Basic.new(@nil_string),
+            'ItemName' => item_name
+          }.merge!(encode_attributes(attributes, options[:replace], options[:expect])))
         end
 
       end
 
       class Mock
 
-        def put_attributes(domain_name, item_name, attributes, replace_attributes = [])
-          batch_put_attributes(
-            domain_name,
-            { item_name => attributes },
-            { item_name => replace_attributes }
-          )
+        def put_attributes(domain_name, item_name, attributes, options = {})
+          options[:expect] = {} unless options[:expect]
+          options[:replace] = [] unless options[:replace]
+          response = Excon::Response.new
+          if @data[:domains][domain_name]
+            options[:expect].each do |ck, cv|
+              if @data[:domains][domain_name][item_name][ck] != [cv]
+                response.status = 409
+                raise(Excon::Errors.status_error({:expects => 200}, response))
+              end
+            end
+            attributes.each do |key, value|
+              @data[:domains][domain_name][item_name] ||= {}
+              @data[:domains][domain_name][item_name][key.to_s] = [] unless @data[:domains][domain_name][item_name][key.to_s]
+              if options[:replace].include?(key.to_s)
+                @data[:domains][domain_name][item_name][key.to_s] = [value.to_s]
+              else
+                @data[:domains][domain_name][item_name][key.to_s] += [value.to_s]
+              end
+            end
+            response.status = 200
+            response.body = {
+              'BoxUsage'  => Fog::AWS::Mock.box_usage,
+              'RequestId' => Fog::AWS::Mock.request_id
+            }
+          else
+            response.status = 400
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+
+          end
+          response
         end
 
       end

data/lib/fog/aws/s3.rb

@@ -135,11 +135,11 @@ module Fog
             end
           @port   = options[:port]      || 443
           @scheme = options[:scheme]    || 'https'
-          reload
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent] || true)
         end
 
         def reload
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
+          @connection.reset
         end
 
         private

data/lib/fog/aws/simpledb.rb

@@ -68,13 +68,22 @@ module Fog
           @nil_string = options[:nil_string]|| 'nil'
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
         end
 
         private
 
-        def encode_attributes(attributes, replace_attributes = [])
+        def encode_attributes(attributes, replace_attributes = [], expected_attributes = {})
           encoded_attributes = {}
           if attributes
+
+            expected_attributes.keys.each_with_index do |exkey, index|
+              for value in Array(expected_attributes[exkey])
+                encoded_attributes["Expected.#{index}.Name"] = exkey.to_s
+                encoded_attributes["Expected.#{index}.Value"] = sdb_encode(value)
+              end
+            end
+
             index = 0
             for key in attributes.keys
               for value in Array(attributes[key])
@@ -117,8 +126,11 @@ module Fog
           encoded_attributes
         end
 
+        def reload
+          @connection.reset
+        end
+
         def request(params)
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
           idempotent = params.delete(:idempotent)
           parser = params.delete(:parser)
 
@@ -128,7 +140,7 @@ module Fog
               :aws_access_key_id  => @aws_access_key_id,
               :hmac               => @hmac,
               :host               => @host,
-              :version            => '2007-11-07'
+              :version            => '2009-04-15'
             }
           )