ruby-macrodroid 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d378de53e069fe32854e621ab9b72b08a0785f99957f57cf4933d650287be069
-  data.tar.gz: 856870eab31f6fffd85f55f1a61315dbec075f9bcbe89b8111e15eca5a064b54
+  metadata.gz: 73bd85e05b55cb8139d501f96e7f0692a052d4544dcd518b73e4e1168ffcb0dd
+  data.tar.gz: 92d7670d08882e34f16085ca22da3a5affc8aa84c3eb89b3f6ec2800c4172501
 SHA512:
-  metadata.gz: 42ec4a29e2a2976767cd62eaa3630388acd4777a07ea72ba95549d2ba0f184d8e8e8fb433385d1610c796c4bcecd9dc613372f702fe9c15e626c0717d26a13ab
-  data.tar.gz: 7fec30fda5d214a892b703ba5cf9ea3e1c9d0b6a5d7bf72221c6fa286558807d7f629c7fc0f6c0b858161873dc2e1a3323c7598fc3c61788848f72e848cabea8
+  metadata.gz: 7361a05b044e4d759728a91d86952f6273a8bfbfc72ff1ac9965f97cd858dd8ad3902cb4cb72f4e0557a291627a631a75d7f4ef0a04481969b8ac91bcd3eb48e
+  data.tar.gz: b7ef1815fe2b3e4ff42de13e34c8a663e58a55681aba9e38533c5175ab9a9b197755205175abfe2a013331150bb2f19d4949e41de4f9e3874ea6a4a3981172e2

data.tar.gz.sig

@@ -1,4 +1 @@
-�0���ʙ"�_�s9��Ӟ\d�K�}�oA
-*��Q���Rr�{
-����zPi���8�W
��:�-�!�N�f��,�Mb������Y�yV������ti/s,��y��~b,���rĘ�`qJ�a��5�6� �,i�YWbD���N�{.�J(�%9��4eO��لP'b�m3?�{r�����Ri�Vm_]��	B�i?rl����Ԓ}
-���qi�����hD=x�r[
+����ժ�+j��h�������m.����wL�w;4�C�.g|���9�)���h�!��J�K�|]�������/���X��_p�k�:�h��I�H-�F���$��;B���C';���ʛe��>�%9�ﾍ���"tҨ�(��uaOk\��"�hf�b�+���d೉�\�[+��1K95s�^�q�*e5��Y���]�O.eT���,9ɩ&I�g��9�G�p)�m��7?Z^&�?�ڜ+��[J$����Se�`>jnz���!��g�-7�	�ϝ�u��P`#��_ɕy���B�D���}6+��[�0��ۨЮ�U�b�.�NX���M�69]S���ٗY'L�3������4zL�JH`|S��+���"��Q���rA@��`BG

data/lib/ruby-macrodroid.rb

@@ -38,6 +38,7 @@ require 'rxfhelper'
 require 'chronic_cron'
 
 
+# PASTE_START
 
 MODEL =<<EOF
 device
@@ -145,8 +146,9 @@ class MacroDroid
           puts 'before RowX.new' if @debug
 
           s2 = s.gsub(/^g:/,'geofence:').gsub(/^m:/,'macro:')\
-              .gsub(/^v:/,'variable:').gsub(/^t:/,'trigger:')\
-              .gsub(/^a:/,'action:').gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
+              .gsub(/^d:/,'description:').gsub(/^v:/,'variable:')\
+              .gsub(/^t:/,'trigger:').gsub(/^a:/,'action:')\
+              .gsub(/^c:/,'constraint:').gsub(/^#.*/,'')
           
           a = s2.split(/(?=^macro:)/)
           
@@ -577,6 +579,7 @@ class DroidSim
 
 end
 
+# PASTE_END
 
 require 'ruby-macrodroid/base'
 require 'ruby-macrodroid/triggers'

data/lib/ruby-macrodroid/actions.rb

@@ -1066,7 +1066,17 @@ end
 class VibrateAction < DeviceSettingsAction
 
   def initialize(h={})
-
+    
+    pattern = [
+      'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
+      'Constant', 'Decreasing', 'Final Fantasy', 'Game Over', 'Star Wars',
+      'Mini Blip', 'Micro Blip'
+    ]    
+    
+    if h[:pattern] then
+      h[:vibrate_pattern] = pattern.map(&:downcase).index h[:pattern]
+    end
+    
     options = {
       vibrate_pattern: 1
     }
@@ -2381,8 +2391,46 @@ end
 #   disable keep awake    => enabled: false
 #
 class KeepAwakeAction < ScreenAction
+  using ColouredText
 
-  def initialize(h={})
+  def initialize(obj=nil)
+    
+    
+    h = if obj.is_a? Hash then
+    
+      obj
+      
+    elsif obj.is_a? Array
+      
+      puts 'obj: ' + obj.inspect if $debug
+      e, macro = obj
+      
+      a = e.xpath('item/*')
+
+      txt = e.text('item/description')      
+      
+      h2 = if txt then
+      
+        raw_duration = (txt || e.text).to_s
+        puts 'raw_duration: ' + raw_duration.inspect 
+        duration = raw_duration[/Screen On - ([^$]+)/i]
+        {duration: duration}
+        
+      elsif a.any? then
+        a.map {|node| [node.name.to_sym, node.text.to_s]}.to_h
+      end      
+      
+      h2.merge(macro: macro)
+
+    end
+    
+    puts ('h: ' + h.inspect).debug #if $debug
+    
+    if h[:duration] then
+            
+      h[:seconds_to_stay_awake_for] =  Subunit.hms_to_seconds(h[:duration])
+      
+    end
 
     options = {
       enabled: true,

data/lib/ruby-macrodroid/macro.rb

@@ -192,6 +192,10 @@ class ActionsNlp
       [SpeakTextAction, {}]
     end     
     
+    get /^Vibrate \(([^\)]+)/i do |pattern|
+      [VibrateAction, {pattern: pattern}]
+    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}]
@@ -285,6 +289,10 @@ class ActionsNlp
       [KeepAwakeAction, h]
     end
     
+    get /Keep Device Awake$/i do
+      [KeepAwakeAction, params]
+    end    
+    
     #a: Disable Keep Awake
     #
     get /Disable Keep Awake/i do
@@ -326,10 +334,44 @@ class ConstraintsNlp
   end
 
   def constraints(params) 
+    
+    # Device State        
+    
+    get /^Device (locked|unlocked)/i do |state|
+      [DeviceLockedConstraint, {locked: state.downcase == 'locked'}]
+    end
 
     get /^airplane mode (.*)/i do |state|
       [AirplaneModeConstraint, {enabled: (state =~ /^enabled|on$/i) == 0}]
     end
+    
+    # 
+    
+    # -- Sensors -----------------------------------
+    #
+    get /^Light Sensor (Less|Greater) than (50.0)lx/i do |operator, val|
+
+      level, option = operator.downcase == 'less' ? [-1,0] : [1,1]
+      
+      h = {
+        light_level: level,
+        light_level_float: val,
+        option: option
+      }
+      
+      [LightLevelConstraint, h]
+    end
+    
+    get /^Proximity Sensor: (Near|Far)/i do |distance|      
+      [ProximitySensorConstraint, {near: distance.downcase == 'near'}]
+    end
+    
+    
+    # -- Screen and Speaker ---------------------------
+    #
+    get /^Screen (On|Off)/i do |state|      
+      [ScreenOnOffConstraint, {screen_on: state.downcase == 'on'}]
+    end    
 
   end
 
@@ -523,6 +565,21 @@ class Macro
       
       @title = node.text('macro') || node.attributes[:name]
       
+      d = node.element('description')
+      
+      if d then
+        
+        desc = []
+        desc << d.text.strip
+        
+        if d.element('item/description') then
+          desc <<  d.text('item/description').strip
+        end
+        
+        @description = desc.join("\n")
+
+      end
+      
       node.xpath('variable').each {|e| set_var(*e.text.to_s.split(/: */,2)) }
       
       #@description = node.attributes[:description]      

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw