ruby-macrodroid 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2f43b1d737df8ffc21bb31f9a7df56964963ba3b88a6e51e008c45ca0d4e5f6
-  data.tar.gz: 6e587a62b683867b37f28dfba70728971e19647cfa803a804ea123c1eb0955b3
+  metadata.gz: 70dd1172a7d2ad827ff72771851910b140616b3f41fd7843ef65dc5bdf55fd5e
+  data.tar.gz: d5ef7e748dd16bfbc83e0ca05932a2b7723c61ea2ee2fbc8f69ef1c77c651ef0
 SHA512:
-  metadata.gz: b247e2d22eac6c837d9bcacf38697b63ab80a41c2affca2adb7389b39423813c9d1816f9c9dd697a013ad75b5417ca2143ca4e040be819a09a67a939765aae2f
-  data.tar.gz: 1a91db74afbbfbe1622d3e19241c9a99ddd05c0ef975e7ac037102104497d12a191c305a4ceb9ab0f5d7d7d476060398b4648ea927bc3135ab52b5633f562e0f
+  metadata.gz: 91746fa312b8c1c5069c16f5c7337b1f6f438af8afecedc5e6469f21e00f98108788f3248d8d93284d9829858b0bf11ce5ad1591bba4a7f8f4ed1005a71c111c
+  data.tar.gz: bd1cefc341fd57809b563f1a4f21f013b3fe3e93143cef0c07862bdfe738ca6479e39c86a80355c110bd786da5b63849cc59616c7d67be58750c4ff2c68a47c3

data/lib/ruby-macrodroid.rb

@@ -112,6 +112,7 @@ require 'rowx'
 require 'uuid'
 #require 'glw'
 #require 'geozone'
+require 'subunit'
 require 'rxfhelper'
 require 'chronic_cron'
 
@@ -177,7 +178,16 @@ class TriggersNlp
     get /^location (entered|exited) \(([^\)]+)/i do |direction, name|
       enter_area = direction.downcase.to_sym == :entered
       [GeofenceTrigger, {name: name, enter_area: enter_area}]
-    end     
+    end
+    
+    # eg. Proximity Sensor (Near)
+    #
+    get /^Proximity Sensor \(([^\)]+)\)/i do |distance|
+      
+      [ProximityTrigger, {distance: distance}]
+    end    
+
+    
     
   end
 
@@ -269,7 +279,33 @@ class ActionsNlp
     #
     get /webhook|HTTP GET/i do
       [OpenWebPageAction, {}]
-    end       
+    end
+    
+    #a: Keep Device Awake Screen On Until Disabled
+    #
+    get /Keep Device Awake Screen On Until Disabled/i do
+      [KeepAwakeAction, {enabled: true, permanent: true, screen_option: 0}]
+    end
+    
+    
+    #a: Keep Device Awake Screen On 1h 1m 1s
+    #
+    get /Keep Device Awake Screen On ([^$]+)/i do |duration|
+      
+      a = duration.split.map(&:to_i)
+      secs = Subunit.new(units={minutes:60, hours:60, seconds: 60}, a).to_i
+      
+      h = {
+        permanent: true, screen_option: 0, seconds_to_stay_awake_for: secs
+      }
+      [KeepAwakeAction, h]
+    end
+    
+    #a: Disable Keep Awake
+    #
+    get /Disable Keep Awake/i do
+      [KeepAwakeAction, {enabled: false, screen_option: 0}]
+    end    
 
 
   end
@@ -642,11 +678,11 @@ EOF
     
     a = [
       'm: ' + @title,
-      't: ' + @triggers.map(&:to_s).join(", "),
-      'a: ' + @actions.map(&:to_s).join(", "),
+      't: ' + @triggers.map(&:to_summary).join(", "),
+      'a: ' + @actions.map(&:to_summary).join(", "),
     ]
     
-    a <<  'c: ' + @constraints.map(&:to_s).join(", ") if @constraints.any?
+    a <<  'c: ' + @constraints.map(&:to_summary).join(", ") if @constraints.any?
     
     a.join("\n") + "\n"
     
@@ -813,7 +849,16 @@ class MacroDroid
   end
 
   def to_s()
-    @macros.map(&:to_s).join("\n")
+    
+    lines = []
+    
+    if @geofences.any? then
+      lines << @geofences.map {|_, value| 'g: ' + value.to_s}.join("\n\n") + "\n"
+    end
+    
+    lines << @macros.map(&:to_s).join("\n")
+    lines.join("\n")
+    
   end
   
   def to_summary()
@@ -964,6 +1009,13 @@ class GeofenceMap
       name: @name, 
       radius: @radius
     }
+      
+  end
+  
+  def to_s()
+    
+    coordinates = "%s, %s" % [@longitude, @latitude]
+    "%s\n  coordinates: %s\n  radius: %s" % [@name, coordinates, @radius]
     
   end
   
@@ -1011,6 +1063,8 @@ class MacroObject
   def to_s()
     "#<%s %s>" % [self.class, @h.inspect]
   end
+  
+  alias to_summary to_s
 
   protected
   
@@ -1982,7 +2036,7 @@ class GeofenceTrigger < Trigger
     direction = @h[:enter_area] ? 'Entry' : 'Exit'
     
     found = @geofences.find {|x| x.id == @h[:geofence_id]}
-    puts 'found: ' + found.inspect    
+    puts 'found: ' + found.inspect    if @debug 
     label = found ? found.name : 'error: name not found'
 
     "Geofence %s (%s)" % [direction, label]
@@ -2030,8 +2084,28 @@ class ActivityRecognitionTrigger < SensorsTrigger
     }
 
     super(options.merge h)
+    
+    @activity = ['In Vehicle', 'On Bicycle', 'Running', 'Walking', 'Still']    
 
   end
+  
+  def to_s()
+    activity = @activity[@h[:selected_index]]
+    'Activity - ' + activity
+  end
+  
+  def to_summary
+    
+    activity = @activity[@h[:selected_index]]
+    s = if activity.length > 10 then
+      activity[0..7] + '..'
+    else
+      activity
+    end
+    
+    'Activity - ' + s
+    
+  end
 
 end
 
@@ -2041,14 +2115,33 @@ class ProximityTrigger < SensorsTrigger
 
   def initialize(h={})
 
+    if h[:distance] then
+      
+      case h[:distance].to_sym
+      when :near
+        options[:near] = true
+      end
+    end
+    
     options = {
       near: true,
       selected_option: 0
     }
 
-    super(options.merge h)
+    super(options.merge filter(options,h))
 
   end
+  
+  def to_s()
+    
+    distance = if @h[:near] then
+      'Near'
+    else
+      'Far'
+    end
+    
+    "Proximity Sensor (%s)" % distance
+  end
 
 end
 
@@ -2652,6 +2745,10 @@ class SpeakTextAction < DeviceAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    "Speak Text (%s)" % @h[:text_to_say]
+  end
 
 end
 
@@ -3553,6 +3650,10 @@ end
 
 # Category: Screen
 #
+# options:
+#   keep awake, screen on => enabled: true
+#   disable keep awake    => enabled: false
+#
 class KeepAwakeAction < ScreenAction
 
   def initialize(h={})
@@ -3567,7 +3668,30 @@ class KeepAwakeAction < ScreenAction
     super(options.merge h)
 
   end
-
+  
+  def to_s()
+    
+    screen = @h[:screen_option] == 0 ? 'Screen On' : 'Screen Off'
+    
+    if @h[:enabled] then
+    
+      whenx = if @h[:seconds_to_stay_awake_for] == 0 then
+    
+      'Until Disabled'
+      
+      else
+        scnds = @h[:seconds_to_stay_awake_for]
+        Subunit.new(units={minutes:60, hours:60}, seconds: scnds).strfunit("%x")
+      end
+      
+      'Keep Device Awake ' + screen + ' ' + whenx
+      
+    else
+      'Disable Keep Awake'
+    end
+    
+    
+  end
 end
 
 # Category: Screen

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - James Robertson
@@ -97,6 +97,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: subunit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  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::Dependency
   name: geozone
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1 +1 @@
-!a��,�Y�냽�:�̶CC�q�$|\M�.^�D��`b��菎U�q�#��r�-#��>Ħ�?� �jLֿ��㛆@V���.p���kP��7H
��`��/����_i����g�D����lP��0��E��@��F�sQ��Llcf��o�g��yT��&��E�����r��zԤj��P;�,큁��_�tdByWђ�SG�c���ɷ"��_DRv�C٪5�3��A��TB�:F��?f
{1h%�:��(P���,��a0U��@�[3VT��DC��u>/!+�#�ʞ�
+�W��V�$�)v_n��`-�N�)`��y�j#�a�ģG���$�odV'���k$j���^(NГWh���>3�n"ڈ$C�T�I:̅oO��I��Y�J����<U٢vc���0p�]>M�����AB��xB�U��	���k�'���{t�@���jj]��	{�JΊVDx0[����)r�j�T�V���؁�sawK�cl8�u%�,����h�>�/JV1Y1B�>U����=��K8�C�ԙE��O