superbot-cloud 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19bbd2c960d6aa5d1568b2466d3aa330bf3a83df27778f0d94443feb29359f4a
-  data.tar.gz: 5378ef953d8a0179fbfae3eeab75fc82d66ffdd58dd3acf77493f4b07fee49ce
+  metadata.gz: 614054f58998b305958b0bca9bcb88ab2c51df2453808252ff37c4ba322aafad
+  data.tar.gz: 337f44708673aac80e59b915d137b134f330da8c142fd7e2fd5c6cffae38fe25
 SHA512:
-  metadata.gz: 2cc5c6baa79028c830533b1bedbcc85012efe39e9514a745483b03278494599cd3709a357a558b56048d0cd338a55adc80e5b8a062466e4b6dc39b2cd4883f9c
-  data.tar.gz: 33f7cf07f72ff70ba63d5a9993545ee449fdf8b038cdf03557776f03cb2c3d49f8f2f80b12668c61f691bd8962455be9e820b6c00351d6e7c4d93bb101e18cf1
+  metadata.gz: 57494354cffc30fc8eea756a42f58dceb6b5f60d735d34aaa43973b37f9388ebc1f94080d71ace476b8fbd39df666e503dd3d4ff5f8411aeb5261d1361c29dbd
+  data.tar.gz: 52da377337dee2ca37ec0d4342653a65b8f3779dbbdde262bca0306c9fe48c2a8ce096274787f836d291e20ecc4e9c70f24f07eeb0d54a8fdf63f6731e131492

data/.rubocop.yml

@@ -8,7 +8,7 @@ AllCops:
     - "*.gemspec"
     - bundler/**/*
     - vendor/bundle/**/* # travis with --deployment
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:

data/Gemfile.lock

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

data/lib/superbot/cloud/api.rb

@@ -14,6 +14,9 @@ module Superbot
         test_upload:                { method: :post_multipart, endpoint: 'tests' },
         test_download:              { method: :get, endpoint: 'tests', required_param: :name },
         delete_test:                { method: :delete, endpoint: 'tests', required_param: :name },
+        schedule_test:              { method: :post, endpoint: 'schedules' },
+        schedule_list:              { method: :get, endpoint: 'schedules' },
+        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' },

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      class LoginRequiredCommand < Clamp::Command
+        include Superbot::Cloud::Validations
+
+        def run(args)
+          require_login
+          super
+        end
+
+        def self.run
+          require_login
+          super
+        rescue StandardError => exc
+          warn exc.message
+          warn exc.backtrace.join("\n")
+        end
+      end
+    end
+  end
+end

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

@@ -5,12 +5,9 @@ module Superbot
     module CLI
       module Member
         class AddCommand < BaseCommand
-          include Superbot::Cloud::Validations
-
           parameter "USERNAME", "Username of a user to add", required: true
 
           def execute
-            require_login
             add_member
           end
 

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

@@ -4,8 +4,7 @@ module Superbot
   module Cloud
     module CLI
       module Member
-        class BaseCommand < Clamp::Command
-          option ["--org"], "ORGANIZATION", "Organization to to take actions on", attribute_name: :organization
+        class BaseCommand < OrganizationBasedCommand
         end
       end
     end

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

@@ -5,10 +5,7 @@ module Superbot
     module CLI
       module Member
         class ListCommand < BaseCommand
-          include Superbot::Cloud::Validations
-
           def execute
-            require_login
             list_members
           end
 

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

@@ -5,12 +5,9 @@ module Superbot
     module CLI
       module Member
         class RemoveCommand < BaseCommand
-          include Superbot::Cloud::Validations
-
           parameter "USERNAME", "Username of a user to remove"
 
           def execute
-            require_login
             remove_member
           end
 

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

@@ -8,21 +8,10 @@ require_relative 'member/list_command'
 module Superbot
   module Cloud
     module CLI
-      class MemberCommand < Clamp::Command
-        include Superbot::Cloud::Validations
-
+      class MemberCommand < LoginRequiredCommand
         subcommand ['add'], "Add member to organization", Member::AddCommand
         subcommand ['remove'], "Remove member from organization", Member::RemoveCommand
         subcommand ['list'], "List your organization members", Member::ListCommand
-
-
-        def self.run
-          require_login
-          super
-        rescue StandardError => exc
-          warn exc.message
-          warn exc.backtrace.join("\n")
-        end
       end
     end
   end

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

@@ -5,10 +5,7 @@ module Superbot
     module CLI
       module Organization
         class ListCommand < Clamp::Command
-          include Superbot::Cloud::Validations
-
           def execute
-            require_login
             list_organizations
           end
 

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      class OrganizationBasedCommand < LoginRequiredCommand
+        option ["--org"], "ORGANIZATION", "Organization to to take actions on", attribute_name: :organization
+      end
+    end
+  end
+end

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

@@ -5,15 +5,8 @@ require_relative 'organization/list_command'
 module Superbot
   module Cloud
     module CLI
-      class OrganizationCommand < Clamp::Command
+      class OrganizationCommand < LoginRequiredCommand
         subcommand ['list'], "List user organizations from the cloud", Organization::ListCommand
-
-        def self.run
-          super
-        rescue StandardError => exc
-          warn exc.message
-          warn exc.backtrace.join("\n")
-        end
       end
     end
   end

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

@@ -4,10 +4,13 @@ require_relative 'validations'
 require_relative 'version_command'
 require_relative 'login_command'
 require_relative 'logout_command'
+require_relative 'login_required_command'
+require_relative 'organization_based_command'
 require_relative 'organization_command'
 require_relative 'test_command'
 require_relative 'webdriver_command'
 require_relative 'member_command'
+require_relative 'schedule_command'
 
 module Superbot
   module Cloud
@@ -16,10 +19,11 @@ module Superbot
         subcommand ['version'], 'Superbot cloud version', VersionCommand
         subcommand ['login'], 'Authorize superbot to access cloud API with Superbot Cloud user credentials', LoginCommand
         subcommand ['logout'], 'Revoke credentials for an account', LogoutCommand
-        subcommand(['org'], 'Manage your organizations', OrganizationCommand)
+        subcommand ['org'], 'Manage your organizations', OrganizationCommand
         subcommand ['test'], "Manage your tests", TestCommand
         subcommand ['webdriver'], "Manage your webdriver sessions", WebdriverCommand
         subcommand ['member'], "Manage your organization members", MemberCommand
+        subcommand(['schedule'], "Manage your test schedules", ScheduleCommand) if ENV['SUPERBOT_FEAT_SCHEDULE'] == 'true'
 
         option ['-v', '--version'], :flag, "Show version information" do
           puts Superbot::Cloud::VERSION

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

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

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Schedule
+        class CancelCommand < BaseCommand
+          parameter "ID ...", "the IDs of the schedule to cancel", required: true
+
+          def execute
+            delete_schedule
+          end
+
+          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
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Schedule
+        class ListCommand < BaseCommand
+          OUTPUT_HEADERS = {
+            id: { name: "ID", column_size: 10 },
+            test_name: { name: "Test", column_size: 25 },
+            starts_at: { name: "Scheduled Time", column_size: 25 },
+            region: { name: "Region", column_size: 20 },
+            status: { name: "Status", column_size: 10 },
+            parallel: { name: "User load", column_size: 10 }
+          }.freeze
+
+          option %w[-q --quiet], :flag, "Only show schedule IDs"
+          option %w[-a --all], :flag, "Show all the schedules (including finished)"
+
+          def execute
+            list_schedules
+          end
+
+          def list_schedules
+            states = all? ? nil : %w[initial processing]
+            api_response = Superbot::Cloud::Api.request(:schedule_list, params: { organization_name: organization, 'aasm_state[]': states })
+
+            abort api_response[:error] if api_response[:error]
+            abort "No active schedules found for organization #{api_response[:organization]}" if api_response[:schedules].empty?
+
+            if quiet?
+              puts(api_response[:schedules].map { |schedule| schedule[:id] })
+            else
+              puts "Organization: #{api_response[:organization]}"
+              puts "Schedules:"
+              puts OUTPUT_HEADERS.values.map { |header| header[:name].ljust(header[:column_size]) }.join
+              api_response[:schedules].each do |schedule|
+                row = schedule.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/schedule_command.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative 'schedule/base_command'
+require_relative 'schedule/list_command'
+require_relative 'schedule/cancel_command'
+
+module Superbot
+  module Cloud
+    module CLI
+      class ScheduleCommand < LoginRequiredCommand
+        subcommand ['list'], "List your schedules", Schedule::ListCommand
+        subcommand ['cancel'], "Cancel your schedule", Schedule::CancelCommand
+      end
+    end
+  end
+end

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

@@ -4,8 +4,7 @@ module Superbot
   module Cloud
     module CLI
       module Test
-        class BaseCommand < Clamp::Command
-          option ["--org"], "ORGANIZATION", "Organization to to take actions on", attribute_name: :organization
+        class BaseCommand < OrganizationBasedCommand
         end
       end
     end

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

@@ -5,12 +5,9 @@ module Superbot
     module CLI
       module Test
         class DeleteCommand < BaseCommand
-          include Superbot::Cloud::Validations
-
           parameter "NAME", "the name of the test to delete", required: true
 
           def execute
-            require_login
             delete_test
           end
 

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

@@ -8,12 +8,9 @@ module Superbot
     module CLI
       module Test
         class DownloadCommand < BaseCommand
-          include Superbot::Cloud::Validations
-
           parameter "NAME", "the name of test to download"
 
           def execute
-            require_login
             download_test
           end
 

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

@@ -5,10 +5,7 @@ module Superbot
     module CLI
       module Test
         class ListCommand < BaseCommand
-          include Superbot::Cloud::Validations
-
           def execute
-            require_login
             list_tests
           end
 

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module CLI
+      module Test
+        class ScheduleCommand < BaseCommand
+          parameter "NAME", "the name of the test to delete", required: true
+          option ['--region'], 'REGION', 'Region for remote webdriver'
+          option ['--user-load'], 'USER_LOAD', 'Number of concurrent users'
+
+          def execute
+            schedule_test
+          end
+
+          def schedule_test
+            Superbot::Cloud::Api.request(:schedule_test, params: schedule_params)
+            puts "Tests successfully scheduled"
+          end
+
+          def schedule_params
+            {
+              test_name: name,
+              region: region,
+              organization_name: organization,
+              parallel: user_load
+            }.compact
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,12 +10,9 @@ module Superbot
     module CLI
       module Test
         class UploadCommand < BaseCommand
-          include Superbot::Cloud::Validations
-
           parameter "PATH", "the path to folder containing tests to upload"
 
           def execute
-            require_login
             upload_tests
           end
 
@@ -29,7 +26,7 @@ module Superbot
                 api_response = Superbot::Cloud::Api.request(
                   :test_upload,
                   params: {
-                    name: Zaru.sanitize!(path),
+                    name: Zaru.sanitize!(File.basename(path)),
                     organization_name: organization,
                     file: UploadIO.new(file, content_type, filename)
                   }

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

@@ -5,22 +5,17 @@ require_relative 'test/list_command'
 require_relative 'test/upload_command'
 require_relative 'test/download_command'
 require_relative 'test/delete_command'
+require_relative 'test/schedule_command'
 
 module Superbot
   module Cloud
     module CLI
-      class TestCommand < Clamp::Command
+      class TestCommand < OrganizationBasedCommand
         subcommand ['list'], "List user tests from the cloud", Test::ListCommand
         subcommand ['upload'], "Upload test to the cloud", Test::UploadCommand
         subcommand ['download'], "Download test from the cloud", Test::DownloadCommand
         subcommand ['delete'], "Delete test from the cloud", Test::DeleteCommand
-
-        def self.run
-          super
-        rescue StandardError => exc
-          warn exc.message
-          warn exc.backtrace.join("\n")
-        end
+        subcommand(['schedule'], "Schedule a test", Test::ScheduleCommand) if ENV['SUPERBOT_FEAT_SCHEDULE'] == 'true'
       end
     end
   end

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

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

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

@@ -4,30 +4,26 @@ module Superbot
   module Cloud
     module CLI
       module Webdriver
-        class DeleteCommand < Clamp::Command
-          include Superbot::Cloud::Validations
-
+        class DeleteCommand < BaseCommand
           parameter "SESSION_ID ...", "webdriver session ID", required: true
 
           def execute
-            require_login
             delete_session
           end
 
           def delete_session
             session_id_list.each do |session_id|
-              begin
-                Superbot::Cloud::Api.request(
-                  :delete_webdriver_session,
-                  params: {
-                    session_id: session_id
-                  }
-                )
+              Superbot::Cloud::Api.request(
+                :delete_webdriver_session,
+                params: {
+                  session_id: session_id,
+                  organization_name: organization
+                }
+              )
 
-                puts "Webdriver session #{session_id} removal has been requested."
-              rescue SystemExit
-                p # skip to next webdriver session
-              end
+              puts "Webdriver session #{session_id} removal has been requested."
+            rescue SystemExit
+              p # skip to next webdriver session
             end
           end
         end

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

@@ -4,8 +4,7 @@ module Superbot
   module Cloud
     module CLI
       module Webdriver
-        class ListCommand < Clamp::Command
-          include Superbot::Cloud::Validations
+        class ListCommand < BaseCommand
           OUTPUT_HEADERS = {
             session_id: "Session ID",
             created_at: "Created at",
@@ -16,20 +15,20 @@ module Superbot
           option %w[-a --all], :flag, "Show all the sessions (including finished)"
 
           def execute
-            require_login
             list_sessions
           end
 
           def list_sessions
             states = all? ? nil : %w[idle proxying]
-            api_response = Superbot::Cloud::Api.request(:webdriver_session_list, params: { 'aasm_state[]': states })
+            api_response = Superbot::Cloud::Api.request(:webdriver_session_list, params: { organization_name: organization, 'aasm_state[]': states })
             abort api_response[:error] if api_response[:error]
 
-            abort "No sessions found" if api_response[:webdriver_sessions].empty?
+            abort "No active sessions found for #{api_response[:organization]} organization" if api_response[:webdriver_sessions].empty?
 
             if quiet?
               puts(api_response[:webdriver_sessions].map { |session| session[:session_id] })
             else
+              puts "Organization: #{api_response[:organization]}"
               puts OUTPUT_HEADERS.values.map { |header| header.ljust(35) }.join
               puts ''.ljust(35 * OUTPUT_HEADERS.length, '-')
               api_response[:webdriver_sessions].each do |webdriver_session|

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

@@ -1,21 +1,15 @@
 # frozen_string_literal: true
 
+require_relative 'webdriver/base_command'
 require_relative 'webdriver/list_command'
 require_relative 'webdriver/delete_command'
 
 module Superbot
   module Cloud
     module CLI
-      class WebdriverCommand < Clamp::Command
+      class WebdriverCommand < LoginRequiredCommand
         subcommand ['list'], "List all webdriver sessions", Webdriver::ListCommand
         subcommand ['delete'], "Terminate and finish specific session", Webdriver::DeleteCommand
-
-        def self.run
-          super
-        rescue StandardError => exc
-          warn exc.message
-          warn exc.backtrace.join("\n")
-        end
       end
     end
   end

data/lib/superbot/cloud/version.rb

@@ -2,6 +2,6 @@
 
 module Superbot
   module Cloud
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/superbot/cloud/web.rb

@@ -7,8 +7,11 @@ module Superbot
         sinatra.get "/login" do
           credentials = request.params.slice('username', 'email', 'token')
           Superbot::Cloud.save_credentials(credentials)
+          redirect "#{Superbot::Cloud::LOGIN_URI}/success"
+        end
+
+        sinatra.after "/login" do
           sinatra.quit!
-          redirect "#{Superbot::Cloud::LOGIN_URI}/success?username=#{Superbot::Cloud.credentials[:username]}"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-cloud
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -137,6 +137,7 @@ files:
 - lib/superbot/cloud/api.rb
 - lib/superbot/cloud/cli.rb
 - lib/superbot/cloud/cli/login_command.rb
+- lib/superbot/cloud/cli/login_required_command.rb
 - lib/superbot/cloud/cli/logout_command.rb
 - lib/superbot/cloud/cli/member/add_command.rb
 - lib/superbot/cloud/cli/member/base_command.rb
@@ -144,16 +145,23 @@ files:
 - lib/superbot/cloud/cli/member/remove_command.rb
 - lib/superbot/cloud/cli/member_command.rb
 - lib/superbot/cloud/cli/organization/list_command.rb
+- 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/schedule/base_command.rb
+- lib/superbot/cloud/cli/schedule/cancel_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
 - lib/superbot/cloud/cli/test/delete_command.rb
 - lib/superbot/cloud/cli/test/download_command.rb
 - lib/superbot/cloud/cli/test/list_command.rb
+- lib/superbot/cloud/cli/test/schedule_command.rb
 - lib/superbot/cloud/cli/test/upload_command.rb
 - lib/superbot/cloud/cli/test_command.rb
 - 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/delete_command.rb
 - lib/superbot/cloud/cli/webdriver/list_command.rb
 - lib/superbot/cloud/cli/webdriver_command.rb