ruby-macrodroid 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb309319c4f87ebf642930e2a926a18292804c87a877724af262bcc1eecd8589
-  data.tar.gz: 697d9e182f7907219c005e5869b88a93d65c01a3bb3a5c1c2a5768d1da0a86cf
+  metadata.gz: b2bb7feb730c6e27fa5a975bfdbf07828880549917f2f827444024baab88520d
+  data.tar.gz: 1c6e78b40874c2ddc5760d052974998071c581ba5cc3c52dcef58c2d1cd288ce
 SHA512:
-  metadata.gz: 9d24dea588d1ddf7106f73ecc9a3593739df4ac6bd23f74601c33f7c183b929d243bbcb473175bccfb728df734a877aa1025676bd3ea972f024093ca310a4e9f
-  data.tar.gz: f7ff237c1a4d962d0579d996b80ce4513f0272430fb4b6cd0f095c24c9260113cfd7cebe117a22bc2c871b48f0c68f881174d2ccbf8f1decc615581dcbd5d5e8
+  metadata.gz: f5f66318dc99e82aa73fb6ce5ba11604f290f57d5757cfcdc46664165095b950cebf30da91b4dd9623200f5b615306f40f7815eefb78fe3f7eb65f5567dfd940
+  data.tar.gz: '03767919cd1943368facf1c7b66c8ebc6cffeceef99123e9d24957adc6cbedc336fa55468c05b73df691cb8c204d629dfdc085933aaee86370dbecf5f67e6b00'

data/lib/ruby-macrodroid.rb

@@ -664,7 +664,7 @@ end
 EOF
   end
     
-  def to_s()
+  def to_s(colour: false)
     
     indent = 0
     actions = @actions.map do |x|
@@ -673,7 +673,11 @@ EOF
       
       r = if indent <= 0 then
       
-        "a: %s" % s
+        if colour then
+          "a".bg_blue.gray.bold + ": %s" % s
+        else
+          "a: %s" % s
+        end
         
       elsif indent > 0 
       
@@ -689,8 +693,15 @@ EOF
       end
       
       if s =~ /^If/i then
+        
         if indent < 1 then
-          r = "a:\n  %s" % s
+          
+          r = if colour then
+            "a".bg_blue.gray.bold + ":\n  %s" % s
+          else
+            "a:\n  %s" % s
+          end
+          
           indent += 1
         else
           r = ('  ' * indent) + "%s" % s
@@ -704,15 +715,21 @@ EOF
     end.join("\n")
     
     a = [
-      'm: ' + @title,
-      @triggers.map {|x| "t: %s" % x}.join("\n"),
+      (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title,
+      @triggers.map {|x| (colour ? "t".bg_red.gray.bold : 't') \
+                     + ": %s" % x}.join("\n"),
       actions
     ]
     
-    a << @constraints.map {|x| "c: %s" % x}.join("\n") if @constraints.any?
+    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, 'd: ' + @description.gsub(/\n/,"\n  "))
+      a.insert(1, (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
+               + @description.gsub(/\n/,"\n  "))
     end
     
     a.join("\n") + "\n"
@@ -899,15 +916,16 @@ class MacroDroid
     @macros.map(&:to_pc).join("\n\n")
   end
 
-  def to_s()
+  def to_s(colour: false)
     
     lines = []
     
     if @geofences.any? then
-      lines << @geofences.map {|_, value| 'g: ' + value.to_s}.join("\n\n") + "\n"
+      lines << @geofences.map {|_, value| (colour ? "g".green.bold : 'g') \
+                               + ': ' + value.to_s}.join("\n\n") + "\n"
     end
     
-    lines << @macros.map(&:to_s).join("\n")
+    lines << @macros.map {|x| x.to_s(colour: colour)}.join("\n")
     lines.join("\n")
     
   end
@@ -3379,6 +3397,35 @@ class ClearLogAction < LoggingAction
 
 end
 
+class PauseAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+      delay_in_milli_seconds: 0, delay_in_seconds: 1, use_alarm: false
+    }
+    super(h)
+    
+  end  
+  
+  def to_s()
+    
+    su = Subunit.new(units={minutes:60, hours:60}, 
+                     seconds: @h[:delay_in_seconds])
+
+    ms = @h[:delay_in_milli_seconds]
+    
+    duration = if su.to_h.has_key?(:minutes) or (ms < 1) then
+      su.strfunit("%X")
+    else
+      "%s %s ms" % [su.strfunit("%X"), ms]
+    end
+    
+    "Wait " + duration
+  end
+  
+end
+
 class MediaAction < Action
   
   def initialize(h={})
@@ -4871,9 +4918,15 @@ class VolumeConstraint < Constraint
       option: 0
     }
 
-    super(options.merge h)
+    super(options.merge filter(options, h))
 
   end
+  
+  def to_s()
+    a = ['Volume On', 'Vibrate Only' 'Silent', 'Vibrate or Silent']
+    
+    "Ringer Volume\n  " + a[@h[:option]]
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw
@@ -101,22 +101,22 @@ dependencies:
   name: subunit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: geozone
   requirement: !ruby/object:Gem::Requirement
@@ -141,22 +141,22 @@ dependencies:
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: chronic_cron
   requirement: !ruby/object:Gem::Requirement