ruby-macrodroid 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d851b05dbc6ecfd52b146846a6bbe935a06d30bfdf523c0550bd18c701b93b
-  data.tar.gz: 97171c71818bc1d0ce3ed70dc790f3464170e18f8ff62b5b3ff47b66f40c49d0
+  metadata.gz: 6f4d8a484f60935d656a2ac7973ca917709201955fe55897ce27d2430cb8ec93
+  data.tar.gz: d886539a6623877a521969d869d8d4b5690191795ffa6710dc0df5149b123707
 SHA512:
-  metadata.gz: a9187782e93e70a758e50a07c49812d5bb915dab37bb108d174157a76d76cc2b625b766665ad5ac3f47c7d12d3ac8082b291966aa36c114d4d573ddf38e567b3
-  data.tar.gz: 7514ffbe6a9b4c063fe278c685ce0a860b4d28a1945d4819faa65b081395b701b5dab657a3d7764b87689f230c74d7c14051e563ad4360937ade7f78466ac3a3
+  metadata.gz: 5d6251c0656a7ff30a252bc3ef38dcdd27da42ef278f34e07d4d03d07a2d11a7bab346e39330d76d17d69dd5f8d2d6091f89a81e691b1c47d7513013781e0524
+  data.tar.gz: bd12b85b6ef51759358f4c7e44e5671a1f69119d156ba25806eeb287e67da4f6cd50aca09940e6b4e5c0e3b9b96475be4dde49ce7f8a01694634e764e45fe343

data.tar.gz.sig

@@ -1,2 +1,2 @@
-\�-��1�g(�3�&�oԓz�7R�,$�ǝ�_�gb����
-���;t1ӎ���M��(Y棸����s_��*A����mX�l4}Mݩ�{������ꉻ;��
+#�[�fb��f�
+ϱ�>�Q

data/lib/ruby-macrodroid.rb

@@ -7,12 +7,7 @@
 #  ## Nlp classes
 #  
 #  TriggersNlp ActionsNlp ConstraintsNlp
-#  
-#  
-#  ## Macro class
-#  
-#  Macro
-#  
+#     
 #  
 #  ## Error class
 #  
@@ -31,11 +26,12 @@
 #  
 
 
+
 require 'yaml'
 require 'rowx'
 require 'uuid'
-require 'glw'
-require 'geozone'
+#require 'glw'
+#require 'geozone'
 require 'geocoder'
 require 'subunit'
 require 'rxfhelper'
@@ -51,10 +47,10 @@ EOF
 class TriggersNlp
   include AppRoutes
 
-  def initialize()
+  def initialize(macro=nil)
 
     super()
-    params = {}
+    params = {macro: macro}
     triggers(params)
 
   end
@@ -117,7 +113,18 @@ class TriggersNlp
       
       [ProximityTrigger, {distance: distance}]
     end    
+    
+    get /^WebHook \(Url\)/i do       
+      [WebHookTrigger, params]
+    end      
 
+    get /^WebHook/i do       
+      [WebHookTrigger, params]
+    end
+    
+    get /^wh/i do       
+      [WebHookTrigger, params]
+    end          
     
     
   end
@@ -134,10 +141,10 @@ end
 class ActionsNlp
   include AppRoutes
 
-  def initialize()
+  def initialize(macro=nil)
 
     super()
-    params = {}
+    params = {macro: macro}
     actions(params)
 
   end
@@ -170,7 +177,7 @@ class ActionsNlp
     end    
     
     get /^Torch :?(.*)/i do |onoffstate|
-      state = onoffstate.downcase == 'on' ? 0 : 1
+      state = %w(on off toggle).index onoffstate.downcase
       [CameraFlashLightAction, {state: state}]
     end    
     
@@ -223,8 +230,20 @@ class ActionsNlp
     
     # e.g. webhook entered_kitchen
     #
-    get /webhook|HTTP GET/i do
-      [OpenWebPageAction, {}]
+    get /(?:webhook|HTTP GET) ([^$]+)$/i do |s|
+      key = s =~ /^http/ ? :url_to_open : :identifier      
+      [OpenWebPageAction, {key => s}]
+    end
+    
+    #
+    get /^WebHook \(Url\)/i do
+      [OpenWebPageAction, params]
+    end
+    
+    # e.g. webhook entered_kitchen
+    #
+    get /^webhook$/i do
+      [OpenWebPageAction, params]
     end
     
     #a: Keep Device Awake Screen On Until Disabled
@@ -253,11 +272,15 @@ class ActionsNlp
       [KeepAwakeAction, {enabled: false, screen_option: 0}]
     end    
 
-    #a: Disable Keep Awake
+    #e.g a: if Airplane mode enabled
     #
     get /if (.*)/i do
       [IfConditionAction, {}]
-    end      
+    end
+    
+    get /End If/i do
+      [EndIfAction, {}]
+    end          
 
   end
 
@@ -280,7 +303,7 @@ class ConstraintsNlp
   def constraints(params) 
 
     get /^airplane mode (.*)/i do |state|
-      [AirplaneModeConstraint, {enabled: (state =~ /^enabled|on$/) == 0}]
+      [AirplaneModeConstraint, {enabled: (state =~ /^enabled|on$/i) == 0}]
     end
 
   end
@@ -345,495 +368,25 @@ end
 
 
 
-class Macro
-  using ColouredText
-  using Params
-
-  attr_reader :local_variables, :triggers, :actions, :constraints, 
-      :guid, :deviceid
-  attr_accessor :title, :description
-
-  def initialize(name=nil, geofences: nil, deviceid: nil, debug: false)
-
-    @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
-    
-    puts 'inside Macro#initialize' if @debug    
-          
-    @local_variables, @triggers, @actions, @constraints = [], [], [], []
-    @h = {}
-    
-  end
-  
-  def add(obj)
-
-    if obj.kind_of? Trigger then
-      
-      puts 'trigger found' if @debug
-      @triggers << obj
-      
-    elsif obj.kind_of? Action
-      
-      puts 'action found' if @debug
-      @actions << obj
-      
-    elsif obj.kind_of? Constraint
-      
-      puts 'constraint found' if @debug
-      @constraints << obj
-      
-    end
-    
-  end
-
-  def to_h()
-
-    h = {
-      local_variables: @local_variables,
-      m_trigger_list: @triggers.map(&:to_h),
-      m_action_list: @actions.map(&:to_h),
-      m_category: @category,
-      m_constraint_list: @constraints.map(&:to_h),
-      m_description: '',
-      m_name: title(),
-      m_excludeLog: false,
-      m_GUID: guid(),
-      m_isOrCondition: false,
-      m_enabled: false,
-      m_descriptionOpen: false,
-      m_headingColor: 0
-    }
-    
-    puts 'h: ' + h.inspect if @debug
-
-    @h.merge(h)
-  end
-
-  def import_h(h)
-
-    if @debug then
-      puts 'inside import_h'
-      puts 'h:' + h.inspect
-    end
-    
-    @category = h[:category]
-    @title = h[:name]
-    @description = h[:description]
-    
-    # fetch the local variables
-    if h[:local_variables].any? and h[:local_variables].first.any? then
-      
-      @local_variables = h[:local_variables].map do |var|
-              
-        val = case var[:type]
-        when 0 # boolean
-          var[:boolean_value]
-        when 1 # integer
-          var[:int_value]
-        when 2 # string
-          var[:string_value]
-        when 3 # decimal
-          var[:decimal_Value]
-        end
-        
-        [var[:name], val]
-        
-      end.to_h
-    end
-    
-    # fetch the triggers
-    @triggers = h[:trigger_list].map do |trigger|
-      puts 'trigger: ' + trigger.inspect
-      #exit      
-      object(trigger.to_snake_case)
-
-    end
-
-    @actions = h[:action_list].map do |action|
-      object(action.to_snake_case)
-    end
-    puts 'before fetch constraints' if @debug
-    # fetch the constraints                               
-    @constraints = h[:constraint_list].map do |constraint|
-      object(constraint.to_snake_case)
-    end                               
-    puts 'after fetch constraints' if @debug    
-    @h = h
-
-    %i(local_variables m_trigger_list m_action_list m_constraint_list)\
-      .each {|x| @h[x] = [] }
-    puts 'after @h set' if @debug    
-    @h
-
-  end
-  
-  def import_xml(node)
-
-    if @debug then
-      puts 'inside Macro#import_xml'
-      puts 'node: ' + node.xml.inspect
-    end
-    
-    if node.element('triggers') then
-            
-      # level 2
-      
-      @title = node.attributes[:name]
-      @category = node.attributes[:category]
-      @description = node.attributes[:description]
-      
-      
-      # get all the triggers
-      @triggers = node.xpath('triggers/*').map do |e|
-        
-        puts 'e.name: ' + e.name.inspect if @debug
-        {timer: TimerTrigger}[e.name.to_sym].new(e.attributes.to_h)
-        
-      end
-
-      # get all the actions
-      @actions = node.xpath('actions/*').map do |e|
-        
-        if e.name == 'notification' then
-          
-          case e.attributes[:type].to_sym
-          when :popup          
-            e.attributes.delete :type
-            ToastAction.new e.attributes.to_h
-          end
-          
-        end
-
-      end    
-                               
-      # get all the constraints
-      @constraints = node.xpath('constraints/*').map do |e|
-        
-        puts 'e.name: ' + e.name.inspect if @debug
-        {airplanemode: AirplaneModeConstraint}[e.name.to_sym].new(e.attributes.to_h)
-
-      end                                  
-      
-    else
-      
-      # Level 1
-      
-      puts 'import_xml: inside level 1' if @debug
-      
-      @title = node.text('macro') || node.attributes[:name]
-      
-      #@description = node.attributes[:description]      
-      
-      tp = TriggersNlp.new      
-      
-      @triggers = node.xpath('trigger').map do |e|
-        
-        r = tp.find_trigger e.text
-        
-        puts 'found trigger ' + r.inspect if @debug
-        
-        if r then
-          if r[0] == GeofenceTrigger then
-            GeofenceTrigger.new(r[1], geofences: @geofences)
-          else
-            r[0].new(r[1])
-          end
-        end
-        
-      end
-      
-      ap = ActionsNlp.new      
-      
-      @actions = node.xpath('action').map do |e|
-        
-        puts 'action e: ' + e.xml.inspect if @debug
-        puts 'e.text ' + e.text if @debug
-        
-        inner_lines = e.xpath('item/description/text()')        
-        
-        action = if e.text.to_s.strip.empty? then
-          inner_lines.shift
-        else
-          e.text.strip
-        end
-        
-        r = ap.find_action action
-        puts 'found action ' + r.inspect if @debug
-        
-        if r then
-          
-          loose = inner_lines.shift
-          
-          raw_attributes = if loose then
-          
-            puts 'do something ' + loose.to_s if @debug
-            loose.to_s
-            
-          else
-            
-            a = e.xpath('item/*')
-            
-            h = if a.any? then
-              a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
-            else
-              {}
-            end
-            
-            r[1].merge(h)
-            
-          end
-          r[0].new(raw_attributes)
-        end
-        
-      end      
-                               
-      cp = ConstraintsNlp.new      
-      
-      @constraints = node.xpath('constraint').map do |e|
-        
-        r = cp.find_constraint e.text
-        puts 'found constraint ' + r.inspect if @debug
-        
-        if r then
-          r[0].new(r[1])
-        end
-        
-      end                                   
-      
-    end
-    
-    self
-    
-  end
-  
-  def match?(triggerx, detail={time: $env[:time]}, model=nil )
-                
-    if @triggers.any? {|x| x.type == triggerx and x.match?(detail, model) } then
-      
-      if @debug then
-        puts 'checking constraints ...' 
-        puts '@constraints: ' + @constraints.inspect
-      end
-      
-      if @constraints.all? {|x| x.match?($env.merge(detail), model) } then
-      
-        true
-        
-      else
-
-        return false
-        
-      end
-      
-    end
-    
-  end
-  
-  # invokes the actions
-  #
-  def run()
-    @actions.map(&:invoke)
-  end
-  
-  # prepares the environment in order for triggers to test fire successfully
-  # Used for testing
-  #
-  def set_env()
-    @triggers.each(&:set_env)
-  end
-
-  def to_pc()
-    
-    heading = '# ' + @title
-    heading += '\n# ' + @description if @description
-    condition = @triggers.first.to_pc
-    actions = @actions.map(&:to_pc).join("\n")
-    
-<<EOF
-#{heading}
-
-if #{condition} then
-  #{actions}
-end
-EOF
-  end
-    
-  def to_s(colour: false)
-    
-    indent = 0
-    actions = @actions.map do |x|
-
-      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
-      
-        if colour then
-          "a".bg_blue.gray.bold + ": %s" % s
-        else
-          "a: %s" % s
-        end
-        
-      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|DO \/ WHILE)/i then
-        
-        if indent < 1 then
-          
-          r = if colour then
-            "a".bg_blue.gray.bold + ":\n  %s" % s
-          else
-            "a:\n  %s" % s
-          end
-          
-          indent += 1
-        else
-          r = ('  ' * indent) + "%s" % s
-        end
-
-        indent += 1
-      end
-      
-      r
-      
-    end.join("\n")
-
-    a = []
-    a << '# ' + @category + "\n" if @category
-    a <<  (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title
-
-    
-    if @description and @description.length >= 1 then
-      a << (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
-               + @description.gsub(/\n/,"\n  ")
-    end    
-    
-    if @local_variables.length >= 1 then
-      
-      vars = @local_variables.map do |k,v|
-        label = colour ? 'v'.bg_magenta : 'v'
-        label += ': '
-        label + "%s: %s" % [k,v]
-      end
-      
-      a << vars.join("\n")
-    end
-    
-    a << @triggers.map {|x| (colour ? "t".bg_red.gray.bold : 't') \
-                     + ": %s" % x}.join("\n")
-    a << actions
-
-    
-    if @constraints.any? then
-      a << @constraints.map do |x|
-        (colour ? "c".bg_green.gray.bold : 'c') + ": %s" % x
-      end.join("\n") 
-    end
-    
-
-    
-
-    
-    a.join("\n") + "\n"
-    
-  end
-  
-  def to_summary(colour: false)
-    
-    if colour then
-      
-      a = [
-        'm'.bg_cyan.gray.bold + ': ' + @title,
-        't'.bg_red.gray.bold + ': ' + @triggers.map \
-      {|x| x.to_summary(colour: false)}.join(", "),
-        'a'.bg_blue.gray.bold + ': ' + @actions.map \
-      {|x| x.to_summary(colour: false)}.join(", ")
-      ]
-      
-      if @constraints.any? then
-        a <<  'c'.bg_green.gray.bold + ': ' + @constraints.map \
-            {|x| x.to_summary(colour: false)}.join(", ") 
-      end      
-      
-    else
-      
-      a = [
-        'm: ' + @title,
-        't: ' + @triggers.map {|x| x.to_summary(colour: false)}.join(", "),
-        'a: ' + @actions.map {|x| x.to_summary(colour: false)}.join(", ")
-      ]
-      
-      if @constraints.any? then
-        a <<  'c: ' + @constraints.map \
-            {|x| x.to_summary(colour: false)}.join(", ") 
-      end
-    end
-    
-    
-    
-    a.join("\n") + "\n"
-    
-  end
-
-  private
-  
-  def guid()
-    '-' + rand(1..9).to_s + 18.times.map { rand 9 }.join    
-  end
-
-  def object(h={})
-
-    puts ('inside object h:'  + h.inspect).debug if @debug  
-    klass = Object.const_get h[:class_type]
-    puts klass.inspect.highlight if $debug
-    
-    if klass == GeofenceTrigger then
-      puts 'GeofenceTrigger found'.highlight if $debug
-      GeofenceTrigger.new(h, geofences: @geofences)
-    else
-      puts 'before klass'
-      h2 = h.merge( macro: self)
-      puts 'h2: ' + h2.inspect      
-      r = klass.new h2 
-      puts 'r:' + r.inspect
-      r
-      
-    end
-    
-  end
-
-end
 
 
 class MacroDroidError < Exception
 end
 
 class MacroDroid
+  include RXFHelperModule
   using ColouredText
   using Params  
 
   attr_reader :macros, :geofences, :yaml
-  attr_accessor :deviceid
+  attr_accessor :deviceid, :remote_url
   
   # note: The deviceid can only be found from an existing Webhook trigger, 
   #       generated from MacroDroid itself.
 
-  def initialize(obj=nil, deviceid: nil, debug: false)
+  def initialize(obj=nil, deviceid: nil, remote_url: nil, debug: false)
 
-    @deviceid, @debug = deviceid, debug    
+    @deviceid, @remote_url, @debug = deviceid, remote_url, debug    
     
     @geofences = {}
     
@@ -862,10 +415,16 @@ class MacroDroid
           puts 'before RowX.new' if @debug
 
           s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
-              .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
-              .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
+              .gsub(/^v:/,'variable:').gsub(/^t:/,'trigger:')\
+              .gsub(/^a:/,'action:').gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
+          
+          a = s2.split(/(?=^macro:)/)
           
-          raw_macros, raw_geofences = s2.split(/(?=^macro:)/,2).reverse
+          raw_geofences = a.shift if a.first =~ /^geofence/
+          raw_macros = a.join
+          #raw_macros, raw_geofences .reverse
+          
+          puts 'raw_macros: ' + raw_macros.inspect if @debug
           
           if raw_geofences then
             
@@ -878,6 +437,7 @@ class MacroDroid
           end
           
           xml = RowX.new(raw_macros).to_xml
+          puts 'xml: ' + xml if @debug
           import_rowxml(xml)
           
         elsif s =~ /^# / 
@@ -931,14 +491,16 @@ class MacroDroid
 
     }    
   end
+  
+  def export(filepath)
+    FileX.write filepath, to_json
+  end
 
-  def export_json()
+  def to_json()
 
     to_h.to_json
 
   end
-
-  alias to_json export_json
   
 
   def to_h()
@@ -1040,7 +602,7 @@ class MacroDroid
 #       puts '@geofences: ' + @geofences.inspect if @debug
       
       m = Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
-                    debug: @debug )
+                    remote_url: @remote_url, debug: @debug )
       m.import_h(macro)
       m
 
@@ -1062,7 +624,7 @@ class MacroDroid
     @macros = doc.root.xpath('item').map do |node|
       puts ('geofences: ' + geofences.inspect).highlight if @debug
       Macro.new(geofences: geofences.map(&:last), deviceid: @deviceid, 
-                debug: @debug).import_xml(node)
+                remote_url: @remote_url, debug: @debug).import_xml(node)
       
     end
 
@@ -1084,7 +646,7 @@ class MacroDroid
     end
        
     @macros = doc.root.xpath('macro').map do |node|
-          
+      puts 'node: ' + node.inspect if @debug    
       Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
                 debug: @debug).import_xml(node)
       
@@ -1285,7 +847,9 @@ class DroidSim
 
 end
 
+
 require 'ruby-macrodroid/base'
 require 'ruby-macrodroid/triggers'
 require 'ruby-macrodroid/actions'
 require 'ruby-macrodroid/constraints'
+require 'ruby-macrodroid/macro'