superbot-runner 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '091ed939470e454cc64348d22d673b044817155156d8b64dac8aa741dfdfa144'
-  data.tar.gz: 3d44e96b539001350b39650977b65cb5643a450f3d88d2a178b3f3cb692f2ada
+  metadata.gz: 0be967c2b3098d7cab4ca7aba618a0ed899296e30cce8f39df12a596f35ca80f
+  data.tar.gz: cf16e77ac90892eab5dcec5d03590a753de860336ba39138cfa72fec2101a7de
 SHA512:
-  metadata.gz: a6e19bde47cef4b6ef5dcba5a8f654cb960cd329f78b8a6d6b91a21bf411f7c10c7eb7094c7f2b6795147ca88c3551fadd33b03a7ef99ffe8090accc62704af9
-  data.tar.gz: 9263dd07a1dc49e8c0c55eabd253e61667838fa615af1023e94950547eedcf49c7761b10e0ab067a2486f81047b23e5e09c9f78947246ecb818adf191b902f4c
+  metadata.gz: 8502f217c152a9818af1cc4220d150b50f6dd8976f83b6f21ac41f68305076a11c3a85c8641917805158220d404f29c97c1af6fc267940324e264d1a3f226d24
+  data.tar.gz: d70c816c4e90970314356603e857c21871e47178082074aecd64cee3d03f799719b09d3f161e0194c621f83a113bcbaeef053f76e2eae517781f34a33b9a5ad7

data/Gemfile.lock

@@ -1,7 +1,12 @@
+PATH
+  remote: ../superbot-runner-side
+  specs:
+    superbot-runner-side (0.1.0)
+
 PATH
   remote: .
   specs:
-    superbot-runner (0.1.2)
+    superbot-runner (0.1.3)
       superbot-runner-side
 
 GEM
@@ -19,22 +24,22 @@ GEM
     clamp (1.2.1)
     diff-lcs (1.3)
     excon (0.62.0)
-    ffi (1.9.25)
+    ffi (1.10.0)
     io-like (0.3.0)
     kommando (0.1.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    mimemagic (0.3.2)
+    mimemagic (0.3.3)
     mini_portile2 (2.4.0)
     multipart-post (2.0.0)
     mustermann (1.0.3)
-    nokogiri (1.9.1)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     public_suffix (3.0.3)
     rack (2.0.6)
-    rack-protection (2.0.4)
+    rack-protection (2.0.5)
       rack
     rake (10.5.0)
     rspec (3.8.0)
@@ -54,31 +59,34 @@ GEM
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
-    sinatra (2.0.4)
+    sinatra (2.0.5)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.4)
+      rack-protection (= 2.0.5)
       tilt (~> 2.0)
     sinatra-silent (0.0.1)
-    superbot (0.2.0)
+    superbot (0.3.1)
       clamp (= 1.2.1)
-      kommando (~> 0.1)
+      kommando (= 0.1.2)
       launchy (= 2.4.3)
-      sinatra (= 2.0.4)
+      sinatra (= 2.0.5)
       sinatra-silent (= 0.0.1)
-      superbot-cloud (~> 0.1.22)
-      superbot-runner
-      superbot-selenium-webdriver (~> 1.0.5)
-      superbot-teleport (~> 0.2.3)
+      superbot-cloud (= 0.2.2)
+      superbot-record (= 0.1.0)
+      superbot-runner (= 0.1.2)
+      superbot-selenium-webdriver (= 1.0.5)
+      superbot-teleport (= 0.2.6)
       zaru (= 0.2.0)
-    superbot-cloud (0.1.22)
+    superbot-cloud (0.2.2)
       marcel (= 0.3.3)
       multipart-post (= 2.0.0)
-    superbot-runner-side (0.1.0)
+    superbot-record (0.1.0)
+      superbot-record-chrome
+    superbot-record-chrome (0.1.0)
     superbot-selenium-webdriver (1.0.5)
       chromedriver-helper (= 2.1.0)
       selenium-webdriver (= 3.141.0)
-    superbot-teleport (0.2.3)
+    superbot-teleport (0.2.6)
       excon
     tilt (2.0.9)
     zaru (0.2.0)
@@ -90,8 +98,9 @@ DEPENDENCIES
   bundler (~> 1.17)
   rake (~> 10.0)
   rspec (~> 3.0)
-  superbot (~> 0.2.0)
+  superbot (~> 0.3.1)
   superbot-runner!
+  superbot-runner-side!
 
 BUNDLED WITH
    1.17.1

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

@@ -7,34 +7,38 @@ module Superbot
 
         parameter "PATH", "path to test suite"
 
-        option ['--browser'], 'BROWSER', "Browser type to use. Can be either local or cloud", default: 'local' do |browser|
-          validates_browser_type browser
-          require_login unless browser == 'cloud'
-          browser
-        end
+        option ['--browser'], 'BROWSER', "Browser type to use. Can be either local or cloud", default: 'local'
         option ['--region'], 'REGION', 'Region for remote webdriver'
         option ['--no-teleport'], :flag, 'Do not start teleport before running'
         option ['--org'], 'ORGANIZATION', 'Name of organization to take action', attribute_name: :organization
 
         def execute
-          open_teleport unless no_teleport?
+          open_teleport
           sorted_files.each(&method(:run_test_file))
         ensure
-          close_teleport unless no_teleport?
+          close_teleport
         end
 
         private
 
         def open_teleport
+          return if no_teleport?
+
           @teleport = Thread.new do
-            Superbot::Web.run!(webdriver_type: browser, region: region, organization: organization)
+            Superbot::Teleport::CLI::RootCommand.new('teleport').run(teleport_options)
+          rescue StandardError => e
+            abort "Teleport error: #{e.message}"
           end
 
-          if browser == 'local'
-            chromedriver_path = Chromedriver::Helper.new.binary_path
-            @chromedriver = Kommando.new "#{chromedriver_path} --silent --port=9515 --url-base=wd/hub"
-            @chromedriver.run_async
-          end
+          sleep 0.1 until @teleport.stop?
+        end
+
+        def teleport_options
+          {
+            '--browser' => browser,
+            '--region' => region,
+            '--org' => organization
+          }.compact.to_a.flatten
         end
 
         def sorted_files
@@ -58,8 +62,6 @@ module Superbot
         end
 
         def close_teleport
-          sleep 1
-          @chromedriver&.kill
           @teleport&.kill
         end
       end

data/lib/superbot/runner/version.rb

@@ -1,5 +1,5 @@
 module Superbot
   module Runner
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/superbot-runner.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "superbot", "~> 0.2.0"
+  spec.add_development_dependency "superbot", "~> 0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Superbt HQ
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: superbot-runner-side
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.1
 description: 
 email: 
 executables: []