saucer 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c494261378e343b7a57914f25f848304a16fbafd
-  data.tar.gz: fa40d7449b7a56cca8c34cdd831c381964333a0a
+  metadata.gz: 69978c50790a42b9d2c2356767dfcde881f5782d
+  data.tar.gz: 3f308c2b10d311ec80a87a8575103d0dca27aafe
 SHA512:
-  metadata.gz: b4ee9737d38eda08c7fc76af6b56e83a32860ec9c7a12a96da49937ff04eaf90384d0e548a947478a25604e686967e328359bef3c113285f05ee4c5f5f1f69fa
-  data.tar.gz: 5ec274b43b22d3eaeba0291c2389f81875ec5e80eb7184b07f73574887280fb656046a3ffd939081fa2f15941c83152819e808b3ab4ee50bab313a814358e6b3
+  metadata.gz: dbfadc23496f459b2d553a79b75a69c77880322006b7318454190e953c07218af5307928533be5bac64d83fc7359e641a1fbab192ff22de506f4a522d548d4ea
+  data.tar.gz: 547fbf2c14eda5c642d4cd621d2eacfc4948a0f90368dcdc21ff76a030cb9601090250c609159ef576fc2781dd1f4e78a30613249965a0fc79caf8d5fa72149f

data/.rubocop.yml

@@ -22,6 +22,9 @@ Metrics/BlockLength:
 Style/Documentation:
   Enabled: false
 
+Style/BlockDelimiters:
+  EnforcedStyle: braces_for_chaining
+
 RSpec/ExampleLength:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.0.beta3 (2019-07-15)
+* Fixed Bundler namespace
+* Changed Session #begin and #end to #start and #stop
+
 ### 1.0.0.beta2 (2019-05-16)
 * Add iedriver version by default
 

data/README.md

@@ -20,28 +20,24 @@ require 'saucer'
 ## Usage
 
 #### Starting the Driver
-Use Saucer to start your sessions
+Use Saucer to start your session on Sauce Labs
 ```ruby
-@session = Saucer::Session.begin
+@session = Saucer::Session.start
 @driver = @session.driver
 ```
-Optionally you can create options with various parameters to pass into `Session.begin`
+Optionally you can create options with various parameters to pass into `Session.start`
 ```ruby
 options = Saucer::Options.new(browser_name: 'Safari', 
                               browser_version: '12.0',
                               platform_name: 'macOS 10.14')
-@session = Saucer::Session.begin(options)
+@session = Saucer::Session.start(options)
 @driver = @session.driver
 ```
 
 #### Finishing the session
-You can still quit the driver yourself if you'd like
+Stopping the session will automatically quit the driver and send updated data to Sauce Labs
 ```ruby
-@driver.quit
-```
-You get some automatic data population if you end the Session
-```ruby
-@session.end
+@session.stop
 ```
 
 #### Automatic Data Population
@@ -51,7 +47,7 @@ in the `env.rb` or `hooks.rb` file.
 ```ruby
 Before do |scenario|
   options = Saucer::Options.new(scenario: scenario)
-  session = Saucer::Session.begin(options)
+  session = Saucer::Session.start(options)
   @driver = session.driver
 end
 ```
@@ -77,9 +73,6 @@ Saucer provides a number of custom methods as part of the session instance:
 @session.start_network
 @session.breakpoint
 
-# This will cause an error, but is available as an option 
-session.stop
-
 # These things can be done after the session has ended
 @session.save_screenshots
 @session.save_log(log_type: :selenium) 

data/lib/saucer/asset_management.rb

@@ -36,11 +36,11 @@ module Saucer
         raise APIError, "Can not retrieve log: #{response['message']}" if JSON.parse(response).key?('message')
       rescue NoMethodError
         # Sauce Log is Special
-        JSON.parse(response).map do |hash|
-          hash.map do |key, value|
+        JSON.parse(response).map { |hash|
+          hash.map { |key, value|
             "#{key}: #{value}"
-          end.join("\n")
-        end.join("\n\n")
+          }.join("\n")
+        }.join("\n\n")
       rescue JSON::ParserError, NoMethodError
         response
       rescue APIError

data/lib/saucer/data_collection.rb

@@ -5,8 +5,8 @@ module Saucer
     PAGE_OBJECTS = %w[site_prism page-object watirsome watir_drops].freeze
 
     def gems
-      Bundler.definition.specs.map(&:name).each_with_object({}) do |gem_name, hash|
-        name = Bundler.environment.specs.to_hash[gem_name]
+      ::Bundler.definition.specs.map(&:name).each_with_object({}) do |gem_name, hash|
+        name = ::Bundler.environment.specs.to_hash[gem_name]
         next if name.empty?
 
         hash[gem_name] = name.first.version

data/lib/saucer/options.rb

@@ -8,7 +8,7 @@ module Saucer
     SAUCE = %i[access_key appium_version avoid_proxy build capture_html chromedriver_version command_timeout
                crmuxdriver_version custom_data disable_popup_handler extended_debugging firefox_adapter_version
                firefox_profile_url idle_timeout iedriver_version max_duration name parent_tunnel passed prerun
-               prevent_Requeue priority proxy_host public record_logs record_screenshots record_video
+               prevent_requeue priority proxy_host public record_logs record_screenshots record_video
                restricted_public_info screen_resolution selenium_version source tags time_zone tunnel_identifier
                username video_upload_on_pass].freeze
 
@@ -17,13 +17,8 @@ module Saucer
     attr_accessor :url, :scenario
     attr_reader :data_center, :remaining
 
-    def initialize(opts)
-      VALID.each do |option|
-        self.class.__send__(:attr_accessor, option)
-        next unless opts.key?(option)
-
-        instance_variable_set("@#{option}", opts.delete(option))
-      end
+    def initialize(opts = {})
+      create_instance_variables(opts)
 
       validate_credentials
       @browser_name ||= 'firefox'
@@ -33,12 +28,20 @@ module Saucer
       @iedriver_version ||= '3.141.59' if @browser_name == 'internet explorer'
 
       opts.key?(:url) ? @url = opts[:url] : self.data_center = :US_WEST
-      @scenario = opts[:scenario] if opts.key?(:scenario)
+      @scenario = opts.delete(:scenario)
 
-      # TODO: - validate that these all include `:`
       @remaining = opts
     end
 
+    def create_instance_variables(opts)
+      VALID.each do |option|
+        self.class.__send__(:attr_accessor, option)
+        next unless opts.key?(option)
+
+        instance_variable_set("@#{option}", opts.delete(option))
+      end
+    end
+
     def capabilities
       w3c = W3C.each_with_object({}) do |option, hash|
         value = instance_variable_get("@#{option}")

data/lib/saucer/session.rb

@@ -15,7 +15,7 @@ module Saucer
         end
       end
 
-      def begin(options = nil, scenario: nil)
+      def start(options = nil, scenario: nil)
         options ||= Options.new(scenario: scenario)
         options.name ||= test_name if test_name
         options.build ||= build_name
@@ -57,7 +57,7 @@ module Saucer
       @options = options
       @job_id = driver.session_id
       @tags = []
-      @scenario = options.scenario
+      @scenario = options.scenario if options.scenario
       @runner = self.class.runner
       @data = generate_data
 
@@ -77,7 +77,7 @@ module Saucer
       opt
     end
 
-    def end
+    def stop
       self.result = runner.result unless runner.result.nil?
 
       if runner.exception
@@ -104,11 +104,8 @@ module Saucer
     end
 
     def result=(res)
-      SauceWhisk::Jobs.change_status(@job_id, res)
-    end
-
-    def stop
-      SauceWhisk::Jobs.stop(@job_id)
+      result = res == true || res.to_s.match?(/pass/i)
+      SauceWhisk::Jobs.change_status(@job_id, result)
     end
 
     def delete

data/lib/saucer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Saucer
-  VERSION = '1.0.0.beta2'
+  VERSION = '1.0.0.beta3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saucer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Titus Fortner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake