fog 0.0.62 → 0.0.63

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 62
+:patch: 63
 :build: 

data/fog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.62"
+  s.version = "0.0.63"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-03-30}
+  s.date = %q{2010-03-31}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
   s.email = %q{geemus@gmail.com}

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

@@ -6,7 +6,7 @@ module Fog
 
       class Server < Fog::Model
 
-        identity  :id,                'instanceId'
+        identity  :id,                    'instanceId'
 
         attribute :architecture
         attribute :ami_launch_index,      'amiLaunchIndex'

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

@@ -18,8 +18,8 @@ module Fog
         attribute :storage_class,   'StorageClass'
 
         def body
-          @body ||= if last_modified
-            collection.get(identity).body
+          @body ||= if last_modified && (file = collection.get(identity))
+            file.body
           else
             ''
           end

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

@@ -16,6 +16,13 @@ module Fog
         model Fog::AWS::S3::File
 
         def all(options = {})
+          options = {
+            'delimiter'   => @delimiter,
+            'marker'      => @marker,
+            'max-keys'    => @max_keys,
+            'prefix'      => @prefix
+          }.merge!(options)
+          options = options.reject {|key,value| value.nil? || value.to_s.empty?}
           merge_attributes(options)
           parent = directory.collection.get(
             directory.name,
@@ -33,13 +40,6 @@ module Fog
         end
 
         def get(key, options = {}, &block)
-          options = {
-            'delimiter'   => @delimiter,
-            'marker'      => @marker,
-            'max-keys'    => @max_keys,
-            'prefix'      => @prefix
-          }.merge!(options)
-          options = options.reject {|key,value| value.nil? || value.to_s.empty?}
           data = connection.get_object(directory.name, key, options, &block)
           file_data = {
             :body => data.body,

data/lib/fog/aws/requests/ec2/describe_instances.rb

@@ -74,14 +74,14 @@ module Fog
           instance_set.each do |instance|
             case instance['instanceState']['name']
             when 'pending'
-              if Time.now - instance['launchTime'] > 2
-                instance['instanceState'] = { :code => 16, :name => 'running' }
+              if Time.now - instance['launchTime'] > 1
+                instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
               end
             when 'rebooting'
-              instance['instanceState'] = { :code => 16, :name => 'running' }
+              instance['instanceState'] = { 'code' => 16, 'name' => 'running' }
             when 'shutting-down'
               if Time.now - @data[:deleted_at][instance['instanceId']] > 2
-                instance['instanceState'] = { :code => 16, :name => 'terminating' }
+                instance['instanceState'] = { 'code' => 16, 'name' => 'terminating' }
               end
             when 'terminating'
               if Time.now - @data[:deleted_at][instance['instanceId']] > 4

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 62
-  version: 0.0.62
+  - 63
+  version: 0.0.63
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 -07:00
+date: 2010-03-31 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency