superbot-teleport 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf993d114e2d4d467b2b14447bc00703fec337a3a3ed31493b276b9b497c8b0
-  data.tar.gz: a5d01bc4e1ff057bdbabf44fe7f8442a179c51f39f1f52c1a8846a6461910ba8
+  metadata.gz: 2146506a6dfde333feb61b80b669a6d9119dd34c2462a7ac0ce0b684caf20987
+  data.tar.gz: 8b8feba60bdd91ccde2400260e8107e202ee3f41cb443b00f5bb62b88929ed21
 SHA512:
-  metadata.gz: 0f05f544ed9c7b1953f287473deb3abe8d1946431cf148ea44f3c609d831c8da8307fd7fa8ae679c3ac7ce8c15fa38590e179090fb9a3f4b8019a6de8fc2704e
-  data.tar.gz: 19be38e67e0bd137c11eeb887a521dd6ed5043e4087bad4ae5270c8be7055361b99ce2591578ef7b424bba4994ded339f114a9a6da01ce7ffbc4a7d7f66cf0af
+  metadata.gz: 0acda86612cd0aadd76051dbc94f7a042d4086eab42c3aaa954ce5c0bc16c51d14ed308af6428cc9ed85f73318302d81e10d56278bedf84d2ad7542b3a1b71d1
+  data.tar.gz: ee0c93403ff476339197e1c5f6a11aefc100d88c2ea74e616d48a16373b312cdfb0de5fac6e4c913d94d1e933b03c22ff626a2c117867bb0f17f75f81d18479d

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    superbot-teleport (0.2.0)
+    superbot-teleport (0.2.1)
       excon
-      sinatra
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     childprocess (0.9.0)
@@ -15,53 +16,32 @@ GEM
     chromedriver-helper (2.1.0)
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
+    clamp (1.2.1)
     coderay (1.1.2)
     diff-lcs (1.3)
     excon (0.62.0)
     ffi (1.9.25)
-    formatador (0.2.5)
-    guard (2.15.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-bundler (2.1.0)
-      bundler (~> 1.0)
-      guard (~> 2.2)
-      guard-compat (~> 1.1)
-    guard-compat (1.2.1)
-    guard-process (1.2.1)
-      guard-compat (~> 1.2, >= 1.2.1)
-      spoon (~> 0.0.1)
     io-like (0.3.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.13)
+    kommando (0.1.2)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     method_source (0.9.2)
+    mimemagic (0.3.2)
     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)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    public_suffix (3.0.3)
     rack (2.0.6)
     rack-protection (2.0.4)
       rack
     rake (11.3.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -75,36 +55,44 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    ruby_dep (1.5.0)
     rubyzip (1.2.2)
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
-    shellany (0.0.1)
     sinatra (2.0.4)
       mustermann (~> 1.0)
       rack (~> 2.0)
       rack-protection (= 2.0.4)
       tilt (~> 2.0)
-    spoon (0.0.6)
-      ffi
+    sinatra-silent (0.0.1)
+    superbot (0.1.28)
+      clamp (= 1.2.1)
+      kommando (~> 0.1)
+      launchy (= 2.4.3)
+      selenium-webdriver (~> 3.14, >= 3.14.0)
+      sinatra (= 2.0.4)
+      sinatra-silent (= 0.0.1)
+      superbot-cloud (~> 0.1.18)
+      superbot-teleport (~> 0.2.1)
+      zaru (= 0.2.0)
+    superbot-cloud (0.1.18)
+      marcel (= 0.3.3)
+      multipart-post (= 2.0.0)
     superbot-selenium-webdriver (1.0.0)
       chromedriver-helper (= 2.1.0)
       selenium-webdriver (= 3.141.0)
-    thor (0.20.3)
     tilt (2.0.9)
+    zaru (0.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.17)
-  guard
-  guard-bundler
-  guard-process
   pry
   rake (~> 11.2)
   rspec (~> 3.8)
+  superbot (~> 0.1.28)
   superbot-selenium-webdriver
   superbot-teleport!
 

data/bin/release

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+
+set -e
+
+VERSION=$(superbot teleport --version)
+GEM_FILE="superbot-teleport-$VERSION.gem"
+
+gem uninstall -a -x superbot-teleport
+
+[ -e "$GEM_FILE" ] && rm "$GEM_FILE"
+
+gem build superbot-teleport
+gem install superbot-teleport-$VERSION.gem
+VERSION_INSTALLED=$(superbot teleport --version)
+
+if [ "$VERSION" != "$VERSION_INSTALLED" ]; then
+  echo "!version"
+  exit 1
+fi
+
+echo "ok"

data/lib/superbot/teleport.rb

@@ -1,4 +1,5 @@
 require_relative "teleport/version"
+require_relative "teleport/web"
 require_relative "teleport/cli"
 
 module Superbot

data/lib/superbot/teleport/cli.rb

@@ -1,99 +1,10 @@
-require 'sinatra/base'
-require 'excon'
-require 'json'
+# frozen_string_literal: true
+
+require_relative 'cli/root_command'
 
 module Superbot
   module Teleport
-    class CLI
-      def start!
-        s = Sinatra.new
-        s.set :raise_errors, false
-        s.set :show_exceptions, false
-
-        s.before do
-          $__superbot_teleport_request_for_errors = request
-        end
-
-        s.set :connection, (
-          Excon.new ENV.fetch("SUPERBOT_TELEPORT_UPSTREAM_URL"), {
-            persistent: true,
-            connect_timeout: 3,
-            read_timeout: 5,
-            write_timeout: 5,
-            debug_request: (ENV["EXCON_DEBUG"] == "true"),
-            debug_response: (ENV["EXCON_DEBUG"] == "true")
-          }
-        )
-
-        s.helpers do
-          def request_path(params)
-            params[:splat].join("/")
-          end
-
-          def safe_parse_json(string_or_io, on_error: nil)
-            JSON.parse (string_or_io.respond_to?(:read) ? string_or_io.read : string_or_io)
-          rescue
-            on_error
-          end
-
-          def proxy(method, params, opts={})
-            raise "DELETE may not contain body" if method == :delete && opts[:body]
-            opts[:headers] ||= {}
-
-            unless ENV.fetch("SUPERBOT_TELEPORT_UPSTREAM_URL").include? "localhost"
-              path = "wd/hub/#{request_path(params)}"
-              headers["Content-Type"] = "application/json"
-            else
-              path = request_path
-            end
-
-            settings.connection.request({method: method, path: path}.merge(opts))
-          end
-
-          def respond(upstream)
-            headers = upstream.headers
-            status upstream.status
-            upstream.body
-          end
-        end
-
-        s.get "/wd/hub/*" do
-          respond proxy(:get, params, {headers: headers, body: request.body})
-        end
-
-        s.post "/wd/hub/*" do
-          case request_path(params)
-          when "session"
-            parsed_body = safe_parse_json request.body, on_error: {}
-
-            if ENV['SUPERBOT_TELEPORT_REGION'] && parsed_body['desiredCapabilities']
-              parsed_body['desiredCapabilities']['superOptions'] = { "region": ENV['SUPERBOT_TELEPORT_REGION'] }
-            end
-
-            respond proxy(:post, params, {headers: headers, body: parsed_body.to_json, read_timeout: 500})
-          else
-            respond proxy(:post, params, {headers: headers, body: request.body})
-          end
-        end
-
-        s.delete "/wd/hub/*" do
-          respond proxy(:delete, params, {headers: headers})
-        end
-
-        s.error Excon::Error::Socket do
-          puts "="*30
-          puts $__superbot_teleport_request_for_errors.path_info
-
-          if $!.message.end_with? "(Errno::ECONNREFUSED)"
-            status 500
-            "upstream does not respond"
-          else
-            raise "unknown: #{$!.message}"
-          end
-        end
-
-        s.run!
-      end
+    module CLI
     end
   end
 end

data/lib/superbot/teleport/cli/root_command.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Teleport
+    module CLI
+      class RootCommand < Clamp::Command
+        include Superbot::Validations
+        include Superbot::Cloud::Validations
+
+        option ['-v', '--version'], :flag, "Show version information" do
+          puts Superbot::Teleport::VERSION
+          exit 0
+        end
+
+        option ['--browser'], 'BROWSER', "Browser type to use. Can be either local or cloud", default: 'cloud' do |browser|
+          validates_browser_type browser
+        end
+        option ['--region'], 'REGION', 'Region for remote webdriver'
+
+        def execute
+          require_login unless browser == 'local'
+
+          puts 'Opening teleport...', ''
+          puts 'Configure your remote webdriver to http://localhost:4567/wd/hub', ''
+          puts 'Press [control+c] to exit', ''
+
+          @chromedriver = Kommando.run_async 'chromedriver-helper --silent --port=9515' if browser == 'local'
+
+          @web = Superbot::Web.run!(webdriver_type: browser, region: region)
+        ensure
+          close_teleport
+        end
+
+        def close_teleport
+          @web&.quit!
+          @chromedriver&.kill
+        end
+      end
+    end
+  end
+end

data/lib/superbot/teleport/version.rb

@@ -1,5 +1,5 @@
 module Superbot
   module Teleport
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/superbot/teleport/web.rb

@@ -0,0 +1,100 @@
+require 'excon'
+require 'json'
+
+module Superbot
+  module Teleport
+    module Web
+      def self.register(sinatra, webdriver_type: 'cloud', region: nil)
+        sinatra.before do
+          $__superbot_teleport_request_for_errors = request
+        end
+
+        user_auth_creds = Superbot::Cloud.credentials&.slice(:username, :token) || {}
+
+        sinatra.set :webdriver_type, webdriver_type
+        sinatra.set :webdriver_url, Superbot.webdriver_endpoint(webdriver_type)
+        sinatra.set :region, region
+
+        sinatra.set :connection, (
+          Excon.new sinatra.webdriver_url, {
+            user: user_auth_creds[:username],
+            password: user_auth_creds[:token],
+            persistent: true,
+            connect_timeout: 3,
+            read_timeout: 5,
+            write_timeout: 5,
+          }
+        )
+
+        sinatra.helpers do
+          def request_path(params)
+            params[:splat].join("/")
+          end
+
+          def safe_parse_json(string_or_io, on_error: nil)
+            JSON.parse (string_or_io.respond_to?(:read) ? string_or_io.read : string_or_io)
+          rescue
+            on_error
+          end
+
+          def proxy(method, params, opts={})
+            raise "DELETE may not contain body" if method == :delete && opts[:body]
+            opts[:headers] ||= {}
+
+            unless settings.webdriver_type == 'local'
+              path = "wd/hub/#{request_path(params)}"
+              headers["Content-Type"] = "application/json"
+            else
+              path = request_path
+            end
+
+            settings.connection.request({method: method, path: path}.merge(opts))
+          end
+
+          def respond(upstream)
+            headers = upstream.headers
+            status upstream.status
+            upstream.body
+          end
+        end
+
+        sinatra.get "/wd/hub/*" do
+          respond proxy(:get, params, {headers: headers, body: request.body})
+        end
+
+        sinatra.post "/wd/hub/*" do
+          case request_path(params)
+          when "session"
+            parsed_body = safe_parse_json request.body, on_error: {}
+
+            if settings.region && parsed_body.dig('desiredCapabilities', 'superOptions', 'region').nil?
+              parsed_body['desiredCapabilities'] ||= {}
+              parsed_body['desiredCapabilities']['superOptions'] ||= {}
+              parsed_body['desiredCapabilities']['superOptions']['region'] ||= settings.region
+            end
+
+            respond proxy(:post, params, {headers: headers, body: parsed_body.to_json, read_timeout: 500})
+          else
+            respond proxy(:post, params, {headers: headers, body: request.body})
+          end
+        end
+
+        sinatra.delete "/wd/hub/*" do
+          respond proxy(:delete, params, {headers: headers})
+        end
+
+        sinatra.error Excon::Error::Socket do
+          puts "="*30
+          puts $__superbot_teleport_request_for_errors.path_info
+
+          if $!.message.end_with? "(Errno::ECONNREFUSED)"
+            status 500
+            "upstream does not respond"
+          else
+            raise "unknown: #{$!.message}"
+          end
+        end
+      end
+    end
+  end
+end

data/superbot-teleport.gemspec

@@ -21,16 +21,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "excon"
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 11.2"
   spec.add_development_dependency "rspec", "~> 3.8"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-process"
-  spec.add_development_dependency "guard-bundler"
   spec.add_development_dependency "pry"
 
+  spec.add_development_dependency "superbot", "~> 0.1.28"
   spec.add_development_dependency "superbot-selenium-webdriver"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: superbot-teleport
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Superbot HQ
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -81,35 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-process
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: superbot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.28
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.28
 - !ruby/object:Gem::Dependency
   name: superbot-selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -152,8 +110,7 @@ dependencies:
         version: '0'
 description: 
 email: 
-executables:
-- sb-teleport
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -164,16 +121,17 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
+- bin/release
 - bin/setup
-- exe/sb-teleport
 - lib/superbot/teleport.rb
 - lib/superbot/teleport/cli.rb
+- lib/superbot/teleport/cli/root_command.rb
 - lib/superbot/teleport/version.rb
+- lib/superbot/teleport/web.rb
 - superbot-teleport.gemspec
 homepage: https://github.com/superbothq/superbot-teleport
 licenses:
@@ -195,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: superbot-teleport

data/Guardfile

@@ -1,35 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec features) \
-#  .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
-
-## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), then you will want to move
-## the Guardfile to a watched dir and symlink it back, e.g.
-#
-#  $ mkdir config
-#  $ mv Guardfile config/
-#  $ ln -s config/Guardfile .
-#
-# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
-guard 'process', name: 'sb-teleport', command: 'exe/sb-teleport' do
-  watch(%r{^lib/(.+)\.rb})
-end
-
-guard 'process', name: 'chromedriver', command: 'chromedriver-helper' do
-end
-
-
-guard :bundler do
-  require 'guard/bundler'
-  require 'guard/bundler/verify'
-  helper = Guard::Bundler::Verify.new
-
-  files = ['Gemfile']
-  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
-
-  # Assume files are symlinked from somewhere
-  files.each { |file| watch(helper.real_path(file)) }
-end

data/exe/sb-teleport

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-STDOUT.sync = true
-
-require_relative "../lib/superbot/teleport"
-
-cli = Superbot::Teleport::CLI.new
-cli.start!