fog 0.0.80 → 0.0.81

data/fog.gemspec

@@ -7,8 +7,8 @@ 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.0.80'
-  s.date              = '2010-04-26'
+  s.version           = '0.0.81'
+  s.date              = '2010-04-27'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog.rb

@@ -31,7 +31,7 @@ require 'fog/terremark'
 
 module Fog
 
-  VERSION = '0.0.80'
+  VERSION = '0.0.81'
 
   module Mock
     @delay = 1

data/lib/fog/aws/models/ec2/volume.rb

@@ -20,6 +20,8 @@ module Fog
         attribute :state,             'status'
 
         def initialize(attributes = {})
+          # assign server first to prevent race condition with new_record?
+          self.server = attributes.delete(:server)
           if attributes['attachmentSet']
             attributes.merge!(attributes.delete('attachmentSet').first || {})
           end
@@ -33,6 +35,10 @@ module Fog
           true
         end
 
+        def ready?
+          state == 'available'
+        end
+
         def server=(new_server)
           if new_server
             attach(new_server)
@@ -70,6 +76,7 @@ module Fog
             @server = nil
             @server_id = new_server.id
             connection.attach_volume(@server_id, @id, @device)
+            reload
           end
         end
 
@@ -78,6 +85,7 @@ module Fog
           @server_id = nil
           unless new_record?
             connection.detach_volume(@id)
+            reload
           end
         end
 

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

@@ -8,6 +8,7 @@ module Fog
       class Files < Fog::Collection
 
         attribute :delimiter,     'Delimiter'
+        attribute :directory
         attribute :is_truncated,  'IsTruncated'
         attribute :marker,        'Marker'
         attribute :max_keys,      ['MaxKeys', 'max-keys']
@@ -35,10 +36,6 @@ module Fog
           end
         end
 
-        def directory
-          @directory
-        end
-
         def get(key, options = {}, &block)
           data = connection.get_object(directory.name, key, options, &block)
           file_data = {

data/spec/spec_helper.rb

@@ -4,7 +4,10 @@ require 'open-uri'
 current_directory = File.dirname(__FILE__)
 require "#{current_directory}/../lib/fog"
 require "#{current_directory}/../lib/fog/bin"
-# Fog.mock!
+
+if ENV["FOG_MOCK"] == "true"
+  Fog.mock!
+end
 
 unless defined?(LOADED_SPEC_OPTS)
   # inlined spec.opts

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 80
-  version: 0.0.80
+  - 81
+  version: 0.0.81
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -07:00
+date: 2010-04-27 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency