fog 0.4.0 → 0.4.1

data/lib/fog/providers/terremark_ecloud.rb

@@ -0,0 +1,17 @@
+require 'nokogiri'
+
+require File.join(File.dirname(__FILE__), '..', 'core')
+require 'fog/core/parser'
+
+module Fog
+  module TerremarkEcloud
+
+    extend Fog::Provider
+
+    service(:compute, 'compute/terremark_ecloud')
+
+    class Mock
+
+    end
+  end
+end

data/lib/fog/{zerigo.rb → providers/zerigo.rb}

@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-require File.join(File.dirname(__FILE__), 'core')
+require 'fog/core'
 require 'fog/core/parser'
 
 module Fog
@@ -8,8 +8,7 @@ module Fog
 
     extend Fog::Provider
 
-    service_path 'fog/zerigo'
-    service :dns
+    service(:dns, 'dns/zerigo')
 
   end
 end

data/lib/fog/{core/storage.rb → storage.rb}

@@ -3,18 +3,18 @@ module Fog
 
     def self.new(attributes)
       attributes = attributes.dup # prevent delete from having side effects
-      case provider = attributes.delete(:provider)
+      case provider = attributes[:provider] # attributes.delete(:provider)
       when 'AWS'
-        require 'fog/aws'
+        require 'fog/storage/aws'
         Fog::AWS::Storage.new(attributes)
       when 'Google'
-        require 'fog/google'
+        require 'fog/storage/google'
         Fog::Google::Storage.new(attributes)
       when 'Local'
-        require 'fog/local'
+        require 'fog/storage/local'
         Fog::Local::Storage.new(attributes)
       when 'Rackspace'
-        require 'fog/rackspace'
+        require 'fog/storage/rackspace'
         Fog::Rackspace::Storage.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized storage provider")
@@ -22,4 +22,4 @@ module Fog
     end
 
   end
-end
+end

data/lib/fog/{aws/storage.rb → storage/aws.rb}

@@ -1,17 +1,34 @@
+module Fog
+  module AWS
+    class S3
+
+      def self.new(attributes = {})
+        location = caller.first
+        warning = "[yellow][WARN] Fog::AWS::S3#new is deprecated, use Fog::AWS::Storage#new instead[/]"
+        warning << " [light_black](" << location << ")[/] "
+        Formatador.display_line(warning)
+        Fog::AWS::Storage.new(attributes)
+      end
+
+    end
+  end
+end
+
 module Fog
   module AWS
     class Storage < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
+      recognizes :provider # remove post deprecation
       
-      model_path 'fog/aws/models/storage'
+      model_path 'fog/storage/models/aws'
       collection  :directories
       model       :directory
       collection  :files
       model       :file
 
-      request_path 'fog/aws/requests/storage'
+      request_path 'fog/storage/requests/aws'
       request :abort_multipart_upload
       request :complete_multipart_upload
       request :copy_object
@@ -154,6 +171,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::AWS::Storage.new is deprecated, use Fog::Storage.new(:provider => 'AWS') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require 'mime/types'
           @aws_access_key_id = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
@@ -202,6 +226,12 @@ module Fog
         # ==== Returns
         # * S3 object with connection to aws.
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::AWS::Storage.new is deprecated, use Fog::Storage.new(:provider => 'AWS') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
           require 'mime/types'
           @aws_access_key_id = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]

data/lib/fog/{google/storage.rb → storage/google.rb}

@@ -4,14 +4,15 @@ module Fog
 
       requires :google_storage_access_key_id, :google_storage_secret_access_key
       recognizes :host, :port, :scheme, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/google/models/storage'
+      model_path 'fog/storage/models/google'
       collection  :directories
       model       :directory
       collection  :files
       model       :file
 
-      request_path 'fog/google/requests/storage'
+      request_path 'fog/storage/requests/google'
       request :copy_object
       request :delete_bucket
       request :delete_object
@@ -127,6 +128,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Google::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Google') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
           @data = self.class.data[@google_storage_access_key_id]
@@ -161,6 +169,13 @@ module Fog
         # ==== Returns
         # * Storage object with connection to google.
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Google::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Google') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
           @google_storage_secret_access_key = options[:google_storage_secret_access_key]

data/lib/fog/{local/storage.rb → storage/local.rb}

@@ -3,8 +3,9 @@ module Fog
     class Storage < Fog::Service
 
       requires :local_root
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/local/models/storage'
+      model_path 'fog/storage/models/local'
       collection  :directories
       model       :directory
       model       :file
@@ -25,6 +26,15 @@ module Fog
         end
 
         def initialize(options={})
+          Fog::Mock.not_implemented
+
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Local::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Local') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @local_root = ::File.expand_path(options[:local_root])
           @data       = self.class.data[@local_root]
         end
@@ -41,6 +51,13 @@ module Fog
       class Real
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Local::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Local') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @local_root = ::File.expand_path(options[:local_root])
         end
 

data/lib/fog/{aws/models/storage → storage/models/aws}/directories.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/storage/directory'
+require 'fog/storage/models/aws/directory'
 
 module Fog
   module AWS

data/lib/fog/{aws/models/storage → storage/models/aws}/directory.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/aws/models/storage/files'
+require 'fog/storage/models/aws/files'
 
 module Fog
   module AWS

data/lib/fog/{aws/models/storage → storage/models/aws}/files.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/storage/file'
+require 'fog/storage/models/aws/file'
 
 module Fog
   module AWS

data/lib/fog/{google/models/storage → storage/models/google}/directories.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/google/models/storage/directory'
+require 'fog/storage/models/google/directory'
 
 module Fog
   module Google

data/lib/fog/{google/models/storage → storage/models/google}/directory.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/google/models/storage/files'
+require 'fog/storage/models/google/files'
 
 module Fog
   module Google

data/lib/fog/{google/models/storage → storage/models/google}/files.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/google/models/storage/file'
+require 'fog/storage/models/google/file'
 
 module Fog
   module Google

data/lib/fog/{local/models/storage → storage/models/local}/directories.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/local/models/storage/directory'
+require 'fog/storage/models/local/directory'
 
 module Fog
   module Local

data/lib/fog/{local/models/storage → storage/models/local}/directory.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/local/models/storage/files'
+require 'fog/storage/models/local/files'
 
 module Fog
   module Local

data/lib/fog/{local/models/storage → storage/models/local}/files.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/local/models/storage/file'
+require 'fog/storage/models/local/file'
 
 module Fog
   module Local

data/lib/fog/{rackspace/models/storage → storage/models/rackspace}/directories.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/rackspace/models/storage/directory'
+require 'fog/storage/models/rackspace/directory'
 
 module Fog
   module Rackspace

data/lib/fog/{rackspace/models/storage → storage/models/rackspace}/directory.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/rackspace/models/storage/files'
+require 'fog/storage/models/rackspace/files'
 
 module Fog
   module Rackspace

data/lib/fog/{rackspace/models/storage → storage/models/rackspace}/files.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/rackspace/models/storage/file'
+require 'fog/storage/models/rackspace/file'
 
 module Fog
   module Rackspace

data/lib/fog/{rackspace/storage.rb → storage/rackspace.rb}

@@ -1,17 +1,34 @@
+module Fog
+  module Rackspace
+    class Files
+
+      def self.new(attributes = {})
+        location = caller.first
+        warning = "[yellow][WARN] Fog::Rackspace::Files#new is deprecated, use Fog::Rackspace::Storage#new instead[/]"
+        warning << " [light_black](" << location << ")[/] "
+        Formatador.display_line(warning)
+        Fog::Rackspace::Storage.new(attributes)
+      end
+
+    end
+  end
+end
+
 module Fog
   module Rackspace
     class Storage < Fog::Service
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/rackspace/models/storage'
+      model_path 'fog/storage/models/rackspace'
       model       :directory
       collection  :directories
       model       :file
       collection  :files
 
-      request_path 'fog/rackspace/requests/storage'
+      request_path 'fog/storage/requests/rackspace'
       request :delete_container
       request :delete_object
       request :get_container
@@ -26,8 +43,9 @@ module Fog
       module Utils
 
         def cdn
-          @cdn ||= Fog::Rackspace::CDN.new(
-            :rackspace_api_key => @rackspace_api_key,
+          @cdn ||= Fog::CDN.new(
+            :provider           => 'Rackspace',
+            :rackspace_api_key  => @rackspace_api_key,
             :rackspace_username => @rackspace_username
           )
         end
@@ -71,6 +89,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Rackspace::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Rackspace') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require 'mime/types'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
@@ -83,6 +108,13 @@ module Fog
         include Utils
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Rackspace::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Rackspace') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require 'mime/types'
           require 'json'
           @rackspace_api_key = options[:rackspace_api_key]

data/lib/fog/{aws/requests/storage → storage/requests/aws}/complete_multipart_upload.rb

@@ -3,7 +3,7 @@ module Fog
     class Storage
       class Real
 
-        require 'fog/aws/parsers/storage/complete_multipart_upload'
+        require 'fog/storage/parsers/aws/complete_multipart_upload'
 
         # Complete a multipart upload
         #