ruby-macrodroid 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d111f7d953dba3eeb6940e3e1f31af4410765fbd4c739de9b53c0d84bac137
-  data.tar.gz: 2d8a574b96647abb40194e3885f38153e1de3b50d3f8f86541698b766981f9d8
+  metadata.gz: 34125d78f367eeff973953934d50436f964bb073ffef48591ce2f09012fc2a01
+  data.tar.gz: 5bb75988f4d979cb80f57c912d8448837848b3d4a5b34a3e524f8fdad3ff62de
 SHA512:
-  metadata.gz: 5184ff198c42f2e75dbfd232a9b5e7ef18bd37e0484aa697983f9cf950e0811659cbdc6936d1b5f622f719de1b8bee9ba7c10c5ec22e06be5aac34530ed5d4a2
-  data.tar.gz: 8f3020868a714825f8e06a04b461761039048e86ecbc22cd70413cbf860bfebb4b61d9c10315530037d1248dcfc3dc8d2d0ccb7be62fe25a625a5045c3a2bade
+  metadata.gz: 223c51744d7dde5e4a7130d3141696df1dc4a8cda0227e0f11324c3ac71e53226c95e8acd1ae27ed62ec46d8c1c8b81060e9135d923285e59e89572985dd146c
+  data.tar.gz: 39490d0ceeb2bfce5c413607d1ea5a1ca87e8942bdcbfd51ecf32f2baac1a1c6fec7bf8909eda8716cc6b397ef847d4c15de6eca9892f9d244f1724d4956a1fe

data/lib/ruby-macrodroid.rb

@@ -112,6 +112,7 @@ require 'rowx'
 require 'uuid'
 require 'glw'
 require 'geozone'
+require 'subunit'
 require 'rxfhelper'
 require 'chronic_cron'
 
@@ -134,6 +135,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}]
@@ -142,7 +149,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, {}]
@@ -177,7 +184,16 @@ class TriggersNlp
     get /^location (entered|exited) \(([^\)]+)/i do |direction, name|
       enter_area = direction.downcase.to_sym == :entered
       [GeofenceTrigger, {name: name, enter_area: enter_area}]
-    end     
+    end
+    
+    # eg. Proximity Sensor (Near)
+    #
+    get /^Proximity Sensor \(([^\)]+)\)/i do |distance|
+      
+      [ProximityTrigger, {distance: distance}]
+    end    
+
+    
     
   end
 
@@ -269,7 +285,33 @@ class ActionsNlp
     #
     get /webhook|HTTP GET/i do
       [OpenWebPageAction, {}]
-    end       
+    end
+    
+    #a: Keep Device Awake Screen On Until Disabled
+    #
+    get /Keep Device Awake Screen On Until Disabled/i do
+      [KeepAwakeAction, {enabled: true, permanent: true, screen_option: 0}]
+    end
+    
+    
+    #a: Keep Device Awake Screen On 1h 1m 1s
+    #
+    get /Keep Device Awake Screen On ([^$]+)/i do |duration|
+      
+      a = duration.split.map(&:to_i)
+      secs = Subunit.new(units={minutes:60, hours:60, seconds: 60}, a).to_i
+      
+      h = {
+        permanent: true, screen_option: 0, seconds_to_stay_awake_for: secs
+      }
+      [KeepAwakeAction, h]
+    end
+    
+    #a: Disable Keep Awake
+    #
+    get /Disable Keep Awake/i do
+      [KeepAwakeAction, {enabled: false, screen_option: 0}]
+    end    
 
 
   end
@@ -361,9 +403,9 @@ class Macro
   attr_reader :local_variables, :triggers, :actions, :constraints, :guid
   attr_accessor :title, :description
 
-  def initialize(name=nil, geofence: geofence, debug: false)
+  def initialize(name=nil, geofences: geofences, debug: false)
 
-    @title, @geofence, @debug = name, geofence, debug
+    @title, @geofences, @debug = name, geofences, debug
     
     puts 'inside Macro#initialize' if @debug    
           
@@ -518,7 +560,11 @@ class Macro
         puts 'found trigger ' + r.inspect if @debug
         
         if r then
-          r[0].new(r[1])
+          if r[0] == GeofenceTrigger then
+            GeofenceTrigger.new(r[1], geofences: @geofences)
+          else
+            r[0].new(r[1])
+          end
         end
         
       end
@@ -619,18 +665,56 @@ EOF
     
   def to_s()
     
+    indent = 0
+    actions = @actions.map do |x|
+
+      s = x.to_s
+      
+      r = if indent <= 0 then
+      
+        "a: %s" % s
+        
+      elsif indent > 0 
+      
+        if s =~ /^Else/ then
+          ('  ' * (indent-1)) + "%s" % s
+        elsif s =~ /^End/
+          indent -= 1
+          ('  ' * indent) + "%s" % s
+        else
+          ('  ' * indent) + "%s" % s
+        end        
+        
+      end
+      
+      if s =~ /^If/i then
+        if indent < 1 then
+          r = "a:\n  %s" % s
+          indent += 1
+        else
+          r = ('  ' * indent) + "%s" % s
+        end
+
+        indent += 1
+      end
+      
+      r
+      
+    end.join("\n")
+    
     a = [
       'm: ' + @title,
       @triggers.map {|x| "t: %s" % x}.join("\n"),
-      @actions.map {|x| "a: %s" % x}.join("\n"),
-      @constraints.map {|x| "a: %s" % x}.join("\n")
+      actions
     ]
     
+    a << @constraints.map {|x| "c: %s" % x}.join("\n") if @constraints.any?
+    
     if @description and @description.length >= 1 then
-      a.insert(1, 'd: ' + @description)
+      a.insert(1, 'd: ' + @description.gsub(/\n/,"\n  "))
     end
     
-    a.join("\n")
+    a.join("\n") + "\n"
     
   end
   
@@ -638,11 +722,11 @@ EOF
     
     a = [
       'm: ' + @title,
-      't: ' + @triggers.map(&:to_s).join(", "),
-      'a: ' + @actions.map(&:to_s).join(", "),
+      't: ' + @triggers.map(&:to_summary).join(", "),
+      'a: ' + @actions.map(&:to_summary).join(", "),
     ]
     
-    a <<  'c: ' + @constraints.map(&:to_s).join(", ") if @constraints.any?
+    a <<  'c: ' + @constraints.map(&:to_summary).join(", ") if @constraints.any?
     
     a.join("\n") + "\n"
     
@@ -662,7 +746,7 @@ EOF
     
     if klass == GeofenceTrigger then
       puts 'GeofenceTrigger found'.highlight if $debug
-      klass.new(@geofence, h)
+      GeofenceTrigger.new(h, geofences: @geofences)
     else
       klass.new h
     end
@@ -679,12 +763,14 @@ class MacroDroid
   using ColouredText
   using Params  
 
-  attr_reader :macros, :geofence
+  attr_reader :macros, :geofences, :yaml
 
   def initialize(obj=nil, debug: false)
 
     @debug = debug    
     
+    @geofences = {}
+    
     if obj then
       
       raw_s, _ = RXFHelper.read(obj)    
@@ -708,10 +794,25 @@ class MacroDroid
           
           puts 'before RowX.new' if @debug
 
-          s2 = s.gsub(/^m:/,'macro:').gsub(/^t:/,'trigger:')\
-              .gsub(/^a:/,'action:').gsub(/^c:/,'constraint:')
-          xml = RowX.new(s2.gsub(/^#.*/,'')).to_xml
+          s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
+              .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
+              .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
+          
+          raw_macros, raw_geofences = s2.split(/(?=^macro:)/,2).reverse
+          
+          if raw_geofences then
+            
+            geoxml = RowX.new(raw_geofences).to_xml
+            
+            geodoc = Rexle.new(geoxml)  
+            geofences = geodoc.root.xpath('item/geofence')        
+            @geofences = fetch_geofences(geofences) if geofences.any?          
+            
+          end
+          
+          xml = RowX.new(raw_macros).to_xml
           import_rowxml(xml)
+          
         elsif s =~ /^# / 
           xml = pc_to_xml(s)
           import_xml(xml)
@@ -721,8 +822,6 @@ class MacroDroid
         
         @h = build_h
         
-
-        
       end
       
     else
@@ -777,7 +876,13 @@ class MacroDroid
 
   def to_h()
 
-    @h.merge(macro_list:  @macros.map(&:to_h)).to_camel_case
+    h = {
+      geofence_data: {
+        geofence_map: @geofences.map {|key, value| [key, value.to_h] }.to_h
+      },
+      macro_list:  @macros.map(&:to_h)
+    }
+    @h.merge(h).to_camel_case
 
   end
   
@@ -788,7 +893,16 @@ class MacroDroid
   end
 
   def to_s()
-    @macros.map(&:to_s).join("\n")
+    
+    lines = []
+    
+    if @geofences.any? then
+      lines << @geofences.map {|_, value| 'g: ' + value.to_s}.join("\n\n") + "\n"
+    end
+    
+    lines << @macros.map(&:to_s).join("\n")
+    lines.join("\n")
+    
   end
   
   def to_summary()
@@ -797,10 +911,37 @@ class MacroDroid
   
   private
   
+  def fetch_geofences(nodes)
+    
+    nodes.map do |e|
+
+      name = e.text.to_s.strip
+      item = e.element('item')
+      coordinates = item.text('coordinates')
+      latitude, longitude = coordinates.split(/, */,2)
+      radius = item.text('radius') 
+      
+      id = UUID.new.generate
+
+      h = {
+        name: name, 
+        longitude: longitude, 
+        latitude: latitude, 
+        radius: radius, 
+        id: id
+      }
+      
+      [id.to_sym, GeofenceMap.new(h)]
+      
+    end.to_h
+
+  end
+  
   def import_json(s)
 
     h = JSON.parse(s, symbolize_names: true)
     puts 'json_to_yaml: ' + h.to_yaml if @debug
+    @yaml = h.to_yaml # helpful for debugging and testing
     
     @h = h.to_snake_case
     puts ('@h: ' + @h.inspect).debug if @debug
@@ -809,7 +950,7 @@ class MacroDroid
     # fetch the geofence data
     if @h[:geofence_data] then
       
-      @geofence = @h[:geofence_data][:geofence_map].map do |id, properties|
+      @geofences = @h[:geofence_data][:geofence_map].map do |id, properties|
         [id, GeofenceMap.new(properties)]
       end.to_h
       
@@ -818,9 +959,9 @@ class MacroDroid
     @macros = @h[:macro_list].map do |macro|
 
       puts ('macro: ' + macro.inspect).debug if @debug
-      puts '@geofence: ' + @geofence.inspect if @debug
+#       puts '@geofences: ' + @geofences.inspect if @debug
       
-      m = Macro.new(geofence: @geofence, debug: @debug )
+      m = Macro.new(geofences: @geofences.map(&:last), debug: @debug )
       m.import_h(macro)
       m
 
@@ -833,13 +974,15 @@ class MacroDroid
   def import_rowxml(raws)
    
     s = RXFHelper.read(raws).first
-    puts 's: ' + s.inspect if $debug
+    puts 's: ' + s.inspect if @debug
     doc = Rexle.new(s)
-    puts 'after doc' if $debug
+    puts 'after doc' if @debug    
+    puts 'import_rowxml: @geofences: ' + @geofences.inspect if @debug
+    geofences = @geofences
     
     @macros = doc.root.xpath('item').map do |node|
-          
-      Macro.new.import_xml(node)
+      puts ('geofences: ' + geofences.inspect).highlight if @debug
+      Macro.new(geofences: geofences.map(&:last), debug: @debug).import_xml(node)
       
     end
 
@@ -862,7 +1005,7 @@ class MacroDroid
        
     @macros = doc.root.xpath('macro').map do |node|
           
-      Macro.new.import_xml(node)
+      Macro.new(geofences: @geofences.map(&:last), debug: @debug).import_xml(node)
       
     end
   end
@@ -895,8 +1038,30 @@ class GeofenceMap
   
   attr_accessor :name, :longitude, :latitude, :radius, :id
   
-  def initialize(h)
-    @id, @latitude, @longitude, @name, @radius = h.values
+  def initialize(id: '', longitude: '', latitude: '', name: '', radius: '')
+    
+    @id, @latitude, @longitude, @name, @radius = id, latitude, \
+        longitude, name, radius    
+    
+  end
+  
+  def to_h()
+    
+    {
+      id: @id, 
+      longitude: @longitude, 
+      latitude: @latitude, 
+      name: @name, 
+      radius: @radius
+    }
+      
+  end
+  
+  def to_s()
+    
+    coordinates = "%s, %s" % [@longitude, @latitude]
+    "%s\n  coordinates: %s\n  radius: %s" % [@name, coordinates, @radius]
+    
   end
   
 end
@@ -943,6 +1108,8 @@ class MacroObject
   def to_s()
     "#<%s %s>" % [self.class, @h.inspect]
   end
+  
+  alias to_summary to_s
 
   protected
   
@@ -957,13 +1124,32 @@ class MacroObject
     UUID.new.generate
   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
+    
+    klass.new h
+    
+  end    
+  
 end
 
 class Trigger < MacroObject
-
+  using Params
+  
+  attr_reader :constraints
+  
   def initialize(h={})    
     super({fakeIcon: 0}.merge(h))
     @list << 'fakeIcon'
+        
+    # fetch the constraints                               
+    @constraints = @h[:constraint_list].map do |constraint|
+      object(constraint.to_snake_case)
+    end       
+    
   end
   
   def match?(detail={}, model=nil)
@@ -1076,6 +1262,11 @@ class BatteryLevelTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_s()
+    operator = @h[:decreases_to] ? '<=' : '>='    
+    "Battery %s %s%%" % [operator, @h[:battery_level]]
+  end
 
 end
 
@@ -1479,14 +1670,32 @@ class TimerTrigger < Trigger
   
   def to_s()
     
-    dow = @h[:days_of_week]
+    dow = @h[:days_of_week]        
 
-    a = Date::ABBR_DAYNAMES
-
-    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%P")    
     
-    "at %s on %s" % [time, days.join(', ')]
+    "%s %s" % [time, days]
   end
   
   private
@@ -1723,6 +1932,10 @@ class DeviceUnlockedTrigger < DeviceEventsTrigger
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Screen Unlocked'
+  end
 
 end
 
@@ -1881,12 +2094,12 @@ end
 #
 class GeofenceTrigger < Trigger
 
-  def initialize(geofence, h={})
+  def initialize( h={}, geofences: {})
 
     if h[:name] then
-      
-      found = geofence.find {|x| x.name == h[:name]}
-      h[:geofence_id] = found.id
+      puts ('geofences2: ' + geofences.inspect)
+      found = geofences.find {|x| x.name.downcase == h[:name].downcase}
+      h[:geofence_id] = found.id if found
       
     end
     
@@ -1899,15 +2112,25 @@ class GeofenceTrigger < Trigger
     }
 
     super(options.merge filter(options, h))
-    @geofence = geofence
+    @geofences = geofences
 
   end
   
   def to_s()
     
-    puts ' @geofence: ' + @geofence.inspect if $debug   
+    if $debug then
+      puts ' @geofences: ' + @geofences.inspect
+      puts '@h: ' + @h.inspect
+      puts '@h[:geofence_id]: ' + @h[:geofence_id].inspect
+    end
+    
     direction = @h[:enter_area] ? 'Entry' : 'Exit'
-    "Geofence %s (%s)" % [direction, @geofence[@h[:geofence_id].to_sym].name]
+    
+    found = @geofences.find {|x| x.id == @h[:geofence_id]}
+    puts 'found: ' + found.inspect    if @debug 
+    label = found ? found.name : 'error: name not found'
+
+    "Geofence %s (%s)" % [direction, label]
     
   end
 
@@ -1952,8 +2175,28 @@ class ActivityRecognitionTrigger < SensorsTrigger
     }
 
     super(options.merge h)
+    
+    @activity = ['In Vehicle', 'On Bicycle', 'Running', 'Walking', 'Still']    
 
   end
+  
+  def to_s()
+    activity = @activity[@h[:selected_index]]
+    'Activity - ' + activity
+  end
+  
+  def to_summary
+    
+    activity = @activity[@h[:selected_index]]
+    s = if activity.length > 10 then
+      activity[0..7] + '..'
+    else
+      activity
+    end
+    
+    'Activity - ' + s
+    
+  end
 
 end
 
@@ -1963,14 +2206,33 @@ class ProximityTrigger < SensorsTrigger
 
   def initialize(h={})
 
+    if h[:distance] then
+      
+      case h[:distance].to_sym
+      when :near
+        options[:near] = true
+      end
+    end
+    
     options = {
       near: true,
       selected_option: 0
     }
 
-    super(options.merge h)
+    super(options.merge filter(options,h))
 
   end
+  
+  def to_s()
+    
+    distance = if @h[:near] then
+      'Near'
+    else
+      'Far'
+    end
+    
+    "Proximity Sensor (%s)" % distance
+  end
 
 end
 
@@ -2143,9 +2405,17 @@ end
 
 
 class Action < MacroObject
+  using Params
+  
+  attr_reader :constraints  
 
   def initialize(h={})    
     super(h)
+    
+    # fetch the constraints                               
+    @constraints = @h[:constraint_list].map do |constraint|
+      object(constraint.to_snake_case)
+    end       
   end
   
   def invoke(s='')    
@@ -2320,6 +2590,64 @@ class TakePictureAction < CameraAction
 
 end
 
+class IfConditionAction < Action
+  
+  def initialize(h={})
+
+    options = {
+      a: true,
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s()
+    
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    r = 'If ' + @constraints.map(&:to_s).join(" %s " % operator)
+    puts 'if ... @h ' + @h.inspect
+    r
+    
+  end
+end
+
+class ElseAction < Action
+  
+  def initialize(h={})
+
+    options = {
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end  
+  
+  def to_s()
+    'Else'
+  end
+  
+end
+
+class EndIfAction < Action
+  
+  def initialize(h={})
+
+    options = {
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end  
+  
+  def to_s()
+    'End If'
+  end
+  
+end
 
 class ConnectivityAction < Action
   
@@ -2387,6 +2715,25 @@ class SetBluetoothAction < ConnectivityAction
 
 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()
+    action = @h[:turn_wifi_on] ? 'Enable' : 'Disable'
+    action + ' Hotspot'
+  end
+end
+
 # Category: Connectivity
 #
 class SendIntentAction < ConnectivityAction
@@ -2574,6 +2921,10 @@ class SpeakTextAction < DeviceAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    "Speak Text (%s)" % @h[:text_to_say]
+  end
 
 end
 
@@ -2688,6 +3039,17 @@ class VibrateAction < DeviceSettingsAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    
+    pattern = [
+      'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
+      'Constant', 'Decreasing', 'Final Fantasy', 'Game Over', 'Star Wars',
+      'Mini Blip', 'Micro Blip'
+    ]
+    
+    'Vibrate ' + "(%s)" % pattern[@h[:vibrate_pattern].to_i]
+  end
 
 end
 
@@ -3475,6 +3837,10 @@ end
 
 # Category: Screen
 #
+# options:
+#   keep awake, screen on => enabled: true
+#   disable keep awake    => enabled: false
+#
 class KeepAwakeAction < ScreenAction
 
   def initialize(h={})
@@ -3489,7 +3855,30 @@ class KeepAwakeAction < ScreenAction
     super(options.merge h)
 
   end
-
+  
+  def to_s()
+    
+    screen = @h[:screen_option] == 0 ? 'Screen On' : 'Screen Off'
+    
+    if @h[:enabled] then
+    
+      whenx = if @h[:seconds_to_stay_awake_for] == 0 then
+    
+      'Until Disabled'
+      
+      else
+        scnds = @h[:seconds_to_stay_awake_for]
+        Subunit.new(units={minutes:60, hours:60}, seconds: scnds).strfunit("%x")
+      end
+      
+      'Keep Device Awake ' + screen + ' ' + whenx
+      
+    else
+      'Disable Keep Awake'
+    end
+    
+    
+  end
 end
 
 # Category: Screen
@@ -3670,6 +4059,21 @@ class BatteryLevelConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    
+    operator = if @h[:greater_than] then
+      '>'
+    elsif @h[:equals]
+      '='
+    else
+      '<'
+    end
+    
+    level = @h[:battery_level]
+    
+    "Battery %s %s%%" % [operator, level]
+  end
 
 end
 
@@ -3721,6 +4125,11 @@ class ExternalPowerConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    connection = @h[:external_power] ? 'Connected' : 'Disconnected'
+    'Power ' + connection
+  end
 
 end
 
@@ -3739,6 +4148,12 @@ class BluetoothConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    device = @h[:device_name] #== 'Any Device' ? 'Any' : @h[:device_name]
+    "Device Connected (%s)" % device
+  end
+  
 
 end
 
@@ -4063,6 +4478,10 @@ class DeviceLockedConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Device ' + (@h[:locked] ? 'Locked' : 'Unlocked')
+  end
 
 end
 
@@ -4249,6 +4668,11 @@ class HeadphonesConnectionConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    connection = @h[:connected] ? 'Connected' : 'Disconnected'
+    'Headphones ' + connection
+  end
 
 end
 
@@ -4438,6 +4862,10 @@ class ScreenOnOffConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
+  end
 
 end
 
@@ -4491,6 +4919,14 @@ class LightLevelConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    
+    operator = @h[:light_level] == -1 ? 'Less than' : 'Greater than'    
+    condition = operator + ' ' + @h[:light_level_float].to_s + 'lx'
+    'Light Sensor ' + condition
+    
+  end
 
 end
 
@@ -4523,5 +4959,9 @@ class ProximitySensorConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Proximity Sensor: ' + (@h[:near] ? 'Near' : 'Far')
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-09-05 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw
@@ -97,6 +97,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: subunit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: geozone
   requirement: !ruby/object:Gem::Requirement