xdrp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 737ab10b27c806f92b76fd5c622e913df7ae8b97d3027a30c2d37cf27714ca33
-  data.tar.gz: 1145d42168fddfb29b70c8339d4a80717873160d261a93cfced4ea17186bf2c4
+  metadata.gz: 617fbc32a4b2adaf234769104583696286e5e9b76f4bf11a0f131e107362c6ca
+  data.tar.gz: 91f2f6c128055b9e895bfb64449d58e0869def96bccf288b81a872a919701119
 SHA512:
-  metadata.gz: 7de5de83cfae5ff60214a93ec8ffab23f5d0429656c8c86273dcb54c330fa99059ac4a9d1d5fbf5787d9fde50d065c63c18c7d2ea4e26241c0ead56b1ca603f3
-  data.tar.gz: 6fc90d8cb24aafde37c44895563b17b585bf50eb9d3794f387c6cd62d32a4dc386cfd3ab3e0104b308965085915f667da604fe4f32f9b74ad5d8a95a47df04d8
+  metadata.gz: 1eaec277d3c3929b9b1b978510e1357d63125f41ae3138f03f77f1793147df35efc8bfacfd66f19b7fadabf34c9982669e5b79334a9d925f182e92c6edf6f4ba
+  data.tar.gz: d58741546686f94390594a42a8ca0b11fc5e2bac1827392252ac2ca108df7f86e54ed610a0e7ba2ef525fefd0941e587cc74b018e17582bddcbfd6badd3bec8e

data/lib/xdrp.rb

@@ -19,22 +19,22 @@ MOUSE = 1
 KEYBOARD = 2
 KEYBOARD_MOUSE = 3
 
-  
+
 module Xdrp
 
   class Recorder
 
     attr_reader :xml
-    
+
     # level:
     #    1 = mouse
     #    2 = keyboard
     #    3 = keyboard + mouse
 
     def initialize(levelx=KEYBOARD_MOUSE, level: levelx, debug: false)
-      
+
       @mouse, @keyboard = false, false
-      
+
       case level
       when 1
         @mouse = true
@@ -46,13 +46,13 @@ module Xdrp
 
 
       @xiw = XInputWrapper.new(verbose: true, debug: debug, callback: self)
-      
+
       @wm = WMCtrl.display
       @win_title = ''
-      
+
     end
 
-    def on_keypress(key, keycode, modifier=nil)      
+    def on_keypress(key, keycode, modifier=nil)
 
       if @debug then
         puts 'key: ' + key.inspect
@@ -61,32 +61,32 @@ module Xdrp
       end
 
       stop() if modifier and modifier[0] == :alt and key == :z
-      
-      return unless @keyboard      
+
+      return unless @keyboard
 
       add_sleep() if Time.now > (@t1 + 2)
-      
+
 
       if @a.length >= 1 and @a[-1][0] == :type then
 
         if modifier.nil? or (modifier and modifier.empty?) then
           @a[-1][2] += key.to_s.sub('{space}', ' ')
         else
-          
+
           if modifier.length < 2  then
-            
+
             if modifier.first == :shift and (keycode.between?(10,21) \
                                              or keycode.between?(24,35) \
                                              or keycode.between?(38,48)) then
-              
+
               char = if key.to_s =~ /[a-z]/ then
                 key.to_s.upcase
               elsif key.to_s =~ /[0-9]/
                 %w[) ! " £ $ % ^ & * ( ][key.to_s.to_i]
               else
-                                
+
                 lsym = %i(` - = [ ] ; ' # \ , . /)
-                
+
                 if lsym.include? key then
 
                   usym = %w(¬ _ + { } : @ ~ | < > ?)
@@ -95,14 +95,14 @@ module Xdrp
                 end
 
               end
-              
+
               @a[-1][2] += char
-              
+
             else
-              @a << [modifier.first, {key: key}] 
+              @a << [modifier.first, {key: key}]
             end
           end
-        end        
+        end
 
       else
 
@@ -123,9 +123,9 @@ module Xdrp
 
     def on_mousedown(button, x, y)
 
-      return unless @mouse      
-      monitor_app()      
-      
+      return unless @mouse
+      monitor_app()
+
       puts "mouse %s button down at %s, %s" % [button, x, y] if @debug
       add_sleep() if Time.now > (@t1 + 2)
       @a << [:mouse, {click: button, x: x, y: y}]
@@ -133,7 +133,7 @@ module Xdrp
     end
 
     def on_mouseup(button, x, y)
-      
+
       return unless @mouse
       puts "mouse %s button up at %s, %s" % [button, x, y] if @debug
     end
@@ -141,7 +141,7 @@ module Xdrp
     def on_mousemove(x, y)
 
       return unless @mouse
-      
+
       puts 'mouse is moving at ' + x.to_s + ' y ' + y.to_s if @debug
       add_sleep() if Time.now > (@t1 + 2)
       @a << [:mousemove, {x: x, y: y}]
@@ -151,7 +151,7 @@ module Xdrp
     def on_mouse_scrolldown()
 
       return unless @mouse
-      
+
       puts 'mouse is scrolling down' if @debug
       add_sleep() if Time.now > (@t1 + 2)
       @a << [:mousewheel, {scroll: 'down'}]
@@ -161,32 +161,32 @@ module Xdrp
     def on_mouse_scrollup()
 
       return unless @mouse
-      
+
       puts 'mouse is scrolling up ' if @debug
       add_sleep() if Time.now > (@t1 + 2)
       @a << [:mousewheel, {scroll: 'up'}]
 
     end
-    
+
     def save(filepath)
       File.write filepath, xml()
     end
 
     def start()
-      
+
       @a = []
       Thread.new { @xiw.listen }
       puts 'recording ...'
       @t1 = Time.now
-      
+
     end
 
     def stop()
-      
+
       @xiw.stop = true
       @doc = Rexle.new(['xdrp', {}, '', *@a])
       puts 'recording stopped'
-      
+
     end
 
     def xml()
@@ -199,21 +199,22 @@ module Xdrp
       @a << [:sleep, {duration: (Time.now - @t1).round}]
       @t1 = Time.now
     end
-    
-    def monitor_app()      
 
-      win = @wm.windows.find {|x| x.active}    
-      
+    def monitor_app()
+
+      win = @wm.windows.find {|x| x.active}
+
       if win.title != @win_title then
         @win_title = win.title
         @a << [:window, {activate: win.title}]
       end
-      
+
     end
 
   end
 
   class Player
+    using ColouredText
 
     def initialize(src, debug: false)
 
@@ -226,8 +227,17 @@ module Xdrp
     def play()
 
       @doc.root.elements.each do |e|
-        puts 'e: ' + e.xml.inspect if @debug
-        method('xdo_' + e.name.to_s).call(e.text || e.attributes)
+
+        if @debug then
+          puts ('e: ' + e.xml.inspect).debug
+          puts 'e.class: ' + e.class.inspect.debug
+        end
+
+        if e.attributes.any? then
+          method('xdo_' + e.name.to_s).call(**(e.attributes))
+        else
+          method('xdo_' + e.name.to_s).call(e.text)
+        end
       end
 
     end
@@ -239,17 +249,17 @@ module Xdrp
     end
 
     def xdo_mouse(click: 'left', x: 0, y: 0)
-      XDo::Mouse.click(x.to_i, y.to_i, 
+      XDo::Mouse.click(x.to_i, y.to_i,
                        Object.const_get('XDo::Mouse::' + click.upcase))
     end
 
     def xdo_mousemove(x: 0, y: 0)
       XDo::Mouse.move(x.to_i, y.to_i)
     end
-                      
+
     def xdo_mousewheel(scroll: 'down')
       XDo::Mouse.wheel(Object.const_get('XDo::Mouse::' + scroll.upcase, 4))
-    end                      
+    end
 
     def xdo_sleep(duration: 0)
       sleep duration.to_f
@@ -262,15 +272,20 @@ module Xdrp
     def xdo_type(s)
       XDo::Keyboard.simulate(s.gsub('{enter}', "\n"))
     end
-    
+
     def xdo_window(activate: '')
-      
+
+      if @debug then
+        puts 'inside xdo_window'
+        puts 'activate: ' + activate.inspect
+      end
+
       wm = WMCtrl.display
       window = wm.windows.find {|x| x.title == activate}
       window.activate
-      
+
     end
-    
+
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xdrp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   TiejpssCygWf9HFO3IZRrjH3OzSduilBf7oorCJZqxI5d7KbuK6ceM00aCBJibQO
   K2bW5QcTuyp9GEliuroid41b
   -----END CERTIFICATE-----
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xdo
@@ -121,24 +121,24 @@ dependencies:
   name: keystroker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="