ruby-macrodroid 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 341332647c11b1d70151aab4625ffefced825585c4814eed7d7aefaf7c96703e
-  data.tar.gz: ac8f26a27b1f9d394174f1d887e8af27a6c551dc55d4cffa89b8fb04f6b1927d
+  metadata.gz: b7aa07338b6ffd2e4edcad4e7a2b63dee60f71632cb5a29a7f54de51570136f9
+  data.tar.gz: 55009e156bce03bdfb487a46cb0085f3c7f0b5375949b602e3e76ce216148e15
 SHA512:
-  metadata.gz: debe33514bbcd6cbc508c6d6a3d647cd37861bc61168743ed15cb1f1d7cf142cd883fb6059b2b7ad901659314f1dadee8f7610dbc03074f79fc3b95c8abc2f27
-  data.tar.gz: 50e36ff27c737d50b0686610398feae034f21a4cfab3a15b0c6367e278305a5bdc4ed6f699c0a220f0794dcf89cd3a2ec5ae0bdaf25f0d18aa49309206c03659
+  metadata.gz: 710ed235030b9553dcd3ca9f7c79efc6a7608f46ad59e4c14b38a5a2725b81f2145e5bc13cbc7d1385718754115a1de1976896030185b497833b916897d1e57f
+  data.tar.gz: de58a516f728dc63dc0660eac45b137a03a1f447554e8e34a8ed61e06e0a578abc1dd1567ff83592677d416534efa5923649dce8af20c19ad991f21006447e77

data/lib/ruby-macrodroid/actions.rb

@@ -33,6 +33,7 @@
 
 
 class Action < MacroObject
+  using ColouredText
   using Params
   include ObjectX
   
@@ -160,7 +161,17 @@ class OpenWebPageAction < ApplicationAction
       a = e.xpath('item/*')
 
       h2 = if a.any? then
-        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+      
+        a.map do |node|
+          
+          if node.name == 'description' and node.text.to_s =~ /: / then
+            node.text.to_s.split(/: +/,2).map(&:strip)
+          else
+            [node.name.to_sym, node.text.to_s.strip]
+          end
+          
+        end.to_h
+        
       else
         txt = e.text('item/description')
         {url: (txt || e.text)}
@@ -394,7 +405,7 @@ class IfConditionAction < Action
       a: true,
       constraint_list: []
     }  
-    puts 'obj: ' + obj.inspect #if $debug
+    puts 'obj: ' + obj.inspect if $debug
     
     if obj.is_a? Hash then
       
@@ -407,20 +418,20 @@ class IfConditionAction < Action
       
       e, macro = obj
       super()
-      puts 'e.xml: ' + e.xml
-      puts 'e.text: ' + e.text.to_s.strip
+      puts 'e.xml: ' + e.xml if $debug
+      puts 'e.text: ' + e.text.to_s.strip if $debug
       raw_txt = e.text.to_s.strip[/^if [^$]+/i] || e.text('item/description')
-      puts 'raw_txt: ' + raw_txt.inspect #if $debug
+      puts 'raw_txt: ' + raw_txt.inspect if $debug
       
       clause = raw_txt[/^If (.*)/i,1]
-      puts 'clause: ' + clause.inspect
+      puts 'clause: ' + clause.inspect if $debug
       conditions = clause.split(/\s+\b(?:AND|OR)\b\s+/i)
-      puts 'conditions: ' + conditions.inspect
+      puts 'conditions: ' + conditions.inspect if $debug
       
       cp = ConstraintsNlp.new      
       
       @constraints = conditions.map do |c|
-        puts 'c: ' + c.inspect 
+        puts 'c: ' + c.inspect  if $debug
         r = cp.find_constraint c
         puts 'found constraint ' + r.inspect if $debug
         
@@ -436,7 +447,7 @@ class IfConditionAction < Action
         
         ap = ActionsNlp.new
         obj2 = action_to_object(ap, item, item, macro)      
-        puts 'obj2: ' + obj2.inspect
+        puts 'obj2: ' + obj2.inspect if $debug
         #macro.add obj2
         
       end
@@ -1627,6 +1638,7 @@ end
 # MacroDroid Specific
 #
 class SetVariableAction < Action
+  using ColouredText
   
   def initialize(obj=nil)
     
@@ -1635,7 +1647,14 @@ class SetVariableAction < Action
     elsif obj.is_a? Array
       e, macro = obj
       node = e.element('item/*')
-      macro.set_var node.name, node.value.to_s
+      #puts ("node.name: %s node.value: %s" % [node.name, node.value]).debug
+      r = macro.set_var node.name, node.value.to_s
+      puts ('r: ' + r.inspect).debug if $debug
+      r
+      if r[:type] == 2 then
+        { variable: {name: r[:name], type: r[:type]}, new_string_value: r[:string_value]
+          }
+      end
     end    
     
     options = {
@@ -2433,7 +2452,7 @@ class KeepAwakeAction < ScreenAction
       h2 = if txt then
       
         raw_duration = (txt || e.text).to_s
-        puts 'raw_duration: ' + raw_duration.inspect 
+        puts 'raw_duration: ' + raw_duration.inspect  if $debug
         duration = raw_duration[/Screen On - ([^$]+)/i]
         {duration: duration}
         
@@ -2445,7 +2464,7 @@ class KeepAwakeAction < ScreenAction
 
     end
     
-    puts ('h: ' + h.inspect).debug #if $debug
+    puts ('h: ' + h.inspect).debug if $debug
     
     if h[:duration] then
             

data/lib/ruby-macrodroid/base.rb

@@ -11,7 +11,7 @@ module ObjectX
   
   def action_to_object(ap, e, item, macro)
     
-    debug = true
+    debug = $debug
     
     puts 'inside action_to_object: item.xml: ' + item.xml if debug
         
@@ -46,7 +46,7 @@ module ObjectX
     else
       
       action = e.text.strip
-      puts 'action: ' + action.inspect if @debug
+      puts 'action: ' + action.inspect if $debug
       r = ap.find_action action
 
       a = e.xpath('item/*')
@@ -56,7 +56,7 @@ module ObjectX
       else
         {}
       end
-      puts 'h: ' + h.inspect if @debug
+      puts 'h: ' + h.inspect if $debug
 
       #r = ap.find_action action          
       #r[0].new(h.merge(macro: self)) if r

data/lib/ruby-macrodroid/constraints.rb

@@ -908,7 +908,7 @@ class TriggerThatInvokedConstraint < Constraint
   
   def initialize(h={})
 
-    puts ('h: ' + h.inspect).green
+    puts ('h: ' + h.inspect).green if $debug
     @trigger = h[:macro].triggers.find {|x| x.siguid == h[:si_guid_that_invoked] }
     
     options = {

data/lib/ruby-macrodroid/macro.rb

@@ -198,6 +198,10 @@ class ActionsNlp
       [VibrateAction, {pattern: pattern}]
     end     
     
+    get /^Vibrate$/i do |pattern|
+      [VibrateAction, {pattern: 'short buzz'}]
+    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}]
@@ -422,8 +426,8 @@ class Macro
   end
   
   def add(obj)
-    puts 'inside add; ' + obj.inspect
-    puts '@actions: ' + @actions.inspect
+    puts 'inside add; ' + obj.inspect if @debug
+    puts '@actions: ' + @actions.inspect if @debug
 
     if obj.kind_of? Trigger then
       
@@ -774,7 +778,10 @@ class Macro
     if not @local_variables.has_key? label.to_sym then
       @local_variables.merge!({label.to_sym => value}) 
     end
-
+    
+    if @debug then
+      puts ("before varify; label: %s value: %s" % [label, value]).debug
+    end
     varify(label, value)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - James Robertson