ruby-macrodroid 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28ec7303f297d90ed5edbbec3806c577d1fe3036851620c230b4620d4a8a98f
-  data.tar.gz: fd27b2da1d660144aae8bc85b3f392b10b385934d1a38f65817d53ff774e382c
+  metadata.gz: 34125d78f367eeff973953934d50436f964bb073ffef48591ce2f09012fc2a01
+  data.tar.gz: 5bb75988f4d979cb80f57c912d8448837848b3d4a5b34a3e524f8fdad3ff62de
 SHA512:
-  metadata.gz: f727092bb6f96799f1cd288e5ebf822b189d70ef2b5bcdb5bab452b93b412b737229fa6fed2d982f1233aa5f21d35fb1791e834d8ea023474c1eac6a3d330fd5
-  data.tar.gz: 706f9423e28c7fda560bf059f4686834e4404dca9576d5682f3e43c82440a79c84e5ddeb65619a5410098993da1ee9574cc681912a94285147b40aba1468f8a8
+  metadata.gz: 223c51744d7dde5e4a7130d3141696df1dc4a8cda0227e0f11324c3ac71e53226c95e8acd1ae27ed62ec46d8c1c8b81060e9135d923285e59e89572985dd146c
+  data.tar.gz: 39490d0ceeb2bfce5c413607d1ea5a1ca87e8942bdcbfd51ecf32f2baac1a1c6fec7bf8909eda8716cc6b397ef847d4c15de6eca9892f9d244f1724d4956a1fe

data/lib/ruby-macrodroid.rb

@@ -110,13 +110,10 @@
 require 'yaml'
 require 'rowx'
 require 'uuid'
-#require 'glw'
-#require 'geozone'
+require 'glw'
+require 'geozone'
 require 'subunit'
-#require 'rxfhelper'
-require 'requestor'
-eval Requestor.read('http://a0.jamesrobertson.eu/rorb/r/ruby'){|x| x.require 'rxfhelper' }
-
+require 'rxfhelper'
 require 'chronic_cron'
 
 
@@ -138,6 +135,12 @@ class TriggersNlp
   end
 
   def triggers(params) 
+    
+    # e.g. at 7:30pm daily
+    get /^(?:at )?(\d+:\d+(?:[ap]m)?) daily/i do |time, days|
+      [TimerTrigger, {time: time, 
+                      days: %w(Mon Tue Wed Thu Fri Sat Sun).join(', ')}]
+    end       
 
     get /^(?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)/i do |time, days|
       [TimerTrigger, {time: time, days: days}]
@@ -146,7 +149,7 @@ class TriggersNlp
     # time.is? 'at 18:30pm on Mon or Tue'
     get /^time.is\? ['"](?:at )?(\d+:\d+(?:[ap]m)?) (?:on )?(.*)['"]/i do |time, days|      
       [TimerTrigger, {time: time, days: days.gsub(' or ',', ')}]
-    end
+    end     
     
     get /^shake[ _]device\??$/i do 
       [ShakeDeviceTrigger, {}]
@@ -1667,14 +1670,32 @@ class TimerTrigger < Trigger
   
   def to_s()
     
-    dow = @h[:days_of_week]
-
-    a = Date::ABBR_DAYNAMES
+    dow = @h[:days_of_week]        
 
-    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)
+    wd = Date::ABBR_DAYNAMES    
+    a = (wd[1..-1] << wd.first)
+    
+    a2 = dow.map.with_index.to_a
+    start = a2.find {|x,i| x}.last
+    r = a2[start..-1].take_while {|x,i| x == true}
+    r2 = a2[start..-1].select {|x,i| x}
+    
+    days = if r == r2 then
     
-    "at %s on %s" % [time, days.join(', ')]
+      x1, x2 = a2[start].last, a2[r.length-1].last
+      
+      if (x2 - x1) >= 2 then
+        "%s-%s" % [a[x1],a[x2]]
+      else
+        a.zip(dow).select {|_,b| b}.map(&:first).join(', ')
+      end
+    else  
+      a.zip(dow).select {|_,b| b}.map(&:first).join(', ')
+    end
+    
+    time = Time.parse("%s:%s" % [@h[:hour], @h[:minute]]).strftime("%-H:%M%P")    
+    
+    "%s %s" % [time, days]
   end
   
   private
@@ -2694,6 +2715,25 @@ class SetBluetoothAction < ConnectivityAction
 
 end
 
+class SetHotspotAction < ConnectivityAction
+  
+  def initialize(h={})
+
+    options = {
+      device_name: "", state: 0, turn_wifi_on: true, use_legacy_mechanism: false, mechanism: 0
+
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def to_s()
+    action = @h[:turn_wifi_on] ? 'Enable' : 'Disable'
+    action + ' Hotspot'
+  end
+end
+
 # Category: Connectivity
 #
 class SendIntentAction < ConnectivityAction

metadata

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