fog 0.0.77 → 0.0.78

data/Gemfile.lock

@@ -9,11 +9,11 @@ specs:
 - formatador: 
     version: 0.0.13
 - json: 
-    version: 1.2.4
+    version: 1.4.0
 - mime-types: 
     version: "1.16"
 - net-ssh: 
-    version: 2.0.21
+    version: 2.0.22
 - nokogiri: 
     version: 1.4.1
 - rspec: 

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.0.77'
-  s.date              = '2010-04-23'
+  s.version           = '0.0.78'
+  s.date              = '2010-04-25'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -180,6 +180,7 @@ Gem::Specification.new do |s|
     lib/fog/collection.rb
     lib/fog/connection.rb
     lib/fog/credentials.rb
+    lib/fog/deprecation.rb
     lib/fog/model.rb
     lib/fog/parser.rb
     lib/fog/rackspace.rb
@@ -253,52 +254,62 @@ Gem::Specification.new do |s|
     lib/fog/ssh.rb
     lib/fog/terremark.rb
     lib/fog/terremark/bin.rb
-    lib/fog/terremark/models/server.rb
-    lib/fog/terremark/models/servers.rb
-    lib/fog/terremark/models/task.rb
-    lib/fog/terremark/models/tasks.rb
-    lib/fog/terremark/parsers/get_catalog.rb
-    lib/fog/terremark/parsers/get_catalog_item.rb
-    lib/fog/terremark/parsers/get_internet_services.rb
-    lib/fog/terremark/parsers/get_node_services.rb
-    lib/fog/terremark/parsers/get_organization.rb
-    lib/fog/terremark/parsers/get_organizations.rb
-    lib/fog/terremark/parsers/get_public_ips.rb
-    lib/fog/terremark/parsers/get_tasks_list.rb
-    lib/fog/terremark/parsers/get_vapp_template.rb
-    lib/fog/terremark/parsers/get_vdc.rb
-    lib/fog/terremark/parsers/instantiate_vapp_template.rb
-    lib/fog/terremark/parsers/internet_service.rb
-    lib/fog/terremark/parsers/node_service.rb
-    lib/fog/terremark/parsers/public_ip.rb
-    lib/fog/terremark/parsers/task.rb
-    lib/fog/terremark/parsers/vapp.rb
-    lib/fog/terremark/requests/add_internet_service.rb
-    lib/fog/terremark/requests/add_node_service.rb
-    lib/fog/terremark/requests/create_internet_service.rb
-    lib/fog/terremark/requests/delete_internet_service.rb
-    lib/fog/terremark/requests/delete_node_service.rb
-    lib/fog/terremark/requests/delete_public_ip.rb
-    lib/fog/terremark/requests/delete_vapp.rb
-    lib/fog/terremark/requests/deploy_vapp.rb
-    lib/fog/terremark/requests/get_catalog.rb
-    lib/fog/terremark/requests/get_catalog_item.rb
-    lib/fog/terremark/requests/get_internet_services.rb
-    lib/fog/terremark/requests/get_node_services.rb
-    lib/fog/terremark/requests/get_organization.rb
-    lib/fog/terremark/requests/get_organizations.rb
-    lib/fog/terremark/requests/get_public_ip.rb
-    lib/fog/terremark/requests/get_public_ips.rb
-    lib/fog/terremark/requests/get_task.rb
-    lib/fog/terremark/requests/get_tasks_list.rb
-    lib/fog/terremark/requests/get_vapp.rb
-    lib/fog/terremark/requests/get_vapp_template.rb
-    lib/fog/terremark/requests/get_vdc.rb
-    lib/fog/terremark/requests/instantiate_vapp_template.rb
-    lib/fog/terremark/requests/power_off.rb
-    lib/fog/terremark/requests/power_on.rb
-    lib/fog/terremark/requests/reset.rb
-    lib/fog/terremark/requests/shutdown.rb
+    lib/fog/terremark/ecloud.rb
+    lib/fog/terremark/models/shared/address.rb
+    lib/fog/terremark/models/shared/addresses.rb
+    lib/fog/terremark/models/shared/network.rb
+    lib/fog/terremark/models/shared/networks.rb
+    lib/fog/terremark/models/shared/server.rb
+    lib/fog/terremark/models/shared/servers.rb
+    lib/fog/terremark/models/shared/task.rb
+    lib/fog/terremark/models/shared/tasks.rb
+    lib/fog/terremark/parser.rb
+    lib/fog/terremark/parsers/shared/get_catalog.rb
+    lib/fog/terremark/parsers/shared/get_catalog_item.rb
+    lib/fog/terremark/parsers/shared/get_internet_services.rb
+    lib/fog/terremark/parsers/shared/get_node_services.rb
+    lib/fog/terremark/parsers/shared/get_organization.rb
+    lib/fog/terremark/parsers/shared/get_organizations.rb
+    lib/fog/terremark/parsers/shared/get_public_ips.rb
+    lib/fog/terremark/parsers/shared/get_tasks_list.rb
+    lib/fog/terremark/parsers/shared/get_vapp_template.rb
+    lib/fog/terremark/parsers/shared/get_vdc.rb
+    lib/fog/terremark/parsers/shared/instantiate_vapp_template.rb
+    lib/fog/terremark/parsers/shared/internet_service.rb
+    lib/fog/terremark/parsers/shared/network.rb
+    lib/fog/terremark/parsers/shared/node_service.rb
+    lib/fog/terremark/parsers/shared/public_ip.rb
+    lib/fog/terremark/parsers/shared/task.rb
+    lib/fog/terremark/parsers/shared/vapp.rb
+    lib/fog/terremark/requests/shared/add_internet_service.rb
+    lib/fog/terremark/requests/shared/add_node_service.rb
+    lib/fog/terremark/requests/shared/create_internet_service.rb
+    lib/fog/terremark/requests/shared/delete_internet_service.rb
+    lib/fog/terremark/requests/shared/delete_node_service.rb
+    lib/fog/terremark/requests/shared/delete_public_ip.rb
+    lib/fog/terremark/requests/shared/delete_vapp.rb
+    lib/fog/terremark/requests/shared/deploy_vapp.rb
+    lib/fog/terremark/requests/shared/get_catalog.rb
+    lib/fog/terremark/requests/shared/get_catalog_item.rb
+    lib/fog/terremark/requests/shared/get_internet_services.rb
+    lib/fog/terremark/requests/shared/get_network.rb
+    lib/fog/terremark/requests/shared/get_node_services.rb
+    lib/fog/terremark/requests/shared/get_organization.rb
+    lib/fog/terremark/requests/shared/get_organizations.rb
+    lib/fog/terremark/requests/shared/get_public_ip.rb
+    lib/fog/terremark/requests/shared/get_public_ips.rb
+    lib/fog/terremark/requests/shared/get_task.rb
+    lib/fog/terremark/requests/shared/get_tasks_list.rb
+    lib/fog/terremark/requests/shared/get_vapp.rb
+    lib/fog/terremark/requests/shared/get_vapp_template.rb
+    lib/fog/terremark/requests/shared/get_vdc.rb
+    lib/fog/terremark/requests/shared/instantiate_vapp_template.rb
+    lib/fog/terremark/requests/shared/power_off.rb
+    lib/fog/terremark/requests/shared/power_on.rb
+    lib/fog/terremark/requests/shared/reset.rb
+    lib/fog/terremark/requests/shared/shutdown.rb
+    lib/fog/terremark/shared.rb
+    lib/fog/terremark/vcloud.rb
     spec/aws/models/ec2/address_spec.rb
     spec/aws/models/ec2/addresses_spec.rb
     spec/aws/models/ec2/flavors_spec.rb

data/lib/fog.rb

@@ -20,6 +20,7 @@ $LOAD_PATH.unshift __DIR__ unless
 
 require 'fog/collection'
 require 'fog/connection'
+require 'fog/deprecation'
 require 'fog/model'
 require 'fog/parser'
 require 'fog/ssh'
@@ -30,7 +31,7 @@ require 'fog/terremark'
 
 module Fog
 
-  VERSION = '0.0.77'
+  VERSION = '0.0.78'
 
   module Mock
     @delay = 1

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

@@ -5,12 +5,14 @@ module Fog
     module EC2
 
       class Snapshot < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:status, :state)
 
         identity  :id, 'snapshotId'
 
         attribute :progress
         attribute :created_at,  'startTime'
-        attribute :status
+        attribute :state,       'status'
         attribute :volume_id,   'volumeId'
 
         def destroy

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

@@ -5,6 +5,8 @@ module Fog
     module EC2
 
       class Volume < Fog::Model
+        extend Fog::Deprecation
+        deprecate(:status, :state)
 
         identity  :id,         'volumeId'
 
@@ -15,8 +17,8 @@ module Fog
         attribute :server_id,         'instanceId'
         attribute :size
         attribute :snapshot_id,       'snapshotId'
-        attribute :status
-        
+        attribute :state,             'status'
+
         def initialize(attributes = {})
           if attributes['attachmentSet']
             attributes.merge!(attributes.delete('attachmentSet').first || {})

data/lib/fog/aws/s3.rb

@@ -167,7 +167,7 @@ DATA
 
           subdomain = params[:host].split(".#{@host}").first
           unless subdomain =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-            puts("[WARN] fog: the specified s3 bucket name(#{subdomain}) is not a valid dns name.  See: http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?Introduction.html")
+            Formatador.display_line("[yellow][WARN] fog: the specified s3 bucket name(#{subdomain}) is not a valid dns name.  See: http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?Introduction.html[/]")
             params[:host] = params[:host].split("#{subdomain}.")[-1]
             if params[:path]
               params[:path] = "#{subdomain}/#{params[:path]}"

data/lib/fog/deprecation.rb

@@ -0,0 +1,14 @@
+module Fog
+  module Deprecation
+
+    def deprecate(older, newer)
+      class_eval <<-EOS, __FILE__, __LINE__
+        def #{older}(*args)
+          Formatador.display_line("[yellow][WARN] #{self} => ##{older} is deprecated, use ##{newer} instead[/]")
+          #{newer}(*args)
+        end
+      EOS
+    end
+
+  end
+end

data/lib/fog/terremark.rb

@@ -1,224 +1,11 @@
+require 'fog/terremark/shared'
+require 'fog/terremark/parser'
+require 'fog/terremark/ecloud'
+require 'fog/terremark/vcloud'
+
 module Fog
   module Terremark
-
-    module Parser
-
-      def parse(data)
-        case data['type']
-        when 'application/vnd.vmware.vcloud.vApp+xml'
-          servers.new(data.merge!(:connection => self))
-        else
-          data
-        end
-      end
-
-    end
-
-    def self.new(options={})
-
-      unless @required
-        require 'fog/terremark/models/server'
-        require 'fog/terremark/models/servers'
-        require 'fog/terremark/models/task'
-        require 'fog/terremark/models/tasks'
-        require 'fog/terremark/parsers/get_catalog'
-        require 'fog/terremark/parsers/get_catalog_item'
-        require 'fog/terremark/parsers/get_internet_services'
-        require 'fog/terremark/parsers/get_node_services'
-        require 'fog/terremark/parsers/get_organization'
-        require 'fog/terremark/parsers/get_organizations'
-        require 'fog/terremark/parsers/get_public_ips'
-        require 'fog/terremark/parsers/get_tasks_list'
-        require 'fog/terremark/parsers/get_vapp_template'
-        require 'fog/terremark/parsers/get_vdc'
-        require 'fog/terremark/parsers/instantiate_vapp_template'
-        require 'fog/terremark/parsers/internet_service'
-        require 'fog/terremark/parsers/node_service'
-        require 'fog/terremark/parsers/public_ip'
-        require 'fog/terremark/parsers/task'
-        require 'fog/terremark/parsers/vapp'
-        require 'fog/terremark/requests/add_internet_service'
-        require 'fog/terremark/requests/add_node_service'
-        require 'fog/terremark/requests/create_internet_service'
-        require 'fog/terremark/requests/delete_internet_service'
-        require 'fog/terremark/requests/delete_node_service'
-        require 'fog/terremark/requests/delete_public_ip'
-        require 'fog/terremark/requests/delete_vapp'
-        require 'fog/terremark/requests/deploy_vapp'
-        require 'fog/terremark/requests/get_catalog'
-        require 'fog/terremark/requests/get_catalog_item'
-        require 'fog/terremark/requests/get_internet_services'
-        require 'fog/terremark/requests/get_node_services'
-        require 'fog/terremark/requests/get_organization'
-        require 'fog/terremark/requests/get_organizations'
-        require 'fog/terremark/requests/get_public_ip'
-        require 'fog/terremark/requests/get_public_ips'
-        require 'fog/terremark/requests/get_task'
-        require 'fog/terremark/requests/get_tasks_list'
-        require 'fog/terremark/requests/get_vapp'
-        require 'fog/terremark/requests/get_vapp_template'
-        require 'fog/terremark/requests/get_vdc'
-        require 'fog/terremark/requests/instantiate_vapp_template'
-        require 'fog/terremark/requests/reset'
-        require 'fog/terremark/requests/power_off'
-        require 'fog/terremark/requests/power_on'
-        require 'fog/terremark/requests/shutdown'
-        @required = true
-      end
-
-      unless options[:terremark_password]
-        raise ArgumentError.new('terremark_password is required to access terremark')
-      end
-      unless options[:terremark_username]
-        raise ArgumentError.new('terremark_username is required to access terremark')
-      end
-      if Fog.mocking?
-        Fog::Terremark::Mock.new(options)
-      else
-        Fog::Terremark::Real.new(options)
-      end
-    end
-
-    class Mock
-      include Fog::Terremark::Parser
-
-      def self.data
-        @data ||= Hash.new do |hash, key|
-          hash[key] = {}
-        end
-      end
-
-      def self.reset_data(keys=data.keys)
-        for key in [*keys]
-          data.delete(key)
-        end
-      end
-
-      def initialize(options={})
-        @terremark_username = options[:terremark_username]
-        @data = self.class.data[@terremark_username]
-      end
-
-    end
-
-    class Real
-      include Fog::Terremark::Parser
-
-      def initialize(options={})
-        @terremark_password = options[:terremark_password]
-        @terremark_username = options[:terremark_username]
-        @terremark_service  = options[:terremark_service] || :vcloud
-        case options[:terremark_service]
-        when :ecloud
-          @host   = options[:host]   || "services.enterprisecloud.terremark.com"
-          @path   = options[:path]   || "/api/v0.8a-ext2.0"
-        when :vcloud
-          @host   = options[:host]   || "services.vcloudexpress.terremark.com"
-          @path   = options[:path]   || "/api/v0.8"
-        else
-          raise "Unsupported Terremark Service"
-        end
-        @port   = options[:port]   || 443
-        @scheme = options[:scheme] || 'https'
-        @cookie = get_organizations.headers['Set-Cookie']
-      end
-
-      # TODO: bust cache on organization creation?
-      def default_organization_id
-        @default_organization_id ||= begin
-          org_list = get_organizations.body['OrgList']
-          if org_list.length == 1
-            org_list.first['href'].split('/').last.to_i
-          else
-            nil
-          end
-        end
-      end
-
-      def default_vdc_id
-        if default_organization_id
-          @default_vdc_id ||= begin
-            vdcs = get_organization(default_organization_id).body['Links'].select {|link|
-              link['type'] == 'application/vnd.vmware.vcloud.vdc+xml'
-            }
-            if vdcs.length == 1
-              vdcs.first['href'].split('/').last.to_i
-            else
-              nil
-            end
-          end
-        else
-          nil
-        end
-      end
-
-      def default_network_id
-        if default_vdc_id
-          @default_network_id ||= begin
-            networks = get_vdc(default_vdc_id).body['AvailableNetworks']
-            if networks.length == 1
-              networks.first['href'].split('/').last.to_i
-            else
-              nil
-            end
-          end
-        else
-          nil
-        end
-      end
-
-      def default_public_ip_id
-        if default_vdc_id
-          @default_public_ip_id ||= begin
-            ips = get_public_ips(default_vdc_id).body['PublicIpAddresses']
-            if ips.length == 1
-              ips.first['Href'].split('/').last.to_i
-            else
-              nil
-            end
-          end
-        else
-          nil
-        end
-      end
-
-      def default_tasks_list_id
-        if default_organization_id
-          @default_tasks_list_id ||= begin
-            task_lists = get_organization(default_organization_id).body['Links'].select {|link|
-              link['type'] == 'application/vnd.vmware.vcloud.tasksList+xml'
-            }
-            if task_lists.length == 1
-              task_lists.first['href'].split('/').last.to_i
-            else
-              nil
-            end
-          end
-        else
-          nil
-        end
-      end
-
-      private
-
-      def request(params)
-        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
-        headers = {}
-        if @cookie
-          headers.merge!('Cookie' => @cookie)
-        end
-        response = @connection.request({
-          :body     => params[:body],
-          :expects  => params[:expects],
-          :headers  => headers.merge!(params[:headers] || {}),
-          :host     => @host,
-          :method   => params[:method],
-          :parser   => params[:parser],
-          :path     => "#{@path}/#{params[:path]}"
-        })
-      end
-
-    end
-
+    ECLOUD_OPTIONS = [:terremark_ecloud_username, :terremark_ecloud_password]
+    VCLOUD_OPTIONS = [:terremark_vcloud_username, :terremark_vcloud_password]
   end
 end