fog 0.2.0 → 0.2.1

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

@@ -1,7 +1,10 @@
-require 'spec_helper'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec_helper')
 
-describe Fog::Vcloud, :type => :tmrk_ecloud_request do
-  subject { @vcloud }
+if Fog.mocking?
+  describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do
+    subject { @vcloud }
 
-  it_should_behave_like "all login requests"
+    it_should_behave_like "all login requests"
+  end
+else
 end

data/spec/vcloud/vcloud_spec.rb

@@ -1,17 +1,18 @@
 require 'spec_helper'
 
-describe Fog::Vcloud do
-  subject { Fog::Vcloud.new() }
+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 }
+    it { should have_at_least(1).supported_versions }
 
-  its(:default_organization_uri) { should == URI.parse(@mock_organization[:info][:href]) }
-  its(:default_organization_uri) { should be_an_instance_of URI::HTTPS }
+    its(:default_organization_uri) { should == @mock_organization[:info][:href] }
 
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 -07:00
+date: 2010-06-27 00:00:00 -05:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 0
-        - 24
-        version: 0.0.24
+        - 1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -106,7 +106,7 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: builder
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
@@ -115,10 +115,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: shindo
+  name: rspec
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
@@ -129,6 +129,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: shindo
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: The Ruby cloud computing library.
 email: geemus@gmail.com
 executables: 
@@ -320,6 +332,15 @@ files:
 - 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
@@ -456,51 +477,66 @@ files:
 - 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
@@ -589,13 +625,13 @@ files:
 - 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/vcloud/parser.rb

@@ -1,42 +0,0 @@
-module Fog
-  module Parsers
-    module Vcloud
-
-      def self.de_camel(str)
-        str.gsub(/(.)([A-Z])/,'\1_\2').downcase
-      end
-
-      class Base < Fog::Parsers::Base
-
-        private
-
-        def generate_link(attributes)
-          link = Struct::VcloudLink.new
-          until attributes.empty?
-            link[attributes.shift.downcase] = attributes.shift
-          end
-          if link.href
-            link.href = URI.parse(link.href)
-          end
-          link
-        end
-
-        def handle_root(attributes)
-          root = {}
-          until attributes.empty?
-            if attributes.first.is_a?(Array)
-              attribute = attributes.shift
-              root[attribute.first.downcase] = attribute.last
-            else
-              root[attributes.shift.downcase] = attributes.shift
-            end
-          end
-          @response.href = URI.parse(root['href'])
-          @response.name = root['name']
-          @response.type = root['type']
-          @response.xmlns = root['xmlns']
-        end
-      end
-    end
-  end
-end

data/lib/fog/vcloud/parsers/get_organization.rb

@@ -1,37 +0,0 @@
-module Fog
-  module Parsers
-    module Vcloud
-
-      class GetOrganization < Fog::Parsers::Vcloud::Base
-        #
-        # Based off of:
-        # http://support.theenterprisecloud.com/kb/default.asp?id=540&Lang=1&SID=
-        # 
-        # vCloud API Guide v0.9 - Page 26
-        #
-
-        def reset
-          @response = Struct::VcloudOrganization.new([])
-        end
-
-        def start_element(name, attributes=[])
-          super
-          case name
-          when 'Link'
-            @response.links << generate_link(attributes)
-          when 'Org'
-            handle_root(attributes)
-          end
-        end
-
-        def end_element(name)
-          if name == 'Description'
-            @response.description = @value
-          end
-        end
-
-      end
-
-    end
-  end
-end

data/lib/fog/vcloud/parsers/get_vdc.rb

@@ -1,62 +0,0 @@
-module Fog
-  module Parsers
-    module Vcloud
-
-      class GetVdc < Fog::Parsers::Vcloud::Base
-        #WARNING: Incomplete
-        #Based off of:
-        #vCloud API Guide v0.9 - Page 27
-
-        def reset
-          @target = nil
-          @response = Struct::VcloudVdc.new([],[],[],Struct::VcloudXCapacity.new,Struct::VcloudXCapacity.new,Struct::VcloudXCapacity.new)
-        end
-
-        def start_element(name, attributes=[])
-          super
-          case name
-          when 'Cpu'
-            @target = :cpu_capacity
-          when 'Memory'
-            @target = :memory_capacity
-          when 'StorageCapacity'
-            @target = :storage_capacity
-          when 'NetworkQuota'
-            @target = :network_quota
-          when 'VmQuota'
-            @target = :vm_quota
-          when 'NicQuota'
-            @target = :nic_quota
-          when 'Link'
-            @response.links << generate_link(attributes)
-          when 'ResourceEntity'
-            @response.resource_entities << generate_link(attributes)
-          when 'Network'
-            @response.networks << generate_link(attributes)
-          when 'Vdc'
-            handle_root(attributes)
-          end
-        end
-
-        def end_element(name)
-          case name
-          when 'Allocated', 'Limit', 'Used'
-            @response[@target][name.downcase] = @value.to_i
-          when 'Units'
-            @response[@target][name.downcase] = @value
-          when "AllocationModel"
-            @response.allocation_model = @value
-          when "Description"
-            @response.description = @value
-          when "NicQuota", "VmQuota", "NetworkQuota"
-            @response[@target] = @value.to_i
-          when 'IsEnabled'
-            @response.enabled = (@value == 'true' ? true : false)
-          end
-        end
-
-      end
-
-    end
-  end
-end

data/lib/fog/vcloud/parsers/get_versions.rb

@@ -1,46 +0,0 @@
-module Fog
-  module Parsers
-    module Vcloud
-
-      class GetVersions < Fog::Parsers::Base
-        #
-        # Based off of:
-        # http://support.theenterprisecloud.com/kb/default.asp?id=535&Lang=1&SID=
-        # https://community.vcloudexpress.terremark.com/en-us/product_docs/w/wiki/02-get-versions.aspx
-        # vCloud API Guide v0.9 - Page 89
-        #
-
-        def reset
-          @response = []
-          @supported = false
-        end
-
-        def start_element(name, attributes = {})
-          super
-          case name
-          when "Version"
-            @version = Struct::VcloudVersion.new
-          when "SupportedVersions"
-            @supported = true
-          end
-        end
-
-        def end_element(name)
-          case name
-          when "Version"
-            @version.version = @value
-            @version.supported = @supported
-          when "LoginUrl"
-            @version.login_url = @value
-          when "VersionInfo"
-            @response << @version
-          when "SupportedVersions"
-            @supported = false
-          end
-        end
-
-      end
-
-    end
-  end
-end

data/lib/fog/vcloud/parsers/login.rb

@@ -1,36 +0,0 @@
-module Fog
-  module Parsers
-    module Vcloud
-
-      class Login < Fog::Parsers::Vcloud::Base
-        #
-        # Based off of:
-        # http://support.theenterprisecloud.com/kb/default.asp?id=536&Lang=1&SID=
-        # https://community.vcloudexpress.terremark.com/en-us/product_docs/w/wiki/01-get-login-token.aspx
-        # vCloud API Guide v0.9 - Page 17
-        #
-
-        def reset
-          @response = Struct::VcloudOrgList.new([])
-        end
-
-        def start_element(name, attributes=[])
-          super
-          case name
-          when 'OrgList'
-            until attributes.empty?
-              if at = attributes.shift
-                if at[0] == "xmlns"
-                  @response.xmlns = at[1]
-                end
-              end
-            end
-          when 'Org'
-            @response.organizations << generate_link(attributes)
-          end
-        end
-
-      end
-    end
-  end
-end