superbot 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e129678c2b0dbe5b2b3917213fa1b9a757ac58d8e663029df774ea41eead31
-  data.tar.gz: 8fb4aa0d11093ad5f733dd2acc96cb2684fb5154aaf1ba03ab56232d42437432
+  metadata.gz: 42bb47f3be6a83eeff358b7f7885c5339322d880080846f44b6a98e3c8db261d
+  data.tar.gz: d278fabe3dc9bdb05ce7178957d194610f5649211a0bdcb38b4a2fd92a91505c
 SHA512:
-  metadata.gz: e7591a876f26d01108159691d377c984a28a2083bcaedeae09929e3628969d2751e423a06474bbea8befabd220dbc4b22c36705bd1a83ad38c34dc19b0f0b7aa
-  data.tar.gz: 52f817ce561627e0d7f4c2d164267040416ed72034df3c836f4d858d217cc379e4ec0f8d111a54aa65f0612b33b5bb1b8dbc880fced488aad7cf30f599c0423f
+  metadata.gz: 4b0a458a747545924dec284a92371f45cb9a01dc8074a79817aa32430523902864e713582350225f4a52bd3e19b8625546bfb1b5e2436494f4b8d72506fa68c0
+  data.tar.gz: '074199a1217ab401674a6d3ec4d61760fe3f5adf28971061858e46b904612286c2ff22ccc5f0417a40f8e5edc8409827d22908eebefb3d6193e4480f2b08b859'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot (0.1.5)
+    superbot (0.1.6)
       clamp (= 1.2.1)
       kommando (~> 0.1)
       launchy (= 2.4.3)

data/lib/superbot.rb

@@ -3,10 +3,17 @@
 module Superbot
   WEBDRIVER_ENDPOINT = {
     cloud: "http://webdriver.superbot.cloud:3000/webdriver/v1",
-    local: "http://127.0.0.1:9515"
+    local: "http://127.0.0.1:9515",
+    local_cloud: "htpp://localhost:3000/webdriver/v1"
   }.freeze
   private_constant :WEBDRIVER_ENDPOINT
 
+  SCREENSHOTS_ENDPOINT = {
+    cloud: "http://peek.superbot.cloud/v1",
+    local_cloud: "http://localhost:3002/v1"
+  }.freeze
+  private_constant :SCREENSHOTS_ENDPOINT
+
   CLOUD_TIMEOUT = 2000
   private_constant :CLOUD_TIMEOUT
 
@@ -21,6 +28,10 @@ module Superbot
   def self.cloud_timeout
     CLOUD_TIMEOUT
   end
+
+  def self.screenshots_url(type, session_id)
+    "#{SCREENSHOTS_ENDPOINT[type.to_sym]}/#{session_id}"
+  end
 end
 
 require_relative "superbot/version"

data/lib/superbot/capybara/runner.rb

@@ -17,11 +17,6 @@ module Superbot
       def run(script)
         puts "Attaching to #{browser} browser..."
         create_runner
-        if browser == 'cloud'
-          puts "Opening screenshot stream..."
-          runner.in.writeln({ eval: screenshot_stream }.to_json)
-          wait_for_finish
-        end
         puts "Running test..."
         runner.in.writeln({ eval: script }.to_json)
         wait_for_finish
@@ -72,7 +67,6 @@ module Superbot
           case parsed_error[:class]
           when "Selenium::WebDriver::Error::WebDriverError", "Selenium::WebDriver::Error::NoSuchWindowError"
             kill_session
-            puts parsed_error[:message]
             puts "", "Seems like browser session has been closed, try to run test again to create new session"
           when "Selenium::WebDriver::Error::ServerError"
             kill_session
@@ -119,20 +113,8 @@ module Superbot
             )
           end
           ::Capybara.current_driver = :chrome_remote
-          session_id = ::Capybara.current_session.driver.browser.send(:bridge).session_id
         WEBDRIVER_CONFIG
       end
-
-      def screenshot_stream
-        <<-SCREENSHOT_STREAM
-          screenshots_url = 'http://peek.superbot.cloud/v1/' + session_id
-          ::Capybara.current_driver = :selenium_chrome
-          ::Capybara.session_name = :peek
-          visit screenshots_url
-          ::Capybara.current_driver = :chrome_remote
-          ::Capybara.session_name = :default
-        SCREENSHOT_STREAM
-      end
     end
   end
 end

data/lib/superbot/cli/root_command.rb

@@ -2,6 +2,7 @@
 
 require_relative "new_command"
 require_relative "run_command"
+require_relative "teleport_command"
 require_relative "version_command"
 
 module Superbot
@@ -12,6 +13,7 @@ module Superbot
       subcommand ["new"], "Create a new project", NewCommand
       subcommand ["run"], "Run a project", RunCommand
       subcommand ["version"], "Show version information", VersionCommand
+      subcommand ["teleport"], "Open a teleport for superbots", TeleportCommand
 
       def self.run
         super

data/lib/superbot/cli/run_command.rb

@@ -13,28 +13,28 @@ module Superbot
         validates_browser_type browser
       end
       option ['--region'], 'REGION', 'Region for remote webdriver'
-      option ['--auth-token'], 'AUTH_TOKEN', 'Cloud webdriver auth credentials', environment_variable: 'CLOUD_DRIVER_AUTH_TOKEN'
+      option ['-u', '--user'], 'AUTH_USER_NAME', 'Cloud webdriver auth credentials', environment_variable: 'AUTH_USER_NAME', attribute_name: :auth_user
+      option ['-p', '--password'], 'AUTH_USER_PASSWORD', 'Cloud webdriver auth credentials', environment_variable: 'AUTH_USER_PASSWORD', attribute_name: :auth_password
 
       def execute
         script = File.read(File.join(path, 'main.rb'))
 
-        webdriver_proxy = Superbot::Web.new(webdriver_endpoint: Superbot.webdriver_endpoint(browser), auth_token: auth_token)
-        webdriver_proxy.run_async_after_running!
-        puts "🤖 active"
+        @teleport = Thread.new do
+          Superbot::CLI::TeleportCommand.run(nil, ARGV[2..-1], context)
+        rescue => e
+          abort e.message
+        end
 
-        chromedriver = Kommando.run_async 'chromedriver --silent --port=9515' if browser == 'local'
+        @capybara_runner = Superbot::Capybara::Runner.new(browser: browser, region: region)
+        @capybara_runner.run(script)
+        puts @capybara_runner.test_result
 
-        capybara_runner = Superbot::Capybara::Runner.new(browser: browser, region: region)
-        capybara_runner.run(script)
-
-        puts capybara_runner.test_result
         puts "Press ENTER to exit"
 
         $stdin.gets
       ensure
-        chromedriver&.kill
-        webdriver_proxy&.quit!
-        capybara_runner&.kill_session
+        @teleport&.kill
+        @capybara_runner&.kill_session
       end
     end
   end

data/lib/superbot/cli/teleport_command.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Superbot
+  module CLI
+    class TeleportCommand < Clamp::Command
+      include Superbot::Validations
+
+      option ['--browser'], 'BROWSER', "Browser type to use. Can be either local or cloud", default: 'local' do |browser|
+        validates_browser_type browser
+      end
+      option ['--region'], 'REGION', 'Region for remote webdriver'
+      option ['-u', '--user'], 'AUTH_USER_NAME', 'Cloud webdriver auth credentials', environment_variable: 'AUTH_USER_NAME', attribute_name: :auth_user
+      option ['-p', '--password'], 'AUTH_USER_PASSWORD', 'Cloud webdriver auth credentials', environment_variable: 'AUTH_USER_PASSWORD', attribute_name: :auth_password
+
+      def execute
+        @web = Superbot::Web.new(
+          webdriver_type: browser,
+          auth_user: auth_user,
+          auth_password: auth_password
+        ).tap(&:run_async_after_running!)
+
+        @chromedriver = Kommando.run_async 'chromedriver --silent --port=9515' if browser == 'local'
+        puts "", "🤖 Teleport is active ☁️ "
+
+        $stdin.gets
+      rescue
+        @chromedriver&.kill
+        @web&.quit!
+      ensure
+        @chromedriver&.kill
+        @web&.quit!
+      end
+    end
+  end
+end

data/lib/superbot/cli/validations.rb

@@ -16,7 +16,7 @@ module Superbot
     end
 
     def validates_browser_type(browser)
-      unless %w(local cloud).include?(browser)
+      unless %w(local cloud local_cloud).include?(browser)
         raise ArgumentError, "The '#{browser}' browser option is not allowed. Should be either 'local' or 'cloud'."
       end
 

data/lib/superbot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Superbot
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/superbot/web.rb

@@ -3,13 +3,14 @@
 require "sinatra/base"
 require "sinatra/silent"
 require 'net/http'
+require 'selenium-webdriver'
 
 require_relative "capybara/convert"
 require_relative "capybara/runner"
 
 module Superbot
   class Web
-    def initialize(webdriver_endpoint: nil, auth_token: nil)
+    def initialize(webdriver_type: 'local', auth_user: nil, auth_password: nil)
       @sinatra = Sinatra.new
       @sinatra.set :bind, "127.0.0.1"
       @sinatra.set :silent_sinatra, true
@@ -37,12 +38,11 @@ module Superbot
         instance.capybara_runner.run(converted_script)
       end
 
-      return unless webdriver_endpoint
-
-      webdriver_uri = URI.parse(webdriver_endpoint)
-      @auth_token = auth_token
+      webdriver_uri = URI.parse(Superbot.webdriver_endpoint(webdriver_type))
+      @auth_user = auth_user
+      @auth_password = auth_password
       @request_settings = {
-        userinfo: @auth_token,
+        userinfo: [@auth_user, @auth_password].join(':'),
         host:     webdriver_uri.host,
         port:     webdriver_uri.port,
         path:     webdriver_uri.path
@@ -61,10 +61,18 @@ module Superbot
             )
             status response.code
             headers instance.all_headers(response)
+
+            if %w(cloud local_cloud).include?(webdriver_type) && verb == 'post' && request.path_info == '/wd/hub/session' && response.kind_of?(Net::HTTPSuccess)
+              session_id = JSON.parse(response.body)['sessionId']
+
+              puts "Opening screenshots stream..."
+              options = Selenium::WebDriver::Chrome::Options.new
+              options.add_argument("app=#{Superbot.screenshots_url(webdriver_type, session_id)}")
+              options.add_argument('no-sandbox')
+              ::Selenium::WebDriver.for :chrome, options: options
+            end
+
             response.body
-          rescue => e
-            puts e.message
-            halt 500, { message: e.message }.to_json
           end
         end
       end
@@ -82,7 +90,7 @@ module Superbot
         )
       )
       req = Net::HTTP.const_get(type).new(uri, new_headers.merge('Content-Type' => 'application/json'))
-      req.basic_auth(*@auth_token.split(':')) if @auth_token
+      req.basic_auth(@auth_user, @auth_password) if @auth_user && @auth_password
       req.body = body.read
       Net::HTTP.new(uri.hostname, uri.port).start do |http|
         http.read_timeout = Superbot.cloud_timeout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -267,6 +267,7 @@ files:
 - lib/superbot/cli/new_command.rb
 - lib/superbot/cli/root_command.rb
 - lib/superbot/cli/run_command.rb
+- lib/superbot/cli/teleport_command.rb
 - lib/superbot/cli/validations.rb
 - lib/superbot/cli/version_command.rb
 - lib/superbot/project.rb