superbara 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d66360cde319a261ff9cf8a16947f058ccaf60d5cd5cee25a38d414f3e50366
-  data.tar.gz: f80e4e1334635453eadb3bd59fd758d3db9fb26b3d206ca3267ee5f99d1132f7
+  metadata.gz: b54a0a96ac8a218737403e0ca7fec18fab1f87c8248f7f9ce94d9de0d4441a1e
+  data.tar.gz: 6e48efea3c3f0971709b27e3211427728ef77315d4831e8f3b347c5666065131
 SHA512:
-  metadata.gz: 4a2dbb84732d5efba839162c0f984f5d5b9bb450a318993901a53c92b27cdc961c841639b34f2984fa6c70ca5cec91029c4444d3db6eec78b43f8582a8211d23
-  data.tar.gz: d2599d10d648e6c3048dda5c416f93ce09fcafb27ed22a8834ae85a832de6e1aac81db596eaf3bd7fb62dc093d913894dacb5e962c45303958daf90b727ca0cd
+  metadata.gz: 70c3466d8bc49ca62cbf1a384580e7e3859d9f982503ef1fa199280a92e0dfc6e2c7d7e5169c45db71455ba62d87dea170e6ebaf22dbc550701228667414f794
+  data.tar.gz: 965c67b7d7bc3ed033c4f375f2964493c9d9887635129bd93f6fad7d3fa1e3afb88aa18bcaa4f85945f2d65e5736069d8e7c21e7c8dd65d39c7df3d62879728d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbara (0.8.0)
+    superbara (0.8.1)
       binding_of_caller (~> 0.8, >= 0.8.0)
       capybara (~> 3.1, >= 3.1.0)
       colorize (~> 0.8, >= 0.8.1)

data/lib/superbara/chrome.rb

@@ -9,9 +9,6 @@ module Superbara; module Chrome
   end
 
   def self.register_drivers
-    chromedriver_path = File.join(Superbara.path, "vendor", "chromedriver", Superbara.platform, "chromedriver")
-    chromedriver_path = "#{chromedriver_path}.exe" if Superbara.platform == "win32"
-
     options = ::Selenium::WebDriver::Chrome::Options.new
     options.add_argument 'window-size=1680,1024'
     options.add_argument 'disable-infobars'
@@ -25,7 +22,7 @@ module Superbara; module Chrome
 
     Capybara.register_driver :chrome do
       Capybara::Selenium::Driver.new(nil,
-        driver_path: chromedriver_path,
+        driver_path: Superbara.chromedriver_path,
         browser: :chrome,
         http_client: client,
         options: options,
@@ -48,7 +45,7 @@ module Superbara; module Chrome
       options.add_argument 'disable-gpu'
 
       Capybara::Selenium::Driver.new(nil,
-        driver_path: chromedriver_path,
+        driver_path: Superbara.chromedriver_path,
         browser: :chrome,
         http_client: client,
         desired_capabilities: capabilities,

data/lib/superbara/cli.rb

@@ -47,8 +47,6 @@ wait 3 do
   has_text? 'Example Domain'
 end
 
-think 1..3
-
 click 'a'
 scroll 50
 """
@@ -77,6 +75,18 @@ scroll 50
       end
     end
 
+    target_path = File.expand_path '~/.superbara'
+    target = File.join target_path, "chromedriver"
+    from = File.join Superbara.path, "vendor", "chromedriver", Superbara.platform, "chromedriver"
+    if Superbara.platform == "win32"
+      from << ".exe"
+      target << ".exe"
+    end
+
+    File.unlink target if File.exist? target
+    FileUtils.mkdir_p target_path
+    FileUtils.cp from, target
+
     case main_command
     when "start", "run"
       project_path_or_file_expanded = File.expand_path(ARGV[1])
@@ -98,6 +108,7 @@ scroll 50
         exit 1
       end
     end
+
     Pry.start if ENV['SUPERBARA_DEBUG']
     ctx = nil
     webapp_thread = nil
@@ -114,7 +125,6 @@ scroll 50
         when "shell"
           Superbara.visual_enable!
           Superbara.shell_enable!
-          Superbara::Chrome.page_load_strategy = "none"
 
           unless webapp_thread
             webapp_thread = Thread.new do
@@ -132,6 +142,7 @@ scroll 50
           puts "project: #{Superbara.project_name}"
           puts ""
           puts "t      action".colorize(:light_black)
+
           Superbara.start!
           Superbara.visual_disabled do
             Superbara.current_context.__superbara_eval "visit 'about:blank'"

data/lib/superbara/dsl.rb

@@ -35,6 +35,8 @@ module Superbara; module DSL
     end
 
     target_path = File.join(Superbara.project_path, filename)
+
+    sleep 0.1 #magically prevents hangs
     save_screenshot(target_path)
   end
 
@@ -166,7 +168,13 @@ return Array.from(
   end
 
   def scroll(percentage, duration: 0.4)
-    outer_height = Capybara.current_session.current_window.session.execute_script "return document.body.scrollHeight"
+    begin
+      outer_height = Capybara.current_session.current_window.session.execute_script "return document.body.scrollHeight"
+    rescue Selenium::WebDriver::Error::UnknownError => ex
+      sleep 0.1
+      retry
+    end
+
     scroll_y = outer_height / 100 * percentage
 
     scrolls = (duration / 0.1).floor

data/lib/superbara/version.rb

@@ -1,3 +1,3 @@
 module Superbara
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/lib/superbara.rb

@@ -111,6 +111,12 @@ module Superbara
     sleep (rand(32) * 0.01).round(2)
   end
 
+  def self.chromedriver_path
+    path = File.join(File.expand_path('~'), ".superbara", "chromedriver")
+    path << ".exe" if Superbara.platform == "win32"
+    path
+  end
+
   def self.platform
     require 'rbconfig'
     cfg = RbConfig::CONFIG
@@ -210,7 +216,7 @@ control+c pressed, closing the browser..."
   end
 end
 
-Superbara::Chrome.register_drivers
+Superbara::Chrome.page_load_strategy = "none"
 
 Capybara.default_driver = if ENV["CHROME_URL"]
   :chrome_remote

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superbara
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Matti Paksula