fog 0.1.8 → 0.1.9

data/lib/fog/bluebox.rb

@@ -1,47 +1,29 @@
 module Fog
   module Bluebox
+    extend Fog::Service
 
-    class Error < Fog::Errors::Error; end
-    class NotFound < Fog::Errors::NotFound; end
+    requires :bluebox_api_key, :bluebox_customer_id
 
-    def self.new(options={})
+    model_path 'fog/bluebox/models'
+    model 'flavor'
+    model 'flavors'
+    model 'images'
+    model 'server'
+    model 'servers'
 
-      unless @required
-        require 'fog/bluebox/models/flavor'
-        require 'fog/bluebox/models/flavors'
-        require 'fog/bluebox/models/images'
-        require 'fog/bluebox/models/server'
-        require 'fog/bluebox/models/servers'
-        require 'fog/bluebox/requests/create_block'
-        require 'fog/bluebox/requests/destroy_block'
-        require 'fog/bluebox/requests/get_block'
-        require 'fog/bluebox/requests/get_blocks'
-        require 'fog/bluebox/requests/get_product'
-        require 'fog/bluebox/requests/get_products'
-        require 'fog/bluebox/requests/get_template'
-        require 'fog/bluebox/requests/get_templates'
-        require 'fog/bluebox/requests/reboot_block'
-        @required = true
-      end
-
-      unless options[:bluebox_api_key]
-        raise ArgumentError.new('bluebox_api_key is required to access Blue Box')
-      end
-      unless options[:bluebox_customer_id]
-        raise ArgumentError.new('bluebox_customer_id is required to access Blue Box')
-      end
-      if Fog.mocking?
-        Fog::Bluebox::Mock.new(options)
-      else
-        Fog::Bluebox::Real.new(options)
-      end
-    end
-
-    def self.reset_data(keys=Mock.data.keys)
-      Mock.reset_data(keys)
-    end
+    request_path 'fog/bluebox/requests'
+    request 'create_block'
+    request 'destroy_block'
+    request 'get_block'
+    request 'get_blocks'
+    request 'get_product'
+    request 'get_products'
+    request 'get_template'
+    request 'get_templates'
+    request 'reboot_block'
 
     class Mock
+      include Collections
 
       def self.data
         @data ||= Hash.new do |hash, key|
@@ -63,6 +45,7 @@ module Fog
     end
 
     class Real
+      include Collections
 
       def initialize(options={})
         @bluebox_api_key      = options[:bluebox_api_key]
@@ -82,11 +65,11 @@ module Fog
         begin
           response = @connection.request(params.merge!({:host => @host}))
         rescue Excon::Errors::Error => error
-          case error
+          raise case error
           when Excon::Errors::NotFound
-            raise Fog::Bluebox::NotFound
+            Fog::Bluebox::NotFound.slurp(error)
           else
-            raise error
+            error
           end
         end
         unless response.body.empty?

data/lib/fog/bluebox/models/flavors.rb

@@ -4,13 +4,7 @@ require 'fog/bluebox/models/flavor'
 module Fog
   module Bluebox
 
-    class Mock
-      def flavors
-        Fog::Bluebox::Flavors.new(:connection => self)
-      end
-    end
-
-    class Real
+    module Collections
       def flavors
         Fog::Bluebox::Flavors.new(:connection => self)
       end

data/lib/fog/bluebox/models/images.rb

@@ -4,15 +4,7 @@ require 'fog/bluebox/models/image'
 module Fog
   module Bluebox
 
-    class Mock
-      def images(attributes = {})
-        Fog::Bluebox::Images.new({
-          :connection => self
-        }.merge!(attributes))
-      end
-    end
-
-    class Real
+    module Collections
       def images(attributes = {})
         Fog::Bluebox::Images.new({
           :connection => self

data/lib/fog/bluebox/models/servers.rb

@@ -4,13 +4,7 @@ require 'fog/bluebox/models/server'
 module Fog
   module Bluebox
 
-    class Mock
-      def servers
-        Fog::Bluebox::Servers.new(:connection => self)
-      end
-    end
-
-    class Real
+    module Collections
       def servers
         Fog::Bluebox::Servers.new(:connection => self)
       end

data/lib/fog/credentials.rb

@@ -34,6 +34,8 @@ module Fog
   :bluebox_api_key:       INTENTIONALLY_LEFT_BLANK
   :bluebox_customer_id:   INTENTIONALLY_LEFT_BLANK
   :local_root:            INTENTIONALLY_LEFT_BLANK
+  :public_key_path:       INTENTIONALLY_LEFT_BLANK
+  :private_key_path:      INTENTIONALLY_LEFT_BLANK
   :rackspace_api_key:     INTENTIONALLY_LEFT_BLANK
   :rackspace_username:    INTENTIONALLY_LEFT_BLANK
   :slicehost_password:    INTENTIONALLY_LEFT_BLANK

data/lib/fog/errors.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Errors
+
+    class Error < StandardError
+      attr_accessor :verbose
+
+      def self.slurp(error, message = nil)
+        new_error = new(message)
+        new_error.set_backtrace(error.backtrace)
+        new_error.verbose = error.message
+        new_error
+      end
+    end
+
+    class MockNotImplemented < Fog::Errors::Error; end
+
+    class NotFound < Fog::Errors::Error; end
+
+  end
+end

data/lib/fog/hmac.rb

@@ -0,0 +1,48 @@
+module Fog
+  class HMAC
+
+    def initialize(type, key)
+      @key = key
+      case type
+      when 'sha1'
+        setup_sha1
+      when 'sha256'
+        setup_sha256
+      end
+    end
+
+    def sign(data)
+      @signer.call(data)
+    end
+
+    private
+
+    def setup_sha1
+      @digest = OpenSSL::Digest::Digest.new('sha1')
+      @signer = lambda do |data|
+        OpenSSL::HMAC.digest(@digest, @key, data)
+      end
+    end
+
+    def setup_sha256
+      begin
+        @digest = OpenSSL::Digest::Digest.new('sha256')
+        @signer = lambda do |data|
+          OpenSSL::HMAC.digest(@digest, @key, data)
+        end
+      rescue RuntimeError => error
+        unless error.message == 'Unsupported digest algorithm (sha256).'
+          raise error
+        else
+          require 'hmac-sha2'
+          @hmac = ::HMAC::SHA256.new(@key)
+          @signer = lambda do |data|
+            @hmac.update(data)
+            @hmac.digest
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/fog/local.rb

@@ -1,31 +1,17 @@
 module Fog
   module Local
+    extend Fog::Service
 
-    def self.new(options={})
+    requires :local_root
 
-      unless @required
-        require 'fog/local/models/directories'
-        require 'fog/local/models/directory'
-        require 'fog/local/models/file'
-        require 'fog/local/models/files'
-        @required = true
-      end
-
-      unless options[:local_root]
-        raise ArgumentError.new('local_root is required to access local')
-      end
-      if Fog.mocking?
-        Fog::Local::Mock.new(options)
-      else
-        Fog::Local::Real.new(options)
-      end
-    end
-
-    def self.reset_data(keys=Mock.data.keys)
-      Mock.reset_data(keys)
-    end
+    model_path 'fog/local/models'
+    model 'directories'
+    model 'directory'
+    model 'file'
+    model 'files'
 
     class Mock
+      include Collections
 
       def self.data
         @data ||= Hash.new do |hash, key|
@@ -54,6 +40,7 @@ module Fog
     end
 
     class Real
+      include Collections
 
       def initialize(options={})
         @local_root = ::File.expand_path(options[:local_root])

data/lib/fog/local/models/directories.rb

@@ -4,13 +4,7 @@ require 'fog/local/models/directory'
 module Fog
   module Local
 
-    class Real
-      def directories
-        Fog::Local::Directories.new(:connection => self)
-      end
-    end
-
-    class Mock
+    module Collections
       def directories
         Fog::Local::Directories.new(:connection => self)
       end

data/lib/fog/rackspace.rb

@@ -5,13 +5,9 @@ module Fog
   module Rackspace
 
     def self.authenticate(options)
-      unless @rackspace_api_key = options[:rackspace_api_key]
-        raise ArgumentError.new('rackspace_api_key is required to access rackspace')
-      end
-      unless @rackspace_username = options[:rackspace_username]
-        raise ArgumentError.new('rackspace_username is required to access rackspace')
-      end
       connection = Fog::Connection.new("https://auth.api.rackspacecloud.com")
+      @rackspace_api_key  = options[:rackspace_api_key]
+      @rackspace_username = options[:rackspace_username]
       response = connection.request({
         :expects  => 204,
         :headers  => {

data/lib/fog/rackspace/files.rb

@@ -1,60 +1,56 @@
 module Fog
   module Rackspace
     module Files
-
-      def self.new(options={})
-
-        unless @required
-          require 'fog/rackspace/models/files/directory'
-          require 'fog/rackspace/models/files/directories'
-          require 'fog/rackspace/models/files/file'
-          require 'fog/rackspace/models/files/files'
-          require 'fog/rackspace/requests/files/delete_container'
-          require 'fog/rackspace/requests/files/delete_object'
-          require 'fog/rackspace/requests/files/get_container'
-          require 'fog/rackspace/requests/files/get_containers'
-          require 'fog/rackspace/requests/files/get_object'
-          require 'fog/rackspace/requests/files/head_container'
-          require 'fog/rackspace/requests/files/head_containers'
-          require 'fog/rackspace/requests/files/head_object'
-          require 'fog/rackspace/requests/files/put_container'
-          require 'fog/rackspace/requests/files/put_object'
-          @required = true
-        end
-
-        if Fog.mocking?
-          Fog::Rackspace::Files::Mock.new(options)
-        else
-          Fog::Rackspace::Files::Real.new(options)
-        end
-      end
-
-      def self.parse_data(data)
-        metadata = {
-          :body => nil,
-          :headers => {}
-        }
-
-        if data.is_a?(String)
-          metadata[:body] = data
-          metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
-        else
-          filename = ::File.basename(data.path)
-          unless (mime_types = MIME::Types.of(filename)).empty?
-            metadata[:headers]['Content-Type'] = mime_types.first.content_type
+      extend Fog::Service
+
+      requires :rackspace_api_key, :rackspace_username
+
+      model_path 'fog/rackspace/models/files'
+      model 'directory'
+      model 'directories'
+      model 'file'
+      model 'files'
+
+      request_path 'fog/rackspace/requests/files'
+      request 'delete_container'
+      request 'delete_object'
+      request 'get_container'
+      request 'get_containers'
+      request 'get_object'
+      request 'head_container'
+      request 'head_containers'
+      request 'head_object'
+      request 'put_container'
+      request 'put_object'
+
+      module Utils
+
+        def parse_data(data)
+          metadata = {
+            :body => nil,
+            :headers => {}
+          }
+
+          if data.is_a?(String)
+            metadata[:body] = data
+            metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
+          else
+            filename = ::File.basename(data.path)
+            unless (mime_types = MIME::Types.of(filename)).empty?
+              metadata[:headers]['Content-Type'] = mime_types.first.content_type
+            end
+            metadata[:body] = data.read
+            metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
           end
-          metadata[:body] = data.read
-          metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
+          # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
+          metadata
         end
-        # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
-        metadata
-      end
 
-      def self.reset_data(keys=Mock.data.keys)
-        Mock.reset_data(keys)
       end
 
       class Mock
+        include Collections
+        include Utils
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -76,6 +72,8 @@ module Fog
       end
 
       class Real
+        include Collections
+        include Utils
 
         def initialize(options={})
           credentials = Fog::Rackspace.authenticate(options)

data/lib/fog/rackspace/models/files/directories.rb

@@ -5,13 +5,7 @@ module Fog
   module Rackspace
     module Files
 
-      class Real
-        def directories
-          Fog::Rackspace::Files::Directories.new(:connection => self)
-        end
-      end
-
-      class Mock
+      module Collections
         def directories
           Fog::Rackspace::Files::Directories.new(:connection => self)
         end

data/lib/fog/rackspace/models/servers/flavors.rb

@@ -5,13 +5,7 @@ module Fog
   module Rackspace
     module Servers
 
-      class Real
-        def flavors
-          Fog::Rackspace::Servers::Flavors.new(:connection => self)
-        end
-      end
-
-      class Mock
+      module Collections
         def flavors
           Fog::Rackspace::Servers::Flavors.new(:connection => self)
         end

data/lib/fog/rackspace/models/servers/images.rb

@@ -5,15 +5,7 @@ module Fog
   module Rackspace
     module Servers
 
-      class Real
-        def images(attributes = {})
-          Fog::Rackspace::Servers::Images.new({
-            :connection => self
-          }.merge!(attributes))
-        end
-      end
-
-      class Mock
+      module Collections
         def images(attributes = {})
           Fog::Rackspace::Servers::Images.new({
             :connection => self