fog 0.4.0 → 0.4.1

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fog (0.4.0)
+    fog (0.4.1)
       builder
-      excon (>= 0.3.7)
+      excon (>= 0.4.0)
       formatador (>= 0.0.16)
       json
       mime-types
@@ -15,7 +15,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    excon (0.3.7)
+    excon (0.4.0)
     formatador (0.0.16)
     gestalt (0.0.11)
       formatador (>= 0.0.12)
@@ -35,7 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   builder
-  excon (>= 0.3.7)
+  excon (>= 0.4.0)
   fog!
   formatador (>= 0.0.16)
   json

data/README.rdoc

@@ -106,8 +106,8 @@ geemus says: "That should give you everything you need to get started, but let m
 == Providers
 
 You should try out the (varying) support fog has for:
-* {AWS}[http://aws.amazon.com] [{Compute}[http://aws.amazon.com/ec2], {ELB}[http://aws.amazon.com/elasticloadbalancing], {Storage}[http://aws.amazon.com/s3], {SimpleDB}[http://aws.amazon.com/simpledb]]
-* <b><em>{Blue Box Group}[http://www.blueboxgrp.com]</em></b> [{Compute}[http://www.blueboxgrp.com/blocks]]
+* {AWS}[http://aws.amazon.com] [{Compute}[http://aws.amazon.com/ec2], {DNS}[http://aws.amazon.com/route53], {ELB}[http://aws.amazon.com/elasticloadbalancing], {Storage}[http://aws.amazon.com/s3], {SimpleDB}[http://aws.amazon.com/simpledb]]
+* <b><em>{Blue Box Group}[http://www.bluebox.net]</em></b> [{Compute}[http://www.bluebox.net/blocks]]
 * <b><em>{Brightbox}[http://www.brightbox.co.uk]</em></b> [{Compute}[http://beta.brightbox.com/]]
 * {Google}[http://www.google.com] [{Storage}[http://code.google.com/apis/storage]]
 * {Linode}[http://www.linode.com] [{DNS}[http://www.linode.com]]

data/bin/fog

@@ -8,7 +8,7 @@ unless Fog.credentials
   exit
 end
 
-require 'fog/core/bin'
+require 'fog/bin'
 
 providers = Fog.providers.map{|provider| provider.to_s}
 providers = if providers.length > 1

data/fog.gemspec

@@ -7,14 +7,14 @@ 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.4.0'
-  s.date              = '2011-01-05'
+  s.version           = '0.4.1'
+  s.date              = '2011-01-21'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
   s.summary     = "brings clouds to you"
-  s.description = "The Ruby cloud computing library."
+  s.description = "The Ruby cloud services library."
 
   ## List the primary authors. If there are a bunch of authors, it's probably
   ## better to set the email to an email list or something. If you don't have
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '>=0.3.7')
+  s.add_dependency('excon', '>=0.4.0')
   s.add_dependency('formatador', '>=0.0.16')
   s.add_dependency('json')
   s.add_dependency('mime-types')

data/lib/fog.rb

@@ -3,22 +3,17 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 
 end
 
-require 'fog/aws'
-require 'fog/bluebox'
-require 'fog/brightbox'
-require 'fog/go_grid'
-require 'fog/google'
-require 'fog/linode'
-require 'fog/local'
-require 'fog/new_servers'
-require 'fog/rackspace'
-require 'fog/slicehost'
+# FIXME: these should go away (force usage of Fog::[Compute, CDN, DNS, Storage]  etc)
+require 'fog/providers'
 require 'fog/terremark'
 require 'fog/vcloud'
-require 'fog/zerigo'
 
+require 'fog/compute'
+require 'fog/cdn'
+require 'fog/dns'
+require 'fog/storage'

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

@@ -16,6 +16,7 @@ module Fog
         ::Rackspace,
         ::Slicehost,
         ::Terremark,
+        ::TerremarkEcloud,
         ::Zerigo
       ].select {|provider| provider.available?}
     end
@@ -72,16 +73,17 @@ module Fog
 
 end
 
-require 'fog/aws/bin'
-require 'fog/bluebox/bin'
-require 'fog/brightbox/bin'
-require 'fog/go_grid/bin'
-require 'fog/google/bin'
-require 'fog/linode/bin'
-require 'fog/local/bin'
-require 'fog/new_servers/bin'
-require 'fog/rackspace/bin'
-require 'fog/slicehost/bin'
-require 'fog/terremark/bin'
-require 'fog/vcloud/bin'
-require 'fog/zerigo/bin'
+require 'fog/bin/aws'
+require 'fog/bin/bluebox'
+require 'fog/bin/brightbox'
+require 'fog/bin/go_grid'
+require 'fog/bin/google'
+require 'fog/bin/linode'
+require 'fog/bin/local'
+require 'fog/bin/new_servers'
+require 'fog/bin/rackspace'
+require 'fog/bin/slicehost'
+require 'fog/bin/terremark'
+require 'fog/bin/terremark_ecloud'
+require 'fog/bin/vcloud'
+require 'fog/bin/zerigo'

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

@@ -27,24 +27,37 @@ class AWS < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        klazz = class_for(key)
-        hash[key] = case key 
+        hash[key] = case key
+        when :cdn
+          Fog::CDN.new(:provider => 'AWS')
+        when :compute
+          Fog::Compute.new(:provider => 'AWS')
+        when :dns
+          Fog::DNS.new(:provider => 'AWS')
         when :ec2
           location = caller.first
           warning = "[yellow][WARN] AWS[:ec2] is deprecated, use AWS[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          klazz.new
+          Fog::Compute.new(:provider => 'AWS')
+        when :elb
+          Fog::AWS::ELB.new
+        when :iam
+          Fog::AWS::IAM.new
         when :eu_storage
-          klazz.new(:region => 'eu-west-1')
+          Fog::Storage.new(:provider => 'AWS', :region => 'eu-west-1')
+        when :sdb
+          Fog::AWS::SimpleDB.new
         when :s3
           location = caller.first
           warning = "[yellow][WARN] AWS[:s3] is deprecated, use AWS[:storage] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          klazz.new
+          Fog::Storage.new(:provider => 'AWS')
+        when :storage
+          Fog::Storage.new(:provider => 'AWS')
         else
-          klazz.new
+          raise ArgumentError, "Unrecognized service: #{service}"
         end
       end
       @@connections[service]

data/lib/fog/{bluebox/bin.rb → bin/bluebox.rb}

@@ -12,13 +12,18 @@ class Bluebox < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        if key == :blocks
+        hash[key] = case key
+        when :blocks
           location = caller.first
           warning = "[yellow][WARN] Bluebox[:blocks] is deprecated, use Bluebox[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
+          Fog::Compute.new(:provider => 'Bluebox')
+        when :compute
+          Fog::Compute.new(:provider => 'Bluebox')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
         end
-        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

data/lib/fog/{brightbox/bin.rb → bin/brightbox.rb}

@@ -12,7 +12,12 @@ class Brightbox < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = class_for(key).new
+        hash[key] = case key
+        when :compute
+          Fog::Compute.new(:provider => 'Brightbox')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
+        end
       end
       @@connections[service]
     end

data/lib/fog/{go_grid/bin.rb → bin/go_grid.rb}

@@ -12,13 +12,18 @@ class GoGrid < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        if key == :servers
+        hash[key] = case key
+        when :compute
+          Fog::Compute.new(:provider => 'GoGrid')
+        when :servers
           location = caller.first
           warning = "[yellow][WARN] GoGrid[:servers] is deprecated, use GoGrid[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
+          Fog::Compute.new(:provider => 'GoGrid')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
         end
-        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

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

@@ -12,7 +12,12 @@ class Google < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = class_for(key).new
+        hash[key] = case key
+        when :storage
+          Fog::Storage.new(:provider => 'Google')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
+        end
       end
       @@connections[service]
     end

data/lib/fog/{linode/bin.rb → bin/linode.rb}

@@ -14,13 +14,20 @@ class Linode < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        if key == :linode
+        hash[key] = case key
+        when :compute
+          Fog::Compute.new(:provider => 'Linode')
+        when :dns
+          Fog::DNS.new(:provider => 'Linode')
+        when :linode
           location = caller.first
           warning = "[yellow][WARN] Linode[:linode] is deprecated, use Linode[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
+          Fog::Compute.new(:provider => 'Linode')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
         end
-        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

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

@@ -12,13 +12,18 @@ class Local < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        if key == :files
+        hash[key] = case key
+        when :files
           location = caller.first
           warning = "[yellow][WARN] Local[:files] is deprecated, use Local[:storage] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
+          Fog::Storage.new(:provider => 'Local')
+        when :storage
+          Fog::Storage.new(:provider => 'Local')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
         end
-        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

data/lib/fog/{new_servers/bin.rb → bin/new_servers.rb}

@@ -12,13 +12,18 @@ class NewServers < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        if key == :new_servers
+        hash[key] = case key
+        when :compute
+          Fog::Compute.new(:provider => 'NewServers')
+        when :new_servers
           location = caller.first
-          warning = "[yellow][WARN] NewServers[:servers] is deprecated, use NewServers[:compute] instead[/]"
+          warning = "[yellow][WARN] NewServers[:new_servers] is deprecated, use NewServers[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
+          Fog::Compute.new(:provider => 'NewServers')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
         end
-        hash[key] = class_for(key).new
       end
       @@connections[service]
     end

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

@@ -16,22 +16,29 @@ class Rackspace < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        klazz = class_for(key)
         hash[key] = case key
+        when :cdn
+          Fog::CDN.new(:provider => 'Rackspace')
+        when :compute
+          Fog::Compute.new(:provider => 'Rackspace')
+        when :dns
+          Fog::DNS.new(:provider => 'Rackspace')
         when :files
           location = caller.first
           warning = "[yellow][WARN] Rackspace[:files] is deprecated, use Rackspace[:storage] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          klazz.new
+          Fog::Storage.new(:provider => 'Rackspace')
         when :servers
           location = caller.first
           warning = "[yellow][WARN] Rackspace[:servers] is deprecated, use Rackspace[:compute] instead[/]"
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
-          klazz.new
+          Fog::Compute.new(:provider => Rackspace)
+        when :storage
+          Fog::Storage.new(:provider => 'Rackspace')
         else
-          klazz.new
+          raise ArgumentError, "Unrecognized service: #{service}"
         end
       end
       @@connections[service]

data/lib/fog/{slicehost/bin.rb → bin/slicehost.rb}

@@ -20,7 +20,14 @@ class Slicehost < Fog::Bin
           warning << " [light_black](" << location << ")[/] "
           Formatador.display_line(warning)
         end
-        hash[key] = class_for(key).new
+        hash[key] = case key
+        when :compute, :slices
+          Fog::Compute.new(:provider => 'Slicehost')
+        when :dns
+          Fog::DNS.new(:provider => 'Slicehost')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
+        end
       end
       @@connections[service]
     end

data/lib/fog/bin/terremark_ecloud.rb

@@ -0,0 +1,28 @@
+class TerremarkEcloud < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::TerremarkEcloud::Compute
+      else
+        # @todo Replace most instances of ArgumentError with NotImplementedError
+        # @todo For a list of widely supported Exceptions, see:
+        # => http://www.zenspider.com/Languages/Ruby/QuickRef.html#35
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = class_for(key).new
+      end
+      @@connections[service]
+    end
+
+    def services
+      [:compute]
+    end
+
+  end
+end

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

@@ -12,7 +12,12 @@ class Zerigo < Fog::Bin
 
     def [](service)
       @@connections ||= Hash.new do |hash, key|
-        hash[key] = class_for(key).new
+        hash[key] = case key
+        when :dns
+          Fog::DNS.new(:provider => 'Zerigo')
+        else
+          raise ArgumentError, "Unrecognized service: #{service}"
+        end
       end
       @@connections[service]
     end

data/lib/fog/cdn.rb

@@ -0,0 +1,19 @@
+module Fog
+  class CDN
+
+    def self.new(attributes)
+      attributes = attributes.dup # prevent delete from having side effects
+      case provider = attributes[:provider] # attributes.delete(:provider)
+      when 'AWS'
+        require 'fog/cdn/aws'
+        Fog::AWS::CDN.new(attributes)
+      when 'Rackspace'
+        require 'fog/cdn/rackspace'
+        Fog::Rackspace::CDN.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} is not a recognized storage provider")
+      end
+    end
+
+  end
+end