superbot 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0e0a593137e0fee2b1e9d1a16c2a31a6bcf6460ae0c87cc1653b440a07a4834
-  data.tar.gz: 5f17e4f9438919334e73a17bfb327a24d494bdf27bb2b3f6b656dd3a8777f4fd
+  metadata.gz: 0a030454c627c3f1cbc0e8006637461cb768b907f3d16c52666e764f0e78a5c5
+  data.tar.gz: cda49595f023bc77c46fea4ada2a098ecf9c12806aebcc192304040f20a068d2
 SHA512:
-  metadata.gz: d285eec9a6a897ac2268a1e0aa668d5492a461026b7694b934851652edd1a5cd9e08f64fae27057eb711c4d1b6f611c7bb6bf7a17c09368738455261f65d4694
-  data.tar.gz: 5e65c38193312991b20bc767a29d5397b5134b4779a8ce956a2b09e864885648262522af0edd3a9fd3e20d7befd0d26ff3971315e3b114068d9e6f4277e255a4
+  metadata.gz: 48016bbb28209f550254a4f5633e6e38b5e8c9cea39a7923c59bbc9b86bc311ceb506b67f31f5224efaacbe9b6ee441489f75d93d9f547852cc49ec4e957f719
+  data.tar.gz: 5ba44971d978bf268695d15ace642b0c86159f1ae567563f191806df4932afab23b8e84d9fc64caa6356191668a2fad53589235794b8d9fc5ee3eba3d123b8c0

data/.rubocop.relaxed.yml

@@ -137,6 +137,9 @@ Lint/AssignmentInCondition:
   Enabled: false
   StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
 
+Lint/NestedMethodDefinition:
+  Enabled: false
+
 Metrics/AbcSize:
   Enabled: false
 

data/.travis.yml

@@ -4,10 +4,12 @@ rvm:
   - 2.5
   - 2.4
   - 2.3
+env:
+  - SUPERBOT_USE_RUBYGEMS=yes
 before_install:
-  - gem install bundler -v 1.16.2
+  - gem install bundler -v 1.17.1
 deploy:
   provider: rubygems
-  api_key: $RUBYGEMS_API_KEY
+  api_key: ${RUBYGEMS_API_KEY}
   on:
     branch: master

data/Gemfile

@@ -4,3 +4,8 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in superbot.gemspec
 gemspec
+
+unless ENV['SUPERBOT_USE_RUBYGEMS'] == "yes"
+  gem "superbot-teleport", path: "../superbot-teleport"
+  gem "superbot-cloud", path: "../superbot-cloud"
+end

data/Gemfile.lock

@@ -1,14 +1,15 @@
 PATH
   remote: .
   specs:
-    superbot (0.1.27)
+    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.18)
+      superbot-cloud (~> 0.1.19)
+      superbot-teleport (~> 0.2.1)
       zaru (= 0.2.0)
 
 GEM
@@ -63,8 +64,6 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.12.1)
-    parallel_tests (2.22.0)
-      parallel
     parser (2.5.1.0)
       ast (~> 2.4.0)
     powerpack (0.1.1)
@@ -73,7 +72,7 @@ GEM
       method_source (~> 0.9.0)
     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)
@@ -112,15 +111,17 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.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-cloud (0.1.18)
+    superbot-cloud (0.1.19)
       marcel (= 0.3.3)
       multipart-post (= 2.0.0)
+    superbot-teleport (0.2.1)
+      excon
     thor (0.20.0)
     tilt (2.0.9)
     unicode-display_width (1.3.3)
@@ -130,12 +131,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 1.17)
   excon (~> 0.62)
   guard (~> 2.14)
   guard-rspec (~> 4.7)
   guard-rubocop (~> 1.3)
-  parallel_tests (~> 2.22)
   rake (~> 10.0)
   rspec (~> 3.0)
   rubocop (~> 0.53)

data/Guardfile

@@ -21,3 +21,19 @@ guard :rubocop do
   watch(/.+\.rb$/)
   watch(%r{(?:.+/)?\.rubocop(?:_todo)?\.yml$}) { |m| File.dirname(m[0]) }
 end
+
+guard 'process', name: 'superbot', command: 'superbot' do
+  watch(%r{^lib/(.+)\.rb})
+end
+
+guard :bundler do
+  require 'guard/bundler'
+  require 'guard/bundler/verify'
+  helper = Guard::Bundler::Verify.new
+
+  files = ['Gemfile']
+  files += Dir['*.gemspec'] if files.any? { |f| helper.uses_gemspec?(f) }
+
+  # Assume files are symlinked from somewhere
+  files.each { |file| watch(helper.real_path(file)) }
+end

data/Rakefile

@@ -3,18 +3,15 @@
 STDOUT.sync = true
 
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require "rubocop/rake_task"
 require "kommando"
-require "parallel_tests/tasks"
 
-RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
-task default: %i[rubocop parallel:spec e2e]
+task default: %i[rubocop spec e2e]
 
-task :rubocop do
-  rubocop_k = Kommando.puts "rubocop"
-  puts "" # styling for rake
-  raise "offenses found" unless rubocop_k.code.zero?
+task :spec do
+  system('rspec')
 end
 
 task :e2e do

data/exe/superbot

@@ -9,11 +9,5 @@ $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 STDOUT.sync = true
 
 require 'superbot'
-require 'superbot/cloud'
-begin
-  require "superbot/local"
-rescue LoadError
-  p # do nothing
-end
 
 Superbot::CLI::RootCommand.run

data/lib/superbot.rb

@@ -37,7 +37,22 @@ module Superbot
   end
 end
 
+require "clamp"
+# TODO
+Clamp.allow_options_after_parameters = true
+
 require_relative "superbot/version"
+require_relative "superbot/cli/validations"
+
+%w(cloud teleport).each do |microgem|
+  begin
+    require "superbot/#{microgem}"
+  rescue LoadError
+    puts "WARNING: superbot-#{microgem} is not installed"
+  end
+end
+
 require_relative "superbot/project"
+require_relative "superbot/convert"
 require_relative "superbot/cli"
 require_relative "superbot/web"

data/lib/superbot/capybara/convert.rb

@@ -22,7 +22,7 @@ module Superbot
       def convert_action(action)
         case action[:type]
         when 'visit'      then "visit '#{action[:url]}'"
-        when 'click'      then "find('#{action[:selector]}').click"
+        when 'click'      then "find('#{action[:selector]}', match: :first).click"
         when 'scroll'     then
           "page.execute_script('window.scrollBy(0,' + (page.execute_script('return document.body.scrollHeight') * #{action[:amountPercent]} / 100).to_s + ')')"
         when 'resolution' then "page.driver.browser.manage.window.resize_to(#{action[:resolution].join(',')})"

data/lib/superbot/cli.rb

@@ -1,13 +1,8 @@
 # frozen_string_literal: true
 
-require "clamp"
-# TODO
-Clamp.allow_options_after_parameters = true
-
 module Superbot
   module CLI
   end
 end
 
-require_relative "cli/validations"
 require_relative "cli/root_command"

data/lib/superbot/cli/root_command.rb

@@ -2,7 +2,6 @@
 
 require_relative "new_command"
 require_relative "run_command"
-require_relative "teleport_command"
 require_relative "version_command"
 require_relative "record_command"
 
@@ -17,13 +16,20 @@ module Superbot
       end
 
       subcommand ["version"], "Show version information", VersionCommand
-      subcommand ["teleport"], "Open a teleport for superbots", TeleportCommand if ENV['SUPERBOT_FEAT_TELEPORT'] == 'true'
       subcommand ["record"], "Open browser with selenium ide pre-loaded", RecordCommand if ENV['SUPERBOT_FEAT_RECORD'] == 'true'
       if ENV['SUPERBOT_FEAT_PROJECT'] == 'true'
         subcommand ["new"], "Create a new project", NewCommand
         subcommand ["run"], "Run a project", RunCommand
       end
 
+      if defined?(::Superbot::Cloud::CLI::RootCommand)
+        subcommand ["cloud"], "Show cloud commands", ::Superbot::Cloud::CLI::RootCommand
+      end
+
+      if defined?(::Superbot::Teleport::CLI::RootCommand)
+        subcommand ["teleport"], "Open teleport to the cloud", ::Superbot::Teleport::CLI::RootCommand
+      end
+
       def self.run
         super
       rescue StandardError => exc

data/lib/superbot/convert.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative "capybara/convert"
+require_relative "capybara/runner"
+require_relative "convert/web"
+
+module Superbot
+  module Convert
+  end
+end

data/lib/superbot/convert/web.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Superbot
+  module Convert
+    module Web
+      def self.register(sinatra)
+        sinatra.helpers do
+          def capybara_runner
+            @capybara_runner ||= Superbot::Capybara::Runner.new
+          end
+        end
+
+        sinatra.post "/__superbot/v1/convert" do
+          begin
+            converted_script = Superbot::Capybara::Convert.call(request.body.read)
+            capybara_runner.run(converted_script)
+            halt 200
+          rescue SystemExit => e
+            e.message
+          end
+        end
+      end
+    end
+  end
+end

data/lib/superbot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Superbot
-  VERSION = "0.1.27"
+  VERSION = "0.1.28"
 end

data/lib/superbot/web.rb

@@ -4,19 +4,15 @@ require "sinatra/base"
 require "sinatra/silent"
 require "net/http"
 
-require_relative "capybara/convert"
-require_relative "capybara/runner"
-
 module Superbot
   class Web
     def initialize(webdriver_type: 'cloud', region: nil)
       @sinatra = Sinatra.new
-      @sinatra.set :bind, ENV.fetch('SUPERBOT_TELEPORT_BIND_ADDRESS', '127.0.0.1')
+      @sinatra.set :bind, ENV.fetch('SUPERBOT_BIND_ADDRESS', '127.0.0.1')
       @sinatra.set :silent_sinatra, true
       @sinatra.set :silent_webrick, true
       @sinatra.set :silent_access_log, false
       @sinatra.server_settings[:Silent] = true
-      instance = self
 
       @sinatra.before do
         headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, DELETE, OPTIONS'
@@ -33,117 +29,23 @@ module Superbot
         "PONG"
       end
 
-      @sinatra.post "/__superbot/v1/convert" do
-        begin
-          converted_script = Superbot::Capybara::Convert.call(request.body.read)
-          instance.capybara_runner.run(converted_script)
-          halt 200
-        rescue SystemExit => e
-          e.message
-        end
-      end
-
-      @webdriver_type = webdriver_type
-      webdriver_uri = URI.parse(Superbot.webdriver_endpoint(@webdriver_type))
-      @request_settings = {
-        scheme:   webdriver_uri.scheme,
-        host:     webdriver_uri.host,
-        port:     webdriver_uri.port,
-        path:     webdriver_uri.path
-      }
-      @region = region
-
-      %w(get post put patch delete).each do |verb|
-        @sinatra.send(verb, "/wd/hub/*") do
-          begin
-            request_path = request.path_info
-            request_path.delete!('/wd/hub', '') if @webdriver_type == 'local'
-            content_type 'application/json'
-            response = instance.remote_webdriver_request(
-              verb.capitalize,
-              request_path,
-              request.query_string,
-              request.body,
-              instance.incomming_headers(request)
-            )
-            status response.code
-            headers instance.all_headers(response)
-            response.body
-          rescue StandardError => e
-            error_message = "Remote webdriver doesn't respond"
-            puts error_message, e
-            halt 500, { message: error_message }.to_json
-          end
-        end
+      if defined?(Superbot::Teleport::Web)
+        Superbot::Teleport::Web.register(@sinatra, webdriver_type: webdriver_type, region: region)
       end
+      Superbot::Cloud::Web.register(@sinatra) if defined?(Superbot::Cloud::Web)
+      Superbot::Convert::Web.register(@sinatra) if defined?(Superbot::Convert::Web)
     end
 
-    def capybara_runner
-      @capybara_runner ||= Superbot::Capybara::Runner.new
-    end
-
-    def remote_webdriver_request(type, path, query_string, body, new_headers)
-      uri = URI.const_get(@request_settings[:scheme].upcase).build(
-        @request_settings.merge(
-          path: @request_settings[:path] + path,
-          query: query_string.empty? ? nil : query_string
-        )
-      )
-      req = Net::HTTP.const_get(type).new(uri, new_headers.merge('Content-Type' => 'application/json'))
-
-      request_body = body.read
-      if cloud_teleport?
-        user_auth_creds = Superbot::Cloud.credentials&.slice(:username, :token)
-        req.basic_auth(*user_auth_creds.values) if user_auth_creds
-
-        if @region && creating_session?(type, path)
-          parsed_body = JSON.parse(request_body)
-          parsed_body['desiredCapabilities']['superOptions'] = { 'region': @region }
-          request_body = parsed_body.to_json
-        end
-      end
-      req.body = request_body
-
-      Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http|
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-        http.read_timeout = Superbot.cloud_timeout
-        http.request(req)
-      end.tap do |response|
-        output_response_errors(response)
-      end
+    def self.run!(options = { webdriver_type: 'cloud', region: nil })
+      new(options).tap(&:run!)
     end
 
-    def cloud_teleport?
-      %w(cloud local_cloud).include?(@webdriver_type)
-    end
-
-    def creating_session?(method, path)
-      method.casecmp?('post') && path == '/session'
-    end
-
-    def all_headers(response)
-      header_list = {}
-      response.header.each_capitalized do |k, v|
-        header_list[k] = v unless k == "Transfer-Encoding"
-      end
-      header_list
-    end
-
-    def incomming_headers(request)
-      request.env.map { |header, value| [header[5..-1].split("_").map(&:capitalize).join('-'), value] if header.start_with?("HTTP_") }.compact.to_h
-    end
-
-    def output_response_errors(response)
-      return unless response.is_a?(Net::HTTPClientError) || response.is_a?(Net::HTTPServerError)
-
-      parsed_body = JSON.parse(response.body, symbolize_names: true)
-      puts "Error: #{parsed_body[:error]}"
-    rescue JSON::ParserError
-      puts "Request to webdriver failed with status: #{response.code}"
+    def run_async!
+      @sinatra.run_async!
     end
 
     def run!
-      @sinatra.run_async!
+      @sinatra.run!
     end
 
     def run_async_after_running!

data/superbot.gemspec

@@ -34,19 +34,19 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "clamp", "1.2.1"
   spec.add_runtime_dependency "zaru", "0.2.0"
-  spec.add_runtime_dependency "sinatra", "2.0.3"
+  spec.add_runtime_dependency "sinatra", "2.0.4"
   spec.add_runtime_dependency "launchy", "2.4.3"
   spec.add_runtime_dependency "sinatra-silent", "0.0.1"
   spec.add_runtime_dependency "kommando", "~> 0.1"
-  spec.add_runtime_dependency "superbot-cloud", "~> 0.1.18"
+  spec.add_runtime_dependency "superbot-cloud", "~> 0.1.19"
+  spec.add_runtime_dependency "superbot-teleport", "~> 0.2.1"
   spec.add_runtime_dependency "selenium-webdriver", "~> 3.14", ">= 3.14.0"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  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 "rubocop", "~> 0.53"
   spec.add_development_dependency "simplecov", "~> 0.16"
-  spec.add_development_dependency "parallel_tests", "~> 2.22"
   spec.add_development_dependency "excon", "~> 0.62"
 
   spec.add_development_dependency "guard", "~> 2.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbot
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Superbots
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -100,48 +100,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: superbot-teleport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.14.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.14.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -198,20 +212,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
-- !ruby/object:Gem::Dependency
-  name: parallel_tests
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.22'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -303,9 +303,10 @@ files:
 - lib/superbot/cli/record_command.rb
 - lib/superbot/cli/root_command.rb
 - lib/superbot/cli/run_command.rb
-- lib/superbot/cli/teleport_command.rb
 - lib/superbot/cli/validations.rb
 - lib/superbot/cli/version_command.rb
+- lib/superbot/convert.rb
+- lib/superbot/convert/web.rb
 - lib/superbot/project.rb
 - lib/superbot/version.rb
 - lib/superbot/web.rb
@@ -330,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Superbot Testing

data/lib/superbot/cli/teleport_command.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-require "superbot/cloud/cli/cloud/validations"
-
-module Superbot
-  module CLI
-    class TeleportCommand < Clamp::Command
-      include Superbot::Validations
-      include Superbot::Cloud::Validations
-
-      option ['--browser'], 'BROWSER', "Browser type to use. Can be either local or cloud", default: 'cloud' do |browser|
-        validates_browser_type browser
-      end
-      option ['--region'], 'REGION', 'Region for remote webdriver'
-
-      def execute
-        require_login unless browser == 'local'
-
-        @web = Superbot::Web.new(webdriver_type: browser, region: region)
-        @web.run_async_after_running!
-
-        @chromedriver = Kommando.run_async 'chromedriver --silent --port=9515' if browser == 'local'
-
-        puts "", "🤖 Teleport is open ☁️ "
-        puts "", "Configure your webdriver to http://localhost:4567/wd/hub"
-        puts "", "Press [control+c] to close teleport"
-
-        handle_keyboard_interrupt
-      ensure
-        close_teleport
-      end
-
-      def handle_keyboard_interrupt
-        @interrupted = false
-
-        trap "SIGINT" do
-          puts
-          puts "Command killed by keyboard interrupt"
-          @interrupted = true
-          exit 130
-        end
-
-        loop do
-          break if @interrupted
-        end
-      end
-
-      def close_teleport
-        @chromedriver&.kill
-        @web&.quit!
-      end
-    end
-  end
-end