ruby-macrodroid 0.9.18 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98e47dfdd0c7a7f5eabe5a942e3d1ad19cbacbb8cdac3de74b301e51a6e9dbdc
-  data.tar.gz: 462bf9fa2ffdb85fc51b93448c1a43b9469bd81bbec42a34549fdde9518a07ef
+  metadata.gz: b5b0e328f9ba62c9217cfc9dcce286b3d450953d77eef32ba00c7fd1bf07d3d7
+  data.tar.gz: d8e6c46d8fc8b4a3185ab9b1a0da3a6937e1aabf43a152e6c238b1187455c0db
 SHA512:
-  metadata.gz: e8e4d4e23d498cd394739002b387907209015e06fea55facfdccdd7983e72cf72372bf152427767388ca8c3ee031dfbbe7ff69be964e210025d54ac60be6e0ed
-  data.tar.gz: c8150eccb7ba454409f7ab6d56a7418f9508050c6ee76021c0508b21b1203529e5fce79ff9dfd1aeadfab0f3aced27d95c2def9151517d3bc4eff32ba8e1d6b0
+  metadata.gz: 11f4918c738e8e42d78f0d5acc2b04994b45848d5d56010dc6c3f89f6c1a05ea24166cd95aaeca736a09d2b0990874cbdfdd8dba8f9548d999e5c50bae2e9dba
+  data.tar.gz: '09d9a30e0c8799ae2cb68acccc3d505a6f8cbe04a6206c28d0584e2b3f16b26b92b394ea24f137bfb576b8df5574a50aed3d32a09b03fe311e4427ddfab7bd3f'

data/lib/ruby-macrodroid/actions.rb

@@ -797,7 +797,7 @@ class SetAirplaneModeAction < ConnectivityAction
     
     state = ['On', 'Off', 'Toggle'][@h[:state]]
     @s = 'Airplane Mode ' + state
-    super(colour: colour)
+    super()
     
   end
 
@@ -819,34 +819,20 @@ class SetWifiAction < ConnectivityAction
 
   end
   
-  def to_s(colour: false, indent: 0)
-    action = @h[:state] == 0 ? 'Enable' : 'Disable'
-    action + ' Wifi'
+  def to_s(colour: false, indent: 0)    
+    
+    @s = if @h[:state] <= 2 then
+      state = %w(Enable Disable Toggle)[@h[:state]]      
+      state + ' Wifi'
+    else
+      "Connected to Network\n%s" % @h[:ssid]
+    end
+    
+    super()
   end
 
 end
 
-# Category: Connectivity
-#
-class SetBluetoothAction < ConnectivityAction
-
-  def initialize(h={})
-
-    options = {
-      device_name: '',
-      state: 0
-    }
-
-    super(options.merge h)
-
-  end
-
-  def to_s(colour: false, indent: 0)
-    'SetBluetoothAction ' + @h.inspect
-  end
-
-  alias to_summary to_s
-end
 
 # Category: Connectivity
 #
@@ -855,6 +841,8 @@ class SetBluetoothAction < ConnectivityAction
   def initialize(h={})
 
     options = {
+      
+      device_address: '',
       device_name: '',
       state: 1
     }
@@ -864,7 +852,21 @@ class SetBluetoothAction < ConnectivityAction
   end
 
   def to_s(colour: false, indent: 0)
-    'SetBluetoothAction ' + @h.inspect
+    
+    @s = if @h[:state] <= 2 then
+    
+      state = %w(Enable Disable Toggle)[@h[:state]]
+      state + ' Bluetooth'
+      
+    else
+      
+      state = @h[:state] == 3 ? 'Connect' : 'Disconnect'
+      state + ' Audio Device' + "\n" + @h[:device_name]
+      
+    end
+
+    super()
+    
   end
 
   alias to_summary to_s
@@ -2223,16 +2225,18 @@ class ControlMediaAction < MediaAction
         }.merge h2
         
       else
