startask 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30dbb24b427f846ff42bd6211855e50afd63003ab67c247bae7168612742202b
-  data.tar.gz: 9ecb8e6c9650ccf8bbd4bb4617bd57c710639e73e0f9ee6a986c7d3272425a37
+  metadata.gz: 8ad982911d12e9f54c2591e57aae3e8088282984540dff16709e41717cb251b7
+  data.tar.gz: e6cfffc5ef7f5ad1cbb9f4ebb7f75a9b36197236533d2f1221d123ce13f44388
 SHA512:
-  metadata.gz: 06ed3157c3f971f0499ad91bfb992380cb48e00f6b6daa7ad6072099219d0e39c2ad78bf33feb3460095f79391076757f770c3fbd38e96d0bc6bea4e7930a46a
-  data.tar.gz: 94bd4563c6b3b0ff69f0e4af49e228bffca7353eed5d94ce4667ca2ab07e511385489f934663d4b751210e3656745fa85b18fd9f3a7cfc7e223ceea22ebe8d78
+  metadata.gz: f731d444684c1029944c4695d802737985902420c49034ca89f2073ee9e6b397d98e04ab05cd390d06c922dba9a0bd8d47e6549651c878968eceed76589c8477
+  data.tar.gz: 7a5a2a533bc8d830838bac80542e9b61e52cc755ec280683374405064da0d6e8796b0fd7cdc1e5f484cb7df194028d32f57f6d797a3500d946ff5194741307f5

data/lib/startask.rb

@@ -6,35 +6,66 @@
 require 'kvx'
 require 'rxfhelper'
 
+module RecordHelper
+  
+  def generate_id()
+    Time.now.to_f.to_s.sub('.','-')
+  end
+  
+  def logit(label)
+    @log << [label, Time.now]
+    #@log << [label, Time.now.strftime("%a, %d %b %Y, %H:%M%P")]        
+    @log.last
+  end
+  
+end
+
 class ActionItem
+  include RecordHelper
 
-  attr_reader :log
+  attr_reader  :id
 
-  def initialize(s)
+  def initialize(s, callback=nil, id: nil)
+    
+    @id = id || generate_id()
     @title = s
     @log = []
+    @callback = callback
+    
   end
   
   def done()
-    logit :completed
+    logaction :completed
   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
   end
   
   def started()
-    logit :started
+    logaction :started
   end
   
   def status()
-    @log.last
+    @log.last ? @log.last : []
   end
   
   def stopped()
-    logit :stopped
+    logaction :stopped
   end
   
   def status=(status)
@@ -48,25 +79,50 @@ class ActionItem
     
   end
   
+  def to_xml()
+    
+    h = {id: @id, status: status().join(' ')}
+    Rexle::Element.new(:action, attributes: h, value: @title)
+    
+  end
+  
   private
   
-  def logit(label)
-    @log << [label, Time.now.strftime("%H:%M%P")]    
+  def logaction(label)    
+    r = logit label
+    @callback.status = r.clone.insert(1, @title) if @callback
   end
 
 end
 
 class Actions
 
+  attr_accessor :status  
+  
+  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)
 
     @a = a.map do |x|
-      x.is_a?(String) ? ActionItem.new(x) : Actions.new.import(x)
+      x.is_a?(String) ? ActionItem.new(x, @callback) : Actions.new(@callback).import(x)
     end
 
     return self
 
   end
+  
+  def log()
+    @a.flat_map {|x| x.log(detail: true)}
+  end  
 
   def [](i)
     @a[i]
@@ -75,25 +131,65 @@ class Actions
   def to_s()
     @a.each(&:to_s)
   end
+  
+  def to_xml()
+    
+    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
 
 class ResultItem
+  include RecordHelper
   
-  def initialize(s)
+  attr_reader :id
+  
+  def initialize(s, callback=nil, id: nil)
+    @id = id || generate_id()
     @evidence = s
+    @callback = callback
   end
   
   def to_s()
     @evidence
   end
   
+  def to_xml()
+    
+    h = {id: @id}
+    Rexle::Element.new(:result, attributes: h, value: @evidence)
+    
+  end  
+  
 end
 
 class Results
   
-  def initialize()
-
+  def initialize(obj=nil, callback: nil)
+    
+    @a = read obj if obj.is_a? Rexle::Recordset
+    @callback = callback    
+    
+    return self
+    
   end
   
   def import(a)
@@ -121,6 +217,12 @@ class Results
     end.join("\n")
   end
   
+  def to_xml()
+    
+    Rexle::Element.new( :results, value: @a.map(&:to_xml).join)
+
+  end    
+  
   def print_row(id, indent: 0)
         
     @a.map.with_index do |x, i|
@@ -132,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
@@ -150,20 +269,35 @@ end
 # started (method) adds a status message to the log
 
 class StarTask
+  include RecordHelper
 
-  attr_reader :situation, :task, :actions, :log, :results
+  attr_reader :situation, :task, :actions, :results, :id
 
   def initialize(src=nil, debug: false)
+    
     @debug = debug
+    @id = generate_id()
     @log = []
-    import src if src
+    @status = ''
+    read src if src
+    
   end
   
   def done()
-    logit :completed
+    logtask :completed
   end
   
   alias completed done
+  
+  def find(id)
+    
+    if @id == id then
+      return self
+    else
+      @actions.find id
+    end
+    
+  end
 
   def import(raws)
 
@@ -179,7 +313,7 @@ class StarTask
        
         rawlabel, body = x.split(/\n/,2)
         
-        [rawlabel.downcase.gsub(/\s+/, '_').to_sym, 
+        [rawlabel.rstrip.downcase.gsub(/\s+/, '_').to_sym, 
          body.strip.gsub(/^(\s*)[\*\+] /,'\1')]
         
       end.to_h
@@ -200,30 +334,108 @@ class StarTask
     kvx = Kvx.new obj
     @situation = kvx.situation
     @task = kvx.task
-    @actions = Actions.new.import(kvx.action[:items])
-    @results = Results.new.import(kvx.result[:items])
+    @actions = Actions.new(self).import(kvx.action[:items])
+    @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
   #
   def started()
-    logit :started
+    logtask :started
   end
   
   def status()
-    @log.last
+    @status
   end
   
-  def stopped()
-    logit :stopped
+  def status=(s)
+    @status = s
   end
   
+  def stopped()
+    logtask :stopped
+  end  
+    
+  def to_xml()
+    
+    situation = Rexle::Element.new( :situation, value: @situation)
+    task = Rexle::Element.new( :task, value: @task)
+    
+    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  
+  
   private
   
-  def logit(label)
-    @log << [label, Time.now.strftime("%H:%M%P")]    
-    return label
+  def logtask(label)
+    
+    r = logit label
+    @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.1
+  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-28 00:00:00.000000000 Z
+date: 2022-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper