superbot-cloud 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8cd0ea8e957d1230ff3b9eb7e7afc6f46242ab2594dc28e33a2ae529abf580
-  data.tar.gz: e16d490de4b68a548623af3a73805dedf3482b1906a50d64975dea579481bd20
+  metadata.gz: b7cf9f4ebda39c246a90a762bf76cb9101fa8f0a34abb8b4c87586fd77b09305
+  data.tar.gz: 3cf214ca9a1215afd9c76f87305da9ec7e647da163330d7a8fe447cd73d2fec6
 SHA512:
-  metadata.gz: cbb070d510196297ef7ca9b1ade929db260b2cda17f411dfd49f80b8874f2aeaf2bc3a281b272e496e64b97b2c4882c3d44d40ad9f4274969a471e335ee7ec89
-  data.tar.gz: 39a9203c7580e93f0ec883f12d335e0edceed2d54f604f61bb33622ed313bdefa04dbb78c52041d494a4e7253e40b02d212823344a9c31ab526de54e00aa5528
+  metadata.gz: 9516b4f2711a3b345b3e89707407653b0215edaf22f1f49507d1cb078f6d1ad68f8df0c58f524feeb7235757657d3c0739abc27550675e9ae97cc0e7db647554
+  data.tar.gz: 01a28235edf1bc534f1704bf6f142bf78b012b25c404ca639c481d3e69cc4ea6b78c4cd277e680c0419144813167cb06adb83bcc91f97b625aa36fd23f19e8ed

data/Gemfile.lock

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

data/lib/superbot/cloud/api.rb

@@ -18,9 +18,14 @@ module Superbot
         cancel_schedule:            { method: :delete, endpoint: 'schedules', required_param: :id },
         webdriver_session_list:     { method: :get, endpoint: 'webdriver_sessions' },
         delete_webdriver_session:   { method: :delete, endpoint: 'webdriver_sessions', required_param: :session_id },
-        organization_members_list:  { method: :get, endpoint: 'members' },
-        organization_add_member:    { method: :post, endpoint: 'members' },
-        organization_remove_member: { method: :delete, endpoint: 'members', required_param: :username }
+        member_list:                { method: :get, endpoint: 'members' },
+        add_member:                 { method: :post, endpoint: 'members' },
+        remove_member:              { method: :delete, endpoint: 'members', required_param: :username },
+        create_interactive_run:     { method: :post, endpoint: 'interactive_runs' },
+        abort_interactive_run:      { method: :delete, endpoint: 'interactive_runs', required_param: :id },
+        update_interactive_run:     { method: :patch, endpoint: 'interactive_runs', required_param: :id },
+        show_interactive_run:       { method: :get, endpoint: 'interactive_runs', required_param: :id },
+        interactive_run_list:       { method: :get, endpoint: 'interactive_runs' }
       }.freeze
 
       def self.request(type, params: {})

data/lib/superbot/cloud/cli/member/add_command.rb

@@ -12,7 +12,7 @@ module Superbot
           end
 
           def add_member
-            api_response = Superbot::Cloud::Api.request(:organization_add_member, params: { organization_name: organization, username: username })
+            api_response = Superbot::Cloud::Api.request(:add_member, params: { organization_name: organization, username: username })
             puts "Succesfully added %<username>s to %<organization>s organization" % api_response.slice(:username, :organization)
           end
         end

data/lib/superbot/cloud/cli/member/list_command.rb

@@ -10,7 +10,7 @@ module Superbot
           end
 
           def list_members
-            api_response = Superbot::Cloud::Api.request(:organization_members_list, params: { organization_name: @organization })
+            api_response = Superbot::Cloud::Api.request(:member_list, params: { organization_name: @organization })
             abort api_response[:error] if api_response[:error]
             puts "Organization: #{api_response[:organization]}"
             puts "Members:"

data/lib/superbot/cloud/cli/member/remove_command.rb

@@ -12,7 +12,7 @@ module Superbot
           end
 
           def remove_member
-            api_response = Superbot::Cloud::Api.request(:organization_remove_member, params: { organization_name: organization, username: username })
+            api_response = Superbot::Cloud::Api.request(:remove_member, params: { organization_name: organization, username: username })
             puts "Member successfully removed from organization"
           end
         end

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

@@ -10,8 +10,8 @@ require_relative 'organization_command'
 require_relative 'test_command'
 require_relative 'webdriver_command'
 require_relative 'member_command'
-require_relative 'run_command'
 require_relative 'schedule_command'
+require_relative 'run_command'
 
 module Superbot
   module Cloud
@@ -24,8 +24,8 @@ module Superbot
         subcommand ['test'], "Manage your tests", TestCommand
         subcommand ['webdriver'], "Manage your webdriver sessions", WebdriverCommand
         subcommand ['member'], "Manage your organization members", MemberCommand
-        subcommand ['run'], "Schedule a cloud run", RunCommand
         subcommand ['schedule'], "Manage your schedules", ScheduleCommand
+        subcommand(['run'], "Schedule a cloud run", RunCommand) if ENV['SUPERBOT_FEAT_CLOUD_RUNS'] == 'true'
 
         option ['-v', '--version'], :flag, "Show version information" do
           puts Superbot::Cloud::VERSION

data/lib/superbot/cloud/cli/run/abort_command.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Run
+        class AbortCommand < BaseCommand
+          parameter "ID ...", "the IDs of runs to abort", required: true
+
+          def execute
+            abort_run
+          end
+
+          def abort_run
+            id_list.each do |run_id|
+              Superbot::Cloud::Api.request(:abort_interactive_run, params: { id: run_id, organization_name: organization })
+              puts "Interactive run #{run_id} successfully aborted"
+            rescue SystemExit
+              p # skip to next run
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/run/base_command.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Run
+        class BaseCommand < OrganizationBasedCommand
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/run/console_command.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Run
+        class ConsoleCommand < BaseCommand
+          parameter "ID", "the ID of run to bots", required: true
+
+          def execute
+            abort "Run is not active anymore" if fetch_interaction[:status] == 'aborted'
+            loop do
+              printf '> '
+              input = $stdin.gets
+              exit if input.nil?
+              cmd, arg = input.rstrip.split(' ')
+              invoke_command(cmd, arg)
+            end
+          end
+
+          private
+
+          def invoke_command(command, argument)
+            return if empty_value?(command)
+
+            case command
+            when 'bots', 'loops' then positive_number?(argument) && send(command, argument)
+            when 'status', 'help', 'exit' then send(command)
+            when 'abort' then abort_run
+            else
+              puts "Unknow command: #{command}"
+            end
+          end
+
+          def common_request_params
+            {
+              id: id,
+              organization_name: organization
+            }
+          end
+
+          def bots(value)
+            return puts("bots: #{fetch_interaction[:parallel].to_i}") if empty_value?(value)
+
+            Superbot::Cloud::Api.request(:update_interactive_run, params: common_request_params.merge(parallel: value))
+            puts "Number of bots scaled to #{value}"
+          end
+
+          def loops(value)
+            return puts("loops: #{fetch_interaction[:loop].to_i}") if empty_value?(value)
+
+            Superbot::Cloud::Api.request(:update_interactive_run, params: common_request_params.merge(loop: value))
+            puts "Number of consecutive invocations scaled to #{value}"
+          end
+
+          def abort_run
+            Superbot::Cloud::Api.request(:abort_interactive_run, params: common_request_params)
+            abort "Abort requested"
+          end
+
+          def exit
+            abort
+          end
+
+          def status
+            puts(fetch_interaction.map { |arr| arr.join(': ') })
+          end
+
+          def fetch_interaction
+            Superbot::Cloud::Api.request(:show_interactive_run, params: common_request_params)
+          end
+
+          def empty_value?(value)
+            value.to_s.strip.empty?
+          end
+
+          def positive_number?(value)
+            return true if empty_value?(value) || value =~ /\A\d+\z/
+
+            puts("Incorrect argument value '#{value}', should be positive number or 0")
+            false
+          end
+
+          def help
+            puts "Interactive run commands:
+
+                    bots              Output number of active bots
+                    loops             Output number of consecutive invocations
+                    bots [n]          Scale number of active bots to [n]
+                    loops [n]         Scale number of consecutive invocations
+                    status            Show current run info
+                    abort             Abort current run and exit console
+                    exit              Exit from console"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Run
+        class CreateCommand < OrganizationBasedCommand
+          parameter "NAME", "the name of the test to delete", required: true
+          option ['--region'], 'REGION', 'Region for remote webdriver'
+
+          def execute
+            Superbot::Cloud::Api.request(:create_interactive_run, params: run_params)
+            puts "Cloud interactive run has been created"
+          end
+
+          def run_params
+            {
+              organization_name: organization,
+              test_name: name,
+              region: region
+            }.compact
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/run/list_command.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Run
+        class ListCommand < BaseCommand
+          OUTPUT_HEADERS = {
+            id: { name: "ID", column_size: 10 },
+            test_name: { name: "Test", column_size: 25 },
+            region: { name: "Region", column_size: 20 },
+            status: { name: "Status", column_size: 10 },
+            parallel: { name: "Bots", column_size: 10 },
+            loop: { name: "Loop count", column_size: 10 }
+          }.freeze
+
+          option %w[-q --quiet], :flag, "Only show interactive run IDs"
+          option %w[-a --all], :flag, "Show all the interactive runs (including finished)"
+
+          def execute
+            list_interactive_runs
+          end
+
+          def list_interactive_runs
+            states = all? ? nil : %w[initial running]
+            api_response = Superbot::Cloud::Api.request(:interactive_run_list, params: { organization_name: organization, 'aasm_state[]': states })
+
+            abort api_response[:error] if api_response[:error]
+            abort "No active interactive runs found for organization #{api_response[:organization]}" if api_response[:interactive_runs].empty?
+
+            if quiet?
+              puts(api_response[:interactive_runs].map { |interactive_run| interactive_run[:id] })
+            else
+              puts "Organization: #{api_response[:organization]}"
+              puts "Interactive runs:"
+              puts OUTPUT_HEADERS.values.map { |header| header[:name].ljust(header[:column_size]) }.join
+              api_response[:interactive_runs].each do |interactive_run|
+                row = interactive_run.slice(*OUTPUT_HEADERS.keys).map do |key, value|
+                  value.to_s.ljust(OUTPUT_HEADERS.dig(key, :column_size))
+                end.join
+                puts row
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbot/cloud/cli/run/scale_command.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Run
+        class ScaleCommand < BaseCommand
+          parameter "ID", "the ID of run to scale", required: true
+
+          option ['--bots'], 'BOTS', 'number of active bots' do |bots|
+            Integer(bots)
+          end
+
+          option ['--loop'], 'LOOP_COUNT', 'number of repeated invocations', attribute_name: :loop_count do |loop_count|
+            Integer(loop_count)
+          end
+
+          def execute
+            scale_run
+          end
+
+          def scale_run
+            api_response = Superbot::Cloud::Api.request(:update_interactive_run, params: { id: id, organization_name: organization, parallel: bots, loop: loop_count }.compact)
+            puts "Scaled"
+            puts "bots: #{api_response[:parallel]}"
+            puts "loop: #{api_response[:loop]}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,34 +1,21 @@
 # frozen_string_literal: true
 
+require_relative 'run/base_command'
+require_relative 'run/create_command'
+require_relative 'run/list_command'
+require_relative 'run/abort_command'
+require_relative 'run/scale_command'
+require_relative 'run/console_command'
+
 module Superbot
   module Cloud
     module CLI
-      class RunCommand < OrganizationBasedCommand
-        parameter "NAME", "the name of the test to delete", required: true
-        option ['--region'], 'REGION', 'Region for remote webdriver'
-        option ['--when'], 'WHEN', "When to schedule a test (either asap or cron expression)", default: 'asap', attribute_name: :starts_at
-        option ['--bots'], 'BOTS', 'Number of running cloud superbots', default: 1
-        option ['--loop'], 'LOOP_COUNT', 'Number of runs for each bot', default: 1, attribute_name: :loop_count
-
-        def execute
-          schedule_test
-        end
-
-        def schedule_test
-          Superbot::Cloud::Api.request(:schedule_test, params: schedule_params)
-          puts "Cloud run has been scheduled"
-        end
-
-        def schedule_params
-          {
-            test_name: name,
-            region: region,
-            organization_name: organization,
-            parallel: bots,
-            starts_at: starts_at,
-            loop: loop_count
-          }.compact
-        end
+      class RunCommand < LoginRequiredCommand
+        subcommand ['create'], "Create new interactive test run", Run::CreateCommand
+        subcommand ['list'], "List your interactive runs", Run::ListCommand
+        subcommand ['abort'], "Abort run", Run::AbortCommand
+        subcommand ['scale'], "Scale your interactive run", Run::ScaleCommand
+        subcommand ['console'], "Interactive run console", Run::ConsoleCommand
       end
     end
   end

data/lib/superbot/cloud/cli/schedule/cancel_command.rb

@@ -13,12 +13,10 @@ module Superbot
 
           def delete_schedule
             id_list.each do |schedule_id|
-              begin
-                Superbot::Cloud::Api.request(:cancel_schedule, params: { id: schedule_id, organization_name: organization })
-                puts "Test schedule #{schedule_id} successfully cancelled"
-              rescue SystemExit
-                p # skip to next schedule
-              end
+              Superbot::Cloud::Api.request(:cancel_schedule, params: { id: schedule_id, organization_name: organization })
+              puts "Test schedule #{schedule_id} successfully cancelled"
+            rescue SystemExit
+              p # skip to next schedule
             end
           end
         end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Schedule
+        class CreateCommand < BaseCommand
+          parameter "NAME", "the name of the test to delete", required: true
+          option ['--region'], 'REGION', 'Region for remote webdriver'
+          option ['--when'], 'WHEN', "When to schedule a test (either asap or cron expression)", default: 'asap', attribute_name: :starts_at
+          option ['--bots'], 'BOTS', 'Number of running cloud superbots', default: 1
+          option ['--loop'], 'LOOP_COUNT', 'Number of runs for each bot', default: 1, attribute_name: :loop_count
+
+          def execute
+            schedule_test
+          end
+
+          def schedule_test
+            Superbot::Cloud::Api.request(:schedule_test, params: schedule_params)
+            puts "Cloud run has been scheduled"
+          end
+
+          def schedule_params
+            {
+              test_name: name,
+              region: region,
+              organization_name: organization,
+              parallel: bots,
+              starts_at: starts_at,
+              loop: loop_count
+            }.compact
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,11 +3,13 @@
 require_relative 'schedule/base_command'
 require_relative 'schedule/list_command'
 require_relative 'schedule/cancel_command'
+require_relative 'schedule/create_command'
 
 module Superbot
   module Cloud
     module CLI
       class ScheduleCommand < LoginRequiredCommand
+        subcommand ['create'], "Create new scheduled run", Schedule::CreateCommand
         subcommand ['list'], "List your schedules", Schedule::ListCommand
         subcommand ['cancel'], "Cancel your schedule", Schedule::CancelCommand
       end

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

@@ -5,15 +5,19 @@ module Superbot
     module CLI
       module Test
         class DeleteCommand < BaseCommand
-          parameter "NAME", "the name of the test to delete", required: true
+          parameter "NAME ...", "the name of the test to delete", required: true
 
           def execute
             delete_test
           end
 
           def delete_test
-            Superbot::Cloud::Api.request(:delete_test, params: { name: name, organization_name: organization })
-            puts "Tests successfully deleted"
+            name_list.each do |name|
+              Superbot::Cloud::Api.request(:delete_test, params: { name: name, organization_name: organization })
+              puts "Tests #{name} successfully deleted"
+            rescue SystemExit => e
+              puts "Test #{name} removal failed: #{e.message}"
+            end
           end
         end
       end

data/lib/superbot/cloud/cli/test/list_command.rb

@@ -5,17 +5,22 @@ module Superbot
     module CLI
       module Test
         class ListCommand < BaseCommand
+          option %w[-q --quiet], :flag, "Only show test names"
+
           def execute
             list_tests
           end
 
           def list_tests
             api_response = Superbot::Cloud::Api.request(:test_list, params: { organization_name: organization })
-            abort api_response[:error] if api_response[:error]
-            puts "Organization: #{api_response[:organization]}"
-            puts "Tests:"
-            api_response[:tests].each do |test|
-              puts(test[:name], test[:files].map { |f| "- #{f[:filename]}" })
+            if quiet?
+              puts(api_response[:tests].map { |test| test[:name] })
+            else
+              puts "Organization: #{api_response[:organization]}"
+              puts "Tests:"
+              api_response[:tests].each do |test|
+                puts(test[:name], test[:files].map { |f| "- #{f[:filename]}" })
+              end
             end
           end
         end

data/lib/superbot/cloud/version.rb

@@ -2,6 +2,6 @@
 
 module Superbot
   module Cloud
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-cloud
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -148,9 +148,16 @@ files:
 - lib/superbot/cloud/cli/organization_based_command.rb
 - lib/superbot/cloud/cli/organization_command.rb
 - lib/superbot/cloud/cli/root_command.rb
+- lib/superbot/cloud/cli/run/abort_command.rb
+- lib/superbot/cloud/cli/run/base_command.rb
+- lib/superbot/cloud/cli/run/console_command.rb
+- lib/superbot/cloud/cli/run/create_command.rb
+- lib/superbot/cloud/cli/run/list_command.rb
+- lib/superbot/cloud/cli/run/scale_command.rb
 - lib/superbot/cloud/cli/run_command.rb
 - lib/superbot/cloud/cli/schedule/base_command.rb
 - lib/superbot/cloud/cli/schedule/cancel_command.rb
+- lib/superbot/cloud/cli/schedule/create_command.rb
 - lib/superbot/cloud/cli/schedule/list_command.rb
 - lib/superbot/cloud/cli/schedule_command.rb
 - lib/superbot/cloud/cli/test/base_command.rb