RubyGems - fog - Versions diffs - 0.2.30 → 0.3.0 - Mend

fog 0.2.30 → 0.3.0

Files changed (531) hide show

@@ -32,13 +32,13 @@ module Vcloud
       end
       def startup_notice
-        puts "You have access to the following vCloud services: #{Vcloud.registered_services}."
+        Formatador.display_line("You have access to the following Vcloud services: #{Vcloud.registered_services}.")
       end
       def [](service)
         @@connections ||= Hash.new do |hash, key|
           if credentials = Fog.credentials[:vcloud][key]
-            hash[key] = Fog::Vcloud.new(credentials)
+            hash[key] = eval(credentials[:module]).new(credentials)
           else
             raise ArgumentError.new("Unregistered service: :#{key}. Registered services are: #{Vcloud.registered_services}")
           end

data/lib/fog/vcloud/collection.rb CHANGED

@@ -1,5 +1,5 @@
 module Fog
-  module Vcloud
+  class Vcloud < Fog::Service
     class Collection < Fog::Collection
       def load(objects)

data/lib/fog/vcloud/generators.rb CHANGED

@@ -1,5 +1,5 @@
 module Fog
-  module Vcloud
+  class Vcloud < Fog::Service
     module Generators
       def unauthenticated_basic_request(*args)

data/lib/fog/vcloud/model.rb CHANGED

@@ -1,5 +1,5 @@
 module Fog
-  module Vcloud
+  class Vcloud < Fog::Service
     class Model < Fog::Model
       attr_accessor :loaded

data/lib/fog/vcloud/models/vdc.rb CHANGED

@@ -1,5 +1,5 @@
 module Fog
-  module Vcloud
+  class Vcloud
     class Vdc < Fog::Vcloud::Model
       identity :href

data/lib/fog/vcloud/models/vdcs.rb CHANGED

@@ -1,12 +1,7 @@
-module Fog
-  module Vcloud
-    class Real
-      def vdcs(options = {})
-        @vdcs ||= Fog::Vcloud::Vdcs.new(options.merge(:connection => self))
-      end
-    end
+require 'fog/vcloud/models/vdc'
+module Fog
+  class Vcloud
     class Vdcs < Fog::Vcloud::Collection
       model Fog::Vcloud::Vdc
@@ -36,6 +31,5 @@ module Fog
       end
     end
   end
 end

data/lib/fog/vcloud/requests/get_network.rb CHANGED

@@ -1,5 +1,5 @@
 module Fog
-  module Vcloud
+  class Vcloud
     class Real
       basic_request :get_network

data/lib/fog/vcloud/requests/get_organization.rb CHANGED

@@ -1,5 +1,5 @@
 module Fog
-  module Vcloud
+  class Vcloud
     class Real
       basic_request :get_organization

data/lib/fog/vcloud/requests/get_vdc.rb CHANGED

@@ -1,5 +1,5 @@
 module Fog
-  module Vcloud
+  class Vcloud
     class Real
       basic_request :get_vdc

data/lib/fog/vcloud/requests/get_versions.rb CHANGED

@@ -1,5 +1,5 @@
 module Fog
-  module Vcloud
+  class Vcloud
     class Real
       unauthenticated_basic_request :get_versions

data/lib/fog/vcloud/requests/login.rb CHANGED

@@ -1,5 +1,5 @@
 module Fog
-  module Vcloud
+  class Vcloud
     class Real

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

@@ -1,30 +1,29 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
-        extend Fog::Vcloud::Extension
+      class Ecloud < Fog::Vcloud
         model_path 'fog/vcloud/terremark/ecloud/models'
         model :catalog_item
         model :catalog
         model :firewall_acl
-        model :firewall_acls
+        collection :firewall_acls
         model :internet_service
-        model :internet_services
+        collection :internet_services
         model :ip
-        model :ips
+        collection :ips
         model :network
-        model :networks
+        collection :networks
         model :node
-        model :nodes
+        collection :nodes
         model :public_ip
-        model :public_ips
+        collection :public_ips
         model :server
-        model :servers
+        collection :servers
         model :task
-        model :tasks
+        collection :tasks
         model :vdc
-        model :vdcs
+        collection :vdcs
         request_path 'fog/vcloud/terremark/ecloud/requests'
         request :add_internet_service
@@ -63,7 +62,11 @@ module Fog
         request :power_reset
         request :power_shutdown
-        module Mock
+        class Mock < Fog::Vcloud::Mock
+          def initialize(options={})
+          end
           def self.base_url
             "https://fakey.com/api/v0.8b-ext2.3"
           end
@@ -187,10 +190,12 @@ module Fog
           end
         end
-        module Real
+        class Real < Fog::Vcloud::Real
           def supporting_versions
             ["v0.8b-ext2.3", "0.8b-ext2.3"]
           end
         end
       end

data/lib/fog/vcloud/terremark/ecloud/models/catalog.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class Catalog < Fog::Vcloud::Collection

data/lib/fog/vcloud/terremark/ecloud/models/catalog_item.rb CHANGED

@@ -1,10 +1,10 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class CatalogItem < Fog::Vcloud::Model
-          identity :href, :Href
+          identity :href, :aliases => :Href
           ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd

data/lib/fog/vcloud/terremark/ecloud/models/firewall_acl.rb CHANGED

@@ -1,10 +1,10 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class FirewallAcl < Fog::Vcloud::Model
-          identity :href, :Href
+          identity :href, :aliases => :Href
           ignore_attributes :xmlns, :xmlns_i

data/lib/fog/vcloud/terremark/ecloud/models/firewall_acls.rb CHANGED

@@ -1,7 +1,9 @@
+require 'lib/fog/vcloud/terremark/ecloud/models/firewall_acl'
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class FirewallAcls < Fog::Vcloud::Collection

data/lib/fog/vcloud/terremark/ecloud/models/internet_service.rb CHANGED

@@ -1,10 +1,10 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class InternetService < Fog::Vcloud::Model
-          identity :href, :Href
+          identity :href, :aliases => :Href
           ignore_attributes :xmlns, :xmlns_i
@@ -35,7 +35,7 @@ module Fog
           end
           def monitor=(new_monitor = {})
-            if new_monitor.nil?
+            if new_monitor.nil? || new_monitor.empty?
               @monitor = nil
             elsif new_monitor.is_a?(Hash)
               @monitor = {}

data/lib/fog/vcloud/terremark/ecloud/models/internet_services.rb CHANGED

@@ -1,13 +1,9 @@
+require 'lib/fog/vcloud/terremark/ecloud/models/internet_service'
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
-        module Real
-          def internet_services(options = {})
-            @internet_services ||= Fog::Vcloud::Terremark::Ecloud::InternetServices.new(options.merge(:connection => self))
-          end
-        end
+      class Ecloud
         class InternetServices < Fog::Vcloud::Collection

data/lib/fog/vcloud/terremark/ecloud/models/ip.rb CHANGED

@@ -1,14 +1,14 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class Ip < Fog::Vcloud::Model
           ignore_attributes :xmlns_i, :xmlns
-          identity :href, :Href
+          identity :href, :aliases => :Href
-          attribute :name, :Name
+          attribute :name, :aliases => :Name
           attribute :status, :aliases => :Status
           attribute :server, :aliases => :Server
           attribute :rnat, :aliases => :RnatAddress

data/lib/fog/vcloud/terremark/ecloud/models/ips.rb CHANGED

@@ -1,7 +1,9 @@
+require 'lib/fog/vcloud/terremark/ecloud/models/ip'
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class Ips < Fog::Vcloud::Collection

data/lib/fog/vcloud/terremark/ecloud/models/network.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class Network < Fog::Vcloud::Model
           identity :href

data/lib/fog/vcloud/terremark/ecloud/models/networks.rb CHANGED

@@ -1,13 +1,9 @@
+require 'lib/fog/vcloud/terremark/ecloud/models/network'
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
-        module Real
-          def networks(options = {})
-            @networks ||= Fog::Vcloud::Terremark::Ecloud::Networks.new(options.merge(:connection => self))
-          end
-        end
+      class Ecloud
         class Networks < Fog::Vcloud::Collection

data/lib/fog/vcloud/terremark/ecloud/models/node.rb CHANGED

@@ -1,10 +1,10 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class Node < Fog::Vcloud::Model
-          identity :href, :Href
+          identity :href, :aliases => :Href
           ignore_attributes :xmlns, :xmlns_i

data/lib/fog/vcloud/terremark/ecloud/models/nodes.rb CHANGED

@@ -1,7 +1,9 @@
+require 'lib/fog/vcloud/terremark/ecloud/models/node'
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class Nodes < Fog::Vcloud::Collection

data/lib/fog/vcloud/terremark/ecloud/models/public_ip.rb CHANGED

@@ -1,10 +1,10 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class PublicIp < Fog::Vcloud::Model
-          identity :href, :Href
+          identity :href, :aliases => :Href
           ignore_attributes :xmlns, :xmlns_i

data/lib/fog/vcloud/terremark/ecloud/models/public_ips.rb CHANGED

@@ -1,19 +1,9 @@
+require 'lib/fog/vcloud/terremark/ecloud/models/public_ip'
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
-        module Mock
-          def public_ips(options = {})
-            @public_ips ||= Fog::Vcloud::Terremark::Ecloud::PublicIps.new(options.merge(:connection => self))
-          end
-        end
-        module Real
-          def public_ips(options = {})
-            @public_ips ||= Fog::Vcloud::Terremark::Ecloud::PublicIps.new(options.merge(:connection => self))
-          end
-        end
+      class Ecloud
         class PublicIps < Fog::Vcloud::Collection

data/lib/fog/vcloud/terremark/ecloud/models/server.rb CHANGED

@@ -1,10 +1,10 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class Server < Fog::Vcloud::Model
-          identity :href, :Href
+          identity :href, :aliases => :Href
           ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
@@ -14,7 +14,7 @@ module Fog
           attribute :network_connections, :aliases => :NetworkConnectionSection, :squash => :NetworkConnection
           attribute :os, :aliases => :OperatingSystemSection
           attribute :virtual_hardware, :aliases => :VirtualHardwareSection
-          attribute :storage_size, :size
+          attribute :storage_size, :aliases => :size
           attribute :links, :aliases => :Link, :type => :array
           def friendly_status

data/lib/fog/vcloud/terremark/ecloud/models/servers.rb CHANGED

@@ -1,7 +1,9 @@
+require 'lib/fog/vcloud/terremark/ecloud/models/server'
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class Servers < Fog::Vcloud::Collection

data/lib/fog/vcloud/terremark/ecloud/models/task.rb CHANGED

@@ -1,10 +1,10 @@
 module Fog
-  module Vcloud
+  class Vcloud
     module Terremark
-      module Ecloud
+      class Ecloud
         class Task < Fog::Vcloud::Model
-          identity :href, :Href
+          identity :href, :aliases => :Href
           ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd