neptune 0.0.8 → 0.0.9

data/README

@@ -66,6 +66,9 @@ in for a link to that as it becomes available.
 
 Version History:
 
+May 28, 2011 - 0.0.9 released, adding generic SSA support
+for users wanting to use StochKit and other SSA codes.
+
 April 8, 2011 - 0.0.8 released, fixing MapReduce support
 for both regular Hadoop and Hadoop Streaming. Also increased
 code coverage to cover a number of failure scenarios.

data/bin/neptune

@@ -18,6 +18,6 @@ else
   end
 
   params = Hash[*ARGV]
-  puts neptune(params)
+  puts neptune(params).inspect
 end
 

data/lib/neptune.rb

@@ -163,6 +163,8 @@ def neptune(params)
 
   job_data["@job"] = nil
   job_data["@keyname"] = keyname || "appscale"
+
+  job_data["@type"] = job_data["@type"].to_s
   type = job_data["@type"]
 
   if type == "upc" or type == "x10"
@@ -230,6 +232,10 @@ def neptune(params)
 
   ssh_args = "-i ~/.appscale/#{keyname}.key -o StrictHostkeyChecking=no "
 
+  # TODO - right now the job is assumed to succeed in many cases
+  # need to investigate the various failure scenarios
+  result = { :result => :success }
+
   if type == "input"
     # copy file to remote
     # set location
@@ -247,15 +253,15 @@ def neptune(params)
 
     job_data["@local"] = remote
     puts "job data = #{job_data.inspect}"
-    return controller.put_input(job_data)
+    result[:input] = controller.put_input(job_data)
   elsif type == "output"
-    return controller.get_output(job_data)
+    result[:output] = controller.get_output(job_data)
   elsif type == "get-acl"
     job_data["@type"] = "acl"
-    return controller.get_acl(job_data)
+    result[:acl] = controller.get_acl(job_data)
   elsif type == "set-acl"
     job_data["@type"] = "acl"
-    return controller.set_acl(job_data)
+    result[:acl] = controller.set_acl(job_data)
   elsif type == "compile"
     compiled_location = controller.compile_code(job_data)
 
@@ -283,16 +289,30 @@ def neptune(params)
     puts scp_command
     `#{scp_command}`
 
+    code = job_data["@code"]
+    dirs = code.split(/\//)
+    remote_dir = "/tmp/" + dirs[-1] 
+
+    ssh_command = "ssh #{ssh_args} root@#{shadow_ip} 'rm -rf #{remote_dir}' 2>&1"
+    puts ssh_command
+    `#{ssh_command}`
+
+    ssh_command = "ssh #{ssh_args} root@#{shadow_ip} 'rm -rf #{compiled_location}' 2>&1"
+    puts ssh_command
+    `#{ssh_command}`
+
     out = File.open("#{copy_to}/compile_out") { |f| f.read.chomp! }
     err = File.open("#{copy_to}/compile_err") { |f| f.read.chomp! }
-    return {:out => out, :err => err }
+    result[:out] = out
+    result[:err] = err
+    
+    result[:result] = :failure if result[:err].any?
   else
-    result = controller.start_neptune_job(job_data)
-    if result =~ /job is now running\Z/
-      return {:result => :success, :msg => result}
-    else
-      return {:result => :failure, :msg => result}
-    end
+    msg = controller.start_neptune_job(job_data)
+    result[:msg] = msg
+    result[:result] = :failure if result[:msg] !~ /job is now running\Z/
   end
+
+  return result
 end
 

data/test/ts_neptune.rb

@@ -12,6 +12,7 @@ S3_ACCESS_KEY S3_SECRET_KEY S3_URL
 WALRUS_ACCESS_KEY WALRUS_SECRET_KEY WALRUS_URL }
 
 require 'test/unit'
+require 'rubygems'
 require 'flexmock/test_unit'
 
 REQUIRED_CREDS.each { |cred|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neptune
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Chris Bunch
@@ -15,7 +15,7 @@ autorequire: neptune
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -07:00
+date: 2011-05-28 00:00:00 -07:00
 default_executable: neptune
 dependencies: []