ruby-macrodroid 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12fa9c7d9f642140ed62656a4c3444e5c739ad2be06af2883e23e48766cd742f
-  data.tar.gz: 6f70e2124afbcf43bd15295dfea8aaf9a0a8d6704de819acb34481082d8c905f
+  metadata.gz: b820bff4fbf40858e39fb86dcf5cca3c511fec1285c6ef642469f0222ae7858e
+  data.tar.gz: abea1d50f38024c84dcca885487915a6f878427d0f5504c98ce818976231eb8c
 SHA512:
-  metadata.gz: a00b28e20a41ffbdead956eb07ad4e7fe412aa2ceb773017a709c97a4fd1307672b78405581a8e54d855d1f9cb53fe598638bc542facccde886b127e9e150d17
-  data.tar.gz: ddcdc9689a2f202477018ab710772c834caad0e392c6d7135c0f65beb8e85dbf0144fc793e7b11db404531a1cbaf69876b2b21f7598b6baf1361ba794f7bc809
+  metadata.gz: 6f64c76e11c1b581e8e86bbddbcfec090e90c5673ecc72d64deeb542452a870252dc30a066f699f5ea1b682147f241d2518341b34cfefe6d5e70aacbe4cf22e6
+  data.tar.gz: b3e6b695cca7a0c10c14b4bde58c927504cc2f5e722ba2ca83fb9c905d51369b1a0912134a523ae4a3f6546dbf9e826585fddb6a56fa02799e2d72fcbd37a6d0

data.tar.gz.sig

@@ -1,3 +1 @@
-0t�����Ip���,���d	��Q7��N��j���eO���Xu�,�{2�'���Gi��V�'��qͩTȉ�
���+��)jۥ7� 603�e�����OC�O�갣�pR^���¢�Sܥ�̦�t����>������ᚈ�Xk�Boi��Z��c�O8���q�#a�
-�����L'NK��D�qf�H�k�w�+ԐP]�\�X9��x��w���1wj{S9�fWDgc�6s��Yr�=�ų��UB�,�Q.�z�R�R\C��
�jC��탿Ru�����3����j�a+�������>�tv׳��[��Ѐ�0^
-d[m6��N�eœ�׷�HvLv
+�����Qt�;�����Ɠ�5���

data/lib/ruby-macrodroid.rb

@@ -7,12 +7,7 @@
 #  ## Nlp classes
 #  
 #  TriggersNlp ActionsNlp ConstraintsNlp
-#  
-#  
-#  ## Macro class
-#  
-#  Macro
-#  
+#     
 #  
 #  ## Error class
 #  
@@ -31,11 +26,12 @@
 #  
 
 
+
 require 'yaml'
 require 'rowx'
 require 'uuid'
-require 'glw'
-require 'geozone'
+#require 'glw'
+#require 'geozone'
 require 'geocoder'
 require 'subunit'
 require 'rxfhelper'
@@ -345,500 +341,6 @@ end
 
 
 
-class Macro
-  using ColouredText
-  using Params
-
-  attr_reader :local_variables, :triggers, :actions, :constraints, 
-      :guid, :deviceid
-  attr_accessor :title, :description
-
-  def initialize(name=nil, geofences: nil, deviceid: nil, debug: false)
-
-    @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
-    
-    puts 'inside Macro#initialize' if @debug    
-          
-    @local_variables, @triggers, @actions, @constraints = [], [], [], []
-    @h = {}
-    
-  end
-  
-  def add(obj)
-
-    if obj.kind_of? Trigger then
-      
-      puts 'trigger found' if @debug
-      @triggers << obj
-      
-    elsif obj.kind_of? Action
-      
-      puts 'action found' if @debug
-      @actions << obj
-      
-    elsif obj.kind_of? Constraint
-      
-      puts 'constraint found' if @debug
-      @constraints << obj
-      
-    end
-    
-  end
-
-  def to_h()
-
-    h = {
-      local_variables: @local_variables,
-      m_trigger_list: @triggers.map(&:to_h),
-      m_action_list: @actions.map(&:to_h),
-      m_category: @category,
-      m_constraint_list: @constraints.map(&:to_h),
-      m_description: '',
-      m_name: title(),
-      m_excludeLog: false,
-      m_GUID: guid(),
-      m_isOrCondition: false,
-      m_enabled: false,
-      m_descriptionOpen: false,
-      m_headingColor: 0
-    }
-    
-    puts 'h: ' + h.inspect if @debug
-
-    @h.merge(h)
-  end
-
-  def import_h(h)
-
-    if @debug then
-      puts 'inside import_h'
-      puts 'h:' + h.inspect
-    end
-    
-    @category = h[:category]
-    @title = h[:name]
-    @description = h[:description]
-    
-    # fetch the local variables
-    if h[:local_variables].any? and h[:local_variables].first.any? then
-      
-      @local_variables = h[:local_variables].map do |var|
-              
-        val = case var[:type]
-        when 0 # boolean
-          var[:boolean_value]
-        when 1 # integer
-          var[:int_value]
-        when 2 # string
-          var[:string_value]
-        when 3 # decimal
-          var[:decimal_Value]
-        end
-        
-        [var[:name], val]
-        
-      end.to_h
-    end
-    
-    # fetch the triggers
-    @triggers = h[:trigger_list].map do |trigger|
-      puts 'trigger: ' + trigger.inspect
-      #exit      
-      object(trigger.to_snake_case)
-
-    end
-
-    @actions = h[:action_list].map do |action|
-      object(action.to_snake_case)
-    end
-    puts 'before fetch constraints' if @debug
-    # fetch the constraints                               
-    @constraints = h[:constraint_list].map do |constraint|
-      object(constraint.to_snake_case)
-    end                               
-    puts 'after fetch constraints' if @debug    
-    @h = h
-
-    %i(local_variables m_trigger_list m_action_list m_constraint_list)\
-      .each {|x| @h[x] = [] }
-    puts 'after @h set' if @debug    
-    @h
-
-  end
-  
-  def import_xml(node)
-
-    if @debug then
-      puts 'inside Macro#import_xml'
-      puts 'node: ' + node.xml.inspect
-    end
-    
-    if node.element('triggers') then
-            
-      # level 2
-      
-      @title = node.attributes[:name]
-      @category = node.attributes[:category]
-      @description = node.attributes[:description]
-      
-      
-      # get all the triggers
-      @triggers = node.xpath('triggers/*').map do |e|
-        
-        puts 'e.name: ' + e.name.inspect if @debug
-        {timer: TimerTrigger}[e.name.to_sym].new(e.attributes.to_h)
-        
-      end
-
-      # get all the actions
-      @actions = node.xpath('actions/*').map do |e|
-        
-        if e.name == 'notification' then
-          
-          case e.attributes[:type].to_sym
-          when :popup          
-            e.attributes.delete :type
-            ToastAction.new e.attributes.to_h
-          end
-          
-        end
-
-      end    
-                               
-      # get all the constraints
-      @constraints = node.xpath('constraints/*').map do |e|
-        
-        puts 'e.name: ' + e.name.inspect if @debug
-        {airplanemode: AirplaneModeConstraint}[e.name.to_sym].new(e.attributes.to_h)
-
-      end                                  
-      
-    else
-      
-      # Level 1
-      
-      puts 'import_xml: inside level 1' if @debug
-      
-      @title = node.text('macro') || node.attributes[:name]
-      
-      #@description = node.attributes[:description]      
-      
-      tp = TriggersNlp.new      
-      
-      @triggers = node.xpath('trigger').map do |e|
-        
-        r = tp.find_trigger e.text
-        
-        puts 'found trigger ' + r.inspect if @debug
-        
-        if r then
-          if r[0] == GeofenceTrigger then
-            GeofenceTrigger.new(r[1], geofences: @geofences)
-          else
-            r[0].new(r[1])
-          end
-        end
-        
-      end
-      
-      ap = ActionsNlp.new      
-      
-      @actions = node.xpath('action').map do |e|
-        
-        puts 'action e: ' + e.xml.inspect if @debug
-        puts 'e.text ' + e.text if @debug
-        
-        inner_lines = e.xpath('item/description/text()')        
-        
-        action = if e.text.to_s.strip.empty? then
-          inner_lines.shift.strip
-        else
-          e.text.strip
-        end
-        
-        r = ap.find_action action
-        puts 'found action ' + r.inspect if @debug
-        
-        if r then
-          
-          loose = inner_lines.shift
-          
-          raw_attributes = if loose then
-          
-            puts 'do something ' + loose.to_s if @debug
-            loose.to_s
-            
-          else
-            
-            a = e.xpath('item/*')
-            
-            h = if a.any? then
-              a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
-            else
-              {}
-            end
-            
-            r[1].merge(h)
-            
-          end
-          r[0].new(raw_attributes)
-        end
-        
-      end      
-                               
-      cp = ConstraintsNlp.new      
-      
-      @constraints = node.xpath('constraint').map do |e|
-        
-        r = cp.find_constraint e.text
-        puts 'found constraint ' + r.inspect if @debug
-        
-        if r then
-          r[0].new(r[1])
-        end
-        
-      end                                   
-      
-    end
-    
-    self
-    
-  end
-  
-  def match?(triggerx, detail={time: $env[:time]}, model=nil )
-                
-    if @triggers.any? {|x| x.type == triggerx and x.match?(detail, model) } then
-      
-      if @debug then
-        puts 'checking constraints ...' 
-        puts '@constraints: ' + @constraints.inspect
-      end
-      
-      if @constraints.all? {|x| x.match?($env.merge(detail), model) } then
-      
-        true
-        
-      else
-
-        return false
-        
-      end
-      
-    end
-    
-  end
-  
-  # invokes the actions
-  #
-  def run()
-    @actions.map(&:invoke)
-  end
-  
-  # prepares the environment in order for triggers to test fire successfully
-  # Used for testing
-  #
-  def set_env()
-    @triggers.each(&:set_env)
-  end
-
-  def to_pc()
-    
-    heading = '# ' + @title
-    heading += '\n# ' + @description if @description
-    condition = @triggers.first.to_pc
-    actions = @actions.map(&:to_pc).join("\n")
-    
-<<EOF
-#{heading}
-
-if #{condition} then
-  #{actions}
-end
-EOF
-  end
-    
-  def to_s(colour: false)
-    
-    indent = 0 #@actions.map(&:to_s).join.lines.length > 0 ? 1 : 0
-    
-    a = []
-    a << '# ' + @category + "\n" if @category
-    a <<  (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title
-
-    
-    if @description and @description.length >= 1 then
-      a << (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
-               + @description.gsub(/\n/,"\n  ")
-    end    
-    
-    if @local_variables.length >= 1 then
-      
-      vars = @local_variables.map do |k,v|
-        label = colour ? 'v'.bg_magenta : 'v'
-        label += ': '
-        label + "%s: %s" % [k,v]
-      end
-      
-      a << vars.join("\n")
-    end    
-    
-    a << @triggers.map do |x|
-      s =-x.to_s(colour: colour)
-      
-      s2 = if s.lines.length > 1 then        
-        "\n" + s.lines.map {|x| x.prepend ('  ' * (indent+1)) }.join
-      else
-        ' ' + s
-      end         
-      #s.lines > 1 ? "\n" + x : x
-      (colour ? "t".bg_red.gray.bold : 't') + ":" + s2
-    end.join("\n")
-    
-    actions = @actions.map do |x|
-
-
-      s = x.to_s(colour: colour)
-      #puts 's: ' + s.inspect      
-      
-
-      
-      r = if indent <= 0 then
-      
-        lines = s.lines
-        
-        if lines.length > 1 then        
-          s = lines.map {|x| x.prepend ('  ' * (indent+1)) }.join
-        end      
-
-        s2 = s.lines.length > 1 ? "\n" + s : ' ' + s        
-        
-        if colour then
-          "a".bg_blue.gray.bold + ":" + s2
-        else
-          "a:" + s2
-        end
-        
-      elsif indent > 0 
-      
-        if s =~ /^Else/ then
-          ('  ' * (indent-1)) + "%s" % s
-        elsif s =~ /^End/
-          indent -= 1
-          ('  ' * indent) + "%s" % s
-        else
-          s2 = s.lines[0] + s.lines[1..-1].map {|x| ('  ' * indent) + x }.join
-          ('  ' * indent) + "%s" % s2
-        end        
-        
-      end
-      
-      if s =~ /^(?:If|DO \/ WHILE)/i then
-        
-        if indent < 1 then
-          
-          r = if colour then
-            "a".bg_blue.gray.bold + ":\n  %s" % s
-          else
-            "a:\n  %s" % s
-          end
-          
-          indent += 1
-        else
-          r = ('  ' * indent) + "%s" % s
-        end
-
-        indent += 1
-      end
-      
-      r
-      
-    end.join("\n")
-
-
-    
-
-    a << actions
-
-    
-    if @constraints.any? then
-      a << @constraints.map do |x|
-        (colour ? "c".bg_green.gray.bold : 'c') + ": %s" % x
-      end.join("\n") 
-    end
-    
-
-    
-
-    
-    a.join("\n") + "\n"
-    
-  end
-  
-  def to_summary(colour: false)
-    
-    if colour then
-      
-      a = [
-        'm'.bg_cyan.gray.bold + ': ' + @title,
-        't'.bg_red.gray.bold + ': ' + @triggers.map \
-      {|x| x.to_summary(colour: false)}.join(", "),
-        'a'.bg_blue.gray.bold + ': ' + @actions.map \
-      {|x| x.to_summary(colour: false)}.join(", ")
-      ]
-      
-      if @constraints.any? then
-        a <<  'c'.bg_green.gray.bold + ': ' + @constraints.map \
-            {|x| x.to_summary(colour: false)}.join(", ") 
-      end      
-      
-    else
-      
-      a = [
-        'm: ' + @title,
-        't: ' + @triggers.map {|x| x.to_summary(colour: false)}.join(", "),
-        'a: ' + @actions.map {|x| x.to_summary(colour: false)}.join(", ")
-      ]
-      
-      if @constraints.any? then
-        a <<  'c: ' + @constraints.map \
-            {|x| x.to_summary(colour: false)}.join(", ") 
-      end
-    end
-    
-    
-    
-    a.join("\n") + "\n"
-    
-  end
-
-  private
-  
-  def guid()
-    '-' + rand(1..9).to_s + 18.times.map { rand 9 }.join    
-  end
-
-  def object(h={})
-
-    puts ('inside object h:'  + h.inspect).debug if @debug  
-    klass = Object.const_get h[:class_type]
-    puts klass.inspect.highlight if $debug
-    
-    if klass == GeofenceTrigger then
-      puts 'GeofenceTrigger found'.highlight if $debug
-      GeofenceTrigger.new(h, geofences: @geofences)
-    else
-      puts 'before klass'
-      h2 = h.merge( macro: self)
-      puts 'h2: ' + h2.inspect      
-      r = klass.new h2 
-      puts 'r:' + r.inspect
-      r
-      
-    end
-    
-  end
-
-end
 
 
 class MacroDroidError < Exception
@@ -901,6 +403,7 @@ class MacroDroid
           end
           
           xml = RowX.new(raw_macros).to_xml
+          puts 'xml: ' + xml if @debug
           import_rowxml(xml)
           
         elsif s =~ /^# / 

data/lib/ruby-macrodroid/actions.rb

@@ -1938,6 +1938,9 @@ class ToastAction < NotificationsAction
     
     h = if obj.is_a? Hash then
       obj
+    elsif obj.is_a? Rexle::Element
+      txt = obj.text('item/description')
+      {msg: (txt || obj.text)}
     else
       {msg: obj}
     end

data/lib/ruby-macrodroid/macro.rb

@@ -0,0 +1,514 @@
+# file: ruby-macrodroid/macro.rb
+
+
+# This file contains the following classes:
+#  
+#  ## Macro class
+#  
+#  Macro
+
+class Macro
+  using ColouredText
+  using Params
+
+  attr_reader :local_variables, :triggers, :actions, :constraints, 
+      :guid, :deviceid
+  attr_accessor :title, :description
+
+  def initialize(name=nil, geofences: nil, deviceid: nil, debug: false)
+
+    @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
+    
+    puts 'inside Macro#initialize' if @debug    
+          
+    @local_variables, @triggers, @actions, @constraints = [], [], [], []
+    @h = {}
+    
+  end
+  
+  def add(obj)
+
+    if obj.kind_of? Trigger then
+      
+      puts 'trigger found' if @debug
+      @triggers << obj
+      
+    elsif obj.kind_of? Action
+      
+      puts 'action found' if @debug
+      @actions << obj
+      
+    elsif obj.kind_of? Constraint
+      
+      puts 'constraint found' if @debug
+      @constraints << obj
+      
+    end
+    
+  end
+
+  def to_h()
+
+    h = {
+      local_variables: @local_variables,
+      m_trigger_list: @triggers.map(&:to_h),
+      m_action_list: @actions.map(&:to_h),
+      m_category: @category,
+      m_constraint_list: @constraints.map(&:to_h),
+      m_description: '',
+      m_name: title(),
+      m_excludeLog: false,
+      m_GUID: guid(),
+      m_isOrCondition: false,
+      m_enabled: false,
+      m_descriptionOpen: false,
+      m_headingColor: 0
+    }
+    
+    puts 'h: ' + h.inspect if @debug
+
+    @h.merge(h)
+  end
+
+  def import_h(h)
+
+    if @debug then
+      puts 'inside import_h'
+      puts 'h:' + h.inspect
+    end
+    
+    @category = h[:category]
+    @title = h[:name]
+    @description = h[:description]
+    
+    # fetch the local variables
+    if h[:local_variables].any? and h[:local_variables].first.any? then
+      
+      @local_variables = h[:local_variables].map do |var|
+              
+        val = case var[:type]
+        when 0 # boolean
+          var[:boolean_value]
+        when 1 # integer
+          var[:int_value]
+        when 2 # string
+          var[:string_value]
+        when 3 # decimal
+          var[:decimal_Value]
+        end
+        
+        [var[:name], val]
+        
+      end.to_h
+    end
+    
+    # fetch the triggers
+    @triggers = h[:trigger_list].map do |trigger|
+      puts 'trigger: ' + trigger.inspect
+      #exit      
+      object(trigger.to_snake_case)
+
+    end
+
+    @actions = h[:action_list].map do |action|
+      object(action.to_snake_case)
+    end
+    puts 'before fetch constraints' if @debug
+    # fetch the constraints                               
+    @constraints = h[:constraint_list].map do |constraint|
+      object(constraint.to_snake_case)
+    end                               
+    puts 'after fetch constraints' if @debug    
+    @h = h
+
+    %i(local_variables m_trigger_list m_action_list m_constraint_list)\
+      .each {|x| @h[x] = [] }
+    puts 'after @h set' if @debug    
+    @h
+
+  end
+  
+  def import_xml(node)
+
+    if @debug then
+      puts 'inside Macro#import_xml'
+      puts 'node: ' + node.xml.inspect
+    end
+    
+    if node.element('triggers') then
+            
+      # level 2
+      
+      @title = node.attributes[:name]
+      @category = node.attributes[:category]
+      @description = node.attributes[:description]
+      
+      
+      # get all the triggers
+      @triggers = node.xpath('triggers/*').map do |e|
+        
+        puts 'e.name: ' + e.name.inspect if @debug
+        {timer: TimerTrigger}[e.name.to_sym].new(e.attributes.to_h)
+        
+      end
+
+      # get all the actions
+      @actions = node.xpath('actions/*').map do |e|
+        
+        if e.name == 'notification' then
+          
+          case e.attributes[:type].to_sym
+          when :popup          
+            e.attributes.delete :type
+            ToastAction.new e.attributes.to_h
+          end
+          
+        end
+
+      end    
+                               
+      # get all the constraints
+      @constraints = node.xpath('constraints/*').map do |e|
+        
+        puts 'e.name: ' + e.name.inspect if @debug
+        {airplanemode: AirplaneModeConstraint}[e.name.to_sym].new(e.attributes.to_h)
+
+      end                                  
+      
+    else
+      
+      # Level 1
+      
+      puts 'import_xml: inside level 1' if @debug
+      
+      @title = node.text('macro') || node.attributes[:name]
+      
+      #@description = node.attributes[:description]      
+      
+      tp = TriggersNlp.new      
+      
+      @triggers = node.xpath('trigger').map do |e|
+        
+        r = tp.find_trigger e.text
+        
+        puts 'found trigger ' + r.inspect if @debug
+        
+        if r then
+          if r[0] == GeofenceTrigger then
+            GeofenceTrigger.new(r[1], geofences: @geofences)
+          else
+            r[0].new(r[1])
+          end
+        end
+        
+      end
+      
+      ap = ActionsNlp.new      
+      
+      @actions = node.xpath('action').flat_map do |e|
+        
+        puts 'action e: ' + e.xml.inspect if @debug
+        puts 'e.text ' + e.text if @debug
+        
+        item = e.element('item')
+        if item then
+          
+          if item.element('description') then
+            
+            item.xpath('description').map do |description|
+              
+              inner_lines = description.text.to_s.strip.lines
+              puts 'inner_lines: ' + inner_lines.inspect if @debug
+              
+              action = if e.text.to_s.strip.empty? then
+                inner_lines.shift.strip
+              else
+                e.text.strip
+              end
+              
+              r = ap.find_action action          
+              r[0].new(description) if r              
+              
+            end
+            
+          else
+            
+            action = e.text.strip
+            r = ap.find_action action
+
+            a = e.xpath('item/*')
+
+            h = if a.any? then
+              a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+            else
+              {}
+            end
+
+            r = ap.find_action action          
+            r[0].new(h) if r
+            
+          end
+          
+        else
+          
+          action = e.text.strip
+          r = ap.find_action action          
+          r[0].new(r[1]) if r
+          
+        end
+
+      end      
+                               
+      cp = ConstraintsNlp.new      
+      
+      @constraints = node.xpath('constraint').map do |e|
+        
+        r = cp.find_constraint e.text
+        puts 'found constraint ' + r.inspect if @debug
+        
+        if r then
+          r[0].new(r[1])
+        end
+        
+      end                                   
+      
+    end
+    
+    self
+    
+  end
+  
+  def match?(triggerx, detail={time: $env[:time]}, model=nil )
+                
+    if @triggers.any? {|x| x.type == triggerx and x.match?(detail, model) } then
+      
+      if @debug then
+        puts 'checking constraints ...' 
+        puts '@constraints: ' + @constraints.inspect
+      end
+      
+      if @constraints.all? {|x| x.match?($env.merge(detail), model) } then
+      
+        true
+        
+      else
+
+        return false
+        
+      end
+      
+    end
+    
+  end
+  
+  # invokes the actions
+  #
+  def run()
+    @actions.map(&:invoke)
+  end
+  
+  # prepares the environment in order for triggers to test fire successfully
+  # Used for testing
+  #
+  def set_env()
+    @triggers.each(&:set_env)
+  end
+
+  def to_pc()
+    
+    heading = '# ' + @title
+    heading += '\n# ' + @description if @description
+    condition = @triggers.first.to_pc
+    actions = @actions.map(&:to_pc).join("\n")
+    
+<<EOF
+#{heading}
+
+if #{condition} then
+  #{actions}
+end
+EOF
+  end
+    
+  def to_s(colour: false)
+    
+    indent = 0 #@actions.map(&:to_s).join.lines.length > 0 ? 1 : 0
+    
+    a = []
+    a << '# ' + @category + "\n" if @category
+    a <<  (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title
+
+    
+    if @description and @description.length >= 1 then
+      a << (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
+               + @description.gsub(/\n/,"\n  ")
+    end    
+    
+    if @local_variables.length >= 1 then
+      
+      vars = @local_variables.map do |k,v|
+        label = colour ? 'v'.bg_magenta : 'v'
+        label += ': '
+        label + "%s: %s" % [k,v]
+      end
+      
+      a << vars.join("\n")
+    end    
+    
+    a << @triggers.map do |x|
+      s =-x.to_s(colour: colour)
+      
+      s2 = if s.lines.length > 1 then        
+        "\n" + s.lines.map {|x| x.prepend ('  ' * (indent+1)) }.join
+      else
+        ' ' + s
+      end         
+      #s.lines > 1 ? "\n" + x : x
+      (colour ? "t".bg_red.gray.bold : 't') + ":" + s2
+    end.join("\n")
+    
+    actions = @actions.map do |x|
+
+
+      s = x.to_s(colour: colour)
+      #puts 's: ' + s.inspect      
+      
+
+      
+      r = if indent <= 0 then
+      
+        lines = s.lines
+        
+        if lines.length > 1 then        
+          s = lines.map {|x| x.prepend ('  ' * (indent+1)) }.join
+        end      
+
+        s2 = s.lines.length > 1 ? "\n" + s : ' ' + s        
+        
+        if colour then
+          "a".bg_blue.gray.bold + ":" + s2
+        else
+          "a:" + s2
+        end
+        
+      elsif indent > 0 
+      
+        if s =~ /^Else/ then
+          ('  ' * (indent-1)) + "%s" % s
+        elsif s =~ /^End/
+          indent -= 1
+          ('  ' * indent) + "%s" % s
+        else
+          s2 = s.lines[0] + s.lines[1..-1].map {|x| ('  ' * indent) + x }.join
+          ('  ' * indent) + "%s" % s2
+        end        
+        
+      end
+      
+      if s =~ /^(?:If|DO \/ WHILE)/i then
+        
+        if indent < 1 then
+          
+          r = if colour then
+            "a".bg_blue.gray.bold + ":\n  %s" % s
+          else
+            "a:\n  %s" % s
+          end
+          
+          indent += 1
+        else
+          r = ('  ' * indent) + "%s" % s
+        end
+
+        indent += 1
+      end
+      
+      r
+      
+    end.join("\n")
+
+
+    
+
+    a << actions
+
+    
+    if @constraints.any? then
+      a << @constraints.map do |x|
+        (colour ? "c".bg_green.gray.bold : 'c') + ": %s" % x
+      end.join("\n") 
+    end
+    
+
+    
+
+    
+    a.join("\n") + "\n"
+    
+  end
+  
+  def to_summary(colour: false)
+    
+    if colour then
+      
+      a = [
+        'm'.bg_cyan.gray.bold + ': ' + @title,
+        't'.bg_red.gray.bold + ': ' + @triggers.map \
+      {|x| x.to_summary(colour: false)}.join(", "),
+        'a'.bg_blue.gray.bold + ': ' + @actions.map \
+      {|x| x.to_summary(colour: false)}.join(", ")
+      ]
+      
+      if @constraints.any? then
+        a <<  'c'.bg_green.gray.bold + ': ' + @constraints.map \
+            {|x| x.to_summary(colour: false)}.join(", ") 
+      end      
+      
+    else
+      
+      a = [
+        'm: ' + @title,
+        't: ' + @triggers.map {|x| x.to_summary(colour: false)}.join(", "),
+        'a: ' + @actions.map {|x| x.to_summary(colour: false)}.join(", ")
+      ]
+      
+      if @constraints.any? then
+        a <<  'c: ' + @constraints.map \
+            {|x| x.to_summary(colour: false)}.join(", ") 
+      end
+    end
+    
+    
+    
+    a.join("\n") + "\n"
+    
+  end
+
+  private
+  
+  def guid()
+    '-' + rand(1..9).to_s + 18.times.map { rand 9 }.join    
+  end
+
+  def object(h={})
+
+    puts ('inside object h:'  + h.inspect).debug if @debug  
+    klass = Object.const_get h[:class_type]
+    puts klass.inspect.highlight if $debug
+    
+    if klass == GeofenceTrigger then
+      puts 'GeofenceTrigger found'.highlight if $debug
+      GeofenceTrigger.new(h, geofences: @geofences)
+    else
+      puts 'before klass'
+      h2 = h.merge( macro: self)
+      puts 'h2: ' + h2.inspect      
+      r = klass.new h2 
+      puts 'r:' + r.inspect
+      r
+      
+    end
+    
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw
@@ -186,6 +186,7 @@ files:
 - lib/ruby-macrodroid.rb
 - lib/ruby-macrodroid/actions.rb
 - lib/ruby-macrodroid/base.rb
+- lib/ruby-macrodroid/macro.rb
 - lib/ruby-macrodroid/triggers.rb
 homepage: https://github.com/jrobertson/ruby-macrodroid
 licenses: