superbot-cloud 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb1c9b07574d814298c45682877013348a7915d974478df1e720d2bbe25bcac
-  data.tar.gz: 35258cf7c427a781d5925c68af3f80c4730f03ef3a8a522196fcf7dc3ca1d949
+  metadata.gz: 5a9d3104480558f1d2611d811fe52920244cf502ab70d1a0ffc7d6d4f9e28a9c
+  data.tar.gz: ef334a9ad002c647fb9029b7704a02d78ca53266415e3ca6b6f3c7419ed74b3f
 SHA512:
-  metadata.gz: f4c9f068fd91b3b917a27c7299c86084362c4152057a32510d4c2e10621811f670ebae048a1b2349181e00ebc191edf11cff269f62af487920b6aff41f5a107d
-  data.tar.gz: 1835a015a48dc819e8d57af3b32786a9d2bd9d818b27009672b4c5d478ba384e44e4e56d29aa120cebfa5d1a1c82104ded7802d53fe1c702202e9fdb1fdb2bcd
+  metadata.gz: d133a15f010b11308d09a31d0f24ecabb956ae1e9e944758f3c8d8b59f51f3fe0d01f099b70442ad67404a35e0f5236b8c8347101657b52b9bab975bf6564a83
+  data.tar.gz: 58ef5bfebf9d0eea808ad5bced543e56af3162542aa195343ce9fc373ab2c5b44076dcaebbf46f4f5fb351017551965bdd24820150519ed52c852225b53097ed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    superbot-cloud (0.1.18)
+    superbot-cloud (0.1.19)
       marcel (= 0.3.3)
       multipart-post (= 2.0.0)
 
@@ -15,6 +15,7 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     clamp (1.2.1)
     diff-lcs (1.3)
+    excon (0.62.0)
     ffi (1.9.25)
     jaro_winkler (1.5.1)
     kommando (0.1.2)
@@ -31,7 +32,7 @@ GEM
     powerpack (0.1.2)
     public_suffix (3.0.3)
     rack (2.0.6)
-    rack-protection (2.0.3)
+    rack-protection (2.0.4)
       rack
     rainbow (3.0.0)
     rake (10.5.0)
@@ -61,21 +62,26 @@ GEM
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
-    sinatra (2.0.3)
+    sinatra (2.0.4)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.3)
+      rack-protection (= 2.0.4)
       tilt (~> 2.0)
     sinatra-silent (0.0.1)
-    superbot (0.1.23)
+    superbot (0.1.28)
       clamp (= 1.2.1)
       kommando (~> 0.1)
       launchy (= 2.4.3)
       selenium-webdriver (~> 3.14, >= 3.14.0)
-      sinatra (= 2.0.3)
+      sinatra (= 2.0.4)
       sinatra-silent (= 0.0.1)
-      superbot-cloud (~> 0.1.17)
+      superbot-cloud (~> 0.1.18)
+      superbot-teleport (~> 0.2.1)
       zaru (= 0.2.0)
+    superbot-teleport (0.2.1)
+      clamp (= 1.2.1)
+      excon
+      kommando (~> 0.1)
     tilt (2.0.9)
     unicode-display_width (1.4.0)
     zaru (0.2.0)
@@ -88,8 +94,8 @@ DEPENDENCIES
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop (~> 0.53)
-  superbot (~> 0.1.23)
+  superbot (~> 0.1.28)
   superbot-cloud!
 
 BUNDLED WITH
-   1.16.6
+   1.17.1

data/exe/superbot-cloud

@@ -17,4 +17,4 @@ end
 
 require 'superbot/cloud'
 
-Superbot::CLI::CloudCommand.run
+Superbot::Cloud::CLI::RootCommand.run

data/lib/superbot/cloud.rb

@@ -2,7 +2,8 @@
 
 module Superbot
   module Cloud
-    LOGIN_URI = "http://#{Superbot::DOMAIN}/login/cloud"
+    BASE_URI = "#{Superbot::URI_SCHEME}://#{Superbot::DOMAIN}"
+    LOGIN_URI = "#{BASE_URI}/login/cloud"
     CREDENTIALS_PATH = File.join(Dir.home, '.superbot')
     private_constant :CREDENTIALS_PATH
     CREDENTIALS_FILE_PATH = File.join(CREDENTIALS_PATH, 'cloud_credentials.json')
@@ -32,5 +33,5 @@ end
 
 require_relative "cloud/version"
 require_relative "cloud/api"
+require_relative "cloud/web"
 require_relative "cloud/cli"
-require_relative "cloud/web_login"

data/lib/superbot/cloud/api.rb

@@ -5,7 +5,7 @@ require 'net/http/post/multipart'
 module Superbot
   module Cloud
     module Api
-      BASE_URI = "#{Superbot::URI_SCHEME}://#{Superbot::DOMAIN}/api/v1"
+      BASE_URI = "#{Superbot::Cloud::BASE_URI}/api/v1"
       ENDPOINT_MAP = {
         login:                    { method: :post, endpoint: 'sessions' },
         token:                    { method: :post, endpoint: 'token' },

data/lib/superbot/cloud/cli/{cloud/login_command.rb → login_command.rb}

@@ -4,8 +4,8 @@ require 'net/http'
 require 'launchy'
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       class LoginCommand < Clamp::Command
         option ['-i', '--interactive'], :flag, 'interactive login from command line'
         option ['-f', '--force'], :flag, 'force override current credentials'
@@ -35,11 +35,8 @@ module Superbot
         end
 
         def web_login
-          web = Superbot::Cloud::WebLogin.new
-          web.run_async_after_running!
           open_cloud_login_uri
-          handle_keyboard_interrupt
-          wait_for_login(web)
+          Superbot::Web.run!
         end
 
         def open_cloud_login_uri
@@ -51,22 +48,6 @@ module Superbot
           puts "Your browser has been opened to visit:", cloud_login_uri
           puts
         end
-
-        def handle_keyboard_interrupt
-          trap "SIGINT" do
-            puts
-            puts "Command killed by keyboard interrupt"
-            exit 130
-          end
-        end
-
-        def wait_for_login(web)
-          loop do
-            break unless web.running?
-
-            sleep 0.1
-          end
-        end
       end
     end
   end

data/lib/superbot/cloud/cli/{cloud/organization → organization}/list_command.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       module Organization
         class ListCommand < Clamp::Command
           include Superbot::Cloud::Validations

data/lib/superbot/cloud/cli/{cloud/organization_command.rb → organization_command.rb}

@@ -3,10 +3,10 @@
 require_relative 'organization/list_command'
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       class OrganizationCommand < Clamp::Command
-        subcommand ['list'], "List user organizations from the cloud", Cloud::Organization::ListCommand
+        subcommand ['list'], "List user organizations from the cloud", Organization::ListCommand
 
         def self.run
           super

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

@@ -1,11 +1,34 @@
 # frozen_string_literal: true
 
-require_relative 'cloud_command'
+require_relative 'validations'
+require_relative 'login_command'
+require_relative 'version_command'
+require_relative 'organization_command'
+require_relative 'test_command'
+require_relative 'webdriver_command'
 
 module Superbot
-  module CLI
-    class RootCommand < Clamp::Command
-      subcommand ['cloud'], "Show cloud commands", CloudCommand
+  module Cloud
+    module CLI
+      class RootCommand < Clamp::Command
+        subcommand ['version'], 'Superbot cloud version', VersionCommand
+        subcommand ['login'], 'Login to superbot cloud', LoginCommand
+        subcommand(['org'], 'Manage your organizations', OrganizationCommand)
+        subcommand ['test'], "Manage your tests", TestCommand
+        subcommand ['webdriver'], "Manage your webdriver sessions", WebdriverCommand
+
+        option ['-v', '--version'], :flag, "Show version information" do
+          puts Superbot::Cloud::VERSION
+          exit 0
+        end
+
+        def self.run
+          super
+        rescue StandardError => exc
+          warn exc.message
+          warn exc.backtrace.join("\n")
+        end
+      end
     end
   end
 end

data/lib/superbot/cloud/cli/{cloud/test → test}/delete_command.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       module Test
         class DeleteCommand < Clamp::Command
           include Superbot::Cloud::Validations

data/lib/superbot/cloud/cli/{cloud/test → test}/list_command.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       module Test
         class ListCommand < Clamp::Command
           include Superbot::Cloud::Validations

data/lib/superbot/cloud/cli/{cloud/test → test}/upload_command.rb

@@ -6,8 +6,8 @@ require 'marcel'
 require 'pathname'
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       module Test
         class UploadCommand < Clamp::Command
           include Superbot::Cloud::Validations

data/lib/superbot/cloud/cli/{cloud/test_command.rb → test_command.rb}

@@ -5,12 +5,12 @@ require_relative 'test/upload_command'
 require_relative 'test/delete_command'
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       class TestCommand < Clamp::Command
-        subcommand ['list'], "List user tests from the cloud", Cloud::Test::ListCommand
-        subcommand ['upload'], "Upload test to the cloud", Cloud::Test::UploadCommand
-        subcommand ['delete'], "Delete test from the cloud", Cloud::Test::DeleteCommand
+        subcommand ['list'], "List user tests from the cloud", Test::ListCommand
+        subcommand ['upload'], "Upload test to the cloud", Test::UploadCommand
+        subcommand ['delete'], "Delete test from the cloud", Test::DeleteCommand
 
         def self.run
           super

data/lib/superbot/cloud/cli/{cloud/version_command.rb → version_command.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       class VersionCommand < Clamp::Command
         def execute
           puts Superbot::Cloud::VERSION

data/lib/superbot/cloud/cli/{cloud/webdriver → webdriver}/delete_command.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       module Webdriver
         class DeleteCommand < Clamp::Command
           include Superbot::Cloud::Validations

data/lib/superbot/cloud/cli/{cloud/webdriver → webdriver}/list_command.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       module Webdriver
         class ListCommand < Clamp::Command
           include Superbot::Cloud::Validations

data/lib/superbot/cloud/cli/{cloud/webdriver_command.rb → webdriver_command.rb}

@@ -4,11 +4,11 @@ require_relative 'webdriver/list_command'
 require_relative 'webdriver/delete_command'
 
 module Superbot
-  module CLI
-    module Cloud
+  module Cloud
+    module CLI
       class WebdriverCommand < Clamp::Command
-        subcommand ['list'], "List all webdriver sessions", Cloud::Webdriver::ListCommand
-        subcommand ['delete'], "Terminate and finish specific session", Cloud::Webdriver::DeleteCommand
+        subcommand ['list'], "List all webdriver sessions", Webdriver::ListCommand
+        subcommand ['delete'], "Terminate and finish specific session", Webdriver::DeleteCommand
 
         def self.run
           super

data/lib/superbot/cloud/version.rb

@@ -2,6 +2,6 @@
 
 module Superbot
   module Cloud
-    VERSION = "0.1.18"
+    VERSION = "0.1.19"
   end
 end

data/lib/superbot/cloud/web.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Cloud
+    module Web
+      def self.register(sinatra)
+        sinatra.get "/login" do
+          credentials = request.params.slice('username', 'email', 'token')
+          Superbot::Cloud.save_credentials(credentials)
+          sinatra.quit!
+          redirect "#{Superbot::Cloud::LOGIN_URI}/success?username=#{Superbot::Cloud.credentials[:username]}"
+        end
+      end
+    end
+  end
+end

data/superbot-cloud.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "multipart-post", "2.0.0"
   spec.add_runtime_dependency "marcel", "0.3.3"
 
-  spec.add_development_dependency "superbot", "~> 0.1.23"
+  spec.add_development_dependency "superbot", "~> 0.1.28"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.23
+        version: 0.1.28
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.23
+        version: 0.1.28
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,22 +134,21 @@ files:
 - lib/superbot/cloud.rb
 - lib/superbot/cloud/api.rb
 - lib/superbot/cloud/cli.rb
-- lib/superbot/cloud/cli/cloud/login_command.rb
-- lib/superbot/cloud/cli/cloud/organization/list_command.rb
-- lib/superbot/cloud/cli/cloud/organization_command.rb
-- lib/superbot/cloud/cli/cloud/test/delete_command.rb
-- lib/superbot/cloud/cli/cloud/test/list_command.rb
-- lib/superbot/cloud/cli/cloud/test/upload_command.rb
-- lib/superbot/cloud/cli/cloud/test_command.rb
-- lib/superbot/cloud/cli/cloud/validations.rb
-- lib/superbot/cloud/cli/cloud/version_command.rb
-- lib/superbot/cloud/cli/cloud/webdriver/delete_command.rb
-- lib/superbot/cloud/cli/cloud/webdriver/list_command.rb
-- lib/superbot/cloud/cli/cloud/webdriver_command.rb
-- lib/superbot/cloud/cli/cloud_command.rb
+- lib/superbot/cloud/cli/login_command.rb
+- lib/superbot/cloud/cli/organization/list_command.rb
+- lib/superbot/cloud/cli/organization_command.rb
 - lib/superbot/cloud/cli/root_command.rb
+- lib/superbot/cloud/cli/test/delete_command.rb
+- lib/superbot/cloud/cli/test/list_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/delete_command.rb
+- lib/superbot/cloud/cli/webdriver/list_command.rb
+- lib/superbot/cloud/cli/webdriver_command.rb
 - lib/superbot/cloud/version.rb
-- lib/superbot/cloud/web_login.rb
+- lib/superbot/cloud/web.rb
 - superbot-cloud.gemspec
 homepage: https://github.com/superbothq/superbot-cloud
 licenses:

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

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "cloud/validations"
-require_relative 'cloud/login_command'
-require_relative 'cloud/version_command'
-require_relative 'cloud/organization_command'
-require_relative 'cloud/test_command'
-require_relative 'cloud/webdriver_command'
-
-module Superbot
-  module CLI
-    class CloudCommand < Clamp::Command
-      subcommand ['version'], 'Superbot cloud version', Cloud::VersionCommand
-      subcommand ['login'], 'Login to superbot cloud', Cloud::LoginCommand
-      subcommand(['org'], 'Manage your organizations', Cloud::OrganizationCommand)
-      subcommand ['test'], "Manage your tests", Cloud::TestCommand
-      subcommand ['webdriver'], "Manage your webdriver sessions", Cloud::WebdriverCommand
-
-      option ['-v', '--version'], :flag, "Show version information" do
-        puts Superbot::Cloud::VERSION
-        exit 0
-      end
-
-      def self.run
-        super
-      rescue StandardError => exc
-        warn exc.message
-        warn exc.backtrace.join("\n")
-      end
-    end
-  end
-end

data/lib/superbot/cloud/web_login.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require 'sinatra'
-require "sinatra/silent"
-require 'fileutils'
-
-module Superbot
-  module Cloud
-    class WebLogin
-      def initialize
-        @sinatra = Sinatra.new do
-          set :bind, "127.0.0.1"
-          set :silent_sinatra, true
-          set :silent_webrick, true
-          set :silent_access_log, false
-          server_settings[:Silent] = true
-          instance = self
-
-          get "/login" do
-            credentials = request.params.slice('username', 'email', 'token')
-            Superbot::Cloud.save_credentials(credentials)
-            instance.quit!
-            redirect "#{Superbot::Cloud::LOGIN_URI}/success?username=#{Superbot::Cloud.credentials[:username]}"
-          end
-        end
-      end
-
-      def self.run!
-        new.run!
-      end
-
-      def run!
-        @sinatra.run_async!
-      end
-
-      def running?
-        @sinatra.running?
-      end
-
-      def run_async_after_running!
-        Thread.new do
-          @sinatra.run!
-        end
-
-        loop do
-          break if running?
-
-          sleep 0.001
-        end
-      end
-    end
-  end
-end