remotedroid 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8301a5580415c8ff56c7234afc06a753f8120a241a6fc55ec21f213d4fb3c547
-  data.tar.gz: 582b60289878929ad00789a14f5fe1b709a7642c02a8ef0fd3361d4e32d68e14
+  metadata.gz: 71e486b66042dfefbfff3717043ded61f7847043a4afc37f1bd7b215076e280b
+  data.tar.gz: e7dee07206e7351a472fd9fb5c767979f7350f65630c7e1161dd7a14d1349347
 SHA512:
-  metadata.gz: c25071dc6b9c5e2089453e0b90b0506d8a1990fe64619437c65642b32150ed50f6ab0ea89d5dfde0a858fe394bd8c804d83ee2acf58c6e04597dc27a807f1360
-  data.tar.gz: 373ca3e9621934a9257b89c3bd1d860a86c54921927a2028846577d6a1baa200ca778605d8a9120f59dcae73b0805e13a11205dabc0a3ff743ed6f8a802ddb54
+  metadata.gz: '08933909445d0ec11a57c9f3006ac9874db4a48d21602a56993505f6c5350acc566a4fb4171e9e2423bd41c2957f6ae5be8294c51f4551808d71f277b1aab2b1'
+  data.tar.gz: 1b48179921c54abd6ad3d112c277133352a3496be7f092709f15463e5ced3418307d93b1aec0edc18167b16677541bea563c2116e8d0068a0becd2a365edc5dd

data.tar.gz.sig

@@ -1,2 +1 @@
-!}Z�Nu�!�L5V��>��b>i�8_�5��S��}����ެP���Ʋ��
�~�����b�Nn,V8OgŪ�k��0�y6v�
-Y]��u�9����G�#�l�f|������-1�|����TDc����8�a� ?�����L~�٬3�0�j�y�q��7�bLj�ۡ�����{ycyvYn<-5[t�`~�n(:|��U<��?a��.�_��h���~�����2�V�b��p=oyDjV`~��jY�e�Mؒ�)^_�ҡ��XSj�׬�~(��J��G��a��`w��8}2cF���Iq��D�"@M��ПC�[�D�	����n1��L��q.�rH�T���8/�E�	��Z�B��^�M��'����
+�u`HI�0�\�`Ƅ���k�\���'_Fd_U��9������K�Ǩ��������plj��B& �7!�e��ɋ�;�Q0�U�|�K������8��]yu�g$#(ۀ)�ă����H	&���.$렐<�Ԙ��3ǜ��ÿύ:.�39O�'��i��~���A�(Vg@����0\;H6�EÀ#��se�}N�%u�=�Mcx��/ܧ�D���O��p�rI��&,\.�?	NˠJE]$Q�Y���٭сf�Fa>��U�J7ϧ;�{~a=r�������rk��(��pn�R��F��dx4�\&:{�O�A�W��>xȢI�@�?5j�4���D��jo���X�Fǭ����=�S�ŷ19u���:M��q

data/lib/remotedroid.rb

@@ -78,6 +78,7 @@ a:
   HTTP GET
     identifier: location
     coords: [lv=coords]
+    type: query
 
 m: shake device
 t: shake device
@@ -322,7 +323,7 @@ module RemoteDroid
   class Controller
     
     attr_reader :model, :control
-    attr_accessor :title, :macros
+    attr_accessor :title, :macros, :store
 
     def initialize(mcs, model=MODEL, deviceid: nil, debug: false)
       
@@ -335,6 +336,8 @@ module RemoteDroid
       if model then
         @model = Model.new(model)
       end
+      
+      @store = {}
 
     end
     
@@ -354,12 +357,12 @@ module RemoteDroid
       @model.op
     end
     
-    def query(trigger)
+    def query(id)
       
-      @h[trigger] = nil
+      @store[id] = nil
       
       # send http request via macrodroid.com API
-      @control.http_exec trigger
+      @control.http_exec id
       
       # wait for the local variable to be updated
       # timeout after 5 seoncds
@@ -367,11 +370,11 @@ module RemoteDroid
       
       begin
         sleep 1
-      end until @h[trigger] or Time.now > t + 5
+      end until @store[id] or Time.now > t + 5
       
-      if @h[trigger] then
-        yield(@h[trigger])
-      end
+
+      return @store[id]
+
       
     end    
     
@@ -408,10 +411,11 @@ module RemoteDroid
     end
     
     alias trigger_fired trigger
+    
+    def update(key, val)
+      @store[key.to_sym] = val      
+    end
         
-    def store()
-      @h
-    end    
 
   end
 
@@ -543,13 +547,29 @@ module RemoteDroid
     def invoke(s, *args)
       @drb.invoke(s, *args)
     end
+    
+    def query(id)
+      
+      t = Time.now
+      h = @drb.query(id)
+      h.merge({latency: (Time.now - t).round(3)})
+      
+    end
+    
+    def update(key, val)
+      @drb.update key.to_sym, val
+    end
+    
+    def store()
+      @drb.store
+    end
       
   end
   
   class TriggerSubscriber < SPSSub
     
     def initialize(host: 'sps.home', drb_host: '127.0.0.1')
-      @remote = OneDrb::Client.new host: drb_host, port: '5777'      
+      @remote = OneDrb::Client.new host: drb_host, port: '5777'    
       super(host: host)
     end
     
@@ -570,7 +590,7 @@ module RemoteDroid
   class ActionSubscriber < SPSSub
     
     def initialize(host: 'sps.home', drb_host: '127.0.0.1')
-      @remote = OneDrb::Client.new host: drb_host, port: '5777'      
+      @remote = OneDrb::Client.new host: drb_host, port: '5777'    
       super(host: host)
     end    
     
@@ -589,5 +609,23 @@ module RemoteDroid
     
   end
   
-  
+  class ResponseSubscriber < SPSSub
+    
+    def initialize(host: 'sps.home', drb_host: '127.0.0.1')
+      @remote = OneDrb::Client.new host: drb_host, port: '5777'    
+      super(host: host)
+    end    
+    
+    def subscribe(topic: 'macrodroid/response')
+      
+      super(topic: topic) do |msg|
+        
+        id, json = msg.split(/:\s+/,2)
+        @remote.update id.to_sym, JSON.parse(json, symbolize_names: true)
+        
+      end
+      
+    end
+    
+  end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remotedroid
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson