startask 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f7117e10b305b80d9ca459f61f9b6612eac3119d1e512bcc16211db5abcb7d
-  data.tar.gz: 0abf88ac656c4dd87c0dc0280f426a724866f8a18b2f60ed0805eaad8cfd8cb2
+  metadata.gz: 8ad982911d12e9f54c2591e57aae3e8088282984540dff16709e41717cb251b7
+  data.tar.gz: e6cfffc5ef7f5ad1cbb9f4ebb7f75a9b36197236533d2f1221d123ce13f44388
 SHA512:
-  metadata.gz: c6536b528bc0587c8d225bae4a8da20762eafef9a3ee5e7854e79e0410fe8ef4fa9a1d08c6fea4d12ca10e0b8fa82301077b6a4ca1dea9b22506552dbad04e77
-  data.tar.gz: 89da5ddcbed700bd31887d9aab6a9d62b242b68059ee891acfd2e688d8e058fd483f90585b7bc3c16523c3fad7b6dd20740817ec3ad2c2713615eb3d36a10110
+  metadata.gz: f731d444684c1029944c4695d802737985902420c49034ca89f2073ee9e6b397d98e04ab05cd390d06c922dba9a0bd8d47e6549651c878968eceed76589c8477
+  data.tar.gz: 7a5a2a533bc8d830838bac80542e9b61e52cc755ec280683374405064da0d6e8796b0fd7cdc1e5f484cb7df194028d32f57f6d797a3500d946ff5194741307f5

data/lib/startask.rb

@@ -13,7 +13,8 @@ module RecordHelper
   end
   
   def logit(label)
-    @log << [label, Time.now.strftime("%H:%M%P")]    
+    @log << [label, Time.now]
+    #@log << [label, Time.now.strftime("%a, %d %b %Y, %H:%M%P")]        
     @log.last
   end
   
@@ -22,11 +23,11 @@ end
 class ActionItem
   include RecordHelper
 
-  attr_reader :log, :id
+  attr_reader  :id
 
-  def initialize(s, callback=nil)
+  def initialize(s, callback=nil, id: nil)
     
-    @id = generate_id()
+    @id = id || generate_id()
     @title = s
     @log = []
     @callback = callback
@@ -38,6 +39,18 @@ class ActionItem
   end
   
   alias completed done
+  
+  def find(id)
+    return self if id == @id
+  end
+  
+  def log(detail: false)
+    detail ? @log.map {|x| [@id, x[-1], x[0], @title]} : @log
+  end
+  
+  def logupdate(item)
+    @log << item
+  end
 
   def to_s()
     @title
@@ -86,8 +99,15 @@ class Actions
 
   attr_accessor :status  
   
-  def initialize(callback=nil)
+  def initialize(obj=nil, callback=nil)
+    
+    @a = read obj if obj.is_a? Rexle::Recordset
     @callback = callback
+    
+  end
+  
+  def find(id)
+    @a.find {|x| x.find id}
   end
 
   def import(a)
@@ -99,6 +119,10 @@ class Actions
     return self
 
   end
+  
+  def log()
+    @a.flat_map {|x| x.log(detail: true)}
+  end  
 
   def [](i)
     @a[i]
@@ -112,6 +136,23 @@ class Actions
     
     Rexle::Element.new( :actions, value: @a.map(&:to_xml).join)
     #@a.map(&:to_xml)
+  end
+
+  private
+  
+  def read(node)
+    
+    node.map do |e|
+      
+      case e.name.to_sym
+      when :action
+        ActionItem.new(e.text, id: e.attributes[:id])
+      when :actions
+        Actions.new(e.xpath('*'), callback: @callback)
+      end
+      
+    end
+    
   end  
 
 end
@@ -121,8 +162,8 @@ class ResultItem
   
   attr_reader :id
   
-  def initialize(s, callback=nil)
-    @id = generate_id()
+  def initialize(s, callback=nil, id: nil)
+    @id = id || generate_id()
     @evidence = s
     @callback = callback
   end
@@ -142,8 +183,13 @@ end
 
 class Results
   
-  def initialize(callback=nil)
-    @callback = callback
+  def initialize(obj=nil, callback: nil)
+    
+    @a = read obj if obj.is_a? Rexle::Recordset
+    @callback = callback    
+    
+    return self
+    
   end
   
   def import(a)
@@ -173,13 +219,8 @@ class Results
   
   def to_xml()
     
-    if @a.length < 2 then      
-      @a[0].to_xml
-    else
-      Rexle::Element.new( :results, value: @a.map(&:to_xml).join)
-    end
-          
-    #@a.map(&:to_xml)
+    Rexle::Element.new( :results, value: @a.map(&:to_xml).join)
+
   end    
   
   def print_row(id, indent: 0)
@@ -193,6 +234,23 @@ class Results
     end.join("\n")
   end
   
+  private
+  
+  def read(node)
+    
+    node.map do |e|
+      
+      case e.name.to_sym
+      when :result
+        ResultItem.new(e.text, id: e.attributes[:id])
+      when :results
+        Results.new(e.xpath('*'), callback: @callback)
+      end
+      
+    end
+    
+  end
+  
 end
 
 # task dictionary
@@ -213,7 +271,7 @@ end
 class StarTask
   include RecordHelper
 
-  attr_reader :situation, :task, :actions, :log, :results, :id
+  attr_reader :situation, :task, :actions, :results, :id
 
   def initialize(src=nil, debug: false)
     
@@ -221,7 +279,8 @@ class StarTask
     @id = generate_id()
     @log = []
     @status = ''
-    import src if src
+    read src if src
+    
   end
   
   def done()
@@ -229,6 +288,16 @@ class StarTask
   end
   
   alias completed done
+  
+  def find(id)
+    
+    if @id == id then
+      return self
+    else
+      @actions.find id
+    end
+    
+  end
 
   def import(raws)
 
@@ -269,6 +338,15 @@ class StarTask
     @results = Results.new(self).import(kvx.result[:items])
 
   end
+  
+  def log(detail: false)
+    #todo
+    detail ? @log.map {|x| [@id, x[-1], x[0]]} : @log
+  end
+  
+  def logupdate(item)
+    @log << item
+  end
     
   # adds a status message to the log
   #
@@ -293,11 +371,28 @@ class StarTask
     situation = Rexle::Element.new( :situation, value: @situation)
     task = Rexle::Element.new( :task, value: @task)
     
-    doc = Rexle.new('<star/>')
+    doc = Rexle.new()
+    doc.add Rexle::Element.new(:star)
+    doc.root.attributes[:id] = @id
     doc.root.add situation
     doc.root.add task
     doc.root.add @actions.to_xml
     doc.root.add @results.to_xml
+    
+    logx = log(detail: true) + @actions.log
+    
+    lognode = Rexle::Element.new(:log)
+    
+    logx.sort_by {|x| x[1]}.reverse.each do |x|
+      
+        attr = {id: x[0], timestamp: x[1]}
+        val = "[%s]" % x[2]
+        val += ' ' + x[3] if x[3]
+        
+        lognode.add Rexle::Element.new( :li, attributes: attr, value: val)
+    end
+    
+    doc.root.add lognode
     doc.root.xml pretty: true
     
   end  
@@ -310,5 +405,37 @@ class StarTask
     @status = r
     
   end
+  
+  def read(obj)
+
+    s, _ = RXFHelper.read obj
+    doc = Rexle.new(s)
+    @id = doc.root.attributes[:id]
+    @situation = doc.root.element('situation').text 
+    @task = doc.root.element('task').text        
+    actions = doc.root.xpath('actions/*')
+    @actions = Actions.new actions
+    results = doc.root.xpath('results/*')
+    @results = Results.new results
+    
+    log = doc.root.xpath('log/*')
+    
+    log.reverse.each do |x|
+      
+      id = x.attributes[:id]
+      found = find id
+      
+      if found then
+        d = Time.parse(x.attributes[:timestamp])        
+        puts 'x.text: ' + x.text.inspect if @debug
+        status = x.text[/^\[([^\]]+)/,1]
+        found.logupdate([status.to_sym, d])
+      end
+      
+      
+    end
+    
+    doc.xml pretty: true
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: startask
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -36,7 +36,7 @@ cert_chain:
   BWN+6F7HF8UfTUHWCQqk9FoCAYtbfQWLUqZwWN+dLzn1CPK0yoPjuSR59/HShliV
   IUEz9QfhClpwEVu+leXBe7RwfxADwAWYEfI=
   -----END CERTIFICATE-----
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper