fog 0.0.35 → 0.0.36

data/Rakefile

@@ -7,7 +7,7 @@ require "#{current_directory}/lib/fog"
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.add_dependency('excon', '>=0.0.11')
+    gem.add_dependency('excon', '>=0.0.13')
     gem.add_dependency('mime-types')
     gem.add_dependency('nokogiri')
     gem.add_dependency('ruby-hmac')

data/VERSION

@@ -1 +1 @@
-0.0.35
+0.0.36

data/bin/fog

@@ -5,7 +5,11 @@ require 'yaml'
 
 module AWS
   class << self
-    if Fog.credentials[:aws_access_key_id] && Fog.credentials[:aws_secret_access_key]
+    key = (ARGV.first && :"#{ARGV.first}") || :default
+    unless Fog.credentials(key)
+      raise ArgumentError.new("No credentials for :#{key}")
+    end
+    if Fog.credentials(key)[:aws_access_key_id] && Fog.credentials(key)[:aws_secret_access_key]
 
       @@ec2 = Fog::AWS::EC2.new(
         :aws_access_key_id => Fog.credentials[:aws_access_key_id],
@@ -51,7 +55,11 @@ end
 
 module Rackspace
   class << self
-    if Fog.credentials[:rackspace_api_key] && Fog.credentials[:rackspace_username]
+    key = (ARGV.first && :"#{ARGV.first}") || :default
+    unless Fog.credentials(key)
+      raise ArgumentError.new("No credentials for :#{key}")
+    end
+    if Fog.credentials(key)[:rackspace_api_key] && Fog.credentials(key)[:rackspace_username]
 
       @@servers = Fog::Rackspace::Servers.new(
         :rackspace_api_key => Fog.credentials[:rackspace_api_key],

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.35"
+  s.version = "0.0.36"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-14}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{me@geemus.com}
@@ -393,18 +393,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<excon>, [">= 0.0.11"])
+      s.add_runtime_dependency(%q<excon>, [">= 0.0.13"])
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0"])
     else
-      s.add_dependency(%q<excon>, [">= 0.0.11"])
+      s.add_dependency(%q<excon>, [">= 0.0.13"])
       s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<ruby-hmac>, [">= 0"])
     end
   else
-    s.add_dependency(%q<excon>, [">= 0.0.11"])
+    s.add_dependency(%q<excon>, [">= 0.0.13"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<ruby-hmac>, [">= 0"])

data/lib/fog.rb

@@ -38,11 +38,11 @@ module Fog
     load "fog/slicehost.rb"
   end
 
-  def self.credentials(path = File.expand_path('~/.fog'))
+  def self.credentials(key = :default)
     @credentials ||= begin
       credentials = {}
-      File.open(path) do |file|
-        credentials = YAML.load(file.read)[:default]
+      File.open(File.expand_path('~/.fog')) do |file|
+        credentials = YAML.load(file.read)[key]
       end
       credentials
     end

data/lib/fog/aws/models/s3/objects.rb

@@ -13,10 +13,11 @@ module Fog
         model Fog::AWS::S3::Object
 
         def all(options = {})
-          bucket.collection.get(
+          collection = bucket.collection.get(
             bucket.name,
             options.reject {|key, value| !['delimiter', 'marker', 'max-keys', 'prefix'].include?(key)}
-          ).objects
+          )
+          collection && collection.objects
         end
 
         def bucket

data/spec/aws/models/s3/objects_spec.rb

@@ -33,6 +33,10 @@ describe 'Fog::AWS::S3::Objects' do
       @bucket.objects.all.should be_a(Fog::AWS::S3::Objects)
     end
 
+    it "should return nil if the bucket does not exist" do
+      bucket = s3.buckets.new(:name => 'notabucket')
+      bucket.objects.all.should be_nil
+    end
   end
 
   describe "#bucket" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -08:00
+date: 2009-12-14 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.11
+        version: 0.0.13
     version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types