fog 0.5.2 → 0.5.3

data/spec/vcloud/terremark/ecloud/requests/instantiate_vapp_template_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :instantiate_vapp_template }
+    it { should respond_to(:instantiate_vapp_template) }
 
     describe "#instantiate_vapp_template" do
       let(:vdc) { @vcloud.vdcs.first }
@@ -32,7 +32,7 @@ if Fog.mocking?
         subject { template_instantiation }
 
         it_should_behave_like "all responses"
-        it { should have_headers_denoting_a_content_type_of "application/xml" }
+        it { should have_headers_denoting_a_content_type_of("application/xml") }
 
         it "updates the mock data properly" do
           expect { subject }.to change { mock_vdc.virtual_machines.size }.by(1)
@@ -42,7 +42,7 @@ if Fog.mocking?
           before  { template_instantiation }
           subject { added_mock_data }
 
-          it { should be_an_instance_of Fog::Vcloud::MockDataClasses::MockVirtualMachine }
+          it { should be_an_instance_of(Fog::Vcloud::MockDataClasses::MockVirtualMachine) }
 
           its(:name) { should == new_vapp_data[:name] }
           its(:memory) { should == new_vapp_data[:memory] }
@@ -68,7 +68,7 @@ if Fog.mocking?
 
           it { should have(9).items }
 
-          it_should_behave_like "it has the standard vcloud v0.8 xmlns attributes"   # 3 keys
+          it_should_behave_like("it has the standard vcloud v0.8 xmlns attributes")   # 3 keys
 
           its(:href) { should == added_mock_data.href }
           its(:type) { should == "application/vnd.vmware.vcloud.vApp+xml" }
@@ -76,7 +76,7 @@ if Fog.mocking?
           its(:status) { should == "0" }
           its(:size) { should == "4" }
 
-          it { should include :Link }
+          it { should include(:Link) }
 
           describe "Link" do
             subject { template_instantiation.body[:Link] }
@@ -92,5 +92,4 @@ if Fog.mocking?
       end
     end
   end
-else
 end

data/spec/vcloud/terremark/ecloud/requests/power_off_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :power_off }
+    it { should respond_to(:power_off) }
 
     describe :power_off, :type => :vcloud_request do
       context "with a valid vapp uri" do

data/spec/vcloud/terremark/ecloud/requests/power_on_spec.rb

@@ -4,7 +4,7 @@ if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
-    it { should respond_to :power_on }
+    it { should respond_to(:power_on) }
 
     describe :power_on, :type => :vcloud_request do
       context "with a valid vapp uri" do

data/spec/vcloud/vcloud_spec.rb

@@ -4,11 +4,11 @@ if Fog.mocking?
   describe Fog::Vcloud, :type => :mock_vcloud_request do
     subject { Fog::Vcloud.new(:username => "foo", :password => "bar", :versions_uri => "https://fakey.com/api/versions") }
 
-    it { should be_an_instance_of Fog::Vcloud::Mock }
+    it { should be_an_instance_of(Fog::Vcloud::Mock) }
 
-    it { should respond_to :default_organization_uri }
+    it { should respond_to(:default_organization_uri) }
 
-    it { should respond_to :supported_versions }
+    it { should respond_to(:supported_versions) }
 
     it { should have_at_least(1).supported_versions }
 

data/tests/compute/requests/terremark_ecloud/organization_tests.rb

@@ -13,6 +13,11 @@ Shindo.tests('TerremarkEcloud::Compute | organization requests', ['terremarkeclo
 
   tests('success') do
 
+    tests("#login (get_organizations)").formats({'OrgList' => [{'href' => String, 'name' => String, 'type' => String}]}) do
+      pending if Fog.mocking?
+      TerremarkEcloud[:compute].login.body
+    end
+
     tests("#get_organization").formats(@organization_format) do
       pending if Fog.mocking?
       TerremarkEcloud[:compute].get_organization.body

data/tests/compute/requests/terremark_ecloud/task_tests.rb

@@ -0,0 +1,39 @@
+Shindo.tests('TerremarkEcloud::Compute | task requests', ['terremarkecloud']) do
+
+  @task_format = {
+    'endTime'   => Fog::Nullable::Time,
+    'href'      => String,
+    'Owner'  => {
+      'href'  => String,
+      'name'  => String,
+      'type'  => String
+    },
+    'Result'  => {
+      'href'  => String,
+      'name'  => String,
+      'type'  => String
+    },
+    'type'      => String,
+    'startTime' => Time,
+    'status'    => String
+  }
+
+  tests('success') do
+
+    @task_list_href = TerremarkEcloud[:compute].get_organization.body['Link'].detect {|link| link['type'] == 'application/vnd.vmware.vcloud.tasksList+xml'}['href']
+
+    tests("#get_task_list").formats({'Tasks' => [@task_format]}) do
+      pending if Fog.mocking?
+      data = TerremarkEcloud[:compute].get_task_list(@task_list_href).body
+      @task_href = data['Tasks'].first['href']
+      data
+    end
+
+    tests("#get_task").formats(@task_format) do
+      pending if Fog.mocking?
+      TerremarkEcloud[:compute].get_task(@task_href).body
+    end
+
+  end
+
+end

data/tests/helpers/formats_helper.rb

@@ -6,10 +6,12 @@ module Fog
   module Nullable
     module Integer; end
     module String; end
+    module Time; end
   end
 end
 [FalseClass, TrueClass].each {|klass| klass.send(:include, Fog::Boolean)}
 [NilClass, String].each {|klass| klass.send(:include, Fog::Nullable::String)}
+[NilClass, Time].each {|klass| klass.send(:include, Fog::Nullable::Time)}
 [Integer, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Integer)}
 
 module Shindo
@@ -38,7 +40,7 @@ module Shindo
         format.delete(key)
         case value
         when Array
-          valid &&= datum.is_a?(Array)
+          valid &&= datum.is_a?(Array) || p("not Array: #{datum.inspect}")
           if datum.is_a?(Array) && !value.empty?
             for element in datum
               type = value.first
@@ -50,10 +52,10 @@ module Shindo
             end
           end
         when Hash
-          valid &&= datum.is_a?(Hash)
+          valid &&= datum.is_a?(Hash) || p("not Hash: #{datum.inspect}")
           valid &&= formats_kernel(datum, value, false)
         else
-          p "#{key} => #{value}" unless datum.is_a?(value)
+          p "#{key} not #{value}: #{datum.inspect}" unless datum.is_a?(value)
           valid &&= datum.is_a?(value)
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -08:00
+date: 2011-02-15 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: builder
   prerelease: false
+  version_requirements: *id001
   type: :runtime
-  requirement: *id001
-  name: builder
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +44,12 @@ dependencies:
         - 5
         - 2
         version: 0.5.2
+  name: excon
   prerelease: false
+  version_requirements: *id002
   type: :runtime
-  requirement: *id002
-  name: excon
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,12 +60,12 @@ dependencies:
         - 0
         - 16
         version: 0.0.16
+  name: formatador
   prerelease: false
+  version_requirements: *id003
   type: :runtime
-  requirement: *id003
-  name: formatador
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,12 +74,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: json
   prerelease: false
+  version_requirements: *id004
   type: :runtime
-  requirement: *id004
-  name: json
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: mime-types
   prerelease: false
+  version_requirements: *id005
   type: :runtime
-  requirement: *id005
-  name: mime-types
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,12 +104,12 @@ dependencies:
         - 0
         - 23
         version: 2.0.23
+  name: net-ssh
   prerelease: false
+  version_requirements: *id006
   type: :runtime
-  requirement: *id006
-  name: net-ssh
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,12 +120,12 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
+  name: nokogiri
   prerelease: false
+  version_requirements: *id007
   type: :runtime
-  requirement: *id007
-  name: nokogiri
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -134,12 +134,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: ruby-hmac
   prerelease: false
+  version_requirements: *id008
   type: :runtime
-  requirement: *id008
-  name: ruby-hmac
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -148,12 +148,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: rake
   prerelease: false
+  version_requirements: *id009
   type: :development
-  requirement: *id009
-  name: rake
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -164,12 +164,12 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
+  name: rspec
   prerelease: false
+  version_requirements: *id010
   type: :development
-  requirement: *id010
-  name: rspec
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -180,10 +180,10 @@ dependencies:
         - 2
         - 2
         version: 0.2.2
+  name: shindo
   prerelease: false
+  version_requirements: *id011
   type: :development
-  requirement: *id011
-  name: shindo
 description: The Ruby cloud services library.
 email: geemus@gmail.com
 executables: 
@@ -421,9 +421,12 @@ files:
 - lib/fog/compute/parsers/slicehost/get_slices.rb
 - lib/fog/compute/parsers/terremark_ecloud/get_catalog.rb
 - lib/fog/compute/parsers/terremark_ecloud/get_catalog_item.rb
+- lib/fog/compute/parsers/terremark_ecloud/get_ip_address.rb
 - lib/fog/compute/parsers/terremark_ecloud/get_ip_addresses.rb
 - lib/fog/compute/parsers/terremark_ecloud/get_network.rb
 - lib/fog/compute/parsers/terremark_ecloud/get_organization.rb
+- lib/fog/compute/parsers/terremark_ecloud/get_task.rb
+- lib/fog/compute/parsers/terremark_ecloud/get_task_list.rb
 - lib/fog/compute/parsers/terremark_ecloud/get_vdc.rb
 - lib/fog/compute/parsers/terremark_ecloud/get_versions.rb
 - lib/fog/compute/parsers/terremark_ecloud/login.rb
@@ -585,11 +588,15 @@ files:
 - lib/fog/compute/requests/slicehost/reboot_slice.rb
 - lib/fog/compute/requests/terremark_ecloud/get_catalog.rb
 - lib/fog/compute/requests/terremark_ecloud/get_catalog_item.rb
+- lib/fog/compute/requests/terremark_ecloud/get_ip_address.rb
 - lib/fog/compute/requests/terremark_ecloud/get_ip_addresses.rb
 - lib/fog/compute/requests/terremark_ecloud/get_network.rb
 - lib/fog/compute/requests/terremark_ecloud/get_organization.rb
+- lib/fog/compute/requests/terremark_ecloud/get_task.rb
+- lib/fog/compute/requests/terremark_ecloud/get_task_list.rb
 - lib/fog/compute/requests/terremark_ecloud/get_vdc.rb
 - lib/fog/compute/requests/terremark_ecloud/get_versions.rb
+- lib/fog/compute/requests/terremark_ecloud/login.rb
 - lib/fog/compute/slicehost.rb
 - lib/fog/compute/terremark_ecloud.rb
 - lib/fog/core.rb
@@ -1060,6 +1067,7 @@ files:
 - tests/compute/requests/terremark_ecloud/helper.rb
 - tests/compute/requests/terremark_ecloud/network_tests.rb
 - tests/compute/requests/terremark_ecloud/organization_tests.rb
+- tests/compute/requests/terremark_ecloud/task_tests.rb
 - tests/compute/requests/terremark_ecloud/vdc_tests.rb
 - tests/core/attribute_tests.rb
 - tests/dns/helper.rb
@@ -1125,7 +1133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fog
-rubygems_version: 1.5.0
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 2
 summary: brings clouds to you
@@ -1255,6 +1263,7 @@ test_files:
 - tests/compute/requests/terremark_ecloud/helper.rb
 - tests/compute/requests/terremark_ecloud/network_tests.rb
 - tests/compute/requests/terremark_ecloud/organization_tests.rb
+- tests/compute/requests/terremark_ecloud/task_tests.rb
 - tests/compute/requests/terremark_ecloud/vdc_tests.rb
 - tests/core/attribute_tests.rb
 - tests/dns/helper.rb