ruby-macrodroid 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79ad74c909d44b5bc3ddd5a5f65a2359cf385de96cd9e504cf30ce390ab2252f
-  data.tar.gz: 71ab0f9b2267ea514859f4ebc9525e4cb5c8389895ccf85df2653a495c7bc104
+  metadata.gz: dfb49da8914ecdd5cc21ca0223801fa0d432890a3df4c352ab7c3914c1bd63fe
+  data.tar.gz: 9f402e6d1c9dbd17f5cb7d3741bcc7c487461a5438adf3cba81a71df9feb50f9
 SHA512:
-  metadata.gz: 8f514b4bc19ddc8b00d8794fe7802779c332f371072db40c30f6a247316764b43306919e571256c5200451965aa9629312e30c82d96838a78d5f4658df22bf95
-  data.tar.gz: 6c4b78db5f22aa70860c34eb9a046909805a93924dc2fb3c7bcae45ced4d552b04e3c05645a1ac54135b220fae189641352820b90f00b78ae00506701ce3dc4d
+  metadata.gz: 0753ef46f3cdbc1e5a8fb6539747e662a2e537089aa83e32ecf47c89334b1acb71ced47f77230e1fcae00314d8dd70e8e4d37380c27f25ebb0ccafe837121daa
+  data.tar.gz: e78f3fc06bcdbd1685de98d5473b2564d904a722053527505002f5a5bbfa43e51e99832d2a9a29eb5a12d3e9bab94d91429f78628625e74acbae6876b909f43a

data/lib/ruby-macrodroid.rb

@@ -3,10 +3,19 @@
 # file: ruby-macrodroid.rb
 
 require 'uuid'
+require 'yaml'
+require 'glw'
+require 'geozone'
 require 'rxfhelper'
 require 'chronic_cron'
 
 
+MODEL =<<EOF
+device
+  connectivity
+    airplane_mode is disabled
+EOF
+
 class TriggersNlp
   include AppRoutes
 
@@ -20,11 +29,45 @@ class TriggersNlp
 
   def triggers(params) 
 
-    get /^at (\d+:\d+(?:[ap]m)?) on (.*)/i do |time, days|
+    get /^(?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)/i do |time, days|
       [TimerTrigger, {time: time, days: days}]
     end
 
+    # 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
+    
+    get /^shake[ _]device\??$/i do 
+      [ShakeDeviceTrigger, {}]
+    end
+    
+    get /^Flip Device (.*)$/i do |motion|
+       facedown = motion =~ /Face Up (?:->|to) Face Down/i
+      [FlipDeviceTrigger, {face_down: facedown }]
+    end
+    
+    get /^flip_device_down\?$/i do
+      [FlipDeviceTrigger, {face_down: true }]
+    end
 
+    get /^flip_device_up\?$/i do
+      [FlipDeviceTrigger, {face_down: false }]
+    end        
+    
+    get /^Failed Login Attempt$/i do
+      [FailedLoginTrigger, {}]
+    end
+    
+    get /^failed_login?$/i do
+      [FailedLoginTrigger, {}]
+    end         
+
+    get /^Geofence (Entry|Exit) \(([^\)]+)/i do |direction, name|
+      enter_area = direction.downcase.to_sym == :entry
+      [GeofenceTrigger, {name: name, enter_area: enter_area}]
+    end     
+    
   end
 
   alias find_trigger run_route
@@ -44,10 +87,73 @@ class ActionsNlp
 
   def actions(params) 
 
+    # e.g. message popup: hello world!
     get /^message popup: (.*)/i do |msg|
       [ToastAction, {msg: msg}]
     end
 
+    # e.g. Popup Message 'hello world!'
+    get /^Popup[ _]Message ['"]([^'"]+)/i do |msg|
+      [ToastAction, {msg: msg}]
+    end
+    
+    # e.g. say current time
+    get /^say current[ _]time/i do
+      [SayTimeAction, {}]
+    end    
+    
+    get /^Torch :?(.*)/i do |onoffstate|
+      state = onoffstate.downcase == 'on' ? 0 : 1
+      [CameraFlashLightAction, {state: state}]
+    end    
+    
+    get /^Take Picture/i do
+      [TakePictureAction, {}]
+    end
+    
+    get /^take_picture/i do
+      [TakePictureAction, {}]
+    end           
+        
+    # e.g. Display Notification: Hi there: This is the body of the message
+    get /^Display Notification: ([^:]+): [^$]+$/i do |subject, text|
+      [NotificationAction, {subject: subject, text: text}]
+    end           
+    
+    
+    # e.g. Enable Wifi
+    get /^(Enable|Disable) Wifi$/i do |raw_state|
+      
+      state = raw_state.downcase.to_sym == :enable ? 0 : 1
+      [SetWifiAction, {state: state}]
+      
+    end    
+    
+    # e.g. Play: Altair
+    get /^Play: (.*)$/i do |name|
+
+      [PlaySoundAction, {file_path: name}]
+      
+    end     
+    
+    # e.g. Launch Settings
+    get /^Launch (.*)$/i do |application|
+
+      h = {
+        application_name: application,
+        package_to_launch: 'com.android.' + application.downcase
+      }
+      [LaunchActivityAction, h]
+      
+    end
+    
+    # e.g. HTTP GET http://someurl.com/something
+    get /^HTTP GET ([^$]+)$/i do |url|
+
+      [OpenWebPageAction, url_to_open: url]
+      
+    end
+
 
   end
 
@@ -55,6 +161,29 @@ class ActionsNlp
 
 end
 
+class ConstraintsNlp
+  include AppRoutes
+
+  def initialize()
+
+    super()
+    params = {}
+    constraints(params)
+
+  end
+
+  def constraints(params) 
+
+    get /^airplane mode (.*)/i do |state|
+      [AirplaneModeConstraint, {enabled: (state =~ /^enabled|on$/) == 0}]
+    end
+
+  end
+
+  alias find_constraint run_route
+
+end
+
 module Params
 
   refine Hash do
@@ -112,19 +241,16 @@ class Macro
   using ColouredText
   using Params
 
-  attr_reader :local_variables, :triggers, :actions, :guid
-  attr_accessor :title
+  attr_reader :local_variables, :triggers, :actions, :constraints, :guid
+  attr_accessor :title, :description
 
-  def initialize(name=nil, debug: false)
+  def initialize(name=nil, geofence: geofence, debug: false)
 
-    @title, @debug = name, debug
+    @title, @geofence, @debug = name, geofence, debug
     
-    puts 'inside Macro#initialize' if @debug
-    
-    lv=[], triggers=[], actions=[]
-    @local_variables, @triggers, @actions = lv, triggers, actions
+    puts 'inside Macro#initialize' if @debug    
           
-    @triggers, @actions, @constraints = [], [], []
+    @local_variables, @triggers, @actions, @constraints = [], [], [], []
     @h = {}
     
   end
@@ -156,9 +282,9 @@ class Macro
       local_variables: @local_variables,
       m_trigger_list: @triggers.map(&:to_h),
       m_action_list: @actions.map(&:to_h),
-      m_constraint_list: [], 
+      m_constraint_list: @constraints.map(&:to_h),
       m_description: '',
-      m_name: @title,
+      m_name: title(),
       m_excludeLog: false,
       m_GUID: guid(),
       m_isOrCondition: false,
@@ -174,6 +300,14 @@ class Macro
 
   def import_h(h)
 
+    if @debug then
+      puts 'inside import_h'
+      puts 'h:' + h.inspect
+    end
+    
+    @title = h[:name]
+    @description = h[:description]
+    
     # fetch the local variables
     @local_variables = h['local_variables']
     
@@ -188,13 +322,15 @@ class Macro
       object(action.to_snake_case)
     end
 
-    # fetch the constraints (not yet implemented)
+    # fetch the constraints                               
+    @constraints = h[:constraint_list].map do |constraint|
+      object(constraint.to_snake_case)
+    end                               
     
     @h = h
 
-    %i(local_variables m_trigger_list m_action_list).each do |x|
-      @h[x] = []
-    end
+    %i(local_variables m_trigger_list m_action_list m_constraint_list)\
+      .each {|x| @h[x] = [] }
 
     @h
 
@@ -208,6 +344,7 @@ class Macro
     end
     
     @title = node.attributes[:name]
+    @description = node.attributes[:description]
 
     if node.element('triggers') then
       
@@ -235,6 +372,14 @@ class Macro
         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
       
@@ -266,6 +411,19 @@ class Macro
         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
     
@@ -273,16 +431,16 @@ class Macro
     
   end
   
-  def match?(triggerx, detail={time: $env[:time]} )
+  def match?(triggerx, detail={time: $env[:time]}, model=nil )
                 
-    if @triggers.any? {|x| x.type == triggerx and x.match?(detail) } then
+    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)) } then
+      if @constraints.all? {|x| x.match?($env.merge(detail), model) } then
       
         true
         
@@ -296,9 +454,65 @@ class Macro
     
   end
   
+  # invokes the actions
+  #
   def run()
     @actions.map(&:invoke)
-  end  
+  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()
+    
+    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")
+    ]
+    
+    if @description and @description.length >= 1 then
+      a.insert(1, 'd: ' + @description)
+    end
+    
+    a.join("\n")
+    
+  end
+  
+  def to_summary()
+    
+    a = [
+      'm: ' + @title,
+      't: ' + @triggers.map(&:to_s).join(", "),
+      'a: ' + @actions.map(&:to_s).join(", "),
+    ]
+    
+    a <<  'c: ' + @constraints.map(&:to_s).join(", ") if @constraints.any?
+    
+    a.join("\n") + "\n"
+    
+  end
 
   private
   
@@ -310,17 +524,28 @@ class Macro
 
     puts ('inside object h:'  + h.inspect).debug if @debug
     klass = Object.const_get h[:class_type]
-    klass.new h
+    puts klass.inspect.highlight if $debug
+    
+    if klass == GeofenceTrigger then
+      puts 'GeofenceTrigger found'.highlight if $debug
+      klass.new(@geofence, h)
+    else
+      klass.new h
+    end
+    
   end
 
 end
 
 
+class MacroDroidError < Exception
+end
+
 class MacroDroid
   using ColouredText
   using Params  
 
-  attr_reader :macros
+  attr_reader :macros, :geofence
 
   def initialize(obj=nil, debug: false)
 
@@ -328,16 +553,36 @@ class MacroDroid
     
     if obj then
       
-      s, _ = RXFHelper.read(obj)    
+      raw_s, _ = RXFHelper.read(obj)    
+      
+      s = raw_s.strip
       
       if s[0] == '{' then
+        
         import_json(s) 
+        
       elsif  s[0] == '<'
+        
         import_xml(s)
         @h = build_h
+        
       else
-        import_xml(text_to_xml(s))
+
+        puts 's: ' + s.inspect if @debug
+        
+        xml = if s =~ /m:\s/ then
+          puts 'before text_to_xml' if @debug
+          text_to_xml(s)
+        elsif s =~ /^# / 
+          pc_to_xml(s)
+        else
+          raise MacroDroidError, 'invalid input'
+        end
+        import_xml(xml)
         @h = build_h
+        
+
+        
       end
       
     else
@@ -389,15 +634,53 @@ class MacroDroid
 
   alias to_json export_json
 
-  def import_json(s)
 
-    @h = JSON.parse(s, symbolize_names: true).to_snake_case
-    puts ('@h: ' + @h.pretty_inspect).debug if @debug
+  def to_h()
+
+    @h.merge(macro_list:  @macros.map(&:to_h)).to_camel_case
+
+  end
+  
+  # returns pseudocode
+  #
+  def to_pc()
+    @macros.map(&:to_pc).join("\n\n")
+  end
+
+  def to_s()
+    @macros.map(&:to_s).join("\n")
+  end
+  
+  def to_summary()
+    @macros.map(&:to_summary).join("\n")
+  end  
+  
+  private
+  
+  def import_json(s)
 
+    h = JSON.parse(s, symbolize_names: true)
+    puts 'json_to_yaml: ' + h.to_yaml if @debug
+    
+    @h = h.to_snake_case
+    puts ('@h: ' + @h.inspect).debug if @debug
+    
+    
+    # fetch the geofence data
+    if @h[:geofence_data] then
+      
+      @geofence = @h[:geofence_data][:geofence_map].map do |id, properties|
+        [id, GeofenceMap.new(properties)]
+      end.to_h
+      
+    end
+    
     @macros = @h[:macro_list].map do |macro|
 
-      puts ('macro: ' + macro.pretty_inspect).debug if @debug
-      m = Macro.new(debug: @debug)
+      puts ('macro: ' + macro.inspect).debug if @debug
+      puts '@geofence: ' + @geofence.inspect if @debug
+      
+      m = Macro.new(geofence: @geofence, debug: @debug )
       m.import_h(macro)
       m
 
@@ -409,23 +692,52 @@ class MacroDroid
   
   def import_xml(raws)
     
+    puts 'raws: ' + raws.inspect if @debug
     s = RXFHelper.read(raws).first
     puts 's: ' + s.inspect if @debug
     doc = Rexle.new(s)
-    puts 'after doc' if @debug
+    
+    if @debug then
+      puts 'doc: ' + doc.root.xml
+    end
+    
+    debug = @debug
     
     @macros = doc.root.xpath('macro').map do |node|
           
-      macro = Macro.new @title, debug: @debug
+      macro = Macro.new @title, debug: debug
       macro.import_xml(node)
       macro
       
     end
   end
   
+  def pc_to_xml(s)
+    
+    macros = s.strip.split(/(?=#)/).map do |raw_macro|
+
+      a = raw_macro.lines
+      name = a.shift[/(?<=# ).*/]
+      description = a.shift[/(?<=# ).*/] if a[0][/^# /]
+      body = a.join.strip
+
+      a2 = body.lines
+      # get the trigger
+      trigger = [:trigger, {}, a2[0][/^if (.*) then/,1]]
+      action = [:action, {}, a2[1].strip]
+      [:macro, {name: name, description: description}, trigger, action, []]
+
+    end
+
+    doc = Rexle.new([:macros, {}, '', *macros])
+    doc.root.xml pretty: true    
+    
+  end
+  
   def text_to_xml(s)
     
-    a = s.split(/.*(?=^m:)/); a.shift
+    a = s.split(/.*(?=^m:)/)
+    puts 'a : ' + a.inspect if @debug
     a.map!(&:chomp)
 
     macros = a.map do |x|
@@ -439,8 +751,9 @@ class MacroDroid
       lines.each {|line| h[line[0].to_sym] << line[/^\w: +(.*)/,1] }
       triggers = h[:t].map {|text| [:trigger, {}, text]}
       actions = h[:a].map {|text| [:action, {}, text]}
+      constraints = h[:c].map {|text| [:constraint, {}, text]}
 
-      [:macro, {name: name},'', *triggers, *actions]
+      [:macro, {name: name},'', *triggers, *actions, *constraints]
 
     end
 
@@ -448,15 +761,18 @@ class MacroDroid
     doc.root.xml pretty: true    
     
   end
+  
 
-  def to_h()
-
-    @h.merge(macro_list:  @macros.map(&:to_h)).to_camel_case
+end
 
+class GeofenceMap
+  
+  attr_accessor :name, :longitude, :latitude, :radius, :id
+  
+  def initialize(h)
+    @id, @latitude, @longitude, @name, @radius = h.values
   end
-
-
-
+  
 end
 
 class MacroObject
@@ -467,6 +783,8 @@ class MacroObject
 
   def initialize(h={})
     
+    $env ||= {}
+    
     @h = {constraint_list: [], is_or_condition: false, 
           is_disabled: false}.merge(h)
     @list = []
@@ -495,6 +813,10 @@ class MacroObject
     h2.merge('m_classType' => self.class.to_s)
 
   end
+  
+  def to_s()
+    "#<%s %s>" % [self.class, @h.inspect]
+  end
 
   protected
   
@@ -518,10 +840,11 @@ class Trigger < MacroObject
     @list << 'fakeIcon'
   end
   
-  def match?(detail={})    
+  def match?(detail={}, model=nil)
+
+    # only match where the key exists in the trigger object
+    detail.select {|k,v| @h.include? k }.all? {|key,value| @h[key] == value}
 
-    detail.all? {|key,value| @h[key] == value}
-    
   end
 
 end
@@ -1008,27 +1331,50 @@ class TimerTrigger < Trigger
       use_alarm: false
     }
             
-    super(options.merge filter(options,h))
+    super(options.merge filter(options, h))
 
   end
   
-  def match?(detail={time: $env[:time]})
+  def match?(detail={time: $env[:time]}, model=nil)
+    
+   time() == detail[:time]
 
-    a = @h[:days_of_week]
-    a.unshift a.pop
+  end
+  
+  # sets the environmental conditions for this trigger to fire
+  #
+  def set_env()
+    $env[:time] = time()
+  end
+  
+  def to_pc()    
+    "time.is? '%s'" % self.to_s.gsub(',', ' or')
+  end
+  
+  def to_s()
+    
+    dow = @h[:days_of_week]
 
-    dow = a.map.with_index {|x, i| x ? i : nil }.compact.join(',')
+    a = Date::ABBR_DAYNAMES
 
-    s = "%s %s * * %s" % [@h[:minute], @h[:hour], dow]
+    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)
     
-    if $debug then
-      puts 's: ' + s.inspect 
-      puts 'detail: ' + detail.inspect
-      puts '@h: ' + @h.inspect
-    end
+    "at %s on %s" % [time, days.join(', ')]
+  end
+  
+  private
+  
+  def time()
     
-    ChronicCron.new(s, detail[:time]).to_time == detail[:time]
+    a = @h[:days_of_week].clone
+    a.unshift a.pop
 
+    dow = a.map.with_index {|x, i| x ? i : nil }.compact.join(',')
+    s = "%s %s * * %s" % [@h[:minute], @h[:hour], dow]        
+    recent_time = ($env && $env[:time]) ? $env[:time] : Time.now
+    ChronicCron.new(s, recent_time).to_time
+    
   end
 
 end
@@ -1101,6 +1447,15 @@ class RegularIntervalTrigger < Trigger
 
 end
 
+class DeviceEventsTrigger < Trigger
+  
+  def initialize(h={})
+    super(h)
+    @group = 'device_events'
+  end  
+  
+end
+
 # Category: Device Events
 #
 # Airplane Mode Changed
@@ -1112,7 +1467,7 @@ end
 # shorthand example:
 #   airplanemode: enabled
 #
-class AirplaneModeTrigger < Trigger
+class AirplaneModeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1128,7 +1483,7 @@ end
 
 # Category: Device Events
 #
-class AutoSyncChangeTrigger < Trigger
+class AutoSyncChangeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1144,7 +1499,7 @@ end
 
 # Category: Device Events
 #
-class DayDreamTrigger < Trigger
+class DayDreamTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1160,7 +1515,7 @@ end
 
 # Category: Device Events
 #
-class DockTrigger < Trigger
+class DockTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1176,7 +1531,30 @@ end
 
 # Category: Device Events
 #
-class GPSEnabledTrigger < Trigger
+class FailedLoginTrigger < DeviceEventsTrigger
+  
+  def initialize(h={})
+
+    options = {
+      num_failures: 1
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def to_pc()
+    'failed_login?'
+  end
+
+  def to_s()
+    'Failed Login Attempt'
+  end
+end
+
+# Category: Device Events
+#
+class GPSEnabledTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1192,7 +1570,7 @@ end
 
 # Category: Device Events
 #
-class MusicPlayingTrigger < Trigger
+class MusicPlayingTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1209,7 +1587,7 @@ end
 
 # Category: Device Events
 #
-class DeviceUnlockedTrigger < Trigger
+class DeviceUnlockedTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1224,7 +1602,7 @@ end
 
 # Category: Device Events
 #
-class AutoRotateChangeTrigger < Trigger
+class AutoRotateChangeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1240,7 +1618,7 @@ end
 
 # Category: Device Events
 #
-class ClipboardChangeTrigger < Trigger
+class ClipboardChangeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1257,7 +1635,7 @@ end
 
 # Category: Device Events
 #
-class BootTrigger < Trigger
+class BootTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1272,7 +1650,7 @@ end
 
 # Category: Device Events
 #
-class IntentReceivedTrigger < Trigger
+class IntentReceivedTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1292,7 +1670,7 @@ end
 
 # Category: Device Events
 #
-class NotificationTrigger < Trigger
+class NotificationTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1318,7 +1696,7 @@ end
 
 # Category: Device Events
 #
-class ScreenOnOffTrigger < Trigger
+class ScreenOnOffTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1334,7 +1712,7 @@ end
 
 # Category: Device Events
 #
-class SilentModeTrigger < Trigger
+class SilentModeTrigger < DeviceEventsTrigger
 
   def initialize(h={})
 
@@ -1377,8 +1755,15 @@ end
 #
 class GeofenceTrigger < Trigger
 
-  def initialize(h={})
+  def initialize(geofence, h={})
 
+    if h[:name] then
+      
+      found = geofence.find {|x| x.name == h[:name]}
+      h[:geofence_id] = found.id
+      
+    end
+    
     options = {
       update_rate_text: '5 Minutes',
       geofence_id: '',
@@ -1387,9 +1772,18 @@ class GeofenceTrigger < Trigger
       enter_area: true
     }
 
-    super(options.merge h)
+    super(options.merge filter(options, h))
+    @geofence = geofence
 
   end
+  
+  def to_s()
+    
+    puts ' @geofence: ' + @geofence.inspect if $debug   
+    direction = @h[:enter_area] ? 'Entry' : 'Exit'
+    "Geofence %s (%s)" % [direction, @geofence[@h[:geofence_id].to_sym].name]
+    
+  end
 
 end
 
@@ -1410,9 +1804,19 @@ class SunriseSunsetTrigger < Trigger
 
 end
 
+
+class SensorsTrigger < Trigger
+  
+  def initialize(h={})
+    super(h)
+    @group = 'sensors'
+  end
+  
+end
+
 # Category: Sensors
 #
-class ActivityRecognitionTrigger < Trigger
+class ActivityRecognitionTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1429,7 +1833,7 @@ end
 
 # Category: Sensors
 #
-class ProximityTrigger < Trigger
+class ProximityTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1446,7 +1850,7 @@ end
 
 # Category: Sensors
 #
-class ShakeDeviceTrigger < Trigger
+class ShakeDeviceTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1456,12 +1860,25 @@ class ShakeDeviceTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_pc()
+    'shake_device?'
+  end
+  
+  def to_s()
+    'Shake Device'
+  end
 
 end
 
 # Category: Sensors
 #
-class FlipDeviceTrigger < Trigger
+# options:
+#   Face Up -> Face Down
+#   Face Down -> Face Up
+#   Any -> Face Down
+#
+class FlipDeviceTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1473,13 +1890,23 @@ class FlipDeviceTrigger < Trigger
 
     super(options.merge h)
 
+  end  
+  
+  def to_pc()
+    @h[:face_down] ? 'flip_device_down?' : 'flip_device_up?'
   end
+  
+  def to_s()
+    
+    action = @h[:face_down] ? 'Face Up -> Face Down' : 'Face Down -> Face Up'
+    'Flip Device ' + action
+  end  
 
 end
 
 # Category: Sensors
 #
-class OrientationTrigger < Trigger
+class OrientationTrigger < SensorsTrigger
 
   def initialize(h={})
 
@@ -1661,6 +2088,10 @@ class LaunchActivityAction < ApplicationAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Launch ' + @h[:application_name]
+  end
 
 end
 
@@ -1698,6 +2129,10 @@ class OpenWebPageAction < ApplicationAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'HTTP GET'
+  end
 
 end
 
@@ -1745,6 +2180,15 @@ class TakePictureAction < CameraAction
     super(options.merge h)
 
   end
+  
+  def to_pc()
+    camera = @h[:use_front_camera] ? :front : :back
+    'take_photo :' + camera.to_s
+  end
+
+  def to_s()
+    'Take Picture'
+  end  
 
 end
 
@@ -1773,6 +2217,11 @@ class SetWifiAction < ConnectivityAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    action = @h[:state] == 0 ? 'Enable' : 'Disable'
+    action + ' Wifi'
+  end
 
 end
 
@@ -1903,6 +2352,20 @@ class SayTimeAction < DateTimeAction
     super(options.merge h)
 
   end
+  
+  def invoke()
+    time = ($env and $env[:time]) ? $env[:time] : Time.now
+    tformat = @h['12_hour'] ? "%-I:%M%P" : "%H:%M"
+    super(time.strftime(tformat))
+  end
+  
+  def to_pc()
+    'say current_time()'
+  end
+  
+  def to_s()
+    'Say Current Time'
+  end  
 
 end
 
@@ -2074,6 +2537,14 @@ class CameraFlashLightAction < DeviceSettingsAction
 
   end
 
+  def to_pc()
+    'torch :on'
+  end
+  
+  def to_s()
+    'Torch On'
+  end  
+
 end
 
 # Category: Device Settings
@@ -2411,6 +2882,10 @@ class PlaySoundAction < MediaAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Play: ' + @h[:file_path]
+  end
 
 end
 
@@ -2615,6 +3090,9 @@ end
 class NotificationAction < NotificationsAction
 
   def initialize(h={})
+    
+    h[:notification_subject] = h[:subject] if h[:subject] 
+    h[:notification_text] = h[:text] if h[:text]
 
     options = {
       ringtone_name: 'Default',
@@ -2630,9 +3108,13 @@ class NotificationAction < NotificationsAction
       run_macro_when_pressed: false
     }
 
-    super(options.merge h)
+    super(options.merge filter(options, h))
 
   end
+  
+  def to_s()
+    'Display Notification: ' + "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
+  end
 
 end
 
@@ -2665,6 +3147,14 @@ class ToastAction < NotificationsAction
   def invoke()
     super(@h[:message_text])
   end
+  
+  def to_pc()
+    "popup_message '%s'" % @h[:message_text]
+  end
+  
+  def to_s()
+    "Popup Message '%s'" % @h[:message_text]
+  end
 
 end
 
@@ -2993,5 +3483,917 @@ class Constraint < MacroObject
   def initialize(h={})    
     super(h)
   end
+  
+  def match?(detail={}, model=nil)
+
+    detail.select {|k,v| @h.include? k }.all? {|key,value| @h[key] == value}
+
+  end
+  
+  #def to_s()
+  #  ''
+  #end
+  
+  protected
+  
+  def toggle_match?(key, val)
+    
+    if @h[key] == true and val == key.to_s then
+      true
+    elsif @h[key] == false and val != key.to_s 
+      true
+    else
+      false
+    end
+    
+  end
+
+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
+#
+class BatteryLevelConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      battery_level: 23,
+      equals: false,
+      greater_than: false
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Battery/Power
+#
+class BatterySaverStateConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Battery/Power
+#
+class BatteryTemperatureConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      equals: false,
+      greater_than: false,
+      temperature: 30
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Battery/Power
+#
+class ExternalPowerConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      external_power: true,
+      power_connected_options: [false, true, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class BluetoothConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      any_device: false,
+      bt_state: 0,
+      device_name: 'Any Device'
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class GPSEnabledConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class LocationModeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      options: [false, false, false, true]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class SignalOnOffConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class WifiConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      ssid_list: [],
+      wifi_state: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class CellTowerConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      cell_group_name: 'test group',
+      cell_ids: ["524,14,41070731"],
+      in_range: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class IsRoamingConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      is_roaming: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class DataOnOffConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      data_on: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Connectivity
+#
+class WifiHotSpotConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      check_connections: false,
+      comparison_value: 0,
+      connected_count: 0,
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class CalendarConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enable_regex: false,
+      availability: 0,
+      calendar_id: '1',
+      calendar_name: 'PC Sync',
+      detail_text: '',
+      entry_set: true,
+      ignore_all_day: false,
+      title_text: ''
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class DayOfWeekConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      days_of_week: [false, false, true, false, false, false, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class TimeOfDayConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      end_hour: 1,
+      end_minute: 1,
+      start_hour: 21,
+      start_minute: 58
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class DayOfMonthConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      day_names: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31"],
+      days_of_month: [false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class MonthOfYearConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      months: [false, false, false, false, false, false, false, true, false, false, false, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Date/Time
+#
+class SunsetSunriseConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class AirplaneModeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def match?(detail={}, model=nil)
+    
+    puts 'inside airplaneModeConstraint#match?' if $debug
+    
+    if detail.has_key? :enabled then
+      
+      puts 'detail has the key' if $debug
+      super(detail)
+      
+    elsif model
+      
+      if $debug then
+        puts 'checking the model'
+        switch = model.connectivity.airplane_mode.switch
+        puts 'switch: ' + switch.inspect
+      end
+      
+      toggle_match?(:enabled, switch)
+      
+    end
+    
+  end
+  
+  def to_pc()
+    status = @h[:enabled] ? 'enabled?' : 'disabled?'
+    'airplane_mode.' + status
+  end
+  
+  def to_s()
+    
+    status = @h[:enabled] ? 'Enabled' : 'Disabled'
+    'Airplane Mode ' + status
+    
+  end
+
+end
+
+# Category: Device State
+#
+class AutoRotateConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class DeviceLockedConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      locked: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class RoamingOnOffConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      roaming_on: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class TimeSinceBootConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      less_than: true,
+      time_period_seconds: 10921
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class AutoSyncConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: false
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class NFCStateConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class IsRootedConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      rooted: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Device State
+#
+class VpnConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: MacroDroid Specific
+#
+class MacroEnabledConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true,
+      macro_ids: [-8016812002629322290],
+      macro_names: ["Intruder photo "]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: MacroDroid Specific
+#
+class ModeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      mode: 'Away',
+      mode_selected: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: MacroDroid Specific
+#
+class TriggerThatInvokedConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      not: false,
+      si_guid_that_invoked: -4951291100076165433,
+      trigger_name: 'Shake Device'
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: MacroDroid Specific
+#
+class LastRunTimeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      check_this_macro: false,
+      invoked: true,
+      macro_ids: [-6922688338672048267],
+      macro_names: ["Opendoor"],
+      time_period_seconds: 7260
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Media
+#
+class HeadphonesConnectionConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      connected: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Media
+#
+class MusicActiveConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      music_active: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Notification
+#
+class NotificationPresentConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enable_regex: false,
+      application_name_list: ["All applications"],
+      exact_match: false,
+      excludes: false,
+      excludes_apps: -1,
+      option: 0,
+      package_name_list: ["allApplications"],
+      text_content: ''
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Notification
+#
+class PriorityModeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      in_mode: true,
+      selected_index: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Notification
+#
+class NotificationVolumeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 1
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Phone
+#
+class InCallConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      in_call: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Phone
+#
+class PhoneRingingConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      ringing: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class BrightnessConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      brightness: 35,
+      equals: false,
+      force_pie_mode: false,
+      greater_than: false,
+      is_auto_brightness: false
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class VolumeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class SpeakerPhoneConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      enabled: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class DarkThemeConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: 0
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class ScreenOnOffConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      a: true,
+      screen_on: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Screen and Speaker
+#
+class VolumeLevelConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      comparison: 0,
+      stream_index_array: [false, true, false, false, false, false, false],
+      volume: 42
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Sensors
+#
+class FaceUpDownConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      option: -1,
+      selected_options: [true, false, true, false, false, false]
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Sensors
+#
+class LightLevelConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      light_level: -1,
+      light_level_float: 5000.0,
+      option: 1
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Sensors
+#
+class DeviceOrientationConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      portrait: true
+    }
+
+    super(options.merge h)
+
+  end
+
+end
+
+# Category: Sensors
+#
+class ProximitySensorConstraint < Constraint
+
+  def initialize(h={})
+
+    options = {
+      near: true
+    }
+
+    super(options.merge h)
+
+  end
 
 end