t2-server 0.0.1 → 0.0.2

data/bin/run_workflow

@@ -41,25 +41,23 @@ require 'optparse'
 # server seems to be rather sensitive to slashes, hence
 # all the [...] mucking about.
 def get_outputs(run, pout, dir="")
-  outputs = run.ls("out#{dir}")
-  outputs.each do |out|
-    if out.include? "/"
-      get_outputs(run, pout, "#{dir}/#{out[0...-1]}")
+  dirs, files = run.ls("out#{dir}")
+  dirs.each {|d| get_outputs(run, pout, "#{dir}/#{d}")}
+  files.each do |out|
+    print "          #{dir}/#{out} -> "
+    output_name = "#{dir[1..-1]}/#{out}"
+    data = run.get_output(output_name)
+    if pout
+      p data
     else
-      print "          #{dir}/#{out} -> "
-      data = run.get_output("#{dir[1..-1]}/#{out}")
-      if pout
-        p data
-      else
-        filename = "#{dir[1..-1]}/#{out}".gsub('/','-')
-        File.open(filename, "w") do |file|
-          file.syswrite(data)
-        end
-        puts "written to file: #{filename}"
+      filename = output_name.gsub('/', '-')
+      File.open(filename, "w") do |file|
+        file.syswrite(data)
       end
+      puts "written to file: #{filename}"
     end
   end
-end
+end  
 
 # set up options
 inputs  = {}
@@ -113,6 +111,7 @@ end
 # create run and set inputs
 run = T2Server::Run.create(uri, wkf)
 puts "Created run with uuid: #{run.uuid}"
+puts "Created at #{run.create_time}"
 
 inputs.each do |input, value|
   puts "Set input '#{input}' to #{value}"
@@ -120,8 +119,11 @@ inputs.each do |input, value|
 end
 
 # start run and wait until it is finished
+run.start
+puts "Started at #{run.start_time}"
 print "Running"
-run.start_and_wait(:progress => true)
+run.wait(:progress => true)
+puts "Finished at #{run.finish_time}"
 
 # get outputs
 stdout = run.stdout

data/lib/t2server.rb

@@ -35,6 +35,6 @@ require 't2server/server'
 require 't2server/run'
 
 module T2Server
-  GEM_VERSION = "0.0.1"
+  GEM_VERSION = "0.0.2"
   API_VERSION = "2.2.0a1"
 end

data/lib/t2server/run.rb

@@ -113,13 +113,14 @@ module T2Server
       @server.set_run_attribute(@uuid, @links[:status], STATE[:running])
     end
     
-    def start_and_wait(params={})
+    def wait(params={})
+      return unless running?
+      
       interval = params[:interval] || 1
       progress = params[:progress] || false
       keepalive = params[:keepalive] || false ### TODO maybe move out of params
       
-      # start run and wait
-      start
+      # wait
       until finished?
         sleep(interval)
         if progress
@@ -172,10 +173,11 @@ module T2Server
 
       # compile a list of directory entries stripping the
       # directory name from the front of each filename
-      entries = []
-      XPath.each(doc, "//nss:dir", Namespaces::MAP) {|e| entries << "#{e.text.split('/')[-1]}/"}
-      XPath.each(doc, "//nss:file", Namespaces::MAP) {|e| entries << e.text.split('/')[-1]}
-      entries
+      dirs = []
+      files = []
+      XPath.each(doc, "//nss:dir", Namespaces::MAP) {|e| dirs << e.text.split('/')[-1]}
+      XPath.each(doc, "//nss:file", Namespaces::MAP) {|e| files << e.text.split('/')[-1]}
+      [dirs, files]
     end
 
     def initialized?
@@ -189,6 +191,18 @@ module T2Server
     def finished?
       status == STATE[:finished]
     end
+    
+    def create_time
+      @server.get_run_attribute(@uuid, @links[:createtime])
+    end
+    
+    def start_time
+      @server.get_run_attribute(@uuid, @links[:starttime])
+    end
+
+    def finish_time
+      @server.get_run_attribute(@uuid, @links[:finishtime])
+    end
 
     private
     def get_attributes(desc)
@@ -214,14 +228,17 @@ module T2Server
       doc = Document.new(desc)
       nsmap = Namespaces::MAP
       {
-        :expiry    => XPath.first(doc, "//nsr:expiry", nsmap).attributes["href"].split('/')[-1],
-        :workflow  => XPath.first(doc, "//nsr:creationWorkflow", nsmap).attributes["href"].split('/')[-1],
-        :status    => XPath.first(doc, "//nsr:status", nsmap).attributes["href"].split('/')[-1],
-        :wdir      => XPath.first(doc, "//nsr:workingDirectory", nsmap).attributes["href"].split('/')[-1],
-        :inputs    => XPath.first(doc, "//nsr:inputs", nsmap).attributes["href"].split('/')[-1],
-        :output    => XPath.first(doc, "//nsr:output", nsmap).attributes["href"].split('/')[-1],
-        :securectx => XPath.first(doc, "//nsr:securityContext", nsmap).attributes["href"].split('/')[-1],
-        :listeners => XPath.first(doc, "//nsr:listeners", nsmap).attributes["href"].split('/')[-1]
+        :expiry     => XPath.first(doc, "//nsr:expiry", nsmap).attributes["href"].split('/')[-1],
+        :workflow   => XPath.first(doc, "//nsr:creationWorkflow", nsmap).attributes["href"].split('/')[-1],
+        :status     => XPath.first(doc, "//nsr:status", nsmap).attributes["href"].split('/')[-1],
+        :createtime => XPath.first(doc, "//nsr:createTime", nsmap).attributes["href"].split('/')[-1],
+        :starttime  => XPath.first(doc, "//nsr:startTime", nsmap).attributes["href"].split('/')[-1],
+        :finishtime => XPath.first(doc, "//nsr:finishTime", nsmap).attributes["href"].split('/')[-1],
+        :wdir       => XPath.first(doc, "//nsr:workingDirectory", nsmap).attributes["href"].split('/')[-1],
+        :inputs     => XPath.first(doc, "//nsr:inputs", nsmap).attributes["href"].split('/')[-1],
+        :output     => XPath.first(doc, "//nsr:output", nsmap).attributes["href"].split('/')[-1],
+        :securectx  => XPath.first(doc, "//nsr:securityContext", nsmap).attributes["href"].split('/')[-1],
+        :listeners  => XPath.first(doc, "//nsr:listeners", nsmap).attributes["href"].split('/')[-1]
       }
     end
   end

data/lib/t2server/server.rb

@@ -59,7 +59,7 @@ module T2Server
       
       # initialise run list
       @runs = {}
-      @runs = runs
+      @runs = get_runs
     end
 
     def Server.connect(uri)
@@ -101,38 +101,13 @@ module T2Server
         ""
       end
     end
-      
+    
     def runs
-      request = Net::HTTP::Get.new("#{@links[:runs]}")
-      response = Net::HTTP.new(@host, @port).start {|http| http.request(request)}
-      
-      case response
-      when Net::HTTPOK  
-        doc = Document.new(response.body)
-        
-        # get list of run uuids
-        uuids = []
-        XPath.each(doc, "//nsr:run", Namespaces::MAP) do |run|
-          uuids << run.attributes["href"].split('/')[-1]
-        end
-                
-        # add new runs
-        uuids.each do |uuid|
-          if !@runs.has_key? uuid
-            description = get_run_description(uuid)
-            @runs[uuid] = Run.create(self, "", uuid)
-          end
-        end
-        
-        # clear out the expired runs
-        if @runs.length > @run_limit
-          @runs.delete_if {|key, val| !uuids.member? key}
-        end
-
-        @runs
-      else
-        response_error(response)
-      end
+      get_runs.values
+    end
+    
+    def run(uuid)
+      get_runs[uuid]
     end
 
     def delete_run(uuid)
@@ -154,7 +129,7 @@ module T2Server
     
     def delete_all_runs
       # first refresh run list
-      runs.each_value {|run| run.delete}
+      runs.each {|run| run.delete}
     end
     
     def set_run_input(run, input, value)
@@ -320,5 +295,37 @@ module T2Server
       false
     end
     
+    def get_runs
+      request = Net::HTTP::Get.new("#{@links[:runs]}")
+      response = Net::HTTP.new(@host, @port).start {|http| http.request(request)}
+      
+      case response
+      when Net::HTTPOK  
+        doc = Document.new(response.body)
+        
+        # get list of run uuids
+        uuids = []
+        XPath.each(doc, "//nsr:run", Namespaces::MAP) do |run|
+          uuids << run.attributes["href"].split('/')[-1]
+        end
+                
+        # add new runs
+        uuids.each do |uuid|
+          if !@runs.has_key? uuid
+            description = get_run_description(uuid)
+            @runs[uuid] = Run.create(self, "", uuid)
+          end
+        end
+        
+        # clear out the expired runs
+        if @runs.length > @run_limit
+          @runs.delete_if {|key, val| !uuids.member? key}
+        end
+
+        @runs
+      else
+        response_error(response)
+      end
+    end
   end  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: t2-server
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Robert Haines
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +01:00
+date: 2010-07-22 00:00:00 +01:00
 default_executable: 
 dependencies: []