fog 0.5.2 → 0.5.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.5.2)
+    fog (0.5.3)
       builder
       excon (>= 0.5.2)
       formatador (>= 0.0.16)
@@ -17,9 +17,9 @@ GEM
     builder (3.0.0)
     excon (0.5.2)
     formatador (0.0.16)
-    json (1.4.6)
+    json (1.5.1)
     mime-types (1.16)
-    net-ssh (2.0.23)
+    net-ssh (2.1.0)
     nokogiri (1.4.4)
     rake (0.8.7)
     rspec (1.3.1)

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.5.2'
-  s.date              = '2011-02-11'
+  s.version           = '0.5.3'
+  s.date              = '2011-02-15'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.5.2'
+    VERSION = '0.5.3'
   end
 
 end

data/lib/fog/cdn/aws.rb

@@ -87,7 +87,10 @@ module Fog
           @port     = options[:port]      || 443
           @scheme   = options[:scheme]    || 'https'
           @version  = options[:version]  || '2010-11-01'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
+          unless options.has_key?(:persistent)
+            options[:persistent] = true
+          end
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
         end
 
         def reload

data/lib/fog/compute/parsers/terremark_ecloud/get_ip_address.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class GetIpAddress < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'Id', 'Href', 'Name', 'RnatAddress', 'Server', 'Status'
+              @response[name] = @value
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/terremark_ecloud/get_task.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class GetTask < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def start_element(name, attrs = [])
+            case name
+            when 'Task'
+              for attribute in %w{href status type}
+                if value = attr_value(attribute, attrs)
+                  @response[attribute] = value
+                end
+              end
+              for attribute in %w{endTime startTime}
+                if value = attr_value(attribute, attrs)
+                  @response[attribute] = Time.parse(value)
+                end
+              end
+            when 'Owner', 'Result'
+              data = {}
+              for attribute in %w{href name type}
+                if value = attr_value(attribute, attrs)
+                  data[attribute] = value
+                end
+              end
+              @response[name] = data
+            end
+
+            super
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/terremark_ecloud/get_task_list.rb

@@ -0,0 +1,51 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class GetTaskList < Fog::Parsers::Base
+
+          def reset
+            @response = { 'Tasks' => [] }
+            @task = {}
+          end
+
+          def start_element(name, attrs = [])
+            case name
+            when 'Task'
+              for attribute in %w{href status type}
+                if value = attr_value(attribute, attrs)
+                  @task[attribute] = value
+                end
+              end
+              for attribute in %w{endTime startTime}
+                if value = attr_value(attribute, attrs)
+                  @task[attribute] = Time.parse(value)
+                end
+              end
+            when 'Owner', 'Result'
+              data = {}
+              for attribute in %w{href name type}
+                if value = attr_value(attribute, attrs)
+                  data[attribute] = value
+                end
+              end
+              @task[name] = data
+            end
+
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'Task'
+              @response['Tasks'] << @task
+              @task = {}
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_ip_address.rb

@@ -0,0 +1,19 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_ip_address'
+
+        def get_ip_address(href)
+          request({
+            :href       => href,
+            :idempotent => true,
+            :parser     => Fog::Parsers::TerremarkEcloud::Compute::GetIpAddress.new
+          })
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_task.rb

@@ -0,0 +1,19 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_task'
+
+        def get_task(href)
+          request({
+            :href       => href,
+            :idempotent => true,
+            :parser     => Fog::Parsers::TerremarkEcloud::Compute::GetTask.new
+          })
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_task_list.rb

@@ -0,0 +1,19 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/get_task_list'
+
+        def get_task_list(href)
+          request({
+            :href       => href,
+            :idempotent => true,
+            :parser     => Fog::Parsers::TerremarkEcloud::Compute::GetTaskList.new
+          })
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/terremark_ecloud/get_versions.rb

@@ -11,11 +11,13 @@ module Fog
             :expects  => 200,
             :method   => 'GET',
             :parser   => Fog::Parsers::TerremarkEcloud::Compute::GetVersions.new
-          });
+          })
           version_info = response.body['SupportedVersions'].detect {|version_info| version_info['Version'] == @version}
-          unless login_url = version_info && version_info['LoginUrl']
+          unless @login_url = version_info && version_info['LoginUrl']
+            # no LoginUrl matches specified version
             raise "TerremarkEcloud does not support version #{@version}"
           end
+          response
         end
 
       end

data/lib/fog/compute/requests/terremark_ecloud/login.rb

@@ -0,0 +1,29 @@
+module Fog
+  module TerremarkEcloud
+    class Compute
+      class Real
+
+        require 'fog/compute/parsers/terremark_ecloud/login'
+
+        def login
+          unless @login_url
+            get_versions
+          end
+          connection = Fog::Connection.new(@login_url)
+          response   = connection.request({
+            :expects => 200,
+            :method  => 'POST',
+            :headers => {
+              'Authorization' => ('Basic ' << Base64.encode64("#{@username}:#{@password}").chomp!),
+              'Content-Type'  => 'application/vnd.vmware.vcloud.orgList+xml'
+            },
+            :parser   => Fog::Parsers::TerremarkEcloud::Compute::Login.new
+          })
+          @token = response.headers['Set-Cookie']
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/terremark_ecloud.rb

@@ -10,10 +10,15 @@ module Fog
       request_path 'fog/compute/requests/terremark_ecloud'
       request :get_catalog
       request :get_catalog_item
+      request :get_ip_address
       request :get_ip_addresses
       request :get_network
       request :get_organization
+      request :get_task
+      request :get_task_list
+      request :get_versions
       request :get_vdc
+      request :login
 
       class Mock
 
@@ -36,6 +41,7 @@ module Fog
           @password = options[:terremark_ecloud_password]
           @version  = '0.8b-ext2.6'
           @versions_endpoint = options[:versions_endpoint] || 'https://services.enterprisecloud.terremark.com/api/versions'
+          @connection = Fog::Connection.new(@versions_endpoint, options[:persistent])
         end
 
         def organization_href
@@ -54,14 +60,16 @@ module Fog
           end
 
           begin
-            Fog::Connection.new(params[:href]).request({
-              :parser  => params[:parser],
-              :expects => params[:expects] || 200,
-              :method  => params[:method]  || 'GET',
-              :body    => params[:body],
-              :headers => {
+            uri = URI.parse(params.delete(:href))
+            @connection.request({
+              :body     => params[:body],
+              :expects  => params[:expects] || 200,
+              :headers  => {
                 'Cookie' => @token
-              }.merge(params[:headers] || {})
+              }.merge(params[:headers] || {}),
+              :method   => params[:method]  || 'GET',
+              :parser   => params[:parser],
+              :path     => uri.path
             })
           rescue Excon::Errors::Unauthorized # expired token
             get_token_and_organization
@@ -72,33 +80,9 @@ module Fog
         private
 
         def get_token_and_organization
-          # lookup LoginUrl for specified version
-          connection = Fog::Connection.new(@versions_endpoint)
-          response = connection.request({
-            :expects  => 200,
-            :method   => 'GET',
-            :parser   => Fog::Parsers::TerremarkEcloud::Compute::GetVersions.new
-          });
-          version_info = response.body['SupportedVersions'].detect {|version_info| version_info['Version'] == @version}
-          unless login_url = version_info && version_info['LoginUrl']
-            # no LoginUrl matches specified version
-            raise "TerremarkEcloud does not support version #{@version}"
-          end
-
-          connection = Fog::Connection.new(login_url)
-          response   = connection.request({
-            :expects => 200,
-            :method  => 'POST',
-            :headers => {
-              'Authorization' => ('Basic ' << Base64.encode64("#{@username}:#{@password}").chomp!),
-              'Content-Type'  => 'application/vnd.vmware.vcloud.orgList+xml'
-            },
-            :parser   => Fog::Parsers::TerremarkEcloud::Compute::Login.new
-          })
-
-          @token = response.headers['Set-Cookie']
-
-          if organization = response.body['OrgList'].first
+          response = self.login
+          # if there is only one organization we will note it as a starting point
+          if (response.body['OrgList'].length == 1) && (organization = response.body['OrgList'].first)
             @organization_href = organization['href']
           end
         end

data/lib/fog/core/attributes.rb

@@ -113,7 +113,7 @@ module Fog
 
     module InstanceMethods
 
-      def _dump
+      def _dump(level)
         Marshal.dump(attributes)
       end
 

data/lib/fog/core/collection.rb

@@ -113,6 +113,7 @@ module Fog
     end
 
     def to_json
+      require 'json'
       self.map {|member| member.attributes}.to_json
     end
 

data/lib/fog/core/credentials.rb

@@ -33,7 +33,7 @@ module Fog
     @credentials  ||= begin
       if File.exists?(credentials_path)
         credentials = YAML.load_file(credentials_path)
-        (credentials && credentials[credential]) or raise LoadError.new missing_credentials
+        (credentials && credentials[credential]) or raise LoadError.new(missing_credentials)
       else
         {}
       end

data/lib/fog/core/model.rb

@@ -33,6 +33,7 @@ module Fog
     end
 
     def to_json
+      require 'json'
       attributes.to_json
     end
 

data/lib/fog/dns/aws.rb

@@ -92,7 +92,10 @@ module Fog
           @port     = options[:port]      || 443
           @scheme   = options[:scheme]    || 'https'
           @version  = options[:version]  || '2010-10-01'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
+          unless options.has_key?(:persistent)
+            options[:persistent] = true
+          end
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
         end
 
         def reload

data/lib/fog/storage/aws.rb

@@ -99,7 +99,6 @@ module Fog
           query << "AWSAccessKeyId=#{@aws_access_key_id}"
           query << "Signature=#{CGI.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
-          bucket = params[:host].split('.').first
           "https://#{@host}/#{params[:path]}?#{query.join('&')}"
         end
 
@@ -221,7 +220,6 @@ module Fog
         end
       end
 
-      
       class Real
         include Utils
         extend Fog::Deprecation
@@ -278,8 +276,11 @@ module Fog
             @path   = options[:path]      || '/'
             @port   = options[:port]      || 443
             @scheme = options[:scheme]    || 'https'
+            unless options.has_key?(:persistent)
+              options[:persistent] = true
+            end
           end
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent] || true)
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent])
         end
 
         def reload