further on

lib/cloud_crowd/action.rb

@@ -38,13 +38,16 @@ def process
 
     # Download a file to the specified path.
     def download(url, path)
-      if url.match(FILE_URL)
-        FileUtils.cp(url.sub(FILE_URL, ''), path)
-      else
-        # An alternative would be shelling out: `curl -s "#{url}" > "#{path}"`
-        resp = RestClient::Request.execute(:url => url, :method => :get, :raw_response => true)
-        FileUtils.mv resp.file.path, path
-      end
+      URI.parse(url) # Sanity check.
+      `curl -s "#{url}" > "#{path}"`
+      # if url.match(FILE_URL)
+      #   FileUtils.cp(url.sub(FILE_URL, ''), path)
+      # else
+      #   # An alternative would be shelling out: `curl -s "#{url}" > "#{path}"`
+      #   puts url
+      #   resp = RestClient::Request.execute(:url => url, :method => :get, :raw_response => true)
+      #   FileUtils.mv resp.file.path, path
+      # end
       path
     end
 

lib/cloud_crowd/models/job.rb

@@ -95,8 +95,8 @@ def action_class
     # How complete is this Job?
     def percent_complete
       return 0   if splitting?
-      return 100 if complete?
       return 99  if merging?
+      return 100 if complete?
       (work_units.complete.count / work_units.count.to_f * 100).round
     end
 

lib/cloud_crowd/server.rb

@@ -104,6 +104,8 @@ class Server < Sinatra::Default
       when 'failed'    then current_work_unit.fail(params[:output], params[:time])
       else             error(500, "Completing a work unit must specify status.")
       end
+      # TODO: Optimize this case -- we know there's probably going to be only
+      # a single slot available. Just try to distribute a single WorkUnit.
       WorkUnit.distribute_to_nodes
       json nil
     end