ruby-macrodroid 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d851b05dbc6ecfd52b146846a6bbe935a06d30bfdf523c0550bd18c701b93b
-  data.tar.gz: 97171c71818bc1d0ce3ed70dc790f3464170e18f8ff62b5b3ff47b66f40c49d0
+  metadata.gz: 12fa9c7d9f642140ed62656a4c3444e5c739ad2be06af2883e23e48766cd742f
+  data.tar.gz: 6f70e2124afbcf43bd15295dfea8aaf9a0a8d6704de819acb34481082d8c905f
 SHA512:
-  metadata.gz: a9187782e93e70a758e50a07c49812d5bb915dab37bb108d174157a76d76cc2b625b766665ad5ac3f47c7d12d3ac8082b291966aa36c114d4d573ddf38e567b3
-  data.tar.gz: 7514ffbe6a9b4c063fe278c685ce0a860b4d28a1945d4819faa65b081395b701b5dab657a3d7764b87689f230c74d7c14051e563ad4360937ade7f78466ac3a3
+  metadata.gz: a00b28e20a41ffbdead956eb07ad4e7fe412aa2ceb773017a709c97a4fd1307672b78405581a8e54d855d1f9cb53fe598638bc542facccde886b127e9e150d17
+  data.tar.gz: ddcdc9689a2f202477018ab710772c834caad0e392c6d7135c0f65beb8e85dbf0144fc793e7b11db404531a1cbaf69876b2b21f7598b6baf1361ba794f7bc809

data.tar.gz.sig

@@ -1,2 +1,3 @@
-\�-��1�g(�3�&�oԓz�7R�,$�ǝ�_�gb����
-���;t1ӎ���M��(Y棸����s_��*A����mX�l4}Mݩ�{������ꉻ;��
+0t�����Ip���,���d	��Q7��N��j���eO���Xu�,�{2�'���Gi��V�'��qͩTȉ�
���+��)jۥ7� 603�e�����OC�O�갣�pR^���¢�Sܥ�̦�t����>������ᚈ�Xk�Boi��Z��c�O8���q�#a�
+�����L'NK��D�qf�H�k�w�+ԐP]�\�X9��x��w���1wj{S9�fWDgc�6s��Yr�=�ų��UB�,�Q.�z�R�R\C��
�jC��탿Ru�����3����j�a+�������>�tv׳��[��Ѐ�0^
+d[m6��N�eœ�׷�HvLv

data/lib/ruby-macrodroid.rb

@@ -551,7 +551,7 @@ class Macro
         inner_lines = e.xpath('item/description/text()')        
         
         action = if e.text.to_s.strip.empty? then
-          inner_lines.shift
+          inner_lines.shift.strip
         else
           e.text.strip
         end
@@ -659,21 +659,63 @@ EOF
     
   def to_s(colour: false)
     
-    indent = 0
+    indent = 0 #@actions.map(&:to_s).join.lines.length > 0 ? 1 : 0
+    
+    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 do |x|
+      s =-x.to_s(colour: colour)
+      
+      s2 = if s.lines.length > 1 then        
+        "\n" + s.lines.map {|x| x.prepend ('  ' * (indent+1)) }.join
+      else
+        ' ' + s
+      end         
+      #s.lines > 1 ? "\n" + x : x
+      (colour ? "t".bg_red.gray.bold : 't') + ":" + s2
+    end.join("\n")
+    
     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
+      #puts 's: ' + s.inspect      
+      
+
       
       r = if indent <= 0 then
       
+        lines = s.lines
+        
+        if lines.length > 1 then        
+          s = lines.map {|x| x.prepend ('  ' * (indent+1)) }.join
+        end      
+
+        s2 = s.lines.length > 1 ? "\n" + s : ' ' + s        
+        
         if colour then
-          "a".bg_blue.gray.bold + ": %s" % s
+          "a".bg_blue.gray.bold + ":" + s2
         else
-          "a: %s" % s
+          "a:" + s2
         end
         
       elsif indent > 0 
@@ -684,7 +726,8 @@ EOF
           indent -= 1
           ('  ' * indent) + "%s" % s
         else
-          ('  ' * indent) + "%s" % s
+          s2 = s.lines[0] + s.lines[1..-1].map {|x| ('  ' * indent) + x }.join
+          ('  ' * indent) + "%s" % s2
         end        
         
       end
@@ -711,29 +754,9 @@ EOF
       
     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
 
     

data/lib/ruby-macrodroid/actions.rb

@@ -53,18 +53,6 @@ class Action < MacroObject
     "%s/%s: %s" % [@group, @type, s]
   end  
   
-  def to_s(colour: false, indent: 0)
-
-    h = @h.clone    
-    h.delete :macro
-    @s ||= "#<%s %s>" % [self.class, h.inspect]
-    operator = @h[:is_or_condition] ? 'OR' : 'AND'
-    constraints = @constraints.map \
-        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)
-    
-    @s + constraints
-    
-  end  
   
 end
 
@@ -140,7 +128,7 @@ class LaunchShortcutAction < ApplicationAction
   end
   
   def to_s(colour: false, indent: 0)
-    @s = "Launch Shortcut: " + @h[:app_name] + "\n  " + @h[:name]
+    @s = "Launch Shortcut: " + @h[:app_name] + "\n" + @h[:name]
     super()
   end
   
@@ -169,7 +157,8 @@ class OpenWebPageAction < ApplicationAction
   end
   
   def to_s(colour: false, indent: 0)
-    "HTTP GET\n  url: " + @h[:url_to_open]
+    @s = "HTTP GET\nurl: " + @h[:url_to_open]
+    super()
   end
 
 end
@@ -284,10 +273,20 @@ class LoopAction < Action
 
   def to_s(colour: false, indent: 0)
     
+    h = @h.clone    
+    h.delete :macro
     @s = 'DO / WHILE '
-    super()
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
     
-  end
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment]
+    s = @s.lines.map {|x| ('  ' * indent) + x}.join
+    out << s + constraints
+    out.join("\n")
+    
+  end    
 end
 
 # Conditions/Loops
@@ -344,10 +343,20 @@ class IfConditionAction < Action
 
   def to_s(colour: false, indent: 0)
     
-    @s = "If " #+ @constraints.map(&:to_s).join(" %s " % operator)
-    super(colour: colour)
+    h = @h.clone    
+    h.delete :macro
+    @s = 'If '
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
     
-  end
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment]
+    s = @s.lines.map {|x| ('  ' * indent) + x}.join
+    out << s + constraints
+    out.join("\n")
+    
+  end  
 end
 
 class ElseAction < Action
@@ -383,8 +392,24 @@ class ElseIfConditionAction < Action
   end  
   
   def to_s(colour: false, indent: 0)
+    
+    h = @h.clone    
+    h.delete :macro
     @s = 'Else If '
-    super()
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    constraints = @constraints.map \
+        {|x| '  ' * indent + x.to_summary(colour: colour)}.join(" %s " % operator)    
+    
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment]
+    s = @s.lines.map {|x| ('  ' * indent) + x}.join
+    out << s + constraints
+    out.join("\n")
+    
+  end    
+  
+  def to_summary(colour: false)
+    'foo'
   end
     
 
@@ -436,7 +461,7 @@ class SetAirplaneModeAction < ConnectivityAction
   def to_s(colour: false, indent: 0)
     
     state = ['On', 'Off', 'Toggle'][@h[:state]]
-    @s = 'Airplane Mode ' + state + "\n"
+    @s = 'Airplane Mode ' + state
     super(colour: colour)
     
   end
@@ -618,7 +643,10 @@ class StopWatchAction < DateTimeAction
   end
 
   def to_s(colour: false, indent: 0)
-    'StopWatchAction ' + @h.inspect
+    option = ['Start', 'Pause','Reset','Reset and Restart'][@h[:option]]
+    name = @h[:stopwatch_name]
+    @s = "StopWatch (%s)" % option + "\n" + name #+ ' ' + @h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -1125,7 +1153,7 @@ class FileOperationV21Action < FileAction
     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        
+        + "\n" + detail #+ @h.inspect        
     super()
   end
 
@@ -1244,7 +1272,7 @@ class ShareLocationAction < LocationAction
   end
 
   def to_s(colour: false, indent: 0)
-    @s = 'Share Location' + "\n  GPS" # + @h.inspect
+    @s = 'Share Location' + "\nGPS" # + @h.inspect
     super()
   end
 
@@ -1360,6 +1388,31 @@ class ClearLogAction < LoggingAction
   alias to_summary to_s
 end
 
+
+# MacroDroid Specific
+#
+class CancelActiveMacroAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+
+    super(h)
+    
+  end  
+  
+  def to_s(colour: false, indent: 0)
+    @s = 'Cancel Macro Actions' + "\n  " + @h[:macro_name] #+ ' ' + @h.inspect
+    super()
+    
+  end
+  
+  alias to_summary to_s
+  
+end
+
 # MacroDroid Specific
 #
 class ConfirmNextAction < Action
@@ -1377,7 +1430,7 @@ class ConfirmNextAction < Action
   
   def to_s(colour: false, indent: 0)
     
-    @s = 'Confirm Next'  + "\n  %s: %s" % [@h[:title], @h[:message]]
+    @s = 'Confirm Next'  + "\n%s: %s" % [@h[:title], @h[:message]]
     super()
     
   end
@@ -1461,7 +1514,7 @@ class SetVariableAction < Action
 
     end
     
-    @s = 'Set Variable' + ("\n  %s: " % @h[:variable][:name]) + input #+ @h.inspect
+    @s = 'Set Variable' + ("\n%s: " % @h[:variable][:name]) + input #+ @h.inspect
     super()
     
   end
@@ -1632,7 +1685,7 @@ class SendEmailAction < MessagingAction
 
   def to_s(colour: false, indent: 0)
     recipient = @h[:email_address]
-    @s = 'Send EmailAction' + "\n  To: " + recipient #+ ' ' + @h.inspect
+    @s = 'Send EmailAction' + "\nTo: " + recipient #+ ' ' + @h.inspect
     super()
   end
 
@@ -1707,7 +1760,7 @@ class ClearNotificationsAction < NotificationsAction
     options = {
       package_name_list: [],
       match_text: '',
-      application_name_list: [],
+      application_name_list: [],                  
       clear_persistent: false,
       excludes: false,
       match_option: 0,
@@ -1870,8 +1923,9 @@ class NotificationAction < NotificationsAction
   end
   
   def to_s(colour: false, indent: 0)
-    "Display Notification\n  " + \
+    @s = "Display Notification\n" + \
         "%s: %s" % [@h[:notification_subject], @h[:notification_text]]
+    super()
   end
 
 end
@@ -1917,7 +1971,8 @@ class ToastAction < NotificationsAction
   end
   
   def to_s(colour: false, indent: 0)
-    @s = "Popup Message\n  %s" % @h[:message_text]
+    @s = "Popup Message\n%s" % @h[:message_text]
+    super()
   end
 
 end
@@ -1947,7 +2002,7 @@ class AnswerCallAction < PhoneAction
   end
   
   def to_s(colour: false, indent: 0)
-    @s = 'Answer Call' + "\n  "
+    @s = 'Answer Call'
     super()
   end
 end
@@ -2009,7 +2064,7 @@ class RejectCallAction < PhoneAction
   end
   
   def to_s(colour: false, indent: 0)
-    @s = 'Call Reject' + "\n  "
+    @s = 'Call Reject'
     super()
   end
 
@@ -2085,7 +2140,9 @@ class SetBrightnessAction < ScreenAction
   end
 
   def to_s(colour: false, indent: 0)
-    'SetBrightnessAction ' + @h.inspect
+    val = @h[:brightness_percent] > 100 ? 'Auto' : @h[:brightness_percent].to_s + '%'
+    @s = 'Brightness' + "\n  " + val #@h.inspect
+    super()
   end
 
   alias to_summary to_s
@@ -2135,7 +2192,8 @@ class ScreenOnAction < ScreenAction
     state += ' ' + 'No Lock (root only)' if @h[:screen_off_no_lock]
     #state += ' ' + '(Alternative)' if @h[:screen_on_alternative]
     
-    'Screen ' + state
+    @s = 'Screen ' + state
+    super()
     
   end
 
@@ -2290,7 +2348,7 @@ class SetVibrateAction < VolumeAction
     ]
     
     status = a[@h[:option_int]]
-    @s = 'Vibrate Enable/Disable ' + "\n    " + status + "\n  "
+    @s = 'Vibrate Enable/Disable ' + "\n" + status
     super()
     
   end

data/lib/ruby-macrodroid/base.rb

@@ -54,16 +54,30 @@ class MacroObject
     @h[:siguid]
   end
   
-  def to_s(colour: false)
-
+  def to_s(colour: false, indent: 0)
+    
     h = @h.clone    
     h.delete :macro
     @s ||= "#<%s %s>" % [self.class, h.inspect]
     operator = @h[:is_or_condition] ? 'OR' : 'AND'
     constraints = @constraints.map \
-        {|x| x.to_summary(colour: colour)}.join(" %s " % operator)
+        {|x| 'c: ' + x.to_summary(colour: colour)}
+    
+    out = []
+    out << "; %s" % @h[:comment] if @h[:comment] and @h[:comment].length > 1
+    #s = @s.lines.map {|x| 'x' + x}.join
+    
+    lines = @s.lines
+    
+    if lines.length > 1 then        
+      s = lines[0] + lines[1..-1].map {|x| x.prepend ('  ' * (indent+1)) }.join
+    else
+      s = @s
+    end
     
-    @s + constraints
+    out << s
+    out += constraints
+    out.join("\n")
     
   end
   

data/lib/ruby-macrodroid/triggers.rb

@@ -58,9 +58,9 @@ class Trigger < MacroObject
     @s ||= "#<%s %s>" % [self.class, h.inspect]
     operator = @h[:is_or_condition] ? 'OR' : 'AND'
     constraints = @constraints.map \
-        {|x| x.to_summary(colour: colour, indent: 1)}.join(" %s " % operator)
+        {|x| 'c: ' + x.to_summary(colour: colour, indent: 1)}.join(" %s " % operator)
     
-    @constraints.any? ? @s + "\n  " + constraints : @s
+    @constraints.any? ? @s + "\n" + constraints : @s
     
   end  
 
@@ -1152,7 +1152,7 @@ class NotificationTrigger < DeviceEventsTrigger
 
   def to_s(colour: false)
     s = (@h[:package_name_list] + @h[:application_name_list]).uniq.join(', ')
-    'Notification Received ' + "\n    Any Content (%s)" % s
+    'Notification Received ' + "\n  Any Content (%s)" % s
   end
 
   alias to_summary to_s
@@ -1427,6 +1427,10 @@ class ShakeDeviceTrigger < SensorsTrigger
   def to_s(colour: false)
     'Shake Device'
   end
+  
+  def to_summary(colour: false)
+    'Shake Device'
+  end  
 
 end
 

metadata

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