ruby-macrodroid 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc528ce6042bfe75807bb76fcc73cc255b45b6fe0bf138d4a643a5facd7fdaf1
-  data.tar.gz: 294fed6fbe1ff71b05ea4384f9070e5795ceb1c41979bba419f89a4273164124
+  metadata.gz: c73d4f6bcddec53817e6ae7c59224759e58dd490ab53b2cab91728ceb98961f7
+  data.tar.gz: 37887f1b46a2158d5101b2c51ae444016dcf34606df34f8e6f58aed05482efb9
 SHA512:
-  metadata.gz: 76925a5b3cba1509ec62635c04d5d796ded37f2e8cee958748a59c88938876129853adc91df55281e594b6c9043ba5f8fdaba2307a9ff4727d70cf611f4a2d8f
-  data.tar.gz: 55f01e2512265e988d14cc63f576d18a5cc6fdee2a3d109ed47b0ef54bf3d4947ca4064696e405619bb5c2b5e545866fa771d040a13964e205bd343c7b111325
+  metadata.gz: 6bb6b3059e62aa4ce7924207a6fe545bc5b588d4ea4eab315361be595c47f343602a617dc7c2fdbc4701b44456dfcd18b255dc0fccfd904f7b56b5455f6f67a4
+  data.tar.gz: 2b7f77a7b582a0a8d7beda8ba09d10973e06a4844d114398a5bf534e755e66914cede0023693605abe0100f882befe7598271d70aaa5747bde9dac39c04d03d3

data/lib/ruby-macrodroid.rb

@@ -7,6 +7,12 @@ require 'rxfhelper'
 require 'chronic_cron'
 
 
+MODEL =<<EOF
+device
+  connectivity
+    airplane_mode is disabled
+EOF
+
 class TriggersNlp
   include AppRoutes
 
@@ -20,7 +26,7 @@ class TriggersNlp
 
   def triggers(params) 
 
-    get /^at (\d+:\d+(?:[ap]m)?) on (.*)/i do |time, days|
+    get /^(?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)/i do |time, days|
       [TimerTrigger, {time: time, days: days}]
     end
 
@@ -48,6 +54,9 @@ class ActionsNlp
       [ToastAction, {msg: msg}]
     end
 
+    get /^Popup Message ['"][^'"]+/i do |msg|
+      [ToastAction, {msg: msg}]
+    end
 
   end
 
@@ -178,7 +187,7 @@ class Macro
       m_action_list: @actions.map(&:to_h),
       m_constraint_list: @constraints.map(&:to_h),
       m_description: '',
-      m_name: @title,
+      m_name: title(),
       m_excludeLog: false,
       m_GUID: guid(),
       m_isOrCondition: false,
@@ -194,6 +203,13 @@ class Macro
 
   def import_h(h)
 
+    if @debug then
+      puts 'inside import_h'
+      puts 'h:' + h.inspect
+    end
+    
+    @title = h[:name]
+    
     # fetch the local variables
     @local_variables = h['local_variables']
     
@@ -316,16 +332,16 @@ class Macro
     
   end
   
-  def match?(triggerx, detail={time: $env[:time]} )
+  def match?(triggerx, detail={time: $env[:time]}, model=nil )
                 
-    if @triggers.any? {|x| x.type == triggerx and x.match?(detail) } then
+    if @triggers.any? {|x| x.type == triggerx and x.match?(detail, model) } then
       
       if @debug then
         puts 'checking constraints ...' 
         puts '@constraints: ' + @constraints.inspect
       end
       
-      if @constraints.all? {|x| x.match?($env.merge(detail)) } then
+      if @constraints.all? {|x| x.match?($env.merge(detail), model) } then
       
         true
         
@@ -342,6 +358,15 @@ class Macro
   def run()
     @actions.map(&:invoke)
   end  
+    
+  def to_s()
+    [
+      'm: ' + @title,
+      @triggers.map {|x| "t: %s" % x}.join("\n"),
+      @actions.map {|x| "a: %s" % x}.join("\n"),
+      @constraints.map {|x| "a: %s" % x}.join("\n")
+    ].join("\n")
+  end
 
   private
   
@@ -435,11 +460,11 @@ class MacroDroid
   def import_json(s)
 
     @h = JSON.parse(s, symbolize_names: true).to_snake_case
-    puts ('@h: ' + @h.pretty_inspect).debug if @debug
+    puts ('@h: ' + @h.inspect).debug if @debug
 
     @macros = @h[:macro_list].map do |macro|
 
-      puts ('macro: ' + macro.pretty_inspect).debug if @debug
+      puts ('macro: ' + macro.inspect).debug if @debug
       m = Macro.new(debug: @debug)
       m.import_h(macro)
       m
@@ -499,7 +524,9 @@ class MacroDroid
 
   end
 
-
+  def to_s()
+    @macros.map(&:to_s).join("\n\n")
+  end
 
 end
 
@@ -562,10 +589,11 @@ class Trigger < MacroObject
     @list << 'fakeIcon'
   end
   
-  def match?(detail={})    
+  def match?(detail={}, model=nil)
+
+    # only match where the key exists in the trigger object
+    detail.select {|k,v| @h.include? k }.all? {|key,value| @h[key] == value}
 
-    detail.all? {|key,value| @h[key] == value}
-    
   end
 
 end
@@ -1056,7 +1084,7 @@ class TimerTrigger < Trigger
 
   end
   
-  def match?(detail={time: $env[:time]})
+  def match?(detail={time: $env[:time]}, model=nil)
 
     a = @h[:days_of_week]
     a.unshift a.pop
@@ -1074,6 +1102,18 @@ class TimerTrigger < Trigger
     ChronicCron.new(s, detail[:time]).to_time == detail[:time]
 
   end
+  
+  def to_s()
+    
+    dow = @h[:days_of_week]
+
+    a = Date::ABBR_DAYNAMES
+
+    time = Time.parse("%s:%s" % [@h[:hour], @h[:minute]]).strftime("%-H:%M%P")
+    days = (a[1..-1] << a.first).zip(dow).select {|_,b| b}.map(&:first)
+    
+    "at %s on %s" % [time, days.join(', ')]
+  end
 
 end
 
@@ -2709,6 +2749,10 @@ class ToastAction < NotificationsAction
   def invoke()
     super(@h[:message_text])
   end
+  
+  def to_s()
+    "Popup Message '%s'" % @h[:message_text]
+  end
 
 end
 
@@ -3037,6 +3081,30 @@ class Constraint < MacroObject
   def initialize(h={})    
     super(h)
   end
+  
+  def match?(detail={}, model=nil)
+
+    detail.select {|k,v| @h.include? k }.all? {|key,value| @h[key] == value}
+
+  end
+  
+  #def to_s()
+  #  ''
+  #end
+  
+  protected
+  
+  def toggle_match?(key, val)
+    
+    if @h[key] == true and val == key.to_s then
+      true
+    elsif @h[key] == false and val != key.to_s 
+      true
+    else
+      false
+    end
+    
+  end
 
 end
 
@@ -3398,6 +3466,29 @@ class AirplaneModeConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def match?(detail={}, model=nil)
+    
+    puts 'inside airplaneModeConstraint#match?' if $debug
+    
+    if detail.has_key? :enabled then
+      
+      puts 'detail has the key' if $debug
+      super(detail)
+      
+    elsif model
+      
+      if $debug then
+        puts 'checking the model'
+        switch = model.connectivity.airplane_mode.switch
+        puts 'switch: ' + switch.inspect
+      end
+      
+      toggle_match?(:enabled, switch)
+      
+    end
+    
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
   SBHno3GEuuD8ZWj24IMJpfbp
   -----END CERTIFICATE-----
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -61,22 +61,22 @@ dependencies:
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
   name: chronic_cron
   requirement: !ruby/object:Gem::Requirement