ruby-macrodroid 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6919ccb93fa24e2066b29fd8c2af5bee9dd8cb2fb352cac56cd32261dac0f07
-  data.tar.gz: 6b49954b2ee422b97a7bad61e9498d07930a50e700df82e378f3b5064edb1684
+  metadata.gz: e37f4ab29dcdcd4c347d15cefb087663679ec7859094f94dc50a39dd66799b85
+  data.tar.gz: 26896b3fdea9e794467abdd41e4898d80ff240c9464316e09513db2d6b7956f2
 SHA512:
-  metadata.gz: a5010ad12e0dc37b2d908a0208615dcf530f2b50775f308c76b738f76fc9e714917e99d7436ef2b72898d4fbb9b1c9774a7a99eac2e486ea1bb4cb704146db33
-  data.tar.gz: f0dd6e92e2ec3421eecce5fc7e36e50c92899974d3fc61d734fbab5782bad7f67c9aaab8bbea4c3f8f8c07bf0efe702e3c37a6836a934c5634eff8521dff8737
+  metadata.gz: 3f7da291c314b2cd03ac2704ea3c1fbd2380f7a85389747b559cc1e5106499f71d120ba935ee73f6078978744abd1f20d16cad941bbac597746769e83c2954df
+  data.tar.gz: 8bae5ed2da5e357335f9720746b5bca7358e0a134fc8cf64b8fd5fcc8fc780137d2d4ae20baf2568f8771a467c283d16dc6fd0fa3dddf4cb7cdcd3927c4ff0d7

data/lib/ruby-macrodroid.rb

@@ -154,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, {}]
@@ -528,20 +538,33 @@ 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
+        r = ap.find_action e.text.strip
         puts 'found action ' + r.inspect if @debug
         
         if r then
           
-          a = e.xpath('item/*')
+          loose = e.element('item/description/text()')
+          
+          raw_attributes = if loose then
           
-          h = if a.any? then
-            a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+            puts 'do something ' + loose.to_s
+            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      

data/lib/ruby-macrodroid/actions.rb

@@ -273,6 +273,34 @@ class TakePictureAction < CameraAction
 end
 
 
+# Conditions/Loops
+#
+class IfConfirmedThenAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+      a: true,
+      constraint_list: ''
+    }
+    
+    macro = h[:macro]
+    h2 = options.merge(filter(options,h).merge(macro: macro))
+
+    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
@@ -702,7 +730,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
@@ -1090,6 +1118,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={})
@@ -1275,6 +1327,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={})
@@ -1636,7 +1783,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]
@@ -1667,7 +1820,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/triggers.rb

@@ -1278,6 +1278,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.3
+  version: 0.8.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw