cloud-crowd 0.2.4 → 0.2.5

data/cloud-crowd.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'cloud-crowd'
-  s.version   = '0.2.4'         # Keep version in sync with cloud-cloud.rb
-  s.date      = '2009-09-28'
+  s.version   = '0.2.5'         # Keep version in sync with cloud-cloud.rb
+  s.date      = '2009-09-30'
 
   s.homepage    = "http://wiki.github.com/documentcloud/cloud-crowd"
   s.summary     = "Parallel Processing for the Rest of Us"

data/config/database.example.yml

@@ -1,5 +1,6 @@
 # This is a standard ActiveRecord database.yml file. You can configure it 
-# to use any database that ActiveRecord supports.
+# to use any database that ActiveRecord supports. Only the central server needs
+# this file to be configured -- nodes never connect directly to the database.
 
 :adapter:  mysql
 :encoding: utf8

data/lib/cloud-crowd.rb

@@ -21,11 +21,11 @@ autoload :JSON,         'json'
 autoload :RestClient,   'restclient'
 autoload :RightAws,     'right_aws'
 autoload :Sinatra,      'sinatra'
-autoload :Socket,       'socket'
 autoload :Thin,         'thin'
 autoload :YAML,         'yaml'
 
 # Common code which should really be required in every circumstance.
+require 'socket'
 require 'cloud_crowd/exceptions'
 
 module CloudCrowd
@@ -44,7 +44,7 @@ module CloudCrowd
   autoload :WorkUnit,     'cloud_crowd/models'
   
   # Keep this version in sync with the gemspec.
-  VERSION        = '0.2.4'
+  VERSION        = '0.2.5'
   
   # Increment the schema version when there's a backwards incompatible change.
   SCHEMA_VERSION = 3

data/lib/cloud_crowd/command_line.rb

@@ -98,10 +98,9 @@ Options:
     
     # `crowd node` can either 'start', 'stop', or 'restart'.
     def run_node(subcommand)
-      ensure_config
       load_code
-      subcommand ||= 'start'
-      case subcommand
+      ENV['RACK_ENV'] = @options['environment']
+      case (subcommand || 'start')
       when 'start'    then start_node
       when 'stop'     then stop_node
       when 'restart'  then restart_node
@@ -111,8 +110,6 @@ Options:
     # Launch a Node. Please only run a single node per machine. The Node process
     # will be long-lived, although its workers will come and go.
     def start_node
-      ENV['RACK_ENV'] = @options['environment']
-      load_code
       port = @options[:port] || Node::DEFAULT_PORT
       puts "Starting CloudCrowd Node on port #{port}..."
       Node.new(port, @options[:daemonize])

data/lib/cloud_crowd/models/work_unit.rb

@@ -46,7 +46,7 @@ module CloudCrowd
         work_units.push(unit)
       end
     ensure
-      WorkUnit.cancel_reservations(reservation_number)
+      WorkUnit.cancel_reservations(reservation_number) if reservation_number
     end
     
     # Reserves all available WorkUnits for this process. Returns false if there 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloud-crowd
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 -04:00
+date: 2009-09-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency