startask 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30dbb24b427f846ff42bd6211855e50afd63003ab67c247bae7168612742202b
-  data.tar.gz: 9ecb8e6c9650ccf8bbd4bb4617bd57c710639e73e0f9ee6a986c7d3272425a37
+  metadata.gz: 98f7117e10b305b80d9ca459f61f9b6612eac3119d1e512bcc16211db5abcb7d
+  data.tar.gz: 0abf88ac656c4dd87c0dc0280f426a724866f8a18b2f60ed0805eaad8cfd8cb2
 SHA512:
-  metadata.gz: 06ed3157c3f971f0499ad91bfb992380cb48e00f6b6daa7ad6072099219d0e39c2ad78bf33feb3460095f79391076757f770c3fbd38e96d0bc6bea4e7930a46a
-  data.tar.gz: 94bd4563c6b3b0ff69f0e4af49e228bffca7353eed5d94ce4667ca2ab07e511385489f934663d4b751210e3656745fa85b18fd9f3a7cfc7e223ceea22ebe8d78
+  metadata.gz: c6536b528bc0587c8d225bae4a8da20762eafef9a3ee5e7854e79e0410fe8ef4fa9a1d08c6fea4d12ca10e0b8fa82301077b6a4ca1dea9b22506552dbad04e77
+  data.tar.gz: 89da5ddcbed700bd31887d9aab6a9d62b242b68059ee891acfd2e688d8e058fd483f90585b7bc3c16523c3fad7b6dd20740817ec3ad2c2713615eb3d36a10110

data/lib/startask.rb

@@ -6,17 +6,35 @@
 require 'kvx'
 require 'rxfhelper'
 
+module RecordHelper
+  
+  def generate_id()
+    Time.now.to_f.to_s.sub('.','-')
+  end
+  
+  def logit(label)
+    @log << [label, Time.now.strftime("%H:%M%P")]    
+    @log.last
+  end
+  
+end
+
 class ActionItem
+  include RecordHelper
 
-  attr_reader :log
+  attr_reader :log, :id
 
-  def initialize(s)
+  def initialize(s, callback=nil)
+    
+    @id = generate_id()
     @title = s
     @log = []
+    @callback = callback
+    
   end
   
   def done()
-    logit :completed
+    logaction :completed
   end
   
   alias completed done
@@ -26,15 +44,15 @@ class ActionItem
   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,20 +66,34 @@ 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(callback=nil)
+    @callback = callback
+  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
@@ -75,25 +107,43 @@ 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  
 
 end
 
 class ResultItem
+  include RecordHelper
+  
+  attr_reader :id
   
-  def initialize(s)
+  def initialize(s, callback=nil)
+    @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(callback=nil)
+    @callback = callback
   end
   
   def import(a)
@@ -121,6 +171,17 @@ class Results
     end.join("\n")
   end
   
+  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)
+  end    
+  
   def print_row(id, indent: 0)
         
     @a.map.with_index do |x, i|
@@ -150,17 +211,21 @@ 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, :log, :results, :id
 
   def initialize(src=nil, debug: false)
+    
     @debug = debug
+    @id = generate_id()
     @log = []
+    @status = ''
     import src if src
   end
   
   def done()
-    logit :completed
+    logtask :completed
   end
   
   alias completed done
@@ -179,7 +244,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 +265,50 @@ 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
     
   # 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('<star/>')
+    doc.root.add situation
+    doc.root.add task
+    doc.root.add @actions.to_xml
+    doc.root.add @results.to_xml
+    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
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: startask
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 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-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper