ruby-macrodroid 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b820bff4fbf40858e39fb86dcf5cca3c511fec1285c6ef642469f0222ae7858e
-  data.tar.gz: abea1d50f38024c84dcca885487915a6f878427d0f5504c98ce818976231eb8c
+  metadata.gz: 378a54305a1bfcce6433d130a154765550e7c19f547e19897fffe48c4ee5abf2
+  data.tar.gz: dc2374f5fe37dbf9e011a62272874b6e6b80be87c5dcb6479a253d033a0f3b26
 SHA512:
-  metadata.gz: 6f64c76e11c1b581e8e86bbddbcfec090e90c5673ecc72d64deeb542452a870252dc30a066f699f5ea1b682147f241d2518341b34cfefe6d5e70aacbe4cf22e6
-  data.tar.gz: b3e6b695cca7a0c10c14b4bde58c927504cc2f5e722ba2ca83fb9c905d51369b1a0912134a523ae4a3f6546dbf9e826585fddb6a56fa02799e2d72fcbd37a6d0
+  metadata.gz: 52222f8794ae92cdae799a5309dcb387c8e6e587a9d36fbbc429f636730c57610f4b9e20f9cf65f60989a843aaa1cfa96696954142dc98bb0c162bd737cb49cb
+  data.tar.gz: 9db28bc4773d3e8daff58a75244b1506a2885fd70da22136e10baa4c5f9d008a37e45538320c2ad4831412857aa4fd68a50d13dd6a9f4518744d700cc5521d1b

data/lib/ruby-macrodroid.rb

@@ -47,10 +47,10 @@ EOF
 class TriggersNlp
   include AppRoutes
 
-  def initialize()
+  def initialize(macro=nil)
 
     super()
-    params = {}
+    params = {macro: macro}
     triggers(params)
 
   end
@@ -113,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
@@ -166,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    
     
@@ -249,11 +260,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
 
@@ -276,7 +291,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
@@ -347,6 +362,7 @@ class MacroDroidError < Exception
 end
 
 class MacroDroid
+  include RXFHelperModule
   using ColouredText
   using Params  
 
@@ -387,10 +403,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(/^#.*/,'')
           
-          raw_macros, raw_geofences = s2.split(/(?=^macro:)/,2).reverse
+          a = s2.split(/(?=^macro:)/)
+          
+          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
             
@@ -457,14 +479,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()
@@ -610,7 +634,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)
       
@@ -811,7 +835,68 @@ class DroidSim
 
 end
 
+RD_MACROS =<<EOF
+m: Torch
+t: webhook
+a: Torch toggle
+EOF
+
+module RemoteDroid
+
+  class Service
+    def initialize(callback)
+      @callback = callback
+    end
+  end
+  
+  class Bluetooth
+    def enable()
+    end
+  end
+  
+  class Torch < Service
+        
+    def toggle()
+      @callback.call :torch      
+    end
+    
+  end
+
+  class Control        
+    
+    def initialize(deviceid: nil)
+      @deviceid = deviceid
+      @torch = Torch.new(self)
+    end
+    
+    def bluetooth()
+      @bluetooth
+    end
+    
+    def call(command)
+      url = "https://trigger.macrodroid.com/%s/%s" % [@deviceid, command]
+      puts 'url: ' + url.inspect
+      s = open(url).read      
+    end
+    
+    def torch()
+      @torch
+    end
+
+    def write(s)
+      
+      MacroDroid.new(RD_MACROS, deviceid: @deviceid).export s
+      
+    end
+    
+    alias export write
+    
+  end
+
+end
+
 require 'ruby-macrodroid/base'
 require 'ruby-macrodroid/triggers'
 require 'ruby-macrodroid/actions'
 require 'ruby-macrodroid/constraints'
+require 'ruby-macrodroid/macro'

data/lib/ruby-macrodroid/actions.rb

@@ -42,11 +42,11 @@ class Action < MacroObject
     macro = h[:macro]
     h.delete :macro
     super(h)
-    
-    # fetch the constraints                               
+
     @constraints = @h[:constraint_list].map do |constraint|
       object(constraint.to_snake_case.merge(macro: macro))
-    end       
+    end
+    
   end
   
   def invoke(s='')    
@@ -317,25 +317,49 @@ end
 # Conditions/Loops
 #
 class IfConditionAction < Action
-  
+
   def initialize(obj=nil)
+
+    options = {
+      a: true,
+      constraint_list: []
+    }  
     
-    h = if obj.is_a? Hash then
-      obj
+    if obj.is_a? Hash then
+      
+      h = obj
+      macro = h[:macro]
+      h2 = options.merge(filter(options,h).merge(macro: macro))
+      super(h2)      
+      
+    elsif obj.is_a? Rexle::Element
+      super() 
+      raw_txt = obj.text('item/description') || obj.text.to_s
+      puts 'raw_txt: ' + raw_txt.inspect if $debug
+      
+      clause = raw_txt[/^if (.*)/i,1]
+      conditions = clause.split(/\s+\b(?:AND|OR)\b\s+/i)
+      
+      cp = ConstraintsNlp.new      
+      
+      @constraints = conditions.map do |c|
+        puts 'c: ' + c.inspect 
+        r = cp.find_constraint c
+        puts 'found constraint ' + r.inspect if $debug
+        
+        r[0].new(r[1]) if r
+        
+      end         
+      puts '@constraints: ' + @constraints.inspect if $debug
+      {}
     else
       # get the constraints
 
     end
     
-    options = {
-      a: true,
-      constraint_list: ''
-    }
+
     
-    macro = h[:macro]
-    h2 = options.merge(filter(options,h).merge(macro: macro))
 
-    super(h2)
     
     @label = 'If '
 
@@ -418,10 +442,17 @@ end
 
 class EndIfAction < Action
   
-  def initialize(h={})
-
+  def initialize(obj={})
+    
+    h = if obj.is_a? Hash then
+      obj
+    elsif obj.is_a? Rexle::Element    
+      {}
+    end
+    
+  
     options = {
-      constraint_list: ''
+      constraint_list: []
     }
 
     super(options.merge h)
@@ -432,6 +463,8 @@ class EndIfAction < Action
     'End If'
   end
   
+  alias to_summary to_s
+  
 end
 
 class ConnectivityAction < Action

data/lib/ruby-macrodroid/macro.rb

@@ -7,6 +7,17 @@
 #  
 #  Macro
 
+
+
+VAR_TYPES = {
+  String: [2, :string_value], 
+  TrueClass: [0, :boolean_value], 
+  TrueClass: [0, :boolean_value],
+  Integer: [1, :int_value],
+  Float: [3, :decimal_value]
+}
+
+
 class Macro
   using ColouredText
   using Params
@@ -50,7 +61,7 @@ class Macro
   def to_h()
 
     h = {
-      local_variables: @local_variables,
+      local_variables: varify(@local_variables),
       m_trigger_list: @triggers.map(&:to_h),
       m_action_list: @actions.map(&:to_h),
       m_category: @category,
@@ -183,9 +194,13 @@ class Macro
       
       @title = node.text('macro') || node.attributes[:name]
       
+      @local_variables = node.xpath('variable').map do |e|
+        e.text.split(/: +/,2)
+      end
+      
       #@description = node.attributes[:description]      
       
-      tp = TriggersNlp.new      
+      tp = TriggersNlp.new(self)      
       
       @triggers = node.xpath('trigger').map do |e|
         
@@ -226,8 +241,13 @@ class Macro
                 e.text.strip
               end
               
+              puts 'action: ' + action.inspect if @debug
+              
               r = ap.find_action action          
-              r[0].new(description) if r              
+              puts 'r: ' + r.inspect if @debug
+              o = r[0].new(description) if r              
+              puts 'after o'
+              o
               
             end
             
@@ -354,6 +374,8 @@ EOF
       
       a << vars.join("\n")
     end    
+
+    puts 'before triggers' if @debug
     
     a << @triggers.map do |x|
       s =-x.to_s(colour: colour)
@@ -367,9 +389,11 @@ EOF
       (colour ? "t".bg_red.gray.bold : 't') + ":" + s2
     end.join("\n")
     
+    puts 'before actions' if @debug
     actions = @actions.map do |x|
 
-
+      puts 'x: ' + x.inspect if @debug
+      raise 'Macro#to_s action cannot be nil' if x.nil?
       s = x.to_s(colour: colour)
       #puts 's: ' + s.inspect      
       
@@ -433,6 +457,7 @@ EOF
     a << actions
 
     
+    puts 'before constraints' if @debug
     if @constraints.any? then
       a << @constraints.map do |x|
         (colour ? "c".bg_green.gray.bold : 'c') + ": %s" % x
@@ -510,5 +535,27 @@ EOF
     end
     
   end
+  
+  def varify(local_variables)
+    
+        
+    local_variables.map do |key, value|
+      
+      
+      type = VAR_TYPES[value.class.to_s.to_sym]
+      
+      h = {
+        boolean_value: false,
+        decimal_value: 0.0,
+        int_value: 0,
+        name: key,
+        string_value: '',
+        type: type[0]
+      }
+      h[type[1]] = value
+      h
+    end
+    
+  end
 
 end

data/lib/ruby-macrodroid/triggers.rb

@@ -421,15 +421,22 @@ class WebHookTrigger < Trigger
     options = {
       identifier: ''
     }
+    @deviceid = h[:macro].deviceid
 
+    
+    if h[:identifier].nil? or h[:identifier].empty? then
+      h[:identifier] = h[:macro].title.downcase
+    end
+    
     super(options.merge h)
+    @list << 'identifier'
 
   end
 
   def to_s(colour: false)
     
     url = "https://trigger.macrodroid.com/%s/%s" % \
-        [@h[:macro].deviceid, @h[:identifier]]
+        [@deviceid, @h[:identifier]]
     @s = 'WebHook (Url)' + "\n  " + url
     super()
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw