superbot-teleport 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b274c26142be5c2dc8b56512ce30742f6707868ef8a767b4fa2fa2dde664e6a
-  data.tar.gz: 4aae54f1e4ca46467c11c0427730ef588a6a4a44286941ceda53afecee3d0749
+  metadata.gz: 49234eaa577cc8d0b36d1170229022d765603222b842f9a5191192b32aa4d0af
+  data.tar.gz: 6f38f0ced550f0ebb8d400218c6687a94b8ae4e25b6511958b16e611927f5501
 SHA512:
-  metadata.gz: 9f6b4ecf86782e3706254290d899f38f08dcea71f09081eae6781a1a96ce33979f546ad7d416f326bc622920e63b6cec300cc483a8439f5dd413a62bf1549183
-  data.tar.gz: f6f03e163930c425ac56d25574d7d7c1aa634e4dbda493bf5ae3af95d3e40e6db9b59aaa12f89adffa4dc3841db5b651e556ea6a0a98bf8bedb9142277fe64fa
+  metadata.gz: f26e286bc638cd4a905caf05ea5950cdb4c078e0860937ea3610d1f346fad2184f3ac6ffe4cf6a7c81d93a59cd886f88bb3d3b98ae95cb221ced8e36eb1436aa
+  data.tar.gz: 3e578db0b76f1fe09f7c72236a2e7fc8ad66da483614dd5b6a57ec41adefd1d10abb41114e153f94f9699a5ced0ebab762449deec60d4baf3fb55b8b6935fbff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot-teleport (0.2.8)
+    superbot-teleport (0.2.9)
       excon
 
 GEM

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

@@ -14,12 +14,14 @@ module Superbot
         end
 
         option ['--browser'], 'BROWSER', "Browser type to use. Can be either local or cloud", default: 'cloud'
-        option ['--region'], 'REGION', 'Region for remote webdriver'
-        option ['--org'], 'ORGANIZATION', 'Name of organization to take action', attribute_name: :organization
-        option ['--reuse'], :flag, "Reuse existing session"
+        option ['--region'], 'REGION', "Region for remote webdriver"
+        option ['--org'], 'ORGANIZATION', "Name of organization to take action on", environment_variable: "SUPERBOT_ORG", attribute_name: :organization
+        option ['--ignore-delete'], :flag, "Reuse existing session"
+        option ['--keep-session'], :flag, "Keep session when teleport closing"
+        option ['--session'], 'SESSION', "Session to use in teleport"
 
         def execute
-          validate_teleport_options(browser, organization)
+          validate_teleport_options(browser, organization, session)
 
           run_local_chromedriver if browser == 'local'
 
@@ -31,7 +33,9 @@ module Superbot
             webdriver_type: browser,
             region: region,
             organization: organization,
-            reuse: reuse?
+            ignore_delete: session || ignore_delete?,
+            keep_session: session || keep_session?,
+            session: session
           )
 
           at_exit do

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

@@ -5,16 +5,20 @@ module Superbot
     module Validations
       include Superbot::Cloud::Validations
 
-      def validate_teleport_options(browser, organization)
+      def validate_teleport_options(browser, organization, session = nil)
         return if browser == 'local'
 
         unless %w[local cloud local_cloud].include?(browser)
           signal_usage_error "The --browser=#{browser} browser option is not allowed. Should be either 'local' or 'cloud'."
         end
 
-        signal_usage_error '--org option is required for cloud teleport' unless organization
+        signal_usage_error '--org option is required for cloud teleport' unless organization || ENV['SUPERBOT_TOKEN']
 
         require_login
+
+        return unless session
+
+        Superbot::Cloud::Api.request(:get_webdriver_session, params: {session_id: session, organization_name: organization})
       end
     end
   end

data/lib/superbot/teleport/version.rb

@@ -1,5 +1,5 @@
 module Superbot
   module Teleport
-    VERSION = "0.2.8"
+    VERSION = "0.2.9"
   end
 end

data/lib/superbot/teleport/web.rb

@@ -20,7 +20,6 @@ module Superbot
           read_timeout: 500,
           write_timeout: 500
         )
-        sinatra.set :current_session, nil
 
         sinatra.helpers do
           def request_path(params)
@@ -56,18 +55,22 @@ module Superbot
         sinatra.post "/wd/hub/*" do
           case request_path(params)
           when "session"
-            parsed_body = safe_parse_json request.body, on_error: {}
-
-            parsed_body['organization_name'] = settings.teleport_options[:organization]
-
-            if settings.teleport_options[:region] && parsed_body.dig('desiredCapabilities', 'superOptions', 'region').nil?
-              parsed_body['desiredCapabilities'] ||= {}
-              parsed_body['desiredCapabilities']['superOptions'] ||= {}
-              parsed_body['desiredCapabilities']['superOptions']['region'] ||= settings.teleport_options[:region]
-            end
-
-            unless settings.teleport_options[:reuse] && settings.current_session
-              settings.current_session = proxy(
+            if settings.teleport_options[:session]
+              status 200
+              headers 'Content-Type' => 'application/json'
+              return { 'sessionId': settings.teleport_options[:session] }.to_json
+            else
+              parsed_body = safe_parse_json request.body, on_error: {}
+
+              parsed_body['organization_name'] = settings.teleport_options[:organization]
+
+              if settings.teleport_options[:region] && parsed_body.dig('desiredCapabilities', 'superOptions', 'region').nil?
+                parsed_body['desiredCapabilities'] ||= {}
+                parsed_body['desiredCapabilities']['superOptions'] ||= {}
+                parsed_body['desiredCapabilities']['superOptions']['region'] ||= settings.teleport_options[:region]
+              end
+
+              session_response = proxy(
                 :post,
                 params,
                 headers: headers,
@@ -75,20 +78,21 @@ module Superbot
                 write_timeout: 500,
                 read_timeout: 500
               )
-            end
+              settings.teleport_options[:session] = JSON.parse(session_response.body)['sessionId']
 
-            respond settings.current_session
+              respond session_response
+            end
           else
             respond proxy(:post, params, headers: headers, body: request.body)
           end
         end
 
         sinatra.delete "/wd/hub/*" do
-          if settings.teleport_options[:reuse]
+          if settings.teleport_options[:ignore_delete]
             puts "Skipping DELETE, keep session open"
             halt 204
           else
-            settings.current_session = nil
+            settings.teleport_options[:session] = nil
             respond proxy(:delete, params, headers: headers)
           end
         end
@@ -106,13 +110,12 @@ module Superbot
         end
 
         at_exit do
-          return unless sinatra.settings.current_session
+          return if sinatra.teleport_options[:session] && sinatra.settings.teleport_options[:keep_session]
 
           puts nil, "Removing active session..."
-          session_id = JSON.parse(sinatra.settings.current_session.body)['sessionId']
           sinatra.settings.connection.request(
             method: :delete,
-            path: "wd/hub/session/#{session_id}",
+            path: "wd/hub/session/#{sinatra.teleport_options[:session]}",
             headers: { 'Content-Type' => 'application/json' }
           )
         rescue => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-teleport
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Superbot HQ
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon