ruby-macrodroid 0.8.0 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3e810bea9dc68b5b0bb2623b46a08544ed42db8112f0b2be703bbac6dce6178
-  data.tar.gz: d41bbc4bae9e9c5e7f65684db06c54bb0d058aee56b69f8c58a7dff99724725d
+  metadata.gz: a58f2837ede78c4bdb29b2673c38cf07b850dd8431aa47bf59b9ba08512d1970
+  data.tar.gz: 5300eb53b78a33b8d52682ac21fc901a8fab86f273c581a4fdf5e4fbb033c404
 SHA512:
-  metadata.gz: 5de76ced91b66dae5ce7fba414c4ea09dff2ffbf9c3cd04009c6a270570825605035413fc5b6d3cc115f79816b98d1484bfcb85688f5853e44af5d69fc872539
-  data.tar.gz: 9fe273f88915114ec327913317000548e2fe12a3cac2548a237e13dc7fb8115eb135d329bf1375278414e4b21522faf2de066a5b924ed6152fe63b6a7c7a1103
+  metadata.gz: af593ce8663d6a1842fc3f49dedee195119c82dab6f2f2bba8f9f96cce1ef6e8065efa281777598502261e168ee452cccb09583460b15f7e425ea39a65e8f6b8
+  data.tar.gz: d0f84f3016d838e0fc326695dec1631fbfa27f07951045a3518cc7ad36b3f899e03a060459f72864568ea50e74c68009d9baf6411e31de36b8cea56f3be7bc93

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-t_�
-K��/�%f�8���Ɛ03R�y�}=n�K��+`�#J�Rs'��<���#S�]k��W$Rگ�WI�q{*�=w�#>�$�0��eل�tYe`����6��O�։/.�X��-0(Y��Yç�\\��6�&�0�����@�B������6�$k�)����}���@h���2���IN�V#3��ۋٶ��,f\K�4#Q`��7X���g|s;�D���2$����ɭ[K;��1f�X��DB߇jPP��J�GA���#K�3�Ӻօ&��JSzL�IZ��� kK&��s
h+��(��9��Hdi"��(�"��M�6g�r��MC�1r_
[&J�K�����FN�|�L�hطG>_��߉9�cJ���
+����M�#�6��G�B|�K�Ovn^?ZM+����E�'�[�.T�A�A0@:tZߣ�(
���<�=�<t-y��)LM�/Ф��ųļzJ���_F��c��U���� O��-�O�x���jdK=��\�d�̽W�)7�%h�e�B������+,TD��(,�|�poY�O��*F�:kH\�>�re2�}��B*��m��asRbH!�烆ZYlT�J��؈#u�H��"
+�d1��x�ƪ�e�^���?���5)�Aɻ

data/lib/ruby-macrodroid.rb

@@ -40,10 +40,7 @@ require 'geocoder'
 require 'subunit'
 require 'rxfhelper'
 require 'chronic_cron'
-require 'ruby-macrodroid/base'
-require 'ruby-macrodroid/triggers'
-require 'ruby-macrodroid/actions'
-require 'ruby-macrodroid/constraints'
+
 
 MODEL =<<EOF
 device
@@ -157,6 +154,16 @@ class ActionsNlp
       [ToastAction, {msg: msg}]
     end
     
+    # e.g. Popup Message\n  hello world!
+    get /^Popup Message\n\s+(.*)/im do |msg|
+      [ToastAction, {msg: msg}]
+    end    
+            
+    # e.g. Popup Message
+    get /^Popup Message$/i do
+      [ToastAction, {}]
+    end    
+    
     # e.g. say current time
     get /^say current[ _]time/i do
       [SayTimeAction, {}]
@@ -246,16 +253,17 @@ class ActionsNlp
       [KeepAwakeAction, {enabled: false, screen_option: 0}]
     end    
 
+    #a: Disable Keep Awake
+    #
+    get /if (.*)/i do
+      [IfConditionAction, {}]
+    end      
 
   end
 
   alias find_action run_route
 
-  def to_s(colour: false)
-    'ActionsNlp ' + @h.inspect
-  end
 
-  alias to_summary to_s
 end
 
 class ConstraintsNlp
@@ -282,6 +290,60 @@ class ConstraintsNlp
 end
 
 
+module Params
+
+  refine Hash do
+
+    # turns keys from camelCase into snake_case
+
+    def to_snake_case(h=self)
+
+      h.inject({}) do |r, x|
+
+        key, value = x
+        #puts 'value: ' + value.inspect
+        
+        val = if value.is_a?(Hash) then
+          to_snake_case(value)
+        elsif value.is_a?(Array) and value.first.is_a? Hash
+          value.map {|row| to_snake_case(row)}
+        else
+          value          
+        end
+        
+        r.merge key.to_s.sub(/^m_/,'').gsub(/[A-Z][a-z]/){|x| '_' + 
+          x.downcase}.gsub(/[a-z][A-Z]/){|x| x[0] + '_' + x[1].downcase}\
+          .downcase.to_sym => val
+
+      end
+    end
+
+    # turns keys from snake_case to CamelCase
+    def to_camel_case(h=self)
+      
+      h.inject({}) do |r,x|
+                
+        key, value = x   
+        
+        val = if value.is_a?(Hash) then
+          to_camel_case(value)
+        elsif value.is_a?(Array) and value.first.is_a? Hash
+          value.map {|row| to_camel_case(row)}
+        else
+          value          
+        end
+        
+        r.merge({key.to_s.gsub(/(?<!^m)_[a-z]/){|x| x[-1].upcase} => val})
+      end
+      
+    end
+
+
+  end
+
+end
+
+
 
 class Macro
   using ColouredText
@@ -356,7 +418,25 @@ class Macro
     @description = h[:description]
     
     # fetch the local variables
-    @local_variables = h['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|
@@ -463,20 +543,42 @@ class Macro
       @actions = node.xpath('action').map do |e|
         
         puts 'action e: ' + e.xml.inspect if @debug
-        r = ap.find_action e.text
+        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
           
-          a = e.xpath('item/*')
+          loose = inner_lines.shift
           
-          h = if a.any? then
-            a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+          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(r[1].merge(h))
+          r[0].new(raw_attributes)
         end
         
       end      
@@ -584,7 +686,7 @@ EOF
         
       end
       
-      if s =~ /^If/i then
+      if s =~ /^(?:If|WHILE \/ DO)/i then
         
         if indent < 1 then
           
@@ -607,22 +709,39 @@ EOF
     end.join("\n")
     
     a = [
-      (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title,
-      @triggers.map {|x| (colour ? "t".bg_red.gray.bold : 't') \
-                     + ": %s" % x}.join("\n"),
-      actions
+      (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
     
-    if @description and @description.length >= 1 then
-      a.insert(1, (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
-               + @description.gsub(/\n/,"\n  "))
-    end
+
+    
+
     
     a.join("\n") + "\n"
     
@@ -1160,3 +1279,8 @@ class DroidSim
 
 
 end
+
+require 'ruby-macrodroid/base'
+require 'ruby-macrodroid/triggers'
+require 'ruby-macrodroid/actions'
+require 'ruby-macrodroid/constraints'

data/lib/ruby-macrodroid/actions.rb

@@ -272,7 +272,10 @@ class TakePictureAction < CameraAction
 
 end
 
-class IfConditionAction < Action
+
+# Conditions/Loops
+#
+class IfConfirmedThenAction < Action
   
   def initialize(h={})
     
@@ -286,6 +289,92 @@ class IfConditionAction < Action
 
     super(h2)
     
+    @label = 'If Confirmed Then '
+
+  end
+
+  def to_s(colour: false)
+    
+    @s = "If Confirmed Then " #+ @constraints.map(&:to_s).join(" %s " % operator)
+    super(colour: colour)
+    
+  end
+end
+
+# Conditions/Loops
+#
+class LoopAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+    
+    h2 = options.merge(h)
+
+    super(h2)
+    
+    @label = 'WHILE / DO '
+
+  end
+
+  def to_s(colour: false)
+    
+    @s = 'WHILE / DO '
+    super()
+    
+  end
+end
+
+# Conditions/Loops
+#
+class EndLoopAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+    
+    h2 = options.merge(h)
+
+    super(h2)
+    
+    @label = 'End Loop '
+
+  end
+
+  def to_s(colour: false)
+    
+    'End Loop '
+    
+  end
+end
+
+# Conditions/Loops
+#
+class IfConditionAction < Action
+  
+  def initialize(obj=nil)
+    
+    h = if obj.is_a? Hash then
+      obj
+    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 '
 
   end
@@ -317,7 +406,7 @@ class ElseAction < Action
   
 end
 
-class ElseIfConditionAction < IfConditionAction
+class ElseIfConditionAction < Action
   
   def initialize(h={})
 
@@ -326,9 +415,14 @@ class ElseIfConditionAction < IfConditionAction
     }
 
     super(options.merge h)
-    @label = 'ElseIf '
+    @label = 'Else If '
 
   end  
+  
+  def to_s(colour: false)
+    @s = 'Else If '
+    super()
+  end
     
 
 end
@@ -643,7 +737,7 @@ class ClipboardAction < DeviceAction
   end
 
   def to_s(colour: false)
-    'ClipboardAction ' + @h.inspect
+    'Fill Clipboard' + "\n  " + @h[:clipboard_text] #+ @h.inspect
   end
 
   alias to_summary to_s
@@ -793,6 +887,11 @@ end
 #
 class CameraFlashLightAction < DeviceSettingsAction
 
+  # options
+  #  0  Toch On
+  #  1  Torch Off
+  #  2  Torch Toggle
+  #
   def initialize(h={})
 
     options = {
@@ -1001,6 +1100,40 @@ class FileAction < Action
   
 end
 
+
+
+# Category: Files
+#
+class FileOperationV21Action < FileAction
+
+  def initialize(h={})
+
+    options = {
+      :app_name=>"", :class_name=>"", :package_name=>"", :file_path=>"", 
+      :file_extensions=>["jpg", "jpeg", "png", "raw", "bmp", "tif", "tiff", 
+                         "gif"], :file_option=>2, :from_name=>"Sent", 
+      :from_uri_string=>"", :option=>2
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false)
+    
+    operation = ['Copy', 'Move', 'Delete', 'Create Folder']
+    file = ['All Files', 'All Media Files', 'Images', 'Audio', 'Videos', 'Specify File Pattern', 'Folder']
+    
+    detail = @h[:from_name]
+    detail += ' to: ' + @h[:to_name] if @h[:option] == 1
+    @s = "%s %s" % [operation[@h[:option]], file[@h[:file_option]]]  \
+        + "\n  " + detail #+ @h.inspect        
+    super()
+  end
+
+  alias to_summary to_s
+end
+
 # Category: Files
 #
 class OpenFileAction < FileAction
@@ -1026,6 +1159,30 @@ class OpenFileAction < FileAction
 end
 
 
+# Category: Files
+#
+class WriteToFileAction < FileAction
+
+  def initialize(h={})
+
+    options = {
+      app_name: '',
+      class_name: '',
+      package_name: '',
+      file_path: ''
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false)
+    'Write To File' + "\n  " + @h[:filename] #+ @h.inspect
+  end
+
+  alias to_summary to_s
+end
+
 class LocationAction < Action
   
   def initialize(h={})
@@ -1188,6 +1345,32 @@ class ClearLogAction < LoggingAction
   alias to_summary to_s
 end
 
+# MacroDroid Specific
+#
+class ConfirmNextAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+      :message=>"Do you want to fill the clipboard? ", :title=>"Fill clipboard? ", :negative_text=>"NO", :positive_text=>"YES", :class_type=>"ConfirmNextAction"
+
+    }
+
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false)
+    
+    @s = 'Confirm Next'  + "\n  %s: %s" % [@h[:title], @h[:message]]
+    super()
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
 # MacroDroid Specific
 #
 class ExportMacrosAction < Action
@@ -1211,6 +1394,101 @@ class ExportMacrosAction < Action
   
 end
 
+
+# MacroDroid Specific
+#
+class SetVariableAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+      :user_prompt=>true, 
+      :user_prompt_message=>"Please enter a word to see it reversed", 
+      :user_prompt_show_cancel=>true, 
+      :user_prompt_stop_after_cancel=>true, 
+      :user_prompt_title=>"Word reverse",
+      :name => 'word'
+    }
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false)
+    
+    input = if @h[:user_prompt] then
+      '[User Prompt]'
+    elsif @h[:expression]
+      @h[:expression]
+    elsif @h[:int_value_increment]
+      '(+1)'      
+    elsif @h[:int_value_decrement]
+      '(-1)'
+    elsif @h[:int_random]
+      "Random %d -> %d" % [@h[:int_random_min], @h[:int_random_max]]
+    else
+
+=begin      
+        sym = case @h[:variable][:type]
+        when 0 # boolean
+          :new_boolean_value
+        when 1 # integer
+          :new_int_value
+        when 2 # string
+          :new_string_value
+        when 3 # decimal
+          :new_double_value
+        end
+        
+        @h[sym].to_s
+=end        
+        a = %i(new_boolean_value new_int_value new_string_value new_double_value)
+        @h[a[@h[:variable][:type]]].to_s
+
+    end
+    
+    @s = 'Set Variable' + ("\n  %s: " % @h[:variable][:name]) + input #+ @h.inspect
+    super()
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
+
+
+# MacroDroid Specific
+#
+class TextManipulationAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false)
+    
+    tm = @h[:text_manipulation]
+    
+    s = case tm[:type].to_sym
+    when :SubstringManipulation
+      "Substring(%s, %s)" % [@h[:text], tm[:params].join(', ')]
+    end
+
+    
+    'Text Manipulation' + "\n  " + s #+ ' ' + @h.inspect
+    
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
 class PauseAction < Action
   
   def initialize(h={})
@@ -1572,7 +1850,13 @@ end
 #
 class ToastAction < NotificationsAction
 
-  def initialize(h={})
+  def initialize(obj)
+    
+    h = if obj.is_a? Hash then
+      obj
+    else
+      {msg: obj}
+    end
 
     if h[:msg] then
       h[:message_text] = h[:msg]
@@ -1603,7 +1887,7 @@ class ToastAction < NotificationsAction
   end
   
   def to_s(colour: false)
-    "Popup Message\n  %s" % @h[:message_text]
+    @s = "Popup Message\n  %s" % @h[:message_text]
   end
 
 end

data/lib/ruby-macrodroid/base.rb

@@ -8,58 +8,6 @@
 #  
 
 
-module Params
-
-  refine Hash do
-
-    # turns keys from camelCase into snake_case
-
-    def to_snake_case(h=self)
-
-      h.inject({}) do |r, x|
-
-        key, value = x
-        #puts 'value: ' + value.inspect
-        
-        val = if value.is_a?(Hash) then
-          to_snake_case(value)
-        elsif value.is_a?(Array) and value.first.is_a? Hash
-          value.map {|row| to_snake_case(row)}
-        else
-          value          
-        end
-        
-        r.merge key.to_s.sub(/^m_/,'').gsub(/[A-Z][a-z]/){|x| '_' + 
-          x.downcase}.gsub(/[a-z][A-Z]/){|x| x[0] + '_' + x[1].downcase}\
-          .downcase.to_sym => val
-
-      end
-    end
-
-    # turns keys from snake_case to CamelCase
-    def to_camel_case(h=self)
-      
-      h.inject({}) do |r,x|
-                
-        key, value = x   
-        
-        val = if value.is_a?(Hash) then
-          to_camel_case(value)
-        elsif value.is_a?(Array) and value.first.is_a? Hash
-          value.map {|row| to_camel_case(row)}
-        else
-          value          
-        end
-        
-        r.merge({key.to_s.gsub(/(?<!^m)_[a-z]/){|x| x[-1].upcase} => val})
-      end
-      
-    end
-
-
-  end
-
-end
 
 class MacroObject
   using ColouredText

data/lib/ruby-macrodroid/triggers.rb

@@ -1,4 +1,4 @@
-# file: ruby-macrodroid/constraints.rb
+# file: ruby-macrodroid/triggers.rb
 
 # This file contains the following classes:
 #
@@ -26,6 +26,8 @@
 #  
 
 
+
+
 class Trigger < MacroObject
   using Params
   
@@ -132,7 +134,9 @@ class ApplicationLaunchedTrigger < Trigger
   end
 
   def to_s(colour: false)
-    'ApplicationLaunchedTrigger ' + @h.inspect
+    a = @h[:application_name_list]
+    apps = a.length > 1 ? "[%s]" % a.join(', ')  : a.first
+    'Application Launched' + "\n  " + apps
   end
 
   alias to_summary to_s
@@ -971,6 +975,28 @@ class MusicPlayingTrigger < DeviceEventsTrigger
 end
 
 
+# Category: Device Events
+#
+class NFCTrigger < DeviceEventsTrigger
+
+  def initialize(h={})
+
+    options = {
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def to_s(colour: false)
+    'NFC Tag' + "\n  " + @h[:tag_name]
+  end
+  
+  alias to_summary to_s
+
+end
+
+
 # Category: Device Events
 #
 class DeviceUnlockedTrigger < DeviceEventsTrigger
@@ -1254,6 +1280,28 @@ class SunriseSunsetTrigger < Trigger
 end
 
 
+# Category: MacroDroid Specific
+#
+class EmptyTrigger < Trigger
+
+  def initialize(h={})
+
+    options = {
+
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false)
+    'EmptyTrigger'
+  end
+
+  alias to_summary to_s
+end
+
+
 class SensorsTrigger < Trigger
   
   def initialize(h={})

metadata

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