xautobrowse 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: be7edcbc3108b110f0785f5402c5d2030375d260
-  data.tar.gz: 545779ec6e9792413c45a6d7d2cf46c2a96b42dd
+SHA256:
+  metadata.gz: e71119d67c1f7a76df4466079409be87b0980aeb6473324696bd872e9b59f37e
+  data.tar.gz: 147b61fc5cfc2957542998d6b9e6ac4a8656f831791ad363ce3b9d2bb9c9d87d
 SHA512:
-  metadata.gz: 0ecb265dfbefd02ab544756ac16334ff15871663dec0f262f1054fe6e68850556899487000f3d07acacc17df26786714c706cbf74b7ef6f8df6c575f1a901516
-  data.tar.gz: 38b75cccfa5c3f2414fcc8fcfc98f56fc4afe348b1caf66ed3f0f59771308008a51bfe7b882be3889e23b5b5b64c69b4024dca226ee6ed577b42aaea74970602
+  metadata.gz: fcd0cc0b066699e3f239d79a990ffab514808327d29c176370ebfce542ea19814b72050691356cdb9fe503e3643f13cfa171a394fa0e132d86333df9c7315ce8
+  data.tar.gz: 573e981566daa1390c90f082dc16f00b022bc24add6f2ab26cb39431431e76b188cc5466c279453b5bd8c4bd1edaea9347d7241f536596d014d017bd4944d207

data/lib/xautobrowse.rb

@@ -9,6 +9,7 @@
 
 # revision log:
 
+#  4 Sep 2018: feature: Tabs can now be traversed using the XTabbedWindow gem
 # 23 Jun 2018: feature: A new Window can now be created which attaches itself 
 #                       to the most recent application window created
 # 12 Feb 2018: bug fix: Implemented the missing method ctrl_shift_k() used 
@@ -32,12 +33,12 @@
 #      Then paste the code to a new notepad document for inspection.
 
 
-require 'wmctrl'
+#require 'wmctrl'
 require 'nokorexi'
 require 'clipboard'
-require 'xdo/mouse'
-require 'xdo/keyboard'
-require 'xdo/xwindow'
+#require 'xdo/mouse'
+#require 'xdo/keyboard'
+#require 'xdo/xwindow'
 require 'sps-pub'
 require 'universal_dom_remote'
 
@@ -55,26 +56,32 @@ class XAutoBrowse
     
   end
   
-  class Window
+  class Window < XTabbedWindow
     
-    def initialize(browser=nil)
+    def initialize(browser=nil, new_win: true)
             
       @wm = WMCtrl.instance
       
       if browser then
-        spawn(browser.to_s); sleep 3
         
-        id = XDo::XWindow.wait_for_window(browser.to_s)
-
-        xwin = XDo::XWindow.new(id)
-        title = xwin.title
-        puts 'title:  ' + title.inspect if @debug
-
-        # WMCtrl is used because XDo is problematic at trying to activate a window
-        
-        a = @wm.list_windows true
-        puts 'a: '  + a.inspect if @debug
-        r = a.reverse.find {|x| x[:title] =~ /#{browser}$/i}
+        if new_win then
+          spawn(browser.to_s); sleep 3
+          
+          id = XDo::XWindow.wait_for_window(browser.to_s)
+
+          xwin = XDo::XWindow.new(id)
+          title = xwin.title
+          puts 'title:  ' + title.inspect if @debug
+
+          # WMCtrl is used because XDo is problematic at trying to activate a window
+          
+          a = @wm.list_windows true
+          puts 'a: '  + a.inspect if @debug
+          r = a.reverse.find {|x| x[:title] =~ /#{browser}$/i}
+        else
+          super(browser)
+          r = @window
+        end
       else
         a = @wm.list_windows true
         r = a.last
@@ -118,13 +125,15 @@ class XAutoBrowse
   attr_accessor :actions
   
   
-  def initialize(browser= :firefox, debug: false, sps: false, clicks: {})
+  def initialize(browser= :firefox, new_window: true, debug: false, 
+                 sps: false, clicks: {})
 
     @browser, @debug, @sps, @clicks = browser.to_sym, debug, sps, clicks
+    @new_window = new_window
     
-    @window = Window.new(browser); sleep 2
-    #Thread.new { web_console() { sleep 1 } }
-    sleep 2
+    @window = Window.new(browser, new_win: new_window)
+
+    sleep 4 if new_window
     
     connect() if sps
     
@@ -258,13 +267,20 @@ class XAutoBrowse
     
   end
   
-  def goto(url, attachconsole: true)
+  def goto(url, attachconsole: true, new_tab: !@new_window)
     
-    sleep 1; ctrl_l(); sleep 2
-    enter(url); sleep 5
+    new_tab() if new_tab
+    sleep 1; ctrl_l()
+    sleep 2 if @new_window
+    enter(url)
+    sleep 5 if @new_window
     attach_console() if @sps and attachconsole
 
-  end  
+  end
+
+  def goto_tab(s)
+    @window.goto_tab(s)
+  end
   
   def carriage_return()
     @window.activate(); sleep 1; XDo::Keyboard.return
@@ -292,6 +308,10 @@ class XAutoBrowse
     @window = Window.new
   end
   
+  def new_tab()
+    @window.new_tab
+  end
+  
   # Takes a screenshot of the web page. Images are stored in ~/Pictures
   #
   def screenshot(filename=Time.now\
@@ -353,6 +373,10 @@ class XAutoBrowse
     @window.activate(); XDo::Keyboard.simulate("{TAB}" * n)
   end
   
+  def tab?(s)
+    @window.tab?(s)
+  end
+  
   def text_field(klass: nil, id: nil, name: nil, value: '')
     
     open_web_console() do |console|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xautobrowse
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,48 +30,28 @@ cert_chain:
   UkT65Cjj3pGfXSA+uRiXo7EXRM2Xft7NA1wuE91g2PYjRb8GvdqjxrgF1gp+LHtf
   Gwk=
   -----END CERTIFICATE-----
-date: 2018-06-23 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: xdo
+  name: xtabbedwindow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: ruby-wmctrl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: nokorexi
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A poor man's web automation tool primarily for Firefox in an X windows system.