ruby-macrodroid 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70dd1172a7d2ad827ff72771851910b140616b3f41fd7843ef65dc5bdf55fd5e
-  data.tar.gz: d5ef7e748dd16bfbc83e0ca05932a2b7723c61ea2ee2fbc8f69ef1c77c651ef0
+  metadata.gz: cd79e55449071a3fd0ed864f58fc606dedd69059413876c7466cb071f651fef4
+  data.tar.gz: 70dbc1fd844ff449d0ef1ca680e9b47e5233ff82148ab93063b65d9a87e5f70c
 SHA512:
-  metadata.gz: 91746fa312b8c1c5069c16f5c7337b1f6f438af8afecedc5e6469f21e00f98108788f3248d8d93284d9829858b0bf11ce5ad1591bba4a7f8f4ed1005a71c111c
-  data.tar.gz: bd1cefc341fd57809b563f1a4f21f013b3fe3e93143cef0c07862bdfe738ca6479e39c86a80355c110bd786da5b63849cc59616c7d67be58750c4ff2c68a47c3
+  metadata.gz: 1912e55be98c1236a2df6f17e5e19aa1de75e89854ca3be343821133e841656bb45c116e195237a313726b590c31bb7c898f8cf54f868f37c26f3dd9b11f4694
+  data.tar.gz: fdc3adcb802125e4346bbed8fc089e57a303d2f5624e20fe6b597b03a594ae50ca388b13c54bcb43da3bfb265e6fabc1b46f00119a48f199645ee5d8bdcf0c24

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-<%��_ER���c���{�u[e�'z���ZK����<��5Oj{�Brv��b���g�m�
-C�9�� ;�X��/�O�{��#�z˕�@�9D89���ʲ)�؋�ӱ��|p�w�g�-h����
���d�Q6���Z�f�QP�^,c�co:�+2ɢ0u����L௲w��	!�Ҁ:+|c�Z��T{���Ƀ�IU$�4�7�5�s���g�ub
+Q�-�N��R�3@��[L]��}�p�֔!DSpIQ���ϤuV9���]\�h�����
++ŷ����n#,���M���{׽���O'!<��SQp
����R�R$�im�ra���O�$���C[��G>�{�0��/�4Q�c��#����~OLI9�Ǽ�H����k�N�j2��m�F����Tn��w��z�4<���6{�#�u\6g[x,�8���G\�)K%�ۤWşO9%��$�N`�\���A��*r萳��h�����mp�m��j��j��O-8��� >�G�Fa����x+`TG��/j�&�I+gB�ڵ`�N��<:���‚���bIr�#�:�<�2y4Gc-�(L���(�x��~��4

data/lib/ruby-macrodroid.rb

@@ -113,7 +113,10 @@ require 'uuid'
 #require 'glw'
 #require 'geozone'
 require 'subunit'
-require 'rxfhelper'
+#require 'rxfhelper'
+require 'requestor'
+eval Requestor.read('http://a0.jamesrobertson.eu/rorb/r/ruby'){|x| x.require 'rxfhelper' }
+
 require 'chronic_cron'
 
 
@@ -659,18 +662,55 @@ EOF
     
   def to_s()
     
+    indent = 0
+    actions = @actions.map do |x|
+
+      s = x.to_s
+      
+      r = if indent <= 0 then
+      
+        "a: %s" % s
+        
+      elsif indent > 0 
+      
+        if s =~ /^Else/ then
+          ('  ' * (indent-1)) + "%s" % s
+        elsif s =~ /^End/
+          indent -= 1
+          ('  ' * indent) + "%s" % s
+        else
+          ('  ' * indent) + "%s" % s
+        end        
+        
+      end
+      
+      if s =~ /^If/i then
+        if indent < 1 then
+          r = "a:\n  %s" % s
+          indent += 1
+        else
+          r = ('  ' * indent) + "%s" % s
+        end
+
+        indent += 1
+      end
+      
+      r
+      
+    end.join("\n")
+    
     a = [
       'm: ' + @title,
       @triggers.map {|x| "t: %s" % x}.join("\n"),
-      @actions.map {|x| "a: %s" % x}.join("\n"),
+      actions,
       @constraints.map {|x| "a: %s" % x}.join("\n")
     ]
     
     if @description and @description.length >= 1 then
-      a.insert(1, 'd: ' + @description)
+      a.insert(1, 'd: ' + @description.gsub(/\n/,"\n  "))
     end
     
-    a.join("\n")
+    a.join("\n") + "\n"
     
   end
   
@@ -719,7 +759,7 @@ class MacroDroid
   using ColouredText
   using Params  
 
-  attr_reader :macros, :geofences
+  attr_reader :macros, :geofences, :yaml
 
   def initialize(obj=nil, debug: false)
 
@@ -897,6 +937,7 @@ class MacroDroid
 
     h = JSON.parse(s, symbolize_names: true)
     puts 'json_to_yaml: ' + h.to_yaml if @debug
+    @yaml = h.to_yaml # helpful for debugging and testing
     
     @h = h.to_snake_case
     puts ('@h: ' + @h.inspect).debug if @debug
@@ -1079,13 +1120,32 @@ class MacroObject
     UUID.new.generate
   end
   
+  def object(h={})
+
+    puts ('inside object h:'  + h.inspect).debug if @debug
+    klass = Object.const_get h[:class_type]
+    puts klass.inspect.highlight if $debug
+    
+    klass.new h
+    
+  end    
+  
 end
 
 class Trigger < MacroObject
-
+  using Params
+  
+  attr_reader :constraints
+  
   def initialize(h={})    
     super({fakeIcon: 0}.merge(h))
     @list << 'fakeIcon'
+        
+    # fetch the constraints                               
+    @constraints = h[:constraint_list].map do |constraint|
+      object(constraint.to_snake_case)
+    end       
+    
   end
   
   def match?(detail={}, model=nil)
@@ -1198,6 +1258,11 @@ class BatteryLevelTrigger < Trigger
     super(options.merge h)
 
   end
+  
+  def to_s()
+    operator = @h[:decreases_to] ? '<=' : '>='    
+    "Battery %s %s%%" % [operator, @h[:battery_level]]
+  end
 
 end
 
@@ -1845,6 +1910,10 @@ class DeviceUnlockedTrigger < DeviceEventsTrigger
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Screen Unlocked'
+  end
 
 end
 
@@ -2314,9 +2383,17 @@ end
 
 
 class Action < MacroObject
+  using Params
+  
+  attr_reader :constraints  
 
   def initialize(h={})    
     super(h)
+    
+    # fetch the constraints                               
+    @constraints = h[:constraint_list].map do |constraint|
+      object(constraint.to_snake_case)
+    end       
   end
   
   def invoke(s='')    
@@ -2491,6 +2568,64 @@ class TakePictureAction < CameraAction
 
 end
 
+class IfConditionAction < Action
+  
+  def initialize(h={})
+
+    options = {
+      a: true,
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s()
+    
+    operator = @h[:is_or_condition] ? 'OR' : 'AND'
+    r = 'If ' + @constraints.map(&:to_s).join(" %s " % operator)
+    puts 'if ... @h ' + @h.inspect
+    r
+    
+  end
+end
+
+class ElseAction < Action
+  
+  def initialize(h={})
+
+    options = {
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end  
+  
+  def to_s()
+    'Else'
+  end
+  
+end
+
+class EndIfAction < Action
+  
+  def initialize(h={})
+
+    options = {
+      constraint_list: ''
+    }
+
+    super(options.merge h)
+
+  end  
+  
+  def to_s()
+    'End If'
+  end
+  
+end
 
 class ConnectivityAction < Action
   
@@ -2863,6 +2998,17 @@ class VibrateAction < DeviceSettingsAction
     super(options.merge h)
 
   end
+  
+  def to_s()
+    
+    pattern = [
+      'Blip', 'Short Buzz', 'Long Buzz', 'Rapid', 'Slow', 'Increasing', 
+      'Constant', 'Decreasing', 'Final Fantasy', 'Game Over', 'Star Wars',
+      'Mini Blip', 'Micro Blip'
+    ]
+    
+    'Vibrate ' + "(%s)" % pattern[@h[:vibrate_pattern].to_i]
+  end
 
 end
 
@@ -3872,6 +4018,21 @@ class BatteryLevelConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    
+    operator = if @h[:greater_than] then
+      '>'
+    elsif @h[:equals]
+      '='
+    else
+      '<'
+    end
+    
+    level = @h[:battery_level]
+    
+    "Battery %s %s%%" % [operator, level]
+  end
 
 end
 
@@ -3923,6 +4084,11 @@ class ExternalPowerConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    connection = @h[:external_power] ? 'Connected' : 'Disconnected'
+    'Power ' + connection
+  end
 
 end
 
@@ -3941,6 +4107,12 @@ class BluetoothConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    device = @h[:device_name] #== 'Any Device' ? 'Any' : @h[:device_name]
+    "Device Connected (%s)" % device
+  end
+  
 
 end
 
@@ -4265,6 +4437,10 @@ class DeviceLockedConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Device ' + (@h[:locked] ? 'Locked' : 'Unlocked')
+  end
 
 end
 
@@ -4451,6 +4627,11 @@ class HeadphonesConnectionConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    connection = @h[:connected] ? 'Connected' : 'Disconnected'
+    'Headphones ' + connection
+  end
 
 end
 
@@ -4640,6 +4821,10 @@ class ScreenOnOffConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Screen ' + (@h[:screen_on] ? 'On' : 'Off')
+  end
 
 end
 
@@ -4693,6 +4878,14 @@ class LightLevelConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    
+    operator = @h[:light_level] == -1 ? 'Less than' : 'Greater than'    
+    condition = operator + ' ' + @h[:light_level_float].to_s + 'lx'
+    'Light Sensor ' + condition
+    
+  end
 
 end
 
@@ -4725,5 +4918,9 @@ class ProximitySensorConstraint < Constraint
     super(options.merge h)
 
   end
+  
+  def to_s()
+    'Proximity Sensor: ' + (@h[:near] ? 'Near' : 'Far')
+  end
 
 end

metadata

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