superbot-cloud 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4dbcec81d287ce7f963412a81a3061645dd519fe8951919b1bcabc870007857
-  data.tar.gz: aeafad6a71e729648875cbf35e7052864e7e09bf3ed9cc6c3966db0c93e19006
+  metadata.gz: db593e16a528d6b2d3962fc3cbf698c371c33ab782f7a4c466863655e06779eb
+  data.tar.gz: 4852ae8c8b4edb93faecdc2fc90e58eeaab958ce66e42f04df7f45496f426789
 SHA512:
-  metadata.gz: aa8790116ed3dd57d05b8b89760bd0e9ea2c38122cfa35b74c8ec0c2050828da54c6b3f26595830810a21fab989b9052d6fa0a4a9b8b1f3b85ea0646d24a89e2
-  data.tar.gz: 1b3544b4cc35c66cb80f63e645d78f69d3f2ec65d54aa86d2a7fb4c08a849ab31a9fddb890e1f8cec05c2492b37eec80e6718a0e38410ef28ce23d1533dbaa92
+  metadata.gz: 83306afd7af5b132ff46d96be8b3e4fe5c1fc3f52c5836b7fa8a6a41e2a130dfe1ff08cb6d5a337da96e978861a02227f4ac06bcf8cf5bce7ffe7f367e75cfb6
+  data.tar.gz: 9ab8d305a398c82d6cf8e24c774466940fb6f036a301d7d72ef74b37f506a7186415eac68dd8cdf483a76c2b8ba1208067b0138e81584e6378f65733ffded570

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot-cloud (0.2.7)
+    superbot-cloud (0.3.0)
       marcel (= 0.3.3)
       multipart-post (= 2.0.0)
 

data/lib/superbot/cloud/cli/webdriver/create_command.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Webdriver
+        class CreateCommand < BaseCommand
+          option ['--region'], 'REGION', 'Region for remote webdriver'
+          option ['--local'], :flag, "Local dev webdriver environment", hidden: true
+
+          def execute
+            create_webdriver
+          end
+
+          def create_webdriver
+            request_body = {
+              organization_name: organization,
+              desiredCapabilities: {
+                browserName: 'chrome',
+                superOptions: {}
+              }
+            }
+            request_body[:desiredCapabilities][:superOptions][:region] = region if region
+            puts "Creating webdriver session..."
+            puts "Please wait for Session ID or press [ctrl/cmd + c] to exit"
+            session = Excon.post(
+              [Superbot.webdriver_endpoint(local? ? 'local_cloud' : 'cloud'), 'wd/hub/session'].join('/'),
+              persistent: true,
+              headers: { 'Authorization' => Superbot::Cloud.authorization_header, 'Content-Type' => 'application/json' },
+              body: request_body.to_json,
+              connect_timeout: 3,
+              read_timeout: 500,
+              write_timeout: 500
+            )
+            parsed_response = JSON.parse(session.body)
+            puts parsed_response['error'] || parsed_response['sessionId']
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/webdriver/delete_command.rb

@@ -5,13 +5,27 @@ module Superbot
     module CLI
       module Webdriver
         class DeleteCommand < BaseCommand
-          parameter "SESSION_ID ...", "webdriver session ID", required: true
+          option ['--all'], :flag, "Delete all active sessions"
+          parameter "SESSION_ID ...", "webdriver session ID", required: false
 
           def execute
             delete_session
           end
 
           def delete_session
+            if all?
+              webdriver_sessions = Superbot::Cloud::Api.request(
+                :webdriver_session_list,
+                params: { organization_name: organization, 'aasm_state[]': %w[idle proxying] }
+              ).fetch(:webdriver_sessions, [])
+
+              abort "All sessions are finished" if webdriver_sessions.empty?
+
+              @session_id_list = webdriver_sessions&.map { |session| session[:session_id] }
+            elsif session_id_list.empty?
+              signal_usage_error "parameter SESSION_ID is required"
+            end
+
             session_id_list.each do |session_id|
               Superbot::Cloud::Api.request(
                 :delete_webdriver_session,

data/lib/superbot/cloud/cli/webdriver_command.rb

@@ -3,6 +3,7 @@
 require_relative 'webdriver/base_command'
 require_relative 'webdriver/list_command'
 require_relative 'webdriver/delete_command'
+require_relative 'webdriver/create_command'
 
 module Superbot
   module Cloud
@@ -10,6 +11,7 @@ module Superbot
       class WebdriverCommand < LoginRequiredCommand
         subcommand ['list'], "List all webdriver sessions", Webdriver::ListCommand
         subcommand ['delete'], "Terminate and finish specific session", Webdriver::DeleteCommand
+        subcommand ['create'], "Create active webdriver session", Webdriver::CreateCommand
       end
     end
   end

data/lib/superbot/cloud/version.rb

@@ -2,6 +2,6 @@
 
 module Superbot
   module Cloud
-    VERSION = "0.2.7"
+    VERSION = "0.3.0"
   end
 end

data/lib/superbot/cloud.rb

@@ -34,6 +34,19 @@ module Superbot
       all_credentials.delete(Superbot::DOMAIN.to_sym)
       File.write CREDENTIALS_FILE_PATH, all_credentials.to_json
     end
+
+    def self.authorization_header
+      @authorization_header ||= format(
+        '%<auth_type>s %<auth_token>s',
+        auth_type: ENV['SUPERBOT_TOKEN'] ? 'Bearer' : 'Basic',
+        auth_token: Base64.urlsafe_encode64(
+          ENV.fetch(
+            'SUPERBOT_TOKEN',
+            credentials&.values_at(:username, :token)&.join(':').to_s
+          )
+        )
+      )
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-cloud
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -174,6 +174,7 @@ files:
 - lib/superbot/cloud/cli/validations.rb
 - lib/superbot/cloud/cli/version_command.rb
 - lib/superbot/cloud/cli/webdriver/base_command.rb
+- lib/superbot/cloud/cli/webdriver/create_command.rb
 - lib/superbot/cloud/cli/webdriver/delete_command.rb
 - lib/superbot/cloud/cli/webdriver/list_command.rb
 - lib/superbot/cloud/cli/webdriver_command.rb