fog 0.0.40 → 0.0.41

data/spec/slicehost/requests/create_slice_spec.rb

@@ -5,13 +5,13 @@ describe 'Slicehost.create_slice' do
 
     after(:each) do
       eventually(128) do
-        slicehost.delete_slice(@slice_id)
+        Slicehost[:slices].delete_slice(@slice_id)
       end
     end
 
     it "should return proper attributes" do
       # flavor_id 1: 256 ram, image_id 3: Gentoo 2008.0
-      actual = slicehost.create_slice(1, 3, 'fog_create_slice').body      
+      actual = Slicehost[:slices].create_slice(1, 3, 'fog_create_slice').body      
       actual['addresses'].should be_a(Array)
       # actual['backup-id'].should be_an(Integer)
       actual['bw-in'].should be_an(Float)

data/spec/slicehost/requests/delete_slice_spec.rb

@@ -5,12 +5,12 @@ describe 'Slicehost.delete_slice' do
 
     before(:each) do
       # flavor_id 1: 256 ram, image_id 3: Gentoo 2008.0
-      @slice_id = slicehost.create_slice(1, 3, 'fog_delete_slice').body['id']
+      @slice_id = Slicehost[:slices].create_slice(1, 3, 'fog_delete_slice').body['id']
     end
 
     it "should return proper attributes" do
       eventually(128) do
-        actual = slicehost.delete_slice(@slice_id)
+        actual = Slicehost[:slices].delete_slice(@slice_id)
       end
     end
 

data/spec/slicehost/requests/get_backups_spec.rb

@@ -4,7 +4,7 @@ describe 'Slicehost.get_backups' do
   describe 'success' do
 
     it "should return proper attributes" do
-      actual = slicehost.get_backups.body
+      actual = Slicehost[:slices].get_backups.body
       actual['backups'].should be_an(Array)
       backup = actual['backups'].first
       # backup['date'].should be_a(String)

data/spec/slicehost/requests/get_flavors_spec.rb

@@ -4,7 +4,7 @@ describe 'Slicehost.get_flavors' do
   describe 'success' do
 
     it "should return proper attributes" do
-      actual = slicehost.get_flavors.body
+      actual = Slicehost[:slices].get_flavors.body
       actual['flavors'].should be_an(Array)
       flavor = actual['flavors'].first
       flavor['id'].should be_an(Integer)

data/spec/slicehost/requests/get_images_spec.rb

@@ -4,7 +4,7 @@ describe 'Slicehost.get_images' do
   describe 'success' do
 
     it "should return proper attributes" do
-      actual = slicehost.get_images.body
+      actual = Slicehost[:slices].get_images.body
       actual['images'].should be_an(Array)
       image = actual['images'].first
       image['id'].should be_an(Integer)

data/spec/slicehost/requests/get_slices_spec.rb

@@ -4,7 +4,7 @@ describe 'Slicehost.get_slices' do
   describe 'success' do
 
     it "should return proper attributes" do
-      actual = slicehost.get_slices.body
+      actual = Slicehost[:slices].get_slices.body
       actual['slices'].should be_an(Array)
       slice = actual['slices'].first
       # slice['addresses'].should be_a(Array)

data/spec/spec_helper.rb

@@ -5,54 +5,76 @@ current_directory = File.dirname(__FILE__)
 require "#{current_directory}/../lib/fog"
 # Fog.mock!
 
-def ec2
-  Fog::AWS::EC2.new(
-    :aws_access_key_id => Fog.credentials[:aws_access_key_id],
-    :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
-  )
+unless defined?(LOADED_SPEC_OPTS)
+  # inlined spec.opts
+  require "#{current_directory}/compact_progress_bar_formatter"
+  Spec::Runner.options.parse_format("Spec::Runner::Formatter::CompactProgressBarFormatter")
+  Spec::Runner.options.loadby  = 'mtime'
+  Spec::Runner.options.reverse = true
+  LOADED_SPEC_OPTS = true
 end
 
-def eu_s3
-  Fog::AWS::S3.new(
-    :aws_access_key_id => Fog.credentials[:aws_access_key_id],
-    :aws_secret_access_key => Fog.credentials[:aws_secret_access_key],
-    :host => 's3-external-3.amazonaws.com'
-  )
-end
 
-def files
-  Fog::Rackspace::Files.new(
-    :rackspace_api_key => Fog.credentials[:rackspace_api_key],
-    :rackspace_username => Fog.credentials[:rackspace_username]
-  )
+module AWS
+  class << self
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        credentials = Fog.credentials.reject do |k, v|
+          ![:aws_access_key_id, :aws_secret_access_key].include?(k)
+        end
+        hash[key] = case key
+        when :ec2
+          Fog::AWS::EC2.new(credentials)
+        when :eu_s3
+          Fog::AWS::S3.new(credentials.merge!(:host => 's3-external-3.amazonaws.com'))
+        when :sdb
+          Fog::AWS::SimpleDB.new(credentials)
+        when :s3
+          Fog::AWS::S3.new(credentials)
+        end
+      end
+      @@connections[service]
+    end
+  end
 end
 
-def sdb
-  Fog::AWS::SimpleDB.new(
-    :aws_access_key_id => Fog.credentials[:aws_access_key_id],
-    :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
-  )
+module Rackspace
+  class << self
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        credentials = Fog.credentials.reject do |k, v|
+          ![:rackspace_api_key, :rackspace_username].include?(k)
+        end
+        hash[key] = case key
+        when :files
+          Fog::Rackspace::Files.new(credentials)
+        when :servers
+          Fog::Rackspace::Servers.new(credentials)
+        end
+      end
+      @@connections[service]
+    end
+  end
 end
 
-def s3
-  Fog::AWS::S3.new(
-    :aws_access_key_id => Fog.credentials[:aws_access_key_id],
-    :aws_secret_access_key => Fog.credentials[:aws_secret_access_key]
-  )
+module Slicehost
+  class << self
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        credentials = Fog.credentials.reject do |k, v|
+          ![:slicehost_password].include?(k)
+        end
+        hash[key] = case key
+        when :slices
+          Fog::Slicehost.new(credentials)
+        end
+      end
+      @@connections[service]
+    end
+  end
 end
 
-def servers
-  Fog::Rackspace::Servers.new(
-    :rackspace_api_key => Fog.credentials[:rackspace_api_key],
-    :rackspace_username => Fog.credentials[:rackspace_username]
-  )
-end
 
-def slicehost
-  Fog::Slicehost.new(
-    :password => Fog.credentials[:slicehost_password]
-  )
-end
 
 def eventually(max_delay = 16, &block)
   delays = [0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fog
 version: !ruby/object:Gem::Version 
-  version: 0.0.40
+  version: 0.0.41
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 -08:00
+date: 2010-01-25 00:00:00 -08:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -291,6 +291,7 @@ files:
 - spec/aws/requests/simpledb/list_domains_spec.rb
 - spec/aws/requests/simpledb/put_attributes_spec.rb
 - spec/aws/requests/simpledb/select_spec.rb
+- spec/compact_progress_bar_formatter.rb
 - spec/lorem.txt
 - spec/rackspace/models/servers/server_spec.rb
 - spec/rackspace/requests/files/delete_container_spec.rb
@@ -325,13 +326,24 @@ files:
 - spec/slicehost/requests/get_flavors_spec.rb
 - spec/slicehost/requests/get_images_spec.rb
 - spec/slicehost/requests/get_slices_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/geemus/fog
 licenses: []
 
 post_install_message: |
+  ==================================================
+  
+    fog 0.0.41 has a minor change to the API for ec2 servers:
+  
+      # what_it_was => what_it_is
+  
+      ec2.servers.new(:group_id => 'foo') => ec2.servers.new(:groups => ['foo'])
+  
+    Updating to the newest api version also means you can now assign multiple groups:
+  
+      ec2.servers.new(:groups => ['foo', 'bar'])
+  
   ==================================================
   
     fog 0.0.40 has API changes you should know about.
@@ -443,6 +455,7 @@ test_files:
 - spec/aws/requests/simpledb/list_domains_spec.rb
 - spec/aws/requests/simpledb/put_attributes_spec.rb
 - spec/aws/requests/simpledb/select_spec.rb
+- spec/compact_progress_bar_formatter.rb
 - spec/rackspace/models/servers/server_spec.rb
 - spec/rackspace/requests/files/delete_container_spec.rb
 - spec/rackspace/requests/files/delete_object_spec.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---colour