neptune 0.0.3 → 0.0.4

data/lib/neptune.rb

@@ -125,12 +125,11 @@ end
 # job. By default, job data is private, but a Neptune
 # job can be used to set it to public later (and
 # vice-versa).
-def job(name, &block)
+def neptune(params)
   puts "Received a request to run a job."
-  puts name
-  block.call()
+  puts params[:type]
 
-  keyname = @keyname || "appscale"
+  keyname = params[:keyname] || "appscale"
 
   shadow_ip = CommonFunctions.get_from_yaml(keyname, :shadow)
   secret = CommonFunctions.get_secret_key(keyname)
@@ -138,13 +137,13 @@ def job(name, &block)
   ssh_key = File.expand_path("~/.appscale/#{keyname}.key")
 
   job_data = {}
-  instance_variables.each { |var|
-    job_data[var] = instance_variable_get(var)
+  params.each { |k, v|
+    key = "@#{k}"
+    job_data[key] = v
   }
 
   job_data["@job"] = nil
-  job_data["@type"] = name
-  job_data["@keyname"] = keyname
+  job_data["@keyname"] = keyname || "appscale"
 
   if (job_data["@output"].nil? or job_data["@output"] == "")
     abort("Job output must be specified")
@@ -207,9 +206,9 @@ def job(name, &block)
   else
     result = controller.start_neptune_job(job_data)
     if result =~ /job is now running\Z/
-      return :success
+      return {:result => :success, :msg => result}
     else
-      return :failure
+      return {:result => :failure, :msg => result}
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neptune
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Chris Bunch
@@ -15,7 +15,7 @@ autorequire: neptune
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -08:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: neptune
 dependencies: []