-        {}
+        {
+          send_media_player_commands: true, 
+          simulate_media_button: false
+        }
       end
     end
     #puts 'h: ' + h.inspect
     
     options = {
-      application_name: "Google Play Music", option: "Play/Pause", 
-      package_name: "com.google.android.music", 
-      send_media_player_commands: false, 
-      simulate_media_button: true,
+      option: "Play/Pause", 
+      send_media_player_commands: true, 
+      simulate_media_button: false,
     }
 
     super(options.merge h)
@@ -2245,6 +2249,8 @@ class ControlMediaAction < MediaAction
     
     if @h[:simulate_media_button] then
       @s +=  "\nSimulate Media Button (%s)" % @h[:application_name]
+    else
+      @s +=  "\nSimulate Audio Button"
     end
     
     super()

data/lib/ruby-macrodroid/actionsnlp.rb

@@ -41,6 +41,27 @@ class ActionsNlp
     
     # -- Connectivity ------------------------------------------------------
     
+    get /^Airplane Mode (On|Off|Toggle)/i do |state|
+      
+      index = %w(on off toggle).index state.downcase
+      [SetAirplaneModeAction, {state: index }]
+      
+    end       
+    
+    get /^(Enable|Disable|Toggle) Bluetooth/i do |state|
+      
+      index = %w(enable disable toggle).index state.downcase
+      [SetBluetoothAction, {state: index }]
+      
+    end    
+    
+    get /^(Connect|Disconnect) Audio Device/i do |state|
+      
+      index = %w(connect disconnect).index(state.downcase) + 3
+      [SetBluetoothAction, {state: index }]
+      
+    end    
+    
     get /^(Enable|Disable) HotSpot/i do |state|
       enable, state = if state.downcase == 'enable' then
         [true, 0]
@@ -50,6 +71,19 @@ class ActionsNlp
       [SetHotspotAction, {turn_wifi_on: enable, state: state }]
     end   
     
+    get /^(Enable|Disable|Toggle) Wifi/i do |state|
+      
+      index = %w(enable disable toggle).index state.downcase
+      [SetWifiAction, {state: index }]
+      
+    end       
+    
+    get /^Connect to Network$/i do
+      
+      [SetWifiAction, {state: 4 }]
+      
+    end    
+    
     # e.g. message popup: hello world!
     get /^(?:message popup|popup message): (.*)/i do |msg|
       [ToastAction, {msg: msg}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-macrodroid
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkxMDI3MjEyNDA0WhcN
-  MjAxMDI2MjEyNDA0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDGFPay
-  XYuML5FESMa8WAbhZyaUhuUMxkOuMAQCEvZoB/aNyVE2Ho1yNLwzmJNO3t5ne7YO
-  Q4kRP6/9r76ghiR43XJGhrMicgxL8QC3GmQtJl9KOSiAibzMcya+4hNjF99nqTKf
-  0IbVLz8omiskIbgMMxnLxx8hr4t1cUBW/PXkjufqtzTob+KQEESQeXkQYAjbnnME
-  0+x0LL8Bi1OiLVAK3b2rMzt8onNmSwvYvfPAXrBcTJczsUrCSgiGHkQYGyK8StnE
-  5NaCGOxXObiiyJ/PVEh+kn7R1y9C3Ugprf81qEWg6fsazlFl+JpyCdWphmo/J2Hd
-  7oXa+MxCrZRCRo3Z2Avz54tyXukyq4W5CWuceuucBG/vnAKSoqm69pWGhjhVFDzF
-  BWxmV2iDrU06g+sWXVHWEGGQURyZBl/2ue0rzeaZYFEuLOTN9JRMMwqTNb9S6A0d
-  nLhZkSiHCe7levTBK9tN1zRdqYXb/hj3iZpkIejYMRQaqxdX1sJcvqzijDcCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUYKFwpZGg
-  MIpWf2U87TzYBDvorjMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAxMDI2MjIxOTU3WhcN
+  MjExMDI2MjIxOTU3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDoaG+o
+  lMHEAZHl1nsdoJXwq0LC+quj5tNVCWZh4YQbBElxPfqL/+37lEwiJm9DC2ITVit1
+  H/PAJipSJrOlnX5gBs2xZuKDChGBPLaquioK4ZyTNzMHNTEZiWz3NAGNO+bJuWQd
+  Ho9+C+/BhCgG85XbDrmFdEnYnep3qntkgB860+9NRQNQ53cFn8nBOfGSpvN3Fsqp
+  Ja7FyW59mlLkYccWZrVR+ZAdLYZQLNQ8yobSINKLOkXA9cqExF/pxMjxZpREM1S4
+  qY8Oo4YUw6I2TH3mUkACRdQMmyY/GRR0hDKAFwpsXajz+jmztQ3+dONsqPt+crJB
+  Mk7vSJbCXpVovljhSB3fAGOB0x9hd43AwijgkaW/8lm4N7jajalwXbckaV5C7nnS
+  uMDoU1TBdSKlP3f1VhFVdDBEh8KaqTzyrV8QvJKPirW8BrgpdXB7xYafHBXBSMxo
+  MiafxZoXRxY9cQc7UY9RjFLyKDipubSWhiHfHURnBYgNMJit0mdNGtVBpj8CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUuSf+7NQJ
+  u1oQ39UyDRyono+FMTYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAiOFHbXd+U1P/j84TjNssAprjID/iexoPR482NaIg
-  WVC6VldVyC2tOXEniZvtpsECzR7oLicY2+D4p6ZtYkeI6T19moSN8SFK/lPjHhh5
-  ujRQBqFwiwInlkcZO6e36aNDhrEtocrZyE9KFkYb5ZUUOSJpPIm/+F+4u7R1o3TX
-  gMkrwlIwKylTjbvBjqwrQ65JVHkGrzxOoN4GFo2WEMGyVgMtvCFosWg91dJNpkww
-  RH5jzcCEVO3woUSruZQIk7WYAHiO/ucn4JcocSF/1yO5yDzuh6AODA5wr3kMywOY
-  5+DmfHEB/fXuwZtr6kjloq9MmQFSu+8rMSiVmrP9gzcl3zwXFVZjh4oy6QqQAITQ
-  FvR4UThQs3/4aYBWPAwXUKrth1dV39dGFTX4VXOMqp/yEmBCOme8YMNaAu3M3hHL
-  NZ2kdBIUDnAM24e0/wXdVxg4HnsZbdymxyzMQ4P5pKYcpI6oisBxI37p/Xy+wAg3
-  SBHno3GEuuD8ZWj24IMJpfbp
+  BgkqhkiG9w0BAQsFAAOCAYEAcb48mw7R7DM/tkRsqJ3xARYEsqswd6RIcUEQlk+N
+  wl6h9Ep5XXZRiWkjl7LvIwixLsLYJpnr4HrJSMBJ3fOKWO19r+LgxS98BRnIR/ig
+  hkvDTENgc3rCM+1D40IDUVVNOITDO9sJgBGoFCPqySwvqD3k8ZBSsgEUvHCnX0mU
+  7KPih5gG+3xgOKy+OYP9KT68nqJk0MOZa0wf+7Mdi0yfCQ35OWU6k4MLhVlPn3rs
+  KTWiZmv8DTY/GD7UmsU9PyWo4mRL/HStHKOJpayJ+hzdezD1gIKCViUJVQLaNpV4
+  a1xyM49vQ8wAk4hd+36Hs+te+24tUgisk5YF/m5/xHLPzCwU/dzghzyqurY1CcdZ
+  AP47l82yywwqaxpCXBvlpPZ81LOozzu7JOmr/ziys4ube7PbUYN6uiwfoE2/N8Ol
+  cu2W9lmvKJ505bT8+KLouVOtLlxYZknIB/uIea9r5rrGEJDMdYEYl4ZySFmkvJR4
+  tf7VMFcAy1q1HMyemsBUJk5h
   -----END CERTIFICATE-----
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glw