ruby-macrodroid 0.7.4 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28ec7303f297d90ed5edbbec3806c577d1fe3036851620c230b4620d4a8a98f
-  data.tar.gz: fd27b2da1d660144aae8bc85b3f392b10b385934d1a38f65817d53ff774e382c
+  metadata.gz: 1a302b724cde397e0ef27e3461dad14fa0801158692951fdcf013fccfbc0348c
+  data.tar.gz: b8a041e5185746e5bd2809e98d098cba2ff20534ddcb679f1c342397840a2976
 SHA512:
-  metadata.gz: f727092bb6f96799f1cd288e5ebf822b189d70ef2b5bcdb5bab452b93b412b737229fa6fed2d982f1233aa5f21d35fb1791e834d8ea023474c1eac6a3d330fd5
-  data.tar.gz: 706f9423e28c7fda560bf059f4686834e4404dca9576d5682f3e43c82440a79c84e5ddeb65619a5410098993da1ee9574cc681912a94285147b40aba1468f8a8
+  metadata.gz: 5311bafd81b65b5a0371aab705d469bdab0ec5b920b40c4004e8e7758460b06f72f590c7c2f49d7cf9d21c8407debe682d81235b66d8d27224bd3a8786e75a22
+  data.tar.gz: 27d2d926b5230f6f545d28e59db686edb82708f65d05128ed2fa9e2b3e59375ca14f00dcf72cd99bd8502d7aeb1534077ca9bf71e86e73ad10e62066d1b4dd57

data/lib/ruby-macrodroid.rb

@@ -110,13 +110,11 @@
 require 'yaml'
 require 'rowx'
 require 'uuid'
-#require 'glw'
-#require 'geozone'
+require 'glw'
+require 'geozone'
+require 'geocoder'
 require 'subunit'
-#require 'rxfhelper'
-require 'requestor'
-eval Requestor.read('http://a0.jamesrobertson.eu/rorb/r/ruby'){|x| x.require 'rxfhelper' }
-
+require 'rxfhelper'
 require 'chronic_cron'
 
 
@@ -138,6 +136,12 @@ class TriggersNlp
   end
 
   def triggers(params) 
+    
+    # e.g. at 7:30pm daily
+    get /^(?:at )?(\d+:\d+(?:[ap]m)?) daily/i do |time, days|
+      [TimerTrigger, {time: time, 
+                      days: %w(Mon Tue Wed Thu Fri Sat Sun).join(', ')}]
+    end       
 
     get /^(?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)/i do |time, days|
       [TimerTrigger, {time: time, days: days}]
@@ -146,7 +150,7 @@ class TriggersNlp
     # time.is? 'at 18:30pm on Mon or Tue'
     get /^time.is\? ['"](?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)['"]/i do |time, days|      
       [TimerTrigger, {time: time, days: days.gsub(' or ',', ')}]
-    end
+    end     
     
     get /^shake[ _]device\??$/i do 
       [ShakeDeviceTrigger, {}]
@@ -196,6 +200,11 @@ class TriggersNlp
 
   alias find_trigger run_route
 
+  def to_s(colour: false)
+    'TriggersNlp ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class ActionsNlp
@@ -315,6 +324,11 @@ class ActionsNlp
 
   alias find_action run_route
 
+  def to_s(colour: false)
+    'ActionsNlp ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class ConstraintsNlp
@@ -469,7 +483,8 @@ class Macro
     
     # fetch the triggers
     @triggers = h[:trigger_list].map do |trigger|
-      
+      puts 'trigger: ' + trigger.inspect
+      #exit      
       object(trigger.to_snake_case)
 
     end
@@ -660,16 +675,24 @@ end
 EOF
   end
     
-  def to_s()
+  def to_s(colour: false)
     
     indent = 0
     actions = @actions.map do |x|
 
-      s = x.to_s
+      s = x.to_s(colour: colour)
+      if s.lines.length > 1 then
+        lines = s.lines
+        s = lines[0] + lines[1..-1].map {|x| x.prepend ('  ' * indent) }.join
+      end
       
       r = if indent <= 0 then
       
-        "a: %s" % s
+        if colour then
+          "a".bg_blue.gray.bold + ": %s" % s
+        else
+          "a: %s" % s
+        end
         
       elsif indent > 0 
       
@@ -685,8 +708,15 @@ EOF
       end
       
       if s =~ /^If/i then
+        
         if indent < 1 then
-          r = "a:\n  %s" % s
+          
+          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
@@ -700,30 +730,59 @@ EOF
     end.join("\n")
     
     a = [
-      'm: ' + @title,
-      @triggers.map {|x| "t: %s" % x}.join("\n"),
+      (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title,
+      @triggers.map {|x| (colour ? "t".bg_red.gray.bold : 't') \
+                     + ": %s" % x}.join("\n"),
       actions
     ]
     
-    a << @constraints.map {|x| "c: %s" % x}.join("\n") if @constraints.any?
+    if @constraints.any? then
+      a << @constraints.map do |x|
+        (colour ? "c".bg_green.gray.bold : 'c') + ": %s" % x
+      end.join("\n") 
+    end
     
     if @description and @description.length >= 1 then
-      a.insert(1, 'd: ' + @description.gsub(/\n/,"\n  "))
+      a.insert(1, (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
+               + @description.gsub(/\n/,"\n  "))
     end
     
     a.join("\n") + "\n"
     
   end
   
-  def to_summary()
+  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 = [
-      'm: ' + @title,
-      't: ' + @triggers.map(&:to_summary).join(", "),
-      'a: ' + @actions.map(&:to_summary).join(", "),
-    ]
     
-    a <<  'c: ' + @constraints.map(&:to_summary).join(", ") if @constraints.any?
     
     a.join("\n") + "\n"
     
@@ -737,7 +796,7 @@ EOF
 
   def object(h={})
 
-    puts ('inside object h:'  + h.inspect).debug if @debug
+    puts ('inside object h:'  + h.inspect).debug if @debug  
     klass = Object.const_get h[:class_type]
     puts klass.inspect.highlight if $debug
     
@@ -745,7 +804,13 @@ EOF
       puts 'GeofenceTrigger found'.highlight if $debug
       GeofenceTrigger.new(h, geofences: @geofences)
     else
-      klass.new h
+      puts 'before klass'
+      h2 = h.merge( macro: self)
+      puts 'h2: ' + h2.inspect      
+      r = klass.new h2 
+
+      r
+      
     end
     
   end
@@ -889,21 +954,22 @@ class MacroDroid
     @macros.map(&:to_pc).join("\n\n")
   end
 
-  def to_s()
+  def to_s(colour: false)
     
     lines = []
     
     if @geofences.any? then
-      lines << @geofences.map {|_, value| 'g: ' + value.to_s}.join("\n\n") + "\n"
+      lines << @geofences.map {|_, value| (colour ? "g".green.bold : 'g') \
+                               + ': ' + value.to_s}.join("\n\n") + "\n"
     end
     
-    lines << @macros.map(&:to_s).join("\n")
+    lines << @macros.map {|x| x.to_s(colour: colour)}.join("\n")
     lines.join("\n")
     
   end
   
-  def to_summary()
-    @macros.map(&:to_summary).join("\n")
+  def to_summary(colour: false)
+    @macros.map {|x| x.to_summary(colour: colour)}.join("\n")
   end  
   
   private
@@ -915,13 +981,23 @@ class MacroDroid
       name = e.text.to_s.strip
       item = e.element('item')
       coordinates = item.text('coordinates')
-      latitude, longitude = coordinates.split(/, */,2)
-      radius = item.text('radius') 
+      location = item.text('location')
+      
+      if not coordinates and location then
+        results = Geocoder.search(location)
+        coordinates = results[0].coordinates.join(', ') if results.any?
+      end
+      
+      if coordinates then
+        latitude, longitude = coordinates.split(/, */,2)
+        radius = item.text('radius')
+      end
       
       id = UUID.new.generate
 
       h = {
         name: name, 
+        location: location,
         longitude: longitude, 
         latitude: latitude, 
         radius: radius, 
@@ -1035,10 +1111,11 @@ class GeofenceMap
   
   attr_accessor :name, :longitude, :latitude, :radius, :id
   
-  def initialize(id: '', longitude: '', latitude: '', name: '', radius: '')
+  def initialize(id: '', longitude: '', latitude: '', name: '', radius: '', 
+                 location: nil)
     
-    @id, @latitude, @longitude, @name, @radius = id, latitude, \
-        longitude, name, radius    
+    @id, @latitude, @longitude, @name, @radius, @location = id, latitude, \
+        longitude, name, radius, location    
     
   end
   
@@ -1054,10 +1131,15 @@ class GeofenceMap
       
   end
   
-  def to_s()
+  def to_s(colour: false)
     
-    coordinates = "%s, %s" % [@longitude, @latitude]
-    "%s\n  coordinates: %s\n  radius: %s" % [@name, coordinates, @radius]
+    lines = []
+    coordinates = "%s, %s" % [@latitude, @longitude]
+    lines << "%s" % @name
+    lines << "  location: %s" % @location if @location
+    lines << "  coordinates: %s" % coordinates
+    lines << "  radius: %s" % @radius
+    lines.join("\n")
     
   end
   
@@ -1066,15 +1148,16 @@ end
 class MacroObject
   using ColouredText
   
-  attr_reader :type
+  attr_reader :type, :siguid
   attr_accessor :options
 
   def initialize(h={})
     
     $env ||= {}
     
+    @attributes = %i(constraint_list is_or_condition is_disabled siguid)
     @h = {constraint_list: [], is_or_condition: false, 
-          is_disabled: false}.merge(h)
+          is_disabled: false, siguid: nil}.merge(h)
     @list = []
     
     # fetch the class name and convert from camelCase to snake_eyes
@@ -1082,6 +1165,7 @@ class MacroObject
         .gsub(/\B[A-Z][a-z]/){|x| '_' + x.downcase}\
         .gsub(/[a-z][A-Z]/){|x| x[0] + '_' + x[1].downcase}\
         .downcase.to_sym
+    @constraints = []
   end
 
   def to_h()
@@ -1102,8 +1186,21 @@ class MacroObject
 
   end
   
-  def to_s()
-    "#<%s %s>" % [self.class, @h.inspect]
+  def siguid()
+    @h[:siguid]
+  end
+  
+  def to_s(colour: false)
+
+    h = @h.clone    
+    h.delete :macro
+    @s ||= "#<%s %s>" % [self.class, h.inspect]
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| x.to_summary(colour: colour)}.join(" %s " % operator)
+    
+    @s + constraints
+    
   end
   
   alias to_summary to_s
@@ -1112,7 +1209,7 @@ class MacroObject
   
   def filter(options, h)
     
-    (h.keys - options.keys).each {|key| h.delete key }    
+    (h.keys - (options.keys + @attributes.to_a)).each {|key| h.delete key }    
     return h
     
   end
@@ -1173,6 +1270,11 @@ class WebHookTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'WebHookTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Applications
@@ -1204,6 +1306,11 @@ class WifiConnectionTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'WifiConnectionTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Applications
@@ -1224,6 +1331,11 @@ class ApplicationInstalledRemovedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'ApplicationInstalledRemovedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Applications
@@ -1242,6 +1354,11 @@ class ApplicationLaunchedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'ApplicationLaunchedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Battery/Power
@@ -1260,7 +1377,7 @@ class BatteryLevelTrigger < Trigger
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     operator = @h[:decreases_to] ? '<=' : '>='    
     "Battery %s %s%%" % [operator, @h[:battery_level]]
   end
@@ -1283,6 +1400,11 @@ class BatteryTemperatureTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'BatteryTemperatureTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Battery/Power
@@ -1299,6 +1421,11 @@ class PowerButtonToggleTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'PowerButtonToggleTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -1318,6 +1445,27 @@ class ExternalPowerTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    
+    return 'Power Disconnected' unless @h[:power_connected]
+    
+    status = 'Power Connectd'
+    options = if @h[:power_connected_options].all? then
+      'Any'
+    else
+      
+      a = ['Wired (Fast Charge)', 'Wireless', 'Wired (Slow Charge)']
+      @h[:power_connected_options].map.with_index {|x,i| x ? i : nil}\
+          .compact.map {|i| a[i] }.join(' + ')
+      
+    end
+    
+    "%s: %s" % [status, options]
+
+  end
+  
+  alias to_summary to_s
 
 end
 
@@ -1337,6 +1485,11 @@ class CallActiveTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'CallActiveTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1357,6 +1510,12 @@ class IncomingCallTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    caller = @h[:incoming_call_from_list].map {|x| "%s" % x[:name]}.join(', ')
+    "Call Incoming [%s]" % caller
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1377,6 +1536,11 @@ class OutgoingCallTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'OutgoingCallTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1397,6 +1561,11 @@ class CallEndedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'CallEndedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1413,6 +1582,11 @@ class CallMissedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'CallMissedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Call/SMS
@@ -1437,6 +1611,11 @@ class IncomingSMSTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'IncomingSMSTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1453,6 +1632,11 @@ class WebHookTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'WebHookTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1470,6 +1654,12 @@ class WifiConnectionTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    access_point = @h[:ssid_list].first
+    'Connected to network ' + access_point
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1488,6 +1678,11 @@ class BluetoothTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'BluetoothTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1505,6 +1700,11 @@ class HeadphonesTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'HeadphonesTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1521,6 +1721,11 @@ class SignalOnOffTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'SignalOnOffTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1537,6 +1742,11 @@ class UsbDeviceConnectionTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'UsbDeviceConnectionTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -1574,6 +1784,11 @@ class WifiSSIDTrigger < Trigger
     
   end
 
+  def to_s(colour: false)
+    'WifiSSIDTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -1600,6 +1815,11 @@ class CalendarTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'CalendarTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -1637,7 +1857,7 @@ class TimerTrigger < Trigger
     
     #puts ('h: ' + h.inspect).debug
 
-    options = {
+    @options = {
       alarm_id: uuid(),
       days_of_week: [false, false, false, false, false, false, false],
       minute: 10,
@@ -1645,7 +1865,8 @@ class TimerTrigger < Trigger
       use_alarm: false
     }
             
-    super(options.merge filter(options, h))
+    #super(options.merge filter(options, h))
+    super(@options.merge h)
 
   end
   
@@ -1665,18 +1886,38 @@ class TimerTrigger < Trigger
     "time.is? '%s'" % self.to_s.gsub(',', ' or')
   end
   
-  def to_s()
+  def to_s(colour: false)
     
-    dow = @h[:days_of_week]
-
-    a = Date::ABBR_DAYNAMES
+    dow = @h[:days_of_week]        
 
-    time = Time.parse("%s:%s" % [@h[:hour], @h[:minute]]).strftime("%-H:%M%P")
-    days = (a[1..-1] << a.first).zip(dow).select {|_,b| b}.map(&:first)
+    wd = Date::ABBR_DAYNAMES    
+    a = (wd[1..-1] << wd.first)
+    
+    a2 = dow.map.with_index.to_a
+    start = a2.find {|x,i| x}.last
+    r = a2[start..-1].take_while {|x,i| x == true}
+    r2 = a2[start..-1].select {|x,i| x}
+    
+    days = if r == r2 then
+    
+      x1, x2 = a2[start].last, a2[r.length-1].last
+      
+      if (x2 - x1) >= 2 then
+        "%s-%s" % [a[x1],a[x2]]
+      else
+        a.zip(dow).select {|_,b| b}.map(&:first).join(', ')
+      end
+    else  
+      a.zip(dow).select {|_,b| b}.map(&:first).join(', ')
+    end
+    
+    time = Time.parse("%s:%s" % [@h[:hour], @h[:minute]]).strftime("%H:%M")    
     
-    "at %s on %s" % [time, days.join(', ')]
+    "%s %s" % [time, days]
   end
   
+  alias to_summary to_s
+  
   private
   
   def time()
@@ -1708,6 +1949,11 @@ class StopwatchTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'StopwatchTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -1736,6 +1982,11 @@ class DayTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'DayTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -1759,6 +2010,15 @@ class RegularIntervalTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    
+    interval = Subunit.new(units={minutes:60, hours:60}, \
+                           seconds: @h[:seconds]).strfunit("%c")
+    'Regular Interval ' + "\n  Interval: " + interval
+    
+  end
+
+  alias to_summary to_s
 end
 
 class DeviceEventsTrigger < Trigger
@@ -1793,6 +2053,11 @@ class AirplaneModeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'AirplaneModeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1809,6 +2074,11 @@ class AutoSyncChangeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'AutoSyncChangeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1825,6 +2095,11 @@ class DayDreamTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'DayDreamTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1841,6 +2116,11 @@ class DockTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'DockTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1861,7 +2141,7 @@ class FailedLoginTrigger < DeviceEventsTrigger
     'failed_login?'
   end
 
-  def to_s()
+  def to_s(colour: false)
     'Failed Login Attempt'
   end
 end
@@ -1880,6 +2160,11 @@ class GPSEnabledTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'GPSEnabledTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1896,6 +2181,11 @@ class MusicPlayingTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'MusicPlayingTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -1912,9 +2202,11 @@ class DeviceUnlockedTrigger < DeviceEventsTrigger
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Screen Unlocked'
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -1932,6 +2224,11 @@ class AutoRotateChangeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'AutoRotateChangeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1949,6 +2246,11 @@ class ClipboardChangeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'ClipboardChangeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1964,6 +2266,11 @@ class BootTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'BootTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -1984,6 +2291,11 @@ class IntentReceivedTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'IntentReceivedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -2010,6 +2322,12 @@ class NotificationTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    s = (@h[:package_name_list] + @h[:application_name_list]).uniq.join(', ')
+    'Notification Received ' + "\n    Any Content (%s)" % s
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Events
@@ -2025,6 +2343,12 @@ class ScreenOnOffTrigger < DeviceEventsTrigger
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
+  end
+  
+  alias to_summary to_s
 
 end
 
@@ -2042,6 +2366,11 @@ class SilentModeTrigger < DeviceEventsTrigger
 
   end
 
+  def to_s(colour: false)
+    'SilentModeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Location
@@ -2067,6 +2396,11 @@ class WeatherTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'WeatherTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Location
@@ -2076,7 +2410,7 @@ class GeofenceTrigger < Trigger
   def initialize( h={}, geofences: {})
 
     if h[:name] then
-      puts ('geofences2: ' + geofences.inspect)
+      puts ('geofences2: ' + geofences.inspect) if $debug
       found = geofences.find {|x| x.name.downcase == h[:name].downcase}
       h[:geofence_id] = found.id if found
       
@@ -2095,7 +2429,7 @@ class GeofenceTrigger < Trigger
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     if $debug then
       puts ' @geofences: ' + @geofences.inspect
@@ -2130,6 +2464,11 @@ class SunriseSunsetTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'SunriseSunsetTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2159,12 +2498,12 @@ class ActivityRecognitionTrigger < SensorsTrigger
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     activity = @activity[@h[:selected_index]]
     'Activity - ' + activity
   end
   
-  def to_summary
+  def to_summary(colour: false)
     
     activity = @activity[@h[:selected_index]]
     s = if activity.length > 10 then
@@ -2202,7 +2541,7 @@ class ProximityTrigger < SensorsTrigger
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     distance = if @h[:near] then
       'Near'
@@ -2232,7 +2571,7 @@ class ShakeDeviceTrigger < SensorsTrigger
     'shake_device?'
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Shake Device'
   end
 
@@ -2263,7 +2602,7 @@ class FlipDeviceTrigger < SensorsTrigger
     @h[:face_down] ? 'flip_device_down?' : 'flip_device_up?'
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     action = @h[:face_down] ? 'Face Up -> Face Down' : 'Face Down -> Face Up'
     'Flip Device ' + action
@@ -2286,6 +2625,11 @@ class OrientationTrigger < SensorsTrigger
 
   end
 
+  def to_s(colour: false)
+    'OrientationTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: User Input
@@ -2311,6 +2655,11 @@ class FloatingButtonTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'Floating Button'
+  end
+
+  alias to_summary to_s
 end
 
 # Category: User Input
@@ -2326,6 +2675,11 @@ class ShortcutTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'ShortcutTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: User Input
@@ -2344,6 +2698,33 @@ class VolumeButtonTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    
+    a = [
+      'Volume Up', 
+      'Volume Down',
+      'Volume Up - Long Press', 
+      'Volume Down - Long Press'
+    ]
+    
+    lines = [a[@h[:option]]]
+    lines << '  ' + (@h[:dont_change_volume] ? 'Retain Previous Volume' : 'Update Volume')
+    @s = lines.join("\n")
+  end
+  
+  def to_summary(colour: false)
+    a = [
+      'Volume Up', 
+      'Volume Down',
+      'Volume Up - Long Press', 
+      'Volume Down - Long Press'
+    ]
+    
+    lines = [a[@h[:option]]]
+    lines << (@h[:dont_change_volume] ? 'Retain Previous Volume' : 'Update Volume')
+    @s = lines.join(": ")    
+  end
 
 end
 
@@ -2362,6 +2743,11 @@ class MediaButtonPressedTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'MediaButtonPressedTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: User Input
@@ -2380,6 +2766,11 @@ class SwipeTrigger < Trigger
 
   end
 
+  def to_s(colour: false)
+    'SwipeTrigger ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2388,19 +2779,35 @@ class Action < MacroObject
   
   attr_reader :constraints  
 
-  def initialize(h={})    
+  def initialize(h={}) 
+    
+    macro = h[:macro]
+    h.delete :macro
     super(h)
     
     # fetch the constraints                               
     @constraints = @h[:constraint_list].map do |constraint|
-      object(constraint.to_snake_case)
+      object(constraint.to_snake_case.merge(macro: macro))
     end       
   end
   
   def invoke(s='')    
     "%s/%s: %s" % [@group, @type, s]
   end  
+  
+  def to_s(colour: false)
 
+    h = @h.clone    
+    h.delete :macro
+    @s ||= "#<%s %s>" % [self.class, h.inspect]
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| x.to_summary(colour: colour)}.join(" %s " % operator)
+    
+    @s + constraints
+    
+  end  
+  
 end
 
 
@@ -2435,6 +2842,11 @@ class ShareLocationAction < LocationAction
 
   end
 
+  def to_s(colour: false)
+    'ShareLocationAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2464,7 +2876,7 @@ class LaunchActivityAction < ApplicationAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Launch ' + @h[:application_name]
   end
 
@@ -2485,6 +2897,11 @@ class KillBackgroundAppAction < ApplicationAction
 
   end
 
+  def to_s(colour: false)
+    'KillBackgroundAppAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Applications
@@ -2507,7 +2924,7 @@ class OpenWebPageAction < ApplicationAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     "HTTP GET\n  url: " + @h[:url_to_open]
   end
 
@@ -2538,6 +2955,11 @@ class UploadPhotoAction < CameraAction
 
   end
 
+  def to_s(colour: false)
+    'UploadPhotoAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Camera/Photo
@@ -2563,7 +2985,7 @@ class TakePictureAction < CameraAction
     'take_photo :' + camera.to_s
   end
 
-  def to_s()
+  def to_s(colour: false)
     'Take Picture'
   end  
 
@@ -2572,22 +2994,25 @@ end
 class IfConditionAction < Action
   
   def initialize(h={})
-
+    
     options = {
       a: true,
       constraint_list: ''
     }
+    
+    macro = h[:macro]
+    h2 = options.merge(filter(options,h).merge(macro: macro))
 
-    super(options.merge h)
+    super(h2)
+    
+    @label = 'If '
 
   end
 
-  def to_s()
+  def to_s(colour: false)
     
-    operator = @h[:is_or_condition] ? 'OR' : 'AND'
-    r = 'If ' + @constraints.map(&:to_s).join(" %s " % operator)
-    puts 'if ... @h ' + @h.inspect
-    r
+    @s = "If " #+ @constraints.map(&:to_s).join(" %s " % operator)
+    super(colour: colour)
     
   end
 end
@@ -2601,16 +3026,17 @@ class ElseAction < Action
     }
 
     super(options.merge h)
+    
 
   end  
   
-  def to_s()
+  def to_s(colour: false)
     'Else'
   end
   
 end
 
-class EndIfAction < Action
+class ElseIfConditionAction < IfConditionAction
   
   def initialize(h={})
 
@@ -2619,24 +3045,66 @@ class EndIfAction < Action
     }
 
     super(options.merge h)
+    @label = 'ElseIf '
 
   end  
-  
-  def to_s()
-    'End If'
-  end
-  
+    
+
 end
 
-class ConnectivityAction < Action
+
+class EndIfAction < Action
   
   def initialize(h={})
-    super(h)
+
+    options = {
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end  
+  
+  def to_s(colour: false)
+    'End If'
+  end
+  
+end
+
+class ConnectivityAction < Action
+  
+  def initialize(h={})
+    super(h)
     @group = 'connectivity'
   end
   
 end
 
+# Category: Connectivity
+#
+class SetAirplaneModeAction < ConnectivityAction
+
+  def initialize(h={})
+
+    options = {
+      device_name: '',
+      state: 1
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def to_s(colour: false)
+    
+    state = ['On', 'Off', 'Toggle'][@h[:state]]
+    @s = 'Airplane Mode ' + state + "\n"
+    super(colour: colour)
+    
+  end
+
+end
+
 # Category: Connectivity
 #
 class SetWifiAction < ConnectivityAction
@@ -2653,7 +3121,7 @@ class SetWifiAction < ConnectivityAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     action = @h[:state] == 0 ? 'Enable' : 'Disable'
     action + ' Wifi'
   end
@@ -2675,6 +3143,11 @@ class SetBluetoothAction < ConnectivityAction
 
   end
 
+  def to_s(colour: false)
+    'SetBluetoothAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -2692,6 +3165,30 @@ class SetBluetoothAction < ConnectivityAction
 
   end
 
+  def to_s(colour: false)
+    'SetBluetoothAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
+end
+
+class SetHotspotAction < ConnectivityAction
+  
+  def initialize(h={})
+
+    options = {
+      device_name: "", state: 0, turn_wifi_on: true, use_legacy_mechanism: false, mechanism: 0
+
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def to_s(colour: false)
+    action = @h[:turn_wifi_on] ? 'Enable' : 'Disable'
+    action + ' HotSpot'
+  end
 end
 
 # Category: Connectivity
@@ -2720,6 +3217,11 @@ class SendIntentAction < ConnectivityAction
 
   end
 
+  def to_s(colour: false)
+    'SendIntentAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2755,6 +3257,11 @@ class SetAlarmClockAction < DateTimeAction
 
   end
 
+  def to_s(colour: false)
+    'SetAlarmClockAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -2772,6 +3279,11 @@ class StopWatchAction < DateTimeAction
 
   end
 
+  def to_s(colour: false)
+    'StopWatchAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -2798,7 +3310,7 @@ class SayTimeAction < DateTimeAction
     'say current_time()'
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Say Current Time'
   end  
 
@@ -2828,6 +3340,11 @@ class AndroidShortcutsAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'AndroidShortcutsAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Actions
@@ -2844,6 +3361,11 @@ class ClipboardAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'ClipboardAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Actions
@@ -2859,6 +3381,11 @@ class PressBackAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'PressBackAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Actions
@@ -2882,7 +3409,7 @@ class SpeakTextAction < DeviceAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     "Speak Text (%s)" % @h[:text_to_say]
   end
 
@@ -2903,6 +3430,11 @@ class UIInteractionAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'UIInteractionAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Actions
@@ -2918,6 +3450,11 @@ class VoiceSearchAction < DeviceAction
 
   end
 
+  def to_s(colour: false)
+    'VoiceSearchAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -2944,6 +3481,11 @@ class ExpandCollapseStatusBarAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'ExpandCollapseStatusBarAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -2959,6 +3501,11 @@ class LaunchHomeScreenAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'LaunchHomeScreenAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -2977,11 +3524,11 @@ class CameraFlashLightAction < DeviceSettingsAction
   end
 
   def to_pc()
-    'torch :on'
+    ['torch :on', 'torch :off', 'torch :toggle'][@h[:state]]
   end
   
-  def to_s()
-    'Torch On'
+  def to_s(colour: false)
+    ['Torch On', 'Torch Off', 'Torch Toggle'][@h[:state]]    
   end  
 
 end
@@ -3000,7 +3547,7 @@ class VibrateAction < DeviceSettingsAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     pattern = [
       'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
@@ -3027,6 +3574,11 @@ class SetAutoRotateAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'SetAutoRotateAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3042,6 +3594,11 @@ class DayDreamAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'DayDreamAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3057,6 +3614,11 @@ class SetKeyboardAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'SetKeyboardAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3073,6 +3635,11 @@ class SetKeyguardAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'SetKeyguardAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3089,6 +3656,11 @@ class CarModeAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'CarModeAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3106,6 +3678,11 @@ class ChangeKeyboardAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'ChangeKeyboardAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device Settings
@@ -3127,6 +3704,11 @@ class SetWallpaperAction < DeviceSettingsAction
 
   end
 
+  def to_s(colour: false)
+    'SetWallpaperAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class FileAction < Action
@@ -3155,6 +3737,11 @@ class OpenFileAction < FileAction
 
   end
 
+  def to_s(colour: false)
+    'OpenFileAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -3180,6 +3767,11 @@ class ForceLocationUpdateAction < LocationAction
 
   end
 
+  def to_s(colour: false)
+    'ForceLocationUpdateAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Location
@@ -3200,6 +3792,11 @@ class ShareLocationAction < LocationAction
 
   end
 
+  def to_s(colour: false)
+    'ShareLocationAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Location
@@ -3217,6 +3814,11 @@ class SetLocationUpdateRateAction < LocationAction
 
   end
 
+  def to_s(colour: false)
+    'SetLocationUpdateRateAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class LoggingAction < Action
@@ -3255,6 +3857,11 @@ class AddCalendarEntryAction < LoggingAction
 
   end
 
+  def to_s(colour: false)
+    'AddCalendarEntryAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Logging
@@ -3272,6 +3879,11 @@ class LogAction < LoggingAction
 
   end
 
+  def to_s(colour: false)
+    'LogAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Logging
@@ -3288,6 +3900,40 @@ class ClearLogAction < LoggingAction
 
   end
 
+  def to_s(colour: false)
+    'ClearLogAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
+end
+
+class PauseAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+      delay_in_milli_seconds: 0, delay_in_seconds: 1, use_alarm: false
+    }
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false)
+    
+    su = Subunit.new(units={minutes:60, hours:60}, 
+                     seconds: @h[:delay_in_seconds])
+
+    ms = @h[:delay_in_milli_seconds]
+    
+    duration = if su.to_h.has_key?(:minutes) or (ms < 1) then
+      su.strfunit("%X")
+    else
+      "%s %s ms" % [su.strfunit("%X"), ms]
+    end
+    
+    "Wait " + duration
+  end
+  
 end
 
 class MediaAction < Action
@@ -3316,6 +3962,11 @@ class RecordMicrophoneAction < MediaAction
 
   end
 
+  def to_s(colour: false)
+    'RecordMicrophoneAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Media
@@ -3333,7 +3984,7 @@ class PlaySoundAction < MediaAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Play: ' + @h[:file_path]
   end
 
@@ -3369,6 +4020,11 @@ class SendEmailAction < MessagingAction
 
   end
 
+  def to_s(colour: false)
+    'SendEmailAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Messaging
@@ -3390,6 +4046,11 @@ class SendSMSAction < MessagingAction
 
   end
 
+  def to_s(colour: false)
+    'SendSMSAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Messaging
@@ -3408,6 +4069,11 @@ class UDPCommandAction < MessagingAction
 
   end
 
+  def to_s(colour: false)
+    'UDPCommandAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -3442,6 +4108,11 @@ class ClearNotificationsAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'ClearNotificationsAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3468,6 +4139,10 @@ class MessageDialogAction < NotificationsAction
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    'Display Dialog' + "\n  Battery at: [battery]"
+  end
 
 end
 
@@ -3485,6 +4160,11 @@ class AllowLEDNotificationLightAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'AllowLEDNotificationLightAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3501,6 +4181,11 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'SetNotificationSoundAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3517,6 +4202,11 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'SetNotificationSoundAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3533,6 +4223,11 @@ class SetNotificationSoundAction < NotificationsAction
 
   end
 
+  def to_s(colour: false)
+    'SetNotificationSoundAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notifications
@@ -3562,8 +4257,9 @@ class NotificationAction < NotificationsAction
 
   end
   
-  def to_s()
-    'Display Notification: ' + "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
+  def to_s(colour: false)
+    "Display Notification\n  " + \
+        "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
   end
 
 end
@@ -3602,8 +4298,8 @@ class ToastAction < NotificationsAction
     "popup_message '%s'" % @h[:message_text]
   end
   
-  def to_s()
-    "Popup Message '%s'" % @h[:message_text]
+  def to_s(colour: false)
+    "Popup Message\n  %s" % @h[:message_text]
   end
 
 end
@@ -3631,7 +4327,11 @@ class AnswerCallAction < PhoneAction
     super(options.merge h)
 
   end
-
+  
+  def to_s(colour: false)
+    @s = 'Answer Call' + "\n  "
+    super()
+  end
 end
 
 # Category: Phone
@@ -3650,6 +4350,11 @@ class ClearCallLogAction < PhoneAction
 
   end
 
+  def to_s(colour: false)
+    'ClearCallLogAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Phone
@@ -3665,6 +4370,11 @@ class OpenCallLogAction < PhoneAction
 
   end
 
+  def to_s(colour: false)
+    'OpenCallLogAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Phone
@@ -3679,6 +4389,11 @@ class RejectCallAction < PhoneAction
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    @s = 'Call Reject' + "\n  "
+    super()
+  end
 
 end
 
@@ -3697,6 +4412,11 @@ class MakeCallAction < PhoneAction
 
   end
 
+  def to_s(colour: false)
+    'MakeCallAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -3714,6 +4434,11 @@ class SetRingtoneAction < PhoneAction
 
   end
 
+  def to_s(colour: false)
+    'SetRingtoneAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 class ScreenAction < Action
@@ -3741,6 +4466,11 @@ class SetBrightnessAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    'SetBrightnessAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen
@@ -3757,6 +4487,11 @@ class ForceScreenRotationAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    'ForceScreenRotationAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen
@@ -3776,6 +4511,17 @@ class ScreenOnAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    
+    state = @h[:screen_off] ? 'Off' : 'On'
+    state += ' ' + 'No Lock (root only)' if @h[:screen_off_no_lock]
+    #state += ' ' + '(Alternative)' if @h[:screen_on_alternative]
+    
+    'Screen ' + state
+    
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen
@@ -3793,6 +4539,11 @@ class DimScreenAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    'DimScreenAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen
@@ -3816,7 +4567,7 @@ class KeepAwakeAction < ScreenAction
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     screen = @h[:screen_option] == 0 ? 'Screen On' : 'Screen Off'
     
@@ -3857,6 +4608,11 @@ class SetScreenTimeoutAction < ScreenAction
 
   end
 
+  def to_s(colour: false)
+    'SetScreenTimeoutAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 
@@ -3883,6 +4639,11 @@ class SilentModeVibrateOffAction < VolumeAction
 
   end
 
+  def to_s(colour: false)
+    'SilentModeVibrateOffAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Volume
@@ -3900,6 +4661,27 @@ class SetVibrateAction < VolumeAction
 
   end
 
+  def to_s(colour: false)
+    
+    a = [
+      'Silent (Vibrate On)',
+      'Normal (Vibrate Off)',
+      'Vibrate when ringing On',
+      'Vibrate when ringing Off',
+      'Vibrate when ringing Toggle'
+    ]
+    
+    status = a[@h[:option_int]]
+    @s = 'Vibrate Enable/Disable ' + "\n    " + status + "\n  "
+    super()
+    
+  end
+
+  def to_summary(colour: false)
+    
+    @s = 'Vibrate Enable/Disable'
+    
+  end
 end
 
 # Category: Volume
@@ -3916,6 +4698,11 @@ class VolumeIncrementDecrementAction < VolumeAction
 
   end
 
+  def to_s(colour: false)
+    'VolumeIncrementDecrementAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Volume
@@ -3933,6 +4720,11 @@ class SpeakerPhoneAction < VolumeAction
 
   end
 
+  def to_s(colour: false)
+    'SpeakerPhoneAction ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Volume
@@ -3952,7 +4744,11 @@ class SetVolumeAction < VolumeAction
     super(options.merge h)
 
   end
-
+  
+  def to_s(colour: false)
+    volume = @h[:stream_index_array].zip(@h[:stream_volume_array]).to_h[true]
+    'Volume Change ' + "Notification = %s%%" % volume    
+  end
 end
 
 class Constraint < MacroObject
@@ -3965,7 +4761,7 @@ class Constraint < MacroObject
 
     detail.select {|k,v| @h.include? k }.all? {|key,value| @h[key] == value}
 
-  end
+  end  
   
   #def to_s()
   #  ''
@@ -3987,22 +4783,7 @@ class Constraint < MacroObject
 
 end
 
-class TimeOfDayConstraint < Constraint
-
-  def initialize(h={})
 
-    options = {
-      end_hour: 8,
-      end_minute: 0,
-      start_hour: 22,
-      start_minute: 0
-    }
-
-    super(options.merge h)
-
-  end
-
-end
 
 # Category: Battery/Power
 #
@@ -4020,7 +4801,7 @@ class BatteryLevelConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     operator = if @h[:greater_than] then
       '>'
@@ -4034,6 +4815,8 @@ class BatteryLevelConstraint < Constraint
     
     "Battery %s %s%%" % [operator, level]
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4051,6 +4834,11 @@ class BatterySaverStateConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'BatterySaverStateConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Battery/Power
@@ -4069,6 +4857,11 @@ class BatteryTemperatureConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'BatteryTemperatureConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Battery/Power
@@ -4086,7 +4879,7 @@ class ExternalPowerConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     connection = @h[:external_power] ? 'Connected' : 'Disconnected'
     'Power ' + connection
   end
@@ -4109,11 +4902,12 @@ class BluetoothConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     device = @h[:device_name] #== 'Any Device' ? 'Any' : @h[:device_name]
     "Device Connected (%s)" % device
   end
   
+  alias to_summary to_s
 
 end
 
@@ -4131,6 +4925,11 @@ class GPSEnabledConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'GPSEnabledConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4147,6 +4946,11 @@ class LocationModeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'LocationModeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4163,6 +4967,11 @@ class SignalOnOffConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'SignalOnOffConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4180,6 +4989,11 @@ class WifiConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'WifiConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4198,6 +5012,11 @@ class CellTowerConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'CellTowerConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4214,6 +5033,11 @@ class IsRoamingConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'IsRoamingConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4230,6 +5054,11 @@ class DataOnOffConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DataOnOffConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Connectivity
@@ -4249,6 +5078,11 @@ class WifiHotSpotConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'WifiHotSpotConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4272,6 +5106,11 @@ class CalendarConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'CalendarConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4288,6 +5127,11 @@ class DayOfWeekConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DayOfWeekConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4297,16 +5141,22 @@ class TimeOfDayConstraint < Constraint
   def initialize(h={})
 
     options = {
-      end_hour: 1,
-      end_minute: 1,
-      start_hour: 21,
-      start_minute: 58
+      end_hour: 8,
+      end_minute: 0,
+      start_hour: 22,
+      start_minute: 0
     }
 
     super(options.merge h)
 
   end
-
+  
+  def to_s(colour: false)
+    a = @h[:start_hour], @h[:start_minute], @h[:end_hour], @h[:start_minute]
+    'Time of Day ' + "%02d:%02d - %02d:%02d" % a    
+  end
+  
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4324,6 +5174,11 @@ class DayOfMonthConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DayOfMonthConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4340,6 +5195,11 @@ class MonthOfYearConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'MonthOfYearConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Date/Time
@@ -4356,6 +5216,11 @@ class SunsetSunriseConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'SunsetSunriseConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4400,12 +5265,14 @@ class AirplaneModeConstraint < Constraint
     'airplane_mode.' + status
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     status = @h[:enabled] ? 'Enabled' : 'Disabled'
     'Airplane Mode ' + status
     
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4423,6 +5290,11 @@ class AutoRotateConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'AutoRotateConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4439,9 +5311,11 @@ class DeviceLockedConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Device ' + (@h[:locked] ? 'Locked' : 'Unlocked')
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4459,6 +5333,11 @@ class RoamingOnOffConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'RoamingOnOffConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4476,6 +5355,11 @@ class TimeSinceBootConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'TimeSinceBootConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4492,6 +5376,11 @@ class AutoSyncConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'AutoSyncConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4508,6 +5397,11 @@ class NFCStateConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'NFCStateConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4524,6 +5418,11 @@ class IsRootedConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'IsRootedConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Device State
@@ -4540,6 +5439,11 @@ class VpnConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'VpnConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: MacroDroid Specific
@@ -4558,6 +5462,11 @@ class MacroEnabledConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'MacroEnabledConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: MacroDroid Specific
@@ -4575,23 +5484,46 @@ class ModeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'ModeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: MacroDroid Specific
 #
 class TriggerThatInvokedConstraint < Constraint
-
+  using ColouredText
+  
   def initialize(h={})
 
+    puts ('h: ' + h.inspect).green
+    @trigger = h[:macro].triggers.find {|x| x.siguid == h[:si_guid_that_invoked] }
+    
     options = {
       not: false,
       si_guid_that_invoked: -4951291100076165433,
       trigger_name: 'Shake Device'
     }
 
+    #super(options.merge filter(options,h))
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    'Trigger Fired: ' + @trigger.to_s(colour: colour)
+  end
+  
+  def to_summary(colour: false)
+    #puts '@trigger' + @trigger.inspect
+    if @trigger then
+      'Trigger Fired: ' + @trigger.to_summary(colour: colour)
+    else
+      'Trigger Fired: Trigger not found; guid: ' + @h[:si_guid_that_invoked].inspect
+    end
+  end  
 
 end
 
@@ -4613,6 +5545,11 @@ class LastRunTimeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'LastRunTimeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Media
@@ -4629,10 +5566,12 @@ class HeadphonesConnectionConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     connection = @h[:connected] ? 'Connected' : 'Disconnected'
     'Headphones ' + connection
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4650,6 +5589,11 @@ class MusicActiveConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'MusicActiveConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notification
@@ -4673,6 +5617,11 @@ class NotificationPresentConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'NotificationPresentConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notification
@@ -4690,6 +5639,11 @@ class PriorityModeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'PriorityModeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Notification
@@ -4706,6 +5660,11 @@ class NotificationVolumeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'NotificationVolumeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Phone
@@ -4722,6 +5681,11 @@ class InCallConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'InCallConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Phone
@@ -4737,6 +5701,11 @@ class PhoneRingingConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s(colour: false)
+    @s = @h[:ringing] ? 'Phone Ringing' : 'Not Ringing'
+    super(colour: colour)
+  end
 
 end
 
@@ -4758,6 +5727,11 @@ class BrightnessConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'BrightnessConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen and Speaker
@@ -4770,9 +5744,15 @@ class VolumeConstraint < Constraint
       option: 0
     }
 
-    super(options.merge h)
+    super(options.merge filter(options, h))
 
   end
+  
+  def to_s(colour: false)
+    a = ['Volume On', 'Vibrate Only' 'Silent', 'Vibrate or Silent']
+    
+    "Ringer Volume\n  " + a[@h[:option]]
+  end
 
 end
 
@@ -4790,6 +5770,11 @@ class SpeakerPhoneConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'SpeakerPhoneConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen and Speaker
@@ -4806,6 +5791,11 @@ class DarkThemeConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DarkThemeConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Screen and Speaker
@@ -4823,9 +5813,11 @@ class ScreenOnOffConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -4845,6 +5837,11 @@ class VolumeLevelConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'VolumeLevelConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Sensors
@@ -4862,6 +5859,11 @@ class FaceUpDownConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'FaceUpDownConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Sensors
@@ -4880,7 +5882,7 @@ class LightLevelConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     
     operator = @h[:light_level] == -1 ? 'Less than' : 'Greater than'    
     condition = operator + ' ' + @h[:light_level_float].to_s + 'lx'
@@ -4904,6 +5906,11 @@ class DeviceOrientationConstraint < Constraint
 
   end
 
+  def to_s(colour: false)
+    'DeviceOrientationConstraint ' + @h.inspect
+  end
+
+  alias to_summary to_s
 end
 
 # Category: Sensors
@@ -4920,8 +5927,135 @@ class ProximitySensorConstraint < Constraint
 
   end
   
-  def to_s()
+  def to_s(colour: false)
     'Proximity Sensor: ' + (@h[:near] ? 'Near' : 'Far')
   end
 
 end
+
+
+# ----------------------------------------------------------------------------
+
+
+class DroidSim
+
+  class Service
+    def initialize(callback)
+      @callback = callback
+    end
+  end
+
+  class Application < Service
+
+    def closed()
+    end
+    def launched()
+    end
+  end
+
+  class Battery < Service
+
+    def level()
+    end
+
+    def temperature()
+    end
+
+  end
+  class Bluetooth < Service
+
+    def enable()
+      @callback.on_bluetooth_enabled()
+    end
+
+    #def enabled
+    #  @callback.on_bluetooth_enabled()
+    #end
+
+    def enabled?
+    end
+
+    def disabled
+    end
+
+    def disabled?
+    end
+  end
+
+  class Calendar < Service
+    def event(starts, ends)
+    end
+  end
+
+  class DayTime < Service
+
+    def initialie(s)
+    end
+  end
+
+  class Headphones < Service
+    def inserted
+    end
+
+    def removed
+    end
+  end
+
+  class Webhook < Service
+
+    def url()
+      @url
+    end
+
+    def url=(s)
+      @url = s
+    end
+  end
+
+  class Wifi < Service
+    def enabled
+    end
+
+    def disabled
+    end
+
+    def ssid_in_range()
+    end
+
+    def ssid_out_of_range()
+    end
+  end
+
+  class Power < Service
+    def connected()
+    end
+
+    def disconnected()
+    end
+
+    def button_toggle()
+    end
+  end
+
+  class Popup < Service
+    def message(s)
+      puts s
+    end
+  end
+
+
+  attr_reader :bluetooth, :popup
+
+  def initialize()
+
+    @bluetooth = Bluetooth.new self
+    @popup = Popup.new self
+
+  end
+
+  def on_bluetooth_enabled()
+  
+  end
+
+
+end