ruby-macrodroid 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58f2837ede78c4bdb29b2673c38cf07b850dd8431aa47bf59b9ba08512d1970
-  data.tar.gz: 5300eb53b78a33b8d52682ac21fc901a8fab86f273c581a4fdf5e4fbb033c404
+  metadata.gz: e161537334457ba0da45d5058d8a7a75a1a845cb2e5b9aa7895ea224aac472c5
+  data.tar.gz: 9503ca1e163739e18fba141a333e99fcf27eb3c34c34798f72099f723e63f3fb
 SHA512:
-  metadata.gz: af593ce8663d6a1842fc3f49dedee195119c82dab6f2f2bba8f9f96cce1ef6e8065efa281777598502261e168ee452cccb09583460b15f7e425ea39a65e8f6b8
-  data.tar.gz: d0f84f3016d838e0fc326695dec1631fbfa27f07951045a3518cc7ad36b3f899e03a060459f72864568ea50e74c68009d9baf6411e31de36b8cea56f3be7bc93
+  metadata.gz: 1035077a740b2308cde75c96da176d0dd616111bd9541b364ce2a9e3f13eb39a3ad49930222348a186fe1180bade2eb264e0a9cf4bf05ee5efd2802da27a3850
+  data.tar.gz: 6f0919e4921f12d5c646484f56b8c5b459335d3997559226803e4da30ec5e96e007882a247c0a52ff9766702066f28df534c044792c557a40335079828458da0

data/lib/ruby-macrodroid.rb

@@ -391,6 +391,7 @@ class Macro
       local_variables: @local_variables,
       m_trigger_list: @triggers.map(&:to_h),
       m_action_list: @actions.map(&:to_h),
+      m_category: @category,
       m_constraint_list: @constraints.map(&:to_h),
       m_description: '',
       m_name: title(),
@@ -414,6 +415,7 @@ class Macro
       puts 'h:' + h.inspect
     end
     
+    @category = h[:category]
     @title = h[:name]
     @description = h[:description]
     
@@ -449,17 +451,17 @@ class Macro
     @actions = h[:action_list].map do |action|
       object(action.to_snake_case)
     end
-
+    puts 'before fetch constraints' if @debug
     # fetch the constraints                               
     @constraints = h[:constraint_list].map do |constraint|
       object(constraint.to_snake_case)
     end                               
-    
+    puts 'after fetch constraints' if @debug    
     @h = h
 
     %i(local_variables m_trigger_list m_action_list m_constraint_list)\
       .each {|x| @h[x] = [] }
-
+    puts 'after @h set' if @debug    
     @h
 
   end
@@ -476,6 +478,7 @@ class Macro
       # level 2
       
       @title = node.attributes[:name]
+      @category = node.attributes[:category]
       @description = node.attributes[:description]
       
       
@@ -707,10 +710,11 @@ EOF
       r
       
     end.join("\n")
-    
-    a = [
-      (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title
-    ]
+
+    a = []
+    a << '# ' + @category + "\n" if @category
+    a <<  (colour ? "m".bg_cyan.gray.bold : 'm') + ': ' + @title
+
     
     if @description and @description.length >= 1 then
       a << (colour ? "d".bg_gray.gray.bold : 'd') + ': ' \
@@ -804,7 +808,7 @@ EOF
       h2 = h.merge( macro: self)
       puts 'h2: ' + h2.inspect      
       r = klass.new h2 
-
+      puts 'r:' + r.inspect
       r
       
     end
@@ -842,6 +846,7 @@ class MacroDroid
       if s[0] == '{' then
         
         import_json(s) 
+        puts 'after import_json' if @debug
         
       elsif  s[0] == '<'
         
@@ -934,7 +939,7 @@ class MacroDroid
   end
 
   alias to_json export_json
-
+  
 
   def to_h()
 

data/lib/ruby-macrodroid/actions.rb

@@ -69,43 +69,6 @@ class Action < MacroObject
 end
 
 
-class LocationAction < Action
-  
-  def initialize(h={})
-    super(h)
-    @group = 'location'
-  end
-  
-end
-
-# Category: Location
-#
-class ShareLocationAction < LocationAction
-
-  def initialize(h={})
-    
-    super()
-
-    options = {
-      email: '',
-      variable: {:m_stringValue=>"", :m_name=>"", 
-                 :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, 
-                 :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
-      sim_id: 0,
-      output_channel: 5,
-      old_variable_format: true
-    }
-
-    super(options.merge h)
-
-  end
-
-  def to_s(colour: false)
-    'ShareLocationAction ' + @h.inspect
-  end
-
-  alias to_summary to_s
-end
 
 
 class ApplicationAction < Action
@@ -1212,15 +1175,30 @@ class ForceLocationUpdateAction < LocationAction
   alias to_summary to_s
 end
 
+# Category: Location
+#
+class LocationAction < Action
+  
+  def initialize(h={})
+    super(h)
+    @group = 'location'
+  end
+  
+end
+
 # Category: Location
 #
 class ShareLocationAction < LocationAction
 
   def initialize(h={})
+    
+    super()
 
     options = {
       email: '',
-      variable: {:m_stringValue=>"", :m_name=>"", :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
+      variable: {:m_stringValue=>"", :m_name=>"", 
+                 :m_decimalValue=>0.0, :isLocal=>true, :m_booleanValue=>false, 
+                 :excludeFromLog=>false, :m_intValue=>0, :m_type=>2},
       sim_id: 0,
       output_channel: 5,
       old_variable_format: true
@@ -1231,12 +1209,14 @@ class ShareLocationAction < LocationAction
   end
 
   def to_s(colour: false)
-    'ShareLocationAction ' + @h.inspect
+    @s = 'Share Location' + "\n  GPS" # + @h.inspect
+    super()
   end
 
   alias to_summary to_s
 end
 
+
 # Category: Location
 #
 class SetLocationUpdateRateAction < LocationAction
@@ -1472,16 +1452,26 @@ class TextManipulationAction < Action
   
   def to_s(colour: false)
     
-    tm = @h[:text_manipulation]
-    
-    s = case tm[:type].to_sym
-    when :SubstringManipulation
+    #tm = @h[:text_manipulation][:type]
+
+    #s = case tm[:type].to_sym
+    s = case 3 # @h[:text_manipulation][:option].to_i
+    when 0 # :SubstringManipulation
       "Substring(%s, %s)" % [@h[:text], tm[:params].join(', ')]
+    when 1 # :ReplaceAllManipulation
+      "Replace all(%s, %s, %s)" % [@h[:text], *tm[:params]]      
+    when 2 # :ExtractTextManipulation
+      "Extract text(%s, %s)" % [@h[:text], tm[:params].join(', ')]      
+    when 3 # :UpperCaseManipulation
+      "Upper case(%s)" % [@h[:text]]
+      #'foo'
+    when 4 # :LowerCaseManipulation
+      "Lower case(%s)" % [@h[:text]]      
+    when 5 # :TrimWhitespaceManipulation
+      "Trim whitespace(%s)" % [@h[:text]]      
     end
 
-    
-    'Text Manipulation' + "\n  " + s #+ ' ' + @h.inspect
-    
+    'Text Manipulation' + "\n  " + s.inspect #+ ' ' + @h.inspect        
     
   end
   
@@ -1489,6 +1479,9 @@ class TextManipulationAction < Action
   
 end
 
+
+
+
 class PauseAction < Action
   
   def initialize(h={})
@@ -1603,7 +1596,9 @@ class SendEmailAction < MessagingAction
   end
 
   def to_s(colour: false)
-    'SendEmailAction ' + @h.inspect
+    recipient = @h[:email_address]
+    @s = 'Send EmailAction' + "\n  To: " + recipient #+ ' ' + @h.inspect
+    super()
   end
 
   alias to_summary to_s

data/lib/ruby-macrodroid/triggers.rb

@@ -1604,3 +1604,34 @@ class SwipeTrigger < Trigger
 
   alias to_summary to_s
 end
+
+
+
+
+# Category: User Input
+#
+class WidgetPressedTrigger < Trigger
+
+  def initialize(h={})
+
+    options = {
+      :swipe_start_area=>0, :swipe_motion=>0, :cleared=>true, 
+      :image_id=>2130968576, :image_package_name=>"com.android.providers.settings",
+      :image_resource_name=>"com.android.providers.settings", :widget_label=>"", 
+      :widget_type=>4
+    }
+
+    super(options.merge h)
+
+  end
+
+  def to_s(colour: false)
+    # 4 == cutom , 0 = green, 1 = blue, 2 = red, 3 = yellow
+    style = %w(Green Blue Red Yellow Custom)[@h[:widget_type]]
+    @s = "Widget Button (%s)" % [style] #+ @h.inspect
+    super()
+  end
+
+  alias to_summary to_s
+end
+

metadata

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