cloud-crowd 0.6.0 → 0.6.1

data/cloud-crowd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'cloud-crowd'
-  s.version   = '0.6.0'         # Keep version in sync with cloud-cloud.rb
-  s.date      = '2011-03-04'
+  s.version   = '0.6.1'         # Keep version in sync with cloud-cloud.rb
+  s.date      = '2011-03-12'
 
   s.homepage    = "http://wiki.github.com/documentcloud/cloud-crowd"
   s.summary     = "Parallel Processing for the Rest of Us"

data/lib/cloud-crowd.rb

@@ -45,7 +45,7 @@ module CloudCrowd
   autoload :WorkUnit,     'cloud_crowd/models'
 
   # Keep this version in sync with the gemspec.
-  VERSION        = '0.6.0'
+  VERSION        = '0.6.1'
 
   # Increment the schema version when there's a backwards incompatible change.
   SCHEMA_VERSION = 4

data/lib/cloud_crowd/models/work_unit.rb

@@ -60,8 +60,6 @@ module CloudCrowd
               available_nodes.push(node) unless node.busy?
               next
             end
-          else
-            unit.cancel_reservation
           end
           work_units.push(unit)
         end
@@ -81,7 +79,8 @@ module CloudCrowd
     # were none available.
     def self.reserve_available(options={})
       reservation = ActiveSupport::SecureRandom.random_number(MAX_RESERVATION)
-      any = WorkUnit.available.update_all("reservation = #{reservation}", options[:conditions], options) > 0
+      conditions = "reservation is null and node_record_id is null and status in (#{INCOMPLETE.join(',')}) and #{options[:conditions]}"
+      any = WorkUnit.update_all("reservation = #{reservation}", conditions, options) > 0
       any && reservation
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloud-crowd
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -05:00
+date: 2011-03-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency