fog 0.2.12 → 0.2.13

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.12'
-  s.date              = '2010-07-09'
+  s.version           = '0.2.13'
+  s.date              = '2010-07-12'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -40,7 +40,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.12'
+    VERSION = '0.2.13'
   end
 
   module Mock

data/lib/fog/vcloud/terremark/ecloud.rb

@@ -195,13 +195,18 @@ module Fog
           # If we don't support any versions the service does, then raise an error.
           # If the @version that super selected isn't in our supported list, then select one that is.
           def check_versions
-            super
-            unless (supported_version_numbers & Fog::Vcloud::Terremark::Ecloud.supported_versions).length > 0
-              raise UnsupportedVersion.new("\nService @ #{@versions_uri} supports: #{supported_version_numbers.join(', ')}\n" +
-                                           "Fog::Vcloud::Terremark::Ecloud supports: #{Fog::Vcloud::Terremark::Ecloud.supported_versions.join(', ')}")
-            end
-            unless supported_version_numbers.include?(@version)
-              @version = (supported_version_numbers & Fog::Vcloud::Terremark::Ecloud.supported_versions).sort.first
+            if @version
+              unless supported_version_numbers.include?(@version.to_s)
+                raise UnsupportedVersion.new("#{@version} is not supported by the server.")
+              end
+              unless Fog::Vcloud::Terremark::Ecloud.supported_versions.include?(@version.to_s)
+                raise UnsupportedVersion.new("#{@version} is not supported by Fog::Vcloud::Terremark::Ecloud")
+              end
+            else
+                unless @version = (supported_version_numbers & Fog::Vcloud::Terremark::Ecloud.supported_versions).sort.first
+                  raise UnsupportedVersion.new("\nService @ #{@versions_uri} supports: #{supported_version_numbers.join(', ')}\n" +
+                                               "Fog::Vcloud::Terremark::Ecloud supports: #{Fog::Vcloud::Terremark::Ecloud.supported_versions.join(', ')}")
+                end
             end
           end
         end

data/lib/fog/vcloud/terremark/ecloud/requests/add_internet_service.rb

@@ -30,12 +30,12 @@ module Fog
           end
 
           def validate_internet_service_data(service_data, configure=false)
-            valid_opts = [:name, :protocol, :port, :description, :enabled, :redirect_url]
+            required_opts = [:name, :protocol, :port, :description, :enabled]
             if configure
-              valid_opts + [ :id, :href, :timeout ]
+              required_opts + [ :id, :href, :timeout ]
             end
-            unless valid_opts.all? { |opt| service_data.keys.include?(opt) }
-              raise ArgumentError.new("Required Internet Service data missing: #{(valid_opts - service_data.keys).map(&:inspect).join(", ")}")
+            unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+              raise ArgumentError.new("Required Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
             end
           end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 12
-  version: 0.2.12
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -07:00
+date: 2010-07-12 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency