superbot-teleport 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f14455a955fe9e85587e70aac5f615d4850b15ce26eaaa96394c6f66fdef2763
-  data.tar.gz: 44b3896d9971be48dd607e5ce0c7a5d2914c6da92a899deaaab610681cc57ba3
+  metadata.gz: 460516238c53716d903af8436e2e442f8f52f3840af2af2f888bf8b0ffaaa9f7
+  data.tar.gz: 9abe7372a22813a125c7ba96bddbe883ef7e1f98e0ae28ab0024467fe95291f0
 SHA512:
-  metadata.gz: 0e5753ac512359cce5e0b511c6e1b3a24c30bc02447932cddfc29e2e7272c3920ce06f05377489ffa0a36f01542c906ae82f07e7f881bc48725c363b25c3d25d
-  data.tar.gz: 82c60fd35c22829c54a3ac77bacc6c321b31ed8defebfbfc85a80b3f6d15416dc379b8b682739fcfa6b3bd677d1d5995ab1fc6b46a6809e01e5f0fe5011b7ef7
+  metadata.gz: df098d2b7632447d0337755e686db56d67289e241c24e50ada2a12665c70f5cac6db533a0e5932d7ba9f975b2ef118c7dfc37a490a1415711541d242ccec9d97
+  data.tar.gz: 5bf5b7f9164a5c25e3b13795500a55f2d75450285003205b1ae91feca10439cbbd7ed12738f7517e2c684b473c2bf80892974cdf7c6e9b0da627e286f027ec00

data/Gemfile.lock

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

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

@@ -18,9 +18,10 @@ module Superbot
         option ['--org'], "ORGANIZATION", "Name of organization to take action on", environment_variable: "SUPERBOT_ORG", attribute_name: :organization, default: Superbot::Cloud.credentials&.fetch(:organization, nil)
 
         option ['--ignore-delete'], :flag, "Reuse existing session"
-        option ['--keep-session'], :flag, "Keep session when teleport closing"
+        option ['--keep-session'], :flag, "Keep session after teleport is closed"
         option ['--session'], 'SESSION', "Session to use in teleport"
         option ['--base-url'], 'BASE_URL', "Base project URL"
+        option ['--source'], 'SOURCE', environment_variable: "SUPERBOT_SOURCE"
 
         def execute
           validate_teleport_options(browser, organization, session)
@@ -38,7 +39,8 @@ module Superbot
             ignore_delete: session || ignore_delete?,
             keep_session: session || keep_session?,
             session: session,
-            base_url: base_url
+            base_url: base_url,
+            source: source
           )
 
           at_exit do

data/lib/superbot/teleport/version.rb

@@ -1,5 +1,5 @@
 module Superbot
   module Teleport
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

data/lib/superbot/teleport/web.rb

@@ -15,7 +15,7 @@ module Superbot
           headers: { 'Authorization' => Superbot::Cloud.authorization_header },
           connect_timeout: 3,
           read_timeout: 500,
-          write_timeout: 500,
+          write_timeout: 500
         )
 
         sinatra.helpers do
@@ -61,10 +61,11 @@ module Superbot
 
               parsed_body['organization_name'] = settings.teleport_options[:organization]
 
-              if settings.teleport_options[:region] && parsed_body.dig('desiredCapabilities', 'superOptions', 'region').nil?
+              if settings.teleport_options[:region] || settings.teleport_options[:source]
                 parsed_body['desiredCapabilities'] ||= {}
                 parsed_body['desiredCapabilities']['superOptions'] ||= {}
                 parsed_body['desiredCapabilities']['superOptions']['region'] ||= settings.teleport_options[:region]
+                parsed_body['desiredCapabilities']['superOptions']['source'] ||= settings.teleport_options[:source]
               end
 
               session_response = proxy(
@@ -81,12 +82,13 @@ module Superbot
               respond session_response
             end
           else
-            base_url = settings.teleport_options[:base_url]
-            if base_url
-              # TODO parse navigation command and apply base url if set
-              parsed_body = safe_parse_json request.body, on_error: {}
+            parsed_body = safe_parse_json request.body, on_error: {}
+
+            if settings.teleport_options[:base_url] && parsed_body['url']
+              parsed_body['url'] = URI.join(settings.teleport_options[:base_url], parsed_body['url']).to_s
             end
-            respond proxy(:post, params, headers: headers, body: request.body)
+
+            respond proxy(:post, params, headers: headers, body: parsed_body.to_json)
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superbot-teleport
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Superbot HQ