ruby-macrodroid 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a302b724cde397e0ef27e3461dad14fa0801158692951fdcf013fccfbc0348c
-  data.tar.gz: b8a041e5185746e5bd2809e98d098cba2ff20534ddcb679f1c342397840a2976
+  metadata.gz: 3e6d2bb5ccf9f1caf0c56ba60c4791801dccc28a2be22bfbfc524db01dd553f5
+  data.tar.gz: 4d79491e900a308fcc3473ed6d7b96cdf6169e20c7c0c754c08c806cb52c6d34
 SHA512:
-  metadata.gz: 5311bafd81b65b5a0371aab705d469bdab0ec5b920b40c4004e8e7758460b06f72f590c7c2f49d7cf9d21c8407debe682d81235b66d8d27224bd3a8786e75a22
-  data.tar.gz: 27d2d926b5230f6f545d28e59db686edb82708f65d05128ed2fa9e2b3e59375ca14f00dcf72cd99bd8502d7aeb1534077ca9bf71e86e73ad10e62066d1b4dd57
+  metadata.gz: c671f4e0473e435f7c5c9f760627464b8bf760367485877d43680225f399c6e7a83d2ac95be8ac4960ce8451d301abe7044e70570f1a7344a3a2bcd7ab529746
+  data.tar.gz: 5cbfd7fee603949c495e4af3b315ffb45af15e8810c9ed226305627e47472df6a29c92ce2fed2f824d07d5dbb4b28372fcb420d97b4ea673f8c9a8458dc4ad21

data/lib/ruby-macrodroid.rb

@@ -411,12 +411,13 @@ class Macro
   using ColouredText
   using Params
 
-  attr_reader :local_variables, :triggers, :actions, :constraints, :guid
+  attr_reader :local_variables, :triggers, :actions, :constraints, 
+      :guid, :deviceid
   attr_accessor :title, :description
 
-  def initialize(name=nil, geofences: geofences, debug: false)
+  def initialize(name=nil, geofences: geofences, deviceid: nil, debug: false)
 
-    @title, @geofences, @debug = name, geofences, debug
+    @title, @geofences, @deviceid, @debug = name, geofences, deviceid, debug
     
     puts 'inside Macro#initialize' if @debug    
           
@@ -826,10 +827,14 @@ class MacroDroid
   using Params  
 
   attr_reader :macros, :geofences, :yaml
+  attr_accessor :deviceid
+  
+  # note: The deviceid can only be found from an existing Webhook trigger, 
+  #       generated from MacroDroid itself.
 
-  def initialize(obj=nil, debug: false)
+  def initialize(obj=nil, deviceid: nil, debug: false)
 
-    @debug = debug    
+    @deviceid, @debug = deviceid, debug    
     
     @geofences = {}
     
@@ -1034,7 +1039,8 @@ class MacroDroid
       puts ('macro: ' + macro.inspect).debug if @debug
 #       puts '@geofences: ' + @geofences.inspect if @debug
       
-      m = Macro.new(geofences: @geofences.map(&:last), debug: @debug )
+      m = Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
+                    debug: @debug )
       m.import_h(macro)
       m
 
@@ -1055,7 +1061,8 @@ class MacroDroid
     
     @macros = doc.root.xpath('item').map do |node|
       puts ('geofences: ' + geofences.inspect).highlight if @debug
-      Macro.new(geofences: geofences.map(&:last), debug: @debug).import_xml(node)
+      Macro.new(geofences: geofences.map(&:last), deviceid: @deviceid, 
+                debug: @debug).import_xml(node)
       
     end
 
@@ -1078,7 +1085,8 @@ class MacroDroid
        
     @macros = doc.root.xpath('macro').map do |node|
           
-      Macro.new(geofences: @geofences.map(&:last), debug: @debug).import_xml(node)
+      Macro.new(geofences: @geofences.map(&:last), deviceid: @deviceid, 
+                debug: @debug).import_xml(node)
       
     end
   end
@@ -1256,26 +1264,7 @@ class Trigger < MacroObject
 end
 
 
-# Category: Applications
-#
-class WebHookTrigger < Trigger
-
-  def initialize(h={})
-
-    options = {
-      identifier: ''
-    }
-
-    super(options.merge h)
-
-  end
-
-  def to_s(colour: false)
-    'WebHookTrigger ' + @h.inspect
-  end
 
-  alias to_summary to_s
-end
 
 # Category: Applications
 #
@@ -1633,7 +1622,12 @@ class WebHookTrigger < Trigger
   end
 
   def to_s(colour: false)
-    'WebHookTrigger ' + @h.inspect
+    
+    url = "https://trigger.macrodroid.com/%s/%s" % \
+        [@h[:macro].deviceid, @h[:identifier]]
+    @s = 'WebHook (Url)' + "\n  " + url
+    super()
+
   end
 
   alias to_summary to_s
@@ -2537,7 +2531,7 @@ class ProximityTrigger < SensorsTrigger
       selected_option: 0
     }
 
-    super(options.merge filter(options,h))
+    super(options.merge h)
 
   end
   
@@ -2551,6 +2545,8 @@ class ProximityTrigger < SensorsTrigger
     
     "Proximity Sensor (%s)" % distance
   end
+  
+  alias to_summary to_s
 
 end
 
@@ -2904,6 +2900,29 @@ class KillBackgroundAppAction < ApplicationAction
   alias to_summary to_s
 end
 
+# Category: Applications
+#
+class LaunchShortcutAction < ApplicationAction
+
+  def initialize(h={})
+    
+    options = {
+      :app_name=>"Amazon Alexa", :intent_encoded=>"", :name=>"Ask Alexa"
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def to_s(colour: false)
+    @s = "Launch Shortcut: " + @h[:app_name] + "\n  " + @h[:name]
+    super()
+  end
+  
+  alias to_summary to_s
+
+end
+
 # Category: Applications
 #
 class OpenWebPageAction < ApplicationAction
@@ -3218,7 +3237,7 @@ class SendIntentAction < ConnectivityAction
   end
 
   def to_s(colour: false)
-    'SendIntentAction ' + @h.inspect
+    'Send Intent ' + "\n  " + @h[:action]
   end
 
   alias to_summary to_s
@@ -4582,7 +4601,7 @@ class KeepAwakeAction < ScreenAction
         Subunit.new(units={minutes:60, hours:60}, seconds: scnds).strfunit("%x")
       end
       
-      'Keep Device Awake ' + screen + ' ' + whenx
+      "Keep Device Awake\n  " + screen + ' - ' + whenx
       
     else
       'Disable Keep Awake'
@@ -4904,10 +4923,13 @@ class BluetoothConstraint < Constraint
   
   def to_s(colour: false)
     device = @h[:device_name] #== 'Any Device' ? 'Any' : @h[:device_name]
-    "Device Connected (%s)" % device
+    "Device Connected\n  %s" % device
   end
   
-  alias to_summary to_s
+  def to_summary(colour: false)
+    device = @h[:device_name] #== 'Any Device' ? 'Any' : @h[:device_name]
+    "Device Connected (%s)" % device
+  end
 
 end
 

metadata

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