superbot-teleport 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d3d69e985d80169a431cac30c6d40680dcc21bc0bfa92ef5635815bdf4da3d8
-  data.tar.gz: 40a98b33d15c4b260c19822a9a9bd1dd8141f5f48efb867861ae43cbd408f7ae
+  metadata.gz: 428aebb42ee7827783d9af49474d5e48f7303eaaff8a9612d9e37b033baf9de3
+  data.tar.gz: 6163a6bb059033dbedb3c82553fea9e4f67daea2ad18385b4ffa3e50211f3475
 SHA512:
-  metadata.gz: 5d49b0f49c18286dc8a24ca0c37b55040c371188fe05a0d94815e5c8dac33d6baa6524328595fc3715428f4a207f7668d715e9fa05af0112de9ef02230dce51b
-  data.tar.gz: cb9d3d36960fcd1a5cbcde1e16182052cf04515e220c40104d9250c73863a12423d745ba7d642105d759abc17194b10e5bf0214de9ba2073c6532eeec8cb6c20
+  metadata.gz: 4f3f9cfe22bac517f19cb42b1d931325338c9f2f0a6b87c1a3b88dd5806d254a73fffc2c6b1509791323a618af34ce546b46f464cc8bd55b72560dfd19a0f445
+  data.tar.gz: cb266fdb6b96987283270b122da3187f9b3a7ea60afe72f1f47b95faf171247593edd4753b73e99af01cff7435c9574a32d1b2b71d280d45c217c0576a246803

data/Gemfile.lock

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

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

@@ -1,35 +1,31 @@
 # frozen_string_literal: true
 
+require_relative 'validations'
+
 module Superbot
   module Teleport
     module CLI
       class RootCommand < Clamp::Command
-        include Superbot::Validations
-        include Superbot::Cloud::Validations
+        include Superbot::Teleport::Validations
 
         option ['-v', '--version'], :flag, "Show version information" do
           puts Superbot::Teleport::VERSION
           exit 0
         end
 
-        option ['--browser'], 'BROWSER', "Browser type to use. Can be either local or cloud", default: 'cloud' do |browser|
-          validates_browser_type browser
-        end
+        option ['--browser'], 'BROWSER', "Browser type to use. Can be either local or cloud", default: 'cloud'
         option ['--region'], 'REGION', 'Region for remote webdriver'
         option ['--org'], 'ORGANIZATION', 'Name of organization to take action', attribute_name: :organization
 
         def execute
-          require_login unless browser == 'local'
+          validate_teleport_options(browser, organization)
+
+          run_local_chromedriver if browser == 'local'
 
           puts 'Opening teleport...', ''
           puts 'Configure your remote webdriver to http://localhost:4567/wd/hub', ''
           puts 'Press [control+c] to exit', ''
 
-          if browser == 'local'
-            chromedriver_path = Chromedriver::Helper.new.binary_path
-            @chromedriver = Kommando.run_async "#{chromedriver_path} --silent --port=9515 --url-base=wd/hub"
-          end
-
           @web = Superbot::Web.run!(webdriver_type: browser, region: region, organization: organization)
         ensure
           close_teleport
@@ -39,6 +35,11 @@ module Superbot
           @web&.quit!
           @chromedriver&.kill
         end
+
+        def run_local_chromedriver
+          chromedriver_path = Chromedriver::Helper.new.binary_path
+          @chromedriver = Kommando.run_async "#{chromedriver_path} --silent --port=9515 --url-base=wd/hub"
+        end
       end
     end
   end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Teleport
+    module Validations
+      include Superbot::Cloud::Validations
+
+      def validate_teleport_options(browser, organization)
+        return if browser == 'local'
+
+        unless %w[local cloud local_cloud].include?(browser)
+          signal_usage_error "The --browser=#{browser} browser option is not allowed. Should be either 'local' or 'cloud'."
+        end
+
+        signal_usage_error '--org option is required for cloud teleport' unless organization
+
+        require_login
+      end
+    end
+  end
+end

data/lib/superbot/teleport/version.rb

@@ -1,5 +1,5 @@
 module Superbot
   module Teleport
-    VERSION = "0.2.6"
+    VERSION = "0.2.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-teleport
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Superbot HQ
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -130,6 +130,7 @@ files:
 - lib/superbot/teleport.rb
 - lib/superbot/teleport/cli.rb
 - lib/superbot/teleport/cli/root_command.rb
+- lib/superbot/teleport/cli/validations.rb
 - lib/superbot/teleport/version.rb
 - lib/superbot/teleport/web.rb
 - superbot-teleport.gemspec