superbot 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b92ae576ff82672508bbfe3d7620763df2fd2004a28f8da31a66d9ce1d470ea
-  data.tar.gz: 6e324743a0bbdbaa6f41cd31d70dabd9c67493dc8c034bc2f185a78103d4a3be
+  metadata.gz: 5521299c6e822711616b725a18c9c60d66757301762518ab47543e8e055f4f9c
+  data.tar.gz: 3b5e2d80ee4c4ea7b308618517c37556c193e07f0d22a430ef2247438f521cca
 SHA512:
-  metadata.gz: df458ef3f52997bf520e987d68ee07068c365add3bb19429928e0250d72e1fc048b7ecea68c78066248e11ffb9e0ae306ce291568d75b0ee408a5208395d6365
-  data.tar.gz: eb4a4e7e3358b4c03b56a0eec82467d1ab907a35bc3c70e98a0cbc187832dcaefafdf74055f29eecb6df77235c7468a8f12298f6bf2a24d9a5964ef2b73ef484
+  metadata.gz: 3046c7aada967221fb3b5833dd5cf2a1db4d33d4ddd91c59c546136b5f014ba100b14e9575f47364b7f719f6aa895ac3c519da8fb441dc1067b97266454a1a20
+  data.tar.gz: e370c5eae0bcbf34b520db8857d96dfb51974b780b162d2c3f1095462e0214dba02c8a59014192ee074dad063f8853c0ba93b08d797bf470b006ddb0dc20158f

data/Gemfile

@@ -4,5 +4,3 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in superbot.gemspec
 gemspec
-
-gem "superbot-capybara", "~> 360.0", ">= 360.0.0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot (0.1.9)
+    superbot (0.1.10)
       clamp (= 1.2.1)
       kommando (~> 0.1)
       launchy (= 2.4.3)
@@ -15,22 +15,7 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    archive-zip (0.11.0)
-      io-like (~> 0.3.0)
     ast (2.4.0)
-    capybara (3.6.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      xpath (~> 3.1)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    chromedriver-helper (1.2.0)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
-    cjsonci (0.1.0)
     clamp (1.2.1)
     coderay (1.1.2)
     diff-lcs (1.3)
@@ -55,7 +40,6 @@ GEM
     guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    io-like (0.3.0)
     json (2.1.0)
     kommando (0.1.2)
     launchy (2.4.3)
@@ -69,13 +53,9 @@ GEM
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mimemagic (0.3.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
     multipart-post (2.0.0)
     mustermann (1.0.3)
     nenv (0.3.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -89,11 +69,9 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
-    rack (2.0.5)
+    rack (2.0.6)
     rack-protection (2.0.3)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
     rainbow (3.0.0)
     rake (10.5.0)
     rb-fsevent (0.10.3)
@@ -121,10 +99,6 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
-    rubyzip (1.2.2)
-    selenium-webdriver (3.14.0)
-      childprocess (~> 0.5)
-      rubyzip (~> 1.2)
     shellany (0.0.1)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -137,21 +111,12 @@ GEM
       rack-protection (= 2.0.3)
       tilt (~> 2.0)
     sinatra-silent (0.0.1)
-    superbot-capybara (360.0.0)
-      capybara (= 3.6.0)
-      cjsonci (= 0.1.0)
-      superbot-selenium-webdriver (= 314.2.5)
-    superbot-cloud (0.1.4)
+    superbot-cloud (0.1.5)
       marcel (= 0.3.3)
       multipart-post (= 2.0.0)
-    superbot-selenium-webdriver (314.2.5)
-      chromedriver-helper (= 1.2.0)
-      selenium-webdriver (= 3.14.0)
     thor (0.20.0)
     tilt (2.0.8)
     unicode-display_width (1.3.3)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
     zaru (0.2.0)
 
 PLATFORMS
@@ -169,7 +134,6 @@ DEPENDENCIES
   rubocop (~> 0.53)
   simplecov (~> 0.16)
   superbot!
-  superbot-capybara (~> 360.0, >= 360.0.0)
 
 BUNDLED WITH
    1.16.6

data/lib/superbot/cli/root_command.rb

@@ -10,6 +10,11 @@ module Superbot
     class RootCommand < Clamp::Command
       banner "superbot 🤖"
 
+      option ['-v', '--version'], :flag, "Show version information" do
+        puts Superbot::VERSION
+        exit(0)
+      end
+
       subcommand ["new"], "Create a new project", NewCommand
       subcommand ["version"], "Show version information", VersionCommand
       subcommand ["teleport"], "Open a teleport for superbots", TeleportCommand

data/lib/superbot/cli/teleport_command.rb

@@ -9,18 +9,13 @@ module Superbot
         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!)
+        @web = Superbot::Web.new(webdriver_type: browser).tap(&:run_async_after_running!)
 
         @chromedriver = Kommando.run_async 'chromedriver --silent --port=9515' if browser == 'local'
         puts "", "🤖 Teleport is active ☁️ "
+        puts "", "Configure your webdriver to http://localhost:4567/wd/hub"
 
         $stdin.gets
       ensure

data/lib/superbot/version.rb

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

data/lib/superbot/web.rb

@@ -9,7 +9,7 @@ require_relative "capybara/runner"
 
 module Superbot
   class Web
-    def initialize(webdriver_type: 'local', auth_user: nil, auth_password: nil)
+    def initialize(webdriver_type: 'cloud')
       @sinatra = Sinatra.new
       @sinatra.set :bind, "127.0.0.1"
       @sinatra.set :silent_sinatra, true
@@ -38,10 +38,7 @@ module Superbot
       end
 
       webdriver_uri = URI.parse(Superbot.webdriver_endpoint(webdriver_type))
-      @auth_user = auth_user
-      @auth_password = auth_password
       @request_settings = {
-        userinfo: [@auth_user, @auth_password].join(':'),
         host:     webdriver_uri.host,
         port:     webdriver_uri.port,
         path:     webdriver_uri.path
@@ -82,7 +79,11 @@ module Superbot
         )
       )
       req = Net::HTTP.const_get(type).new(uri, new_headers.merge('Content-Type' => 'application/json'))
-      req.basic_auth(@auth_user, @auth_password) if @auth_user && @auth_password
+
+      if Superbot::Cloud.credentials
+        req.basic_auth(*Superbot::Cloud.credentials.slice(:username, :token).values)
+      end
+
       req.body = body.read
       Net::HTTP.new(uri.hostname, uri.port).start do |http|
         http.read_timeout = Superbot.cloud_timeout

data/lib/superbot.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
 module Superbot
+  DOMAIN = ENV.fetch('SUPERBOT_DOMAIN', 'superbot.cloud')
+
   WEBDRIVER_ENDPOINT = {
-    cloud: "http://webdriver.superbot.cloud:3000/webdriver/v1",
+    cloud: "http://webdriver.#{DOMAIN}/webdriver/v1",
     local: "http://127.0.0.1:9515",
-    local_cloud: "htpp://localhost:3000/webdriver/v1"
+    local_cloud: "http://localhost:3000/webdriver/v1"
   }.freeze
   private_constant :WEBDRIVER_ENDPOINT
 
   SCREENSHOTS_ENDPOINT = {
-    cloud: "http://peek.superbot.cloud/v1",
+    cloud: "http://peek.#{DOMAIN}/v1",
     local_cloud: "http://localhost:3002/v1"
   }.freeze
   private_constant :SCREENSHOTS_ENDPOINT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp