fog 0.2.11 → 0.2.12

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.11'
-  s.date              = '2010-07-02'
+  s.version           = '0.2.12'
+  s.date              = '2010-07-09'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -236,6 +236,12 @@ Gem::Specification.new do |s|
     lib/fog/deprecation.rb
     lib/fog/errors.rb
     lib/fog/hmac.rb
+    lib/fog/linode.rb
+    lib/fog/linode/bin.rb
+    lib/fog/linode/requests/avail_datacenters.rb
+    lib/fog/linode/requests/avail_distributions.rb
+    lib/fog/linode/requests/avail_kernels.rb
+    lib/fog/linode/requests/avail_linodeplans.rb
     lib/fog/local.rb
     lib/fog/local/bin.rb
     lib/fog/local/models/directories.rb

data/lib/fog.rb

@@ -29,6 +29,7 @@ require 'fog/ssh'
 
 require 'fog/aws'
 require 'fog/bluebox'
+require 'fog/linode'
 require 'fog/local'
 require 'fog/new_servers'
 require 'fog/rackspace'
@@ -39,7 +40,7 @@ require 'fog/vcloud'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.11'
+    VERSION = '0.2.12'
   end
 
   module Mock

data/lib/fog/bin.rb

@@ -1,6 +1,7 @@
 require 'fog/credentials'
 
 require 'fog/aws/bin'
+require 'fog/linode/bin'
 require 'fog/local/bin'
 require 'fog/new_servers/bin'
 require 'fog/rackspace/bin'
@@ -14,7 +15,7 @@ module Fog
 
     def services
       services = []
-      [::AWS, ::Local, ::NewServers, ::Rackspace, ::Slicehost, ::Terremark, ::Vcloud, ::Bluebox].each do |service|
+      [::AWS, ::Linode, ::Local, ::NewServers, ::Rackspace, ::Slicehost, ::Terremark, ::Vcloud, ::Bluebox].each do |service|
         if service.initialized?
           services << service
         end

data/lib/fog/linode.rb

@@ -0,0 +1,75 @@
+module Fog
+  module Linode
+    extend Fog::Service
+
+    requires :linode_api_key
+
+    model_path 'fog/linode/models'
+
+    request_path 'fog/linode/requests'
+    request 'avail_datacenters'
+    request 'avail_distributions'
+    request 'avail_kernels'
+    request 'avail_linodeplans'
+
+    class Mock
+      include Collections
+
+      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={})
+        @linode_api_key = options[:linode_api_key]
+        @data = self.class.data[@linode_api_key]
+      end
+
+    end
+
+    class Real
+      include Collections
+
+      def initialize(options={})
+        @linode_api_key = options[:linode_api_key]
+        @host   = options[:host]    || "api.linode.com"
+        @port   = options[:port]    || 443
+        @scheme = options[:scheme]  || 'https'
+        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+      end
+
+      def reload
+        @connection.reset
+      end
+
+      def request(params)
+        params[:query] ||= {}
+        params[:query].merge!(:api_key => @linode_api_key)
+
+        begin
+          response = @connection.request(params.merge!({:host => @host}))
+        rescue Excon::Errors::Error => error
+          raise case error
+          when Excon::Errors::NotFound
+            Fog::Linode::NotFound.slurp(error)
+          else
+            error
+          end
+        end
+
+        unless response.body.empty?
+          response.body = JSON.parse(response.body)
+        end
+        response
+      end
+
+    end
+  end
+end

data/lib/fog/linode/bin.rb

@@ -0,0 +1,30 @@
+module Linode
+  class << self
+    if Fog.credentials[:linode_api_key]
+
+      def initialized?
+        true
+      end
+
+      def [](service)
+        @@connections ||= Hash.new do |hash, key|
+          credentials = Fog.credentials.reject do |k,v|
+            ![:linode_api_key].include?(k)
+          end
+          hash[key] = case key
+          when :linode
+            Fog::Linode.new(credentials)
+          end
+        end
+        @@connections[service]
+      end
+
+    else
+
+      def initialized?
+        false
+      end
+
+    end
+  end
+end

data/lib/fog/linode/requests/avail_datacenters.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Linode
+    class Real
+
+      # Get available data centers
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def avail_datacenters
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :query    => { :api_action => 'avail.datacenters' }
+        )
+      end
+
+    end
+
+    class Mock
+
+      def avail_datacenters
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/linode/requests/avail_distributions.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Linode
+    class Real
+
+      # Get available distributions
+      #
+      # ==== Parameters
+      # * options<~Hash>:
+      #   * distributionId<~Integer>: id to limit results to
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def avail_distributions(options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :query    => { :api_action => 'avail.distributions' }.merge!(options)
+        )
+      end
+
+    end
+
+    class Mock
+
+      def avail_distributions(distribution_id)
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/linode/requests/avail_kernels.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Linode
+    class Real
+
+      # Get available kernels
+      #
+      # ==== Parameters
+      # * options<~Hash>:
+      #   * kernelId<~Integer>: id to limit results to
+      #   * isXen<~Integer>: if 1 limits results to only zen
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def avail_kernels(options={})
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :query    => { :api_action => 'avail.kernels' }.merge!(options)
+        )
+      end
+
+    end
+
+    class Mock
+
+      def avail_kernels(distribution_id)
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/linode/requests/avail_linodeplans.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Linode
+    class Real
+
+      # Get available plans
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Array>:
+      # TODO: docs
+      def avail_linodeplans
+        request(
+          :expects  => 200,
+          :method   => 'GET',
+          :query    => { :api_action => 'avail.linodeplans' }
+        )
+      end
+
+    end
+
+    class Mock
+
+      def avail_linodeplans
+        Fog::Mock.not_implemented
+      end
+
+    end
+  end
+end

data/lib/fog/vcloud.rb

@@ -44,7 +44,7 @@ module Fog
       extend Fog::Vcloud::Generators
 
       attr_accessor :login_uri
-      attr_reader :supported_versions, :versions_uri
+      attr_reader :versions_uri
 
       def initialize(options = {})
         @connections = {}
@@ -53,7 +53,6 @@ module Fog
         @version = options[:version]
         @username = options[:username]
         @password = options[:password]
-        @login_uri = get_login_uri
         @persistent = options[:persistent]
       end
 
@@ -98,6 +97,9 @@ module Fog
         end
       end
 
+      def supported_versions
+        @supported_versions ||= get_versions(@versions_uri).body[:VersionInfo]
+      end
 
       private
 
@@ -118,31 +120,31 @@ module Fog
       end
 
       def supported_version_numbers
-        case @supported_versions
+        case supported_versions
         when Array
-          @supported_versions.map { |version| version[:Version] }
+          supported_versions.map { |version| version[:Version] }
         when Hash
-          @supported_versions[:Version]
+          [ supported_versions[:Version] ]
         end
       end
 
       def get_login_uri
         check_versions
-        URI.parse case @supported_versions
+        URI.parse case supported_versions
         when Array
-          @supported_versions.detect {|version| version[:Version] == @version }[:LoginUrl]
+          supported_versions.detect {|version| version[:Version] == @version }[:LoginUrl]
         when Hash
-          @supported_versions[:LoginUrl]
+          supported_versions[:LoginUrl]
         end
       end
 
-      # Load up @all_versions and @supported_versions from the provided :versions_uri
+      # Load up @all_versions and supported_versions from the provided :versions_uri
       # If there are no supported versions raise an error
       # And choose a default version is none is specified
       def check_versions
-        @supported_versions = get_versions(@versions_uri).body[:VersionInfo]
+        supported_versions = get_versions(@versions_uri).body[:VersionInfo]
 
-        if @supported_versions.empty?
+        if supported_versions.empty?
           raise UnsupportedVersion.new("No supported versions found @ #{@version_uri}")
         end
 
@@ -164,6 +166,7 @@ module Fog
       # login handles the auth, but we just need the Set-Cookie
       # header from that call.
       def do_login
+        @login_uri ||= get_login_uri
         @login_results = login
         @cookie = @login_results.headers['Set-Cookie']
       end
@@ -346,7 +349,6 @@ module Fog
 
       def initialize(credentials = {})
         @versions_uri = URI.parse('https://vcloud.fakey.com/api/versions')
-        @login_uri = get_login_uri
       end
 
       def mock_it(status, mock_data, mock_headers = {})

data/lib/fog/vcloud/extension.rb

@@ -12,9 +12,9 @@ module Fog
           end
           module #{other}::Mock
           end
-          module #{other}::Versions
-            SUPPORTED = @versions
-          end
+            def self.supported_versions
+              @versions
+            end
           def self.extended(klass)
             unless @required
               models.each do |model|

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

@@ -63,7 +63,7 @@ module Fog
         request :power_reset
         request :power_shutdown
 
-        versions "v0.8b-ext2.3"
+        versions "v0.8b-ext2.3", "0.8b-ext2.3"
 
         module Mock
           def self.base_url
@@ -189,19 +189,20 @@ module Fog
           end
         end
 
+        module Real
+          private
 
-        private
-
-        # 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_ids & Versions::SUPPORTED).length > 0
-            raise UnsupportedVersion.new("\nService @ #{@versions_uri} supports: #{supported_version_ids.join(', ')}\n" +
-                                         "Fog::Vcloud::Terremark::Ecloud supports: #{Versions::SUPPORTED.join(', ')}")
-          end
-          unless supported_version_ids.include?(@version)
-            @version = (supported_version_ids & Versions::SUPPORTED).sort.first
+          # 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
+            end
           end
         end
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 12
+  version: 0.2.12
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -05:00
+date: 2010-07-09 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -325,6 +325,12 @@ files:
 - lib/fog/deprecation.rb
 - lib/fog/errors.rb
 - lib/fog/hmac.rb
+- lib/fog/linode.rb
+- lib/fog/linode/bin.rb
+- lib/fog/linode/requests/avail_datacenters.rb
+- lib/fog/linode/requests/avail_distributions.rb
+- lib/fog/linode/requests/avail_kernels.rb
+- lib/fog/linode/requests/avail_linodeplans.rb
 - lib/fog/local.rb
 - lib/fog/local/bin.rb
 - lib/fog/local/models/directories.rb