ruby-macrodroid 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b183aef5c9ca96ad7f0c3abbb5e3439dd6af1a9bb14b9da75ffb99edb9944554
-  data.tar.gz: 237916d146bd126816dfa8f8ffe420ffc8a75fa383d6b5893b4e85bf4702d948
+  metadata.gz: e6919ccb93fa24e2066b29fd8c2af5bee9dd8cb2fb352cac56cd32261dac0f07
+  data.tar.gz: 6b49954b2ee422b97a7bad61e9498d07930a50e700df82e378f3b5064edb1684
 SHA512:
-  metadata.gz: ab40874c447fe623c393c3e9a4eab63a44ec71b6431cfd295cd95cf11412ad4c0c9f2238fc4e1038d0f256734dd29217e91a790fc927f1e2db1517eae8753bed
-  data.tar.gz: 056c5e9f07eb9f148276392ad881f1658addd43a7022102f6614326bb224a8b2824048647bd223c5f2a649e702b35573856a09a773dfa2b329245a660710fcd8
+  metadata.gz: a5010ad12e0dc37b2d908a0208615dcf530f2b50775f308c76b738f76fc9e714917e99d7436ef2b72898d4fbb9b1c9774a7a99eac2e486ea1bb4cb704146db33
+  data.tar.gz: f0dd6e92e2ec3421eecce5fc7e36e50c92899974d3fc61d734fbab5782bad7f67c9aaab8bbea4c3f8f8c07bf0efe702e3c37a6836a934c5634eff8521dff8737

data/lib/ruby-macrodroid.rb

@@ -248,11 +248,7 @@ class ActionsNlp
 
   alias find_action run_route
 
-  def to_s(colour: false)
-    'ActionsNlp ' + @h.inspect
-  end
 
-  alias to_summary to_s
 end
 
 class ConstraintsNlp
@@ -333,6 +329,7 @@ module Params
 end
 
 
+
 class Macro
   using ColouredText
   using Params
@@ -406,7 +403,25 @@ class Macro
     @description = h[:description]
     
     # fetch the local variables
-    @local_variables = h['local_variables']
+    if h[:local_variables].any? and h[:local_variables].first.any? then
+      
+      @local_variables = h[:local_variables].map do |var|
+              
+        val = case var[:type]
+        when 0 # boolean
+          var[:boolean_value]
+        when 1 # integer
+          var[:int_value]
+        when 2 # string
+          var[:string_value]
+        when 3 # decimal
+          var[:decimal_Value]
+        end
+        
+        [var[:name], val]
+        
+      end.to_h
+    end
     
     # fetch the triggers
     @triggers = h[:trigger_list].map do |trigger|
@@ -634,7 +649,7 @@ EOF
         
       end
       
-      if s =~ /^If/i then
+      if s =~ /^(?:If|WHILE \/ DO)/i then
         
         if indent < 1 then
           
@@ -657,22 +672,39 @@ EOF
     end.join("\n")
     
     a = [
-      (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title,
-      @triggers.map {|x| (colour ? "t".bg_red.gray.bold : 't') \
-                     + ": %s" % x}.join("\n"),
-      actions
+      (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title
     ]
     
+    if @description and @description.length >= 1 then
+      a << (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
+               + @description.gsub(/\n/,"\n  ")
+    end    
+    
+    if @local_variables.length >= 1 then
+      
+      vars = @local_variables.map do |k,v|
+        label = colour ? 'v'.bg_magenta : 'v'
+        label += ': '
+        label + "%s: %s" % [k,v]
+      end
+      
+      a << vars.join("\n")
+    end
+    
+    a << @triggers.map {|x| (colour ? "t".bg_red.gray.bold : 't') \
+                     + ": %s" % x}.join("\n")
+    a << actions
+
+    
     if @constraints.any? then
       a << @constraints.map do |x|
         (colour ? "c".bg_green.gray.bold : 'c') + ": %s" % x
       end.join("\n") 
     end
     
-    if @description and @description.length >= 1 then
-      a.insert(1, (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
-               + @description.gsub(/\n/,"\n  "))
-    end
+
+    
+
     
     a.join("\n") + "\n"
     
@@ -745,8 +777,6 @@ EOF
 end
 
 
-
-
 class MacroDroidError < Exception
 end
 

data/lib/ruby-macrodroid/actions.rb

@@ -272,6 +272,60 @@ class TakePictureAction < CameraAction
 
 end
 
+
+# Conditions/Loops
+#
+class LoopAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+    
+    h2 = options.merge(h)
+
+    super(h2)
+    
+    @label = 'WHILE / DO '
+
+  end
+
+  def to_s(colour: false)
+    
+    @s = 'WHILE / DO '
+    super()
+    
+  end
+end
+
+# Conditions/Loops
+#
+class EndLoopAction < Action
+  
+  def initialize(h={})
+    
+    options = {
+
+    }
+    
+    h2 = options.merge(h)
+
+    super(h2)
+    
+    @label = 'End Loop '
+
+  end
+
+  def to_s(colour: false)
+    
+    'End Loop '
+    
+  end
+end
+
+# Conditions/Loops
+#
 class IfConditionAction < Action
   
   def initialize(h={})
@@ -317,7 +371,7 @@ class ElseAction < Action
   
 end
 
-class ElseIfConditionAction < IfConditionAction
+class ElseIfConditionAction < Action
   
   def initialize(h={})
 
@@ -326,9 +380,14 @@ class ElseIfConditionAction < IfConditionAction
     }
 
     super(options.merge h)
-    @label = 'ElseIf '
+    @label = 'Else If '
 
   end  
+  
+  def to_s(colour: false)
+    @s = 'Else If '
+    super()
+  end
     
 
 end
@@ -793,6 +852,11 @@ end
 #
 class CameraFlashLightAction < DeviceSettingsAction
 
+  # options
+  #  0  Toch On
+  #  1  Torch Off
+  #  2  Torch Toggle
+  #
   def initialize(h={})
 
     options = {

data/lib/ruby-macrodroid/base.rb

@@ -8,6 +8,7 @@
 #  
 
 
+
 class MacroObject
   using ColouredText
   

data/lib/ruby-macrodroid/triggers.rb

@@ -1,4 +1,4 @@
-# file: ruby-macrodroid/constraints.rb
+# file: ruby-macrodroid/triggers.rb
 
 # This file contains the following classes:
 #
@@ -26,6 +26,8 @@
 #  
 
 
+
+
 class Trigger < MacroObject
   using Params
   
@@ -971,6 +973,28 @@ class MusicPlayingTrigger < DeviceEventsTrigger
 end
 
 
+# Category: Device Events
+#
+class NFCTrigger < DeviceEventsTrigger
+
+  def initialize(h={})
+
+    options = {
+    }
+
+    super(options.merge h)
+
+  end
+  
+  def to_s(colour: false)
+    'NFC Tag' + "\n  " + @h[:tag_name]
+  end
+  
+  alias to_summary to_s
+
+end
+
+
 # Category: Device Events
 #
 class DeviceUnlockedTrigger < DeviceEventsTrigger

metadata

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