fastlane-plugin-saucectl 0.1.4.pre → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 024240ff63318f8b16a171d979f78e248056944b7d101fcc65fd624052109931
-  data.tar.gz: 8658779f3666c3763d3bee9653a1615948cfaa5d86a29ae467bec7bd312bf446
+  metadata.gz: b60d47d2798bb4bad74799e37917cc95e49efd9e8dbcc7c79df8e038307170b8
+  data.tar.gz: abc1f1d25dcc764c1eeeda22e3b3ef35ef3dea02e4b7c7606e32aab6daae06b0
 SHA512:
-  metadata.gz: 52a09bb69e87375bc95c2859926f7f67d4d95e46c7dab759273579c736148b21490ac098d9f3d88fc624d6be9a86e0126d313d54b1b6a36b5832787c9809323b
-  data.tar.gz: 0e227865084afc04b8b6677229db631bc9385a6550fe44f74450517b9ddfecd6787675b773bfd78ff90624d235bf28dc802634b2ca5667711231479f68983e86
+  metadata.gz: a534469f042c3088a6cfbb424ab0bf5b2a50e228d3e40f1861d55ecfb8b1b787b093241f1db263bd7b4e74b450582c508d7e9ecf47f3c0da81db0247398b1647
+  data.tar.gz: a684548ebab6e4834513d029b85c76bdeac6ba9212ec7b97c542959160ba72de5d59b20dc6433cd35344195fe52e10dd859ae950995d72f9a43f41a08726ceba

data/README.md

@@ -1,7 +1,8 @@
 # fastlane-plugin-saucectl
 
 [![fastlane Plugin Badge](https://rawcdn.githack.com/fastlane/fastlane/master/fastlane/assets/plugin-badge.svg)](https://rubygems.org/gems/fastlane-plugin-saucectl)
-[![codecov](https://codecov.io/gh/ianrhamilton/fastlane-plugin-rsaucectl/branch/main/graph/badge.svg?token=NSVhqgYFYv)](https://codecov.io/gh/ianrhamilton/fastlane-plugin-saucectl)
+[![Gem Version](https://badge.fury.io/rb/fastlane-plugin-saucectl.svg)](https://badge.fury.io/rb/fastlane-plugin-saucectl)
+[![Gem Downloads](https://img.shields.io/gem/dt/fastlane-plugin-saucectl?color=light-green)](https://img.shields.io/gem/dt/fastlane-plugin-saucectl)
 
 ## Getting Started
 
@@ -13,31 +14,24 @@ fastlane add_plugin saucectl
 
 ## About fastlane-plugin-saucectl
 
-The purpose of this plugin is to simplify the set up, configuration, upload, and execution of espresso and xcuitests via the [Sauce Labs](https://saucelabs.com/) platform by utilizing fastlane which will enable you to test your iOS and and Android apps at scale using [Sauce Labs CLI](https://docs.saucelabs.com/dev/cli/saucectl/).
+The purpose of this plugin is to simplify the set up, configuration, upload, and execution of espresso and XCUITest on the Sauce Labs platform by utilizing fastlane which will enable you to test your iOS and Android apps at scale.
 
-**IMPORTANT:** in order for you to use this plugin to execute UI tests, your test class names must proceed with Spec, Specs, Tests, or Test, for example ExampleSpec, ExampleSpecs, ExampleTest, ExampleTests. Your test case names must also begin with test, for example testIDoSomething, testIDoSomethingElse. This is so that the the plugin can search for test classes and their included test cases.
+**IMPORTANT:** To use this plugin to execute UI tests on Sauce Labs, your test class names must proceed with `Spec`, `Specs`, `Tests`, or `Test`, for example `ExampleSpec`, `ExampleSpecs`, `ExampleTest`, or `ExampleTests`. Your test case names must also begin with `test`, for example `testIDoSomething`, `testIDoSomethingElse`. This is so that the the plugin can search for test classes and their included test cases.
 
 Failure to do this will result in missing test classes and test cases from your test run.
 
 **For a detailed introduction to each of the actions available within this plugin, please see the [documentation](https://ianrhamilton.github.io/fastlane-plugin-saucectl/#fastlane-plugin-saucectl)**.
 
-| Available Actions   | Description                                                                                                                                                                                            |
-|---------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| install_saucectl    | Downloads the Sauce Labs saucectl cli binary for test execution                                                                                                                                        |
-| sauce_upload        | Upload test artifacts to sauce labs storage                                                                                                                                                            | 
-| sauce_config        | Create SauceLabs configuration file for test execution based on given parameters                                                                                                                       |
-| sauce_runner        | Execute automated tests on sauce labs platform via saucectl binary for specified configuration                                                                                                         | 
-| delete_from_storage | Delete test artifacts from sauce labs storage by storage id or group id                                                                                                                                |
-| sauce_apps          | Returns the set of files by specific app id that have been uploaded to Sauce Storage by the requester                                                                                                  |
-| sauce_devices       | Returns a list of Device IDs for all devices in the data center that are currently free for testing.                                                                                                   |
-| disabled_tests      | Fetches any disabled ui test cases (for android searches for @Ignore tests, and for ios skipped tests within an xcode test plan). Plan is to use this in the future for generating pretty HTML reports | 
-
-An order of which you may utilize the above actions in your continuous integration platform could be:
-1. Install the saucectl binary via `install_saucectl`
-2. Upload your test artifacts to Sauce Labs storage (for example app apk, and test runner apk)
-3. Create config.yml for given parameters via `sauce_config` 
-4. Execute test based on specified config via `sauce_runner`
-5. Delete test artifacts via `delete_from_storage` so that your storage does not fill up (if you're executing tests on every PR, for example)
+| Available Actions   | Description                                                                                                                                                                                                  |
+|---------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `install_saucectl`    | Downloads the Sauce Labs saucectl cli binary for test execution. Optionally specify the [version](https://github.com/saucelabs/saucectl/releases/) you wish to install or automatically download the latest. |
+| `sauce_upload`        | Upload test artifacts to sauce labs storage                                                                                                                                                                  | 
+| `sauce_config`        | Create SauceLabs configuration file for test execution based on given parameters                                                                                                                             |
+| `sauce_runner`        | Execute automated tests on sauce labs platform via saucectl binary for specified configuration                                                                                                               | 
+| `delete_from_storage` | Delete test artifacts from sauce labs storage by storage id or group id                                                                                                                                      |
+| `sauce_apps`          | Returns the set of files by specific app id that have been uploaded to Sauce Storage by the requester                                                                                                        |
+| `sauce_devices`       | Returns a list of Device IDs for all devices in the data center that are currently free for testing.                                                                                                         |
+| `disabled_tests`      | Fetches any disabled ui test cases (for android searches for @Ignore tests, and for ios skipped tests within an xcode test plan). Plan is to use this in the future for generating pretty HTML reports       | 
 
 ## Example
 

data/lib/fastlane/plugin/saucectl/actions/install_saucectl_action.rb

@@ -4,10 +4,11 @@ require_relative '../helper/installer'
 module Fastlane
   module Actions
     class InstallSaucectlAction < Action
-      def self.run(param = '')
-        UI.message("Installing saucectl 🤖 🚀")
+      def self.run(version = nil)
+        version_message = version[:version].nil? ? 'Installing with latest version of saucectl' : "Installing saucectl with version #{version[:version]}"
+        UI.message("#{version_message} 🤖 🚀")
         installer = Saucectl::Installer.new
-        installer.install
+        installer.install(version)
       end
 
       def self.description
@@ -15,7 +16,16 @@ module Fastlane
       end
 
       def self.details
-        "Installs the Sauce Labs saucectl cli binary"
+        "Optionally set the tag of the version you wish to install. If not tag is set, the latest tag will be downloaded. See: https://github.com/saucelabs/saucectl/tags "
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :version,
+                                       description: "Set the tag of saucectl you wish to install",
+                                       optional: true,
+                                       type: String)
+        ]
       end
 
       def self.authors

data/lib/fastlane/plugin/saucectl/actions/sauce_config_action.rb

@@ -75,12 +75,19 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :test_distribution,
                                        description: "Test distribution method",
                                        optional: true,
-                                       type: String,
-                                       default_value: 'class'),
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :test_class,
                                        description: "Array of tests to execute",
                                        optional: true,
                                        type: Array),
+          FastlaneCore::ConfigItem.new(key: :size,
+                                       description: "Instructs saucectl to run only tests that are annotated with the matching size value i.e @SmallTest, @MediumTest or @LargeTest. Valid values are small, medium, or large. You may only specify one value for this property",
+                                       optional: true,
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :annotation,
+                                       description: "Instructs saucectl to run only tests that match a custom annotation that you have set",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :emulators,
                                        description: "The parent property that defines details for running this suite on virtual devices using an emulator",
                                        optional: true,
@@ -156,8 +163,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :path_to_tests,
                                        description: "Path to your espresso tests",
                                        optional: true,
-                                       type: String,
-                                       default_value: "#{Dir.pwd}/app/src/androidTest"),
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :clear_data,
                                        description: "Clear package data from device (android only)",
                                        optional: true,
@@ -172,7 +178,12 @@ module Fastlane
                                        description: "Sets the maximum number of suites to execute at the same time. If the test defines more suites than the max, excess suites are queued and run in order as each suite completes",
                                        optional: true,
                                        type: Integer,
-                                       default_value: 1)
+                                       default_value: 1),
+          FastlaneCore::ConfigItem.new(key: :timeout,
+                                       description: "Instructs how long (in ms, s, m, or h) saucectl should wait for each suite to complete. You can override this setting for individual suites using the timeout setting within the suites object. If not set, the default value is 0 (unlimited)",
+                                       optional: true,
+                                       type: String,
+                                       default_value: '0')
         ]
       end
 

data/lib/fastlane/plugin/saucectl/helper/android_suites.rb

@@ -0,0 +1,180 @@
+require 'base64'
+require 'fastlane'
+require 'fastlane_core/ui/ui'
+require_relative 'espresso'
+require_relative 'xctest'
+
+module Fastlane
+  module Saucectl
+    #
+    # This class will create test suites based on user specified configuration properties
+    #
+    class AndroidSuites
+      include FileUtils
+
+      UI = FastlaneCore::UI unless Fastlane.const_defined?(:UI)
+
+      def initialize(config)
+        UI.user_error!("❌ #{config[:kind]} is not a supported test framework for android. Use espresso") unless config[:kind].eql?('espresso')
+        @devices = config[:devices].nil? ? config[:emulators] : config[:devices]
+        @is_real_device = config[:emulators].nil?
+        @config = config
+      end
+
+      def generate
+        if @config[:test_distribution] || @config[:size] || @config[:annotation]
+          create_test_distribution_suite
+        elsif @config[:test_class].kind_of?(Array)
+          custom_test_class_suite
+        else
+          test_runner_suite
+        end
+      end
+
+      def test_distribution_array
+        @config[:test_class] || Fastlane::Saucectl::Espresso.new(@config).test_distribution
+      end
+
+      def suite_name(test_type)
+        if ENV['JOB_NAME'].nil? && ENV['BUILD_NUMBER'].nil?
+          "#{@config[:kind]}-#{test_type}"
+        else
+          "#{ENV['JOB_NAME']}-#{ENV['BUILD_NUMBER']}-#{test_type}"
+        end
+      end
+
+      def shard_suites
+        UI.user_error!("❌ Cannot split #{@config[:test_distribution]}'s across devices with a single device/emulator. \nPlease specify a minimum of two devices/emulators!") if @devices.size.eql?(1)
+
+        test_suites = []
+        arr = test_distribution_array
+        shards = arr.each_slice((arr.size / @devices.size.to_f).round).to_a
+        shards.each_with_index do |suite, i|
+          device_options = @is_real_device ? real_device_options(@devices[i]) : virtual_device_options(@devices[i])
+          test_suites << {
+            'name' => suite_name("shard #{i + 1}").downcase,
+            'testOptions' => test_option_type(suite)
+          }.merge(device_options)
+        end
+        test_suites
+      end
+
+      def test_runner_suite
+        test_suites = []
+        @devices.each do |device|
+          device_options = @is_real_device ? real_device_options(device) : virtual_device_options(device)
+          device_name = device.key?(:id) ? device[:id] : device[:name]
+          test_suites << {
+            'name' => suite_name(device_name),
+            'testOptions' => test_option_type
+          }.merge(device_options)
+        end
+        test_suites
+      end
+
+      def custom_test_class_suite
+        test_suites = []
+        @devices.each do |device|
+          device_options = @is_real_device ? real_device_options(device) : virtual_device_options(device)
+          test_classes = @config[:test_class].reject(&:empty?).join(',')
+          test_suites << {
+            'name' => suite_name(device[:name]).downcase,
+            'testOptions' => test_option_type(test_classes.split(','))
+          }.merge(device_options)
+        end
+        test_suites
+      end
+
+      def create_test_distribution_suite
+        if @config[:test_distribution].eql?('shard')
+          shard_suites
+        else
+          test_distribution_suite
+        end
+      end
+
+      def test_distribution_suite
+        UI.user_error!("❌ to distribute tests you must specify the path to your espresso tests. For example `path_to_tests:someModule/src/androidTest`") if @config[:path_to_tests].nil?
+
+        test_suites = []
+        if @config[:size] || @config[:annotation]
+          @devices.each do |device|
+            device_options = @is_real_device ? real_device_options(device) : virtual_device_options(device)
+            test_suites << {
+              'name' => suite_name(device[:name]).downcase,
+              'testOptions' => test_option_type
+            }.merge(device_options)
+          end
+        else
+          @devices.each do |device|
+            device_options = @is_real_device ? real_device_options(device) : virtual_device_options(device)
+            test_distribution_array.each do |test_type|
+              test_suites << {
+                'name' => suite_name(test_type).downcase,
+                'testOptions' => test_option_type(test_type)
+              }.merge(device_options)
+            end
+          end
+        end
+        test_suites
+      end
+
+      def virtual_device_options(device)
+        platform_versions = device[:platform_versions].reject(&:empty?).join(',')
+        { 'emulators' => [{ 'name' => device[:name],
+                            'orientation' => device[:orientation],
+                            'platformVersions' => platform_versions.split(',') }] }
+      end
+
+      def real_device_options(device)
+        { 'devices' => [rdc_options(device)] }
+      end
+
+      def rdc_options(device)
+        device_type_key = device.key?(:id) ? 'id' : 'name'
+        name = device.key?(:id) ? device[:id] : device[:name]
+
+        base_device_hash = {
+          device_type_key => name,
+          'orientation' => device[:orientation]
+        }.merge('options' => device_options(device))
+
+        unless device[:platform_version].nil?
+          base_device_hash = base_device_hash.merge({ 'platformVersion' => device[:platform_version] })
+        end
+
+        base_device_hash
+      end
+
+      def device_options(device)
+        {
+          'carrierConnectivity' => device[:carrier_connectivity],
+          'deviceType' => device[:device_type].upcase!,
+          'private' => device[:private]
+        }
+      end
+
+      def test_option_type(test_type = nil)
+        if @config[:size] || @config[:annotation]
+          key = @config[:size] ? 'size' : 'annotation'
+          value = @config[:size] || @config[:annotation]
+          { key => value }.merge(android_test_options)
+        else
+          if test_type.nil?
+            android_test_options
+          else
+            test_option_type = @config[:test_distribution].eql?('package') ? 'package' : 'class'
+            { test_option_type => test_type }.merge(android_test_options)
+          end
+        end
+      end
+
+      def android_test_options
+        {
+          'clearPackageData' => @config[:clear_data],
+          'useTestOrchestrator' => @config[:use_test_orchestrator]
+        }
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/saucectl/helper/config.rb

@@ -5,7 +5,8 @@ require 'net/http'
 require 'json'
 require 'base64'
 require 'open3'
-require_relative 'suites'
+require_relative 'ios_suites'
+require_relative 'android_suites'
 
 module Fastlane
   module Saucectl
@@ -23,14 +24,13 @@ module Fastlane
         {
           'apiVersion' => 'v1alpha',
           'kind' => @config[:kind],
-          'retries' => @config[:retries],
+          'defaults' => {
+            'timeout' => @config[:timeout],
+          },
           'sauce' => {
             'region' => set_region.to_s,
             'concurrency' => @config[:max_concurrency_size],
-            'metadata' => {
-              'name' => "#{ENV['JOB_NAME']}-#{ENV['BUILD_NUMBER']}",
-              'build' => "Release #{ENV['CI_COMMIT_SHORT_SHA']}"
-            }
+            'retries' => @config[:retries]
           },
           (@config[:kind]).to_s => set_apps,
           'artifacts' => {
@@ -49,12 +49,7 @@ module Fastlane
       end
 
       def set_region
-        case @config[:region]
-        when 'eu'
-          'eu-central-1'
-        else
-          'us-west-1'
-        end
+        @config[:region] == 'eu' ? 'eu-central-1' : 'us-west-1'
       end
 
       def set_apps
@@ -64,12 +59,16 @@ module Fastlane
         }
       end
 
+      def suite
+        @config[:platform].eql?('ios') ? Fastlane::Saucectl::IosSuites.new(@config) : Fastlane::Saucectl::AndroidSuites.new(@config)
+      end
+
       def create
         UI.message("Creating saucectl config .....🚕💨")
         file_name = 'config.yml'
         UI.user_error!("❌ Sauce Labs platform does not support virtual device execution for ios apps") if @config[:platform].eql?('ios') && @config[:emulators]
 
-        config = base_config.merge(create_suite)
+        config = base_config.merge({ 'suites' => suite.generate })
         out_file = File.new(file_name, 'w')
         out_file.puts(config.to_yaml)
         out_file.close
@@ -79,15 +78,6 @@ module Fastlane
         UI.user_error!("Failed to create saucectl config ❌") unless Dir.exist?('.sauce')
       end
 
-      def create_suite
-        suite = Fastlane::Saucectl::Suites.new(@config)
-        { 'suites' => if @config[:emulators]
-                        suite.create_virtual_device_suites
-                      else
-                        suite.create_real_device_suites
-                      end }
-      end
-
       def creat_sauce_dir
         dirname = '.sauce'
         FileUtils.mkdir_p(dirname) unless File.directory?(dirname)

data/lib/fastlane/plugin/saucectl/helper/espresso.rb

@@ -5,7 +5,7 @@ require_relative "file_utils"
 
 module Fastlane
   module Saucectl
-    # This class is responsible for creating test execution plans for ios applications and will distribute tests
+    # This class is responsible for creating test execution plans for android applications and will distribute tests
     # that will be be executed via the cloud provider.
     #
     class Espresso

data/lib/fastlane/plugin/saucectl/helper/installer.rb

@@ -12,11 +12,11 @@ module Fastlane
       include FileUtils
       UI = FastlaneCore::UI unless Fastlane.const_defined?(:UI)
 
-      def install
-        timeout_in_seconds = 30
+      def install(version)
+        timeout_in_seconds = 90
         Timeout.timeout(timeout_in_seconds) do
           download_saucectl_installer
-          execute_saucectl_installer
+          execute_saucectl_installer(version)
           UI.success("✅ Successfully installed saucectl runner binary 🚀")
         rescue OpenURI::HTTPError => e
           response = e.io
@@ -26,13 +26,14 @@ module Fastlane
 
       def download_saucectl_installer
         URI.open('sauce', 'wb') do |file|
-          file << URI.open('https://saucelabs.github.io/saucectl/install').read
+          file << URI.open('https://saucelabs.github.io/saucectl/install', ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read
         end
       end
 
-      def execute_saucectl_installer
-        status = system('sh sauce')
-        status == 1 ? UI.user_error!("❌ failed to install saucectl: #{stderr}") : status
+      def execute_saucectl_installer(version)
+        saucectl_version = version[:version].nil? ? '' : "v#{version[:version]}"
+        status = system("sh sauce #{saucectl_version}")
+        status == 1 ? UI.user_error!("❌ failed to install saucectl") : status
         executable = 'saucectl'
         FileUtils.mv("bin/#{executable}", executable) unless File.exist?(executable)
       end
@@ -40,7 +41,9 @@ module Fastlane
       def system(*cmd)
         Open3.popen2e(*cmd) do |stdin, stdout_stderr, wait_thread|
           Thread.new do
-            stdout_stderr.each { |out| UI.message(out) }
+            stdout_stderr.each do |out|
+              UI.message(out)
+            end
           end
           stdin.close
           wait_thread.value

data/lib/fastlane/plugin/saucectl/helper/ios_suites.rb

@@ -0,0 +1,166 @@
+require 'base64'
+require 'fastlane'
+require 'fastlane_core/ui/ui'
+require_relative 'espresso'
+require_relative 'xctest'
+
+module Fastlane
+  module Saucectl
+    #
+    # This class will create test suites for ios applications based on user specified configuration properties
+    #
+    class IosSuites
+      include FileUtils
+
+      UI = FastlaneCore::UI unless Fastlane.const_defined?(:UI)
+
+      def initialize(config)
+        UI.user_error!("❌ For the ios platform you must specify `devices` array") if config[:devices].nil?
+        UI.user_error!("❌ #{config[:kind]} is not a supported test framework for iOS. Use xcuitest") unless config[:kind].eql?('xcuitest')
+        @config = config
+      end
+
+      def generate
+        check_for_android_params
+
+        if @config[:test_distribution] || @config[:test_plan]
+          create_test_distribution_suite
+        elsif @config[:test_class].kind_of?(Array)
+          custom_test_class_suite
+        else
+          test_runner_suite
+        end
+      end
+
+      def check_for_android_params
+        type = @config[:annotation] ? 'annotation' : 'size'
+        UI.user_error!("❌ execution by #{type} is not supported on the iOS platform!") if @config[:size] || @config[:annotation]
+      end
+
+      def create_test_distribution_suite
+        if @config[:test_distribution].eql?('shard')
+          shard_real_device_suites
+        else
+          test_distribution_suite
+        end
+      end
+
+      def test_distribution_array
+        @config[:test_class] || Fastlane::Saucectl::XCTest.new(@config).test_distribution
+      end
+
+      def suite_name(name)
+        if ENV['JOB_NAME'].nil? && ENV['BUILD_NUMBER'].nil?
+          "#{@config[:kind]}-#{name}"
+        else
+          "#{ENV['JOB_NAME']}-#{ENV['BUILD_NUMBER']}-#{name}"
+        end
+      end
+
+      def shard_real_device_suites
+        test_suites = []
+        arr = test_distribution_array
+        shards = arr.each_slice((arr.size / @config[:devices].size.to_f).round).to_a
+        shards.each_with_index do |suite, i|
+          device_name = @config[:devices][i].key?(:id) ? @config[:devices][i][:id] : @config[:devices][i][:name]
+          test_suites << {
+            'name' => suite_name("#{device_name}-shard-#{i + 1}").downcase,
+            'testOptions' => default_test_options(suite)
+          }.merge(real_device_options(@config[:devices][i]))
+        end
+        test_suites
+      end
+
+      def test_runner_suite
+        test_suites = []
+        @config[:devices].each do |device|
+          device_name = device.key?(:id) ? device[:id] : device[:name]
+          test_suites << {
+            'name' => suite_name(device_name),
+            'testOptions' => default_test_options(nil)
+          }.merge(real_device_options(device))
+        end
+        test_suites
+      end
+
+      def custom_test_class_suite
+        test_suites = []
+        @config[:devices].each do |device|
+          device_options = real_device_options(device)
+          test_classes = @config[:test_class].reject(&:empty?).join(',')
+          test_suites << {
+            'name' => suite_name(device[:name]).downcase,
+            'testOptions' => default_test_options(test_classes.split(','))
+          }.merge(device_options)
+        end
+        test_suites
+      end
+
+      def test_distribution_suite
+        test_suites = []
+        if @config[:test_plan]
+          @config[:devices].each do |device|
+            test_suites << {
+              'name' => suite_name(@config[:test_plan]).downcase,
+              'testOptions' => default_test_options(test_distribution_array)
+            }.merge(real_device_options(device))
+          end
+        else
+          @config[:devices].each do |device|
+            test_distribution_array.each do |test_type|
+              test_suites << {
+                'name' => suite_name(test_type).downcase,
+                'testOptions' => default_test_options(test_type)
+              }.merge(real_device_options(device))
+            end
+          end
+        end
+        test_suites
+      end
+
+      def test_plan_distribution
+        test_suites = []
+        @config[:devices].each do |device|
+          test_suites << {
+            'name' => suite_name(@config[:test_plan]).downcase,
+            'testOptions' => default_test_options(test_distribution_array)
+          }.merge(real_device_options(device))
+        end
+        test_suites
+      end
+
+      def real_device_options(device)
+        { 'devices' => [rdc_options(device)] }
+      end
+
+      def rdc_options(device)
+        device_type_key = device.key?(:id) ? 'id' : 'name'
+        name = device.key?(:id) ? device[:id] : device[:name]
+        base_device_hash = {
+          device_type_key => name,
+          'orientation' => device[:orientation]
+        }.merge('options' => device_options(device))
+
+        unless device[:platform_version].nil?
+          base_device_hash = base_device_hash.merge({ 'platformVersion' => device[:platform_version] })
+        end
+
+        base_device_hash
+      end
+
+      def device_options(device)
+        {
+          'carrierConnectivity' => device[:carrier_connectivity],
+          'deviceType' => device[:device_type].upcase!,
+          'private' => device[:private]
+        }
+      end
+
+      def default_test_options(test_type)
+        unless test_type.nil?
+          { 'class' => test_type }
+        end
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/saucectl/helper/runner.rb

@@ -25,7 +25,10 @@ module Fastlane
       def system(*cmd)
         Open3.popen2e(*cmd) do |stdin, stdout_stderr, wait_thread|
           Thread.new do
-            stdout_stderr.each { |out| UI.message(out) }
+            stdout_stderr.each do |out|
+              message = out.gsub(/(?:\[[^\]].*\])|(?:\(\d{4}\))/, '')
+              puts(message)
+            end
           end
           stdin.close
           wait_thread.value

data/lib/fastlane/plugin/saucectl/helper/xctest.rb

@@ -64,11 +64,11 @@ module Fastlane
         case test_distribution
         when 'testCase', 'testPlan'
           test_data.each do |type|
-            type[:tests].each { |test| tests_arr << "#{test_target}.#{type[:class]}/#{test}" }
+            type[:tests].each { |test| tests_arr << "#{test_target.tr(" ", "_")}.#{type[:class]}/#{test}" }
           end
         else
           test_data.each do |type|
-            tests_arr << "#{test_target}.#{type[:class]}"
+            tests_arr << "#{test_target.tr(" ", "_")}.#{type[:class]}"
           end
         end
         tests_arr.uniq

data/lib/fastlane/plugin/saucectl/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Saucectl
-    VERSION = "0.1.4.pre"
+    VERSION = '0.1.4'.freeze
   end
 end

data/lib/fastlane/plugin/saucectl.rb

@@ -1,11 +1,9 @@
-require 'fastlane'
+require 'fastlane/plugin/saucectl/version'
 
 module Fastlane
   module Saucectl
-    UI = FastlaneCore::UI
-    # Return all .rb files inside the "actions" and "helper" directory
     def self.all_classes
-      Dir[File.expand_path('**/actions/*_action.rb', File.dirname(__FILE__))]
+      Dir[File.expand_path('*/{actions,helper}/*.rb', File.dirname(__FILE__))]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-saucectl
 version: !ruby/object:Gem::Version
-  version: 0.1.4.pre
+  version: 0.1.4
 platform: ruby
 authors:
 - Ian Hamilton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-23 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,14 +181,15 @@ files:
 - lib/fastlane/plugin/saucectl/actions/sauce_devices_action.rb
 - lib/fastlane/plugin/saucectl/actions/sauce_runner_action.rb
 - lib/fastlane/plugin/saucectl/actions/sauce_upload_action.rb
+- lib/fastlane/plugin/saucectl/helper/android_suites.rb
 - lib/fastlane/plugin/saucectl/helper/api.rb
 - lib/fastlane/plugin/saucectl/helper/config.rb
 - lib/fastlane/plugin/saucectl/helper/espresso.rb
 - lib/fastlane/plugin/saucectl/helper/file_utils.rb
 - lib/fastlane/plugin/saucectl/helper/installer.rb
+- lib/fastlane/plugin/saucectl/helper/ios_suites.rb
 - lib/fastlane/plugin/saucectl/helper/runner.rb
 - lib/fastlane/plugin/saucectl/helper/storage.rb
-- lib/fastlane/plugin/saucectl/helper/suites.rb
 - lib/fastlane/plugin/saucectl/helper/xctest.rb
 - lib/fastlane/plugin/saucectl/strings/messages.yml
 - lib/fastlane/plugin/saucectl/version.rb
@@ -205,15 +206,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.10
 signing_key:
 specification_version: 4
-summary: Test your iOS and and Android apps at scale using Sauce Labs toolkit.
+summary: Simplify the set up, configuration, upload, and execution of espresso and
+  XCUITest on the Sauce Labs platform by utilizing fastlane which will enable you
+  to test your iOS and Android apps at scale.
 test_files: []

data/lib/fastlane/plugin/saucectl/helper/suites.rb

@@ -1,201 +0,0 @@
-require 'base64'
-require 'fastlane'
-require 'fastlane_core/ui/ui'
-require_relative 'espresso'
-require_relative 'xctest'
-
-module Fastlane
-  module Saucectl
-    #
-    # This class will create test suites based on user specified configuration properties
-    #
-    class Suites
-      include FileUtils
-
-      UI = FastlaneCore::UI unless Fastlane.const_defined?(:UI)
-
-      def initialize(config)
-        @config = config
-      end
-
-      def create_test_plan
-        check_kind
-        if @config[:platform].casecmp('ios').zero?
-          is_ios_reqs_satisfied?
-          Fastlane::Saucectl::XCTest.new(@config)
-        else
-          Fastlane::Saucectl::Espresso.new(@config)
-        end
-      end
-
-      def check_kind
-        if @config[:platform].eql?('android')
-          UI.user_error!("❌ #{@config[:kind]} is not a supported test framework for android. Use espresso") unless @config[:kind].eql?('espresso')
-        else
-          UI.user_error!("❌ #{@config[:kind]} is not a supported test framework for iOS. Use xcuitest") unless @config[:kind].eql?('xcuitest')
-        end
-      end
-
-      def is_ios_reqs_satisfied?
-        if @config[:test_target].nil? && @config[:test_plan].nil?
-          UI.user_error!("❌ For ios you must specify test_target or test_plan")
-        end
-      end
-
-      def test_distribution_array
-        @config[:test_class] || create_test_plan.test_distribution
-      end
-
-      def suite_name(test_type)
-        if ENV['JOB_NAME'].nil? && ENV['BUILD_NUMBER'].nil?
-          "#{@config[:kind]}-#{test_type.split('.')[-1]}"
-        else
-          "#{ENV['JOB_NAME']}-#{ENV['BUILD_NUMBER']}-#{test_type.split('.')[-1]}"
-        end
-      end
-
-      def create_virtual_device_suites
-        if @config[:test_distribution] == 'shard'
-          shard_virtual_device_suites
-        elsif @config[:test_class]
-          custom_test_classes
-        else
-          test_suites = []
-          @config[:emulators].each do |emulator|
-            test_distribution_array.each do |test_type|
-              test_suites << {
-                'name' => suite_name(test_type).downcase,
-                'testOptions' => default_test_options(test_type)
-              }.merge(virtual_device_options(emulator))
-            end
-          end
-          test_suites
-        end
-      end
-
-      def shard_virtual_device_suites
-        UI.user_error!("❌ Cannot split #{@config[:test_distribution]}'s across virtual devices with a single emulator. \nPlease specify a minimum of two devices!") if @config[:emulators].size.eql?(1)
-        test_suites = []
-        arr = test_distribution_array
-        shards = arr.each_slice((arr.size / @config[:emulators].size.to_f).round).to_a
-        shards.each_with_index do |suite, i|
-          test_suites << {
-            'name' => suite_name("shard #{i + 1}").downcase,
-            'testOptions' => default_test_options(suite)
-          }.merge(virtual_device_options(@config[:emulators][i]))
-        end
-        test_suites
-      end
-
-      def shard_real_device_suites
-        test_suites = []
-        arr = test_distribution_array
-        shards = arr.each_slice((arr.size / @config[:devices].size.to_f).round).to_a
-        shards.each_with_index do |suite, i|
-          test_suites << {
-            'name' => suite_name("shard #{i + 1}").downcase,
-            'testOptions' => default_test_options(suite)
-          }.merge(real_device_options(@config[:devices][i]))
-        end
-        test_suites
-      end
-
-      def test_plan_suites
-        test_suites = []
-        @config[:devices].each do |device|
-          test_suites << {
-            'name' => suite_name(@config[:test_plan].to_s).downcase,
-            'testOptions' => default_test_options(test_distribution_array)
-          }.merge(real_device_options(device))
-        end
-        test_suites
-      end
-
-      def custom_test_classes
-        test_suites = []
-        devices = @config[:devices].nil? ? @config[:emulators] : @config[:devices]
-        devices.each do |device|
-          device_options = @config[:devices].nil? ? virtual_device_options(device) : real_device_options(device)
-          test_classes = @config[:test_class].reject(&:empty?).join(',')
-          test_suites << {
-            'name' => suite_name(device[:name]).downcase,
-            'testOptions' => default_test_options(test_classes.split(','))
-          }.merge(device_options)
-        end
-        test_suites
-      end
-
-      def create_real_device_suites
-        if !@config[:test_plan].nil? && @config[:test_distribution].eql?('class')
-          test_plan_suites
-        elsif @config[:test_distribution] == 'shard'
-          shard_real_device_suites
-        elsif @config[:test_class].kind_of?(Array)
-          custom_test_classes
-        else
-          test_suites = []
-          @config[:devices].each do |device|
-            test_distribution_array.each do |test_type|
-              test_suites << {
-                'name' => suite_name(test_type).downcase,
-                'testOptions' => default_test_options(test_type)
-              }.merge(real_device_options(device))
-            end
-          end
-          test_suites
-        end
-      end
-
-      def virtual_device_options(device)
-        platform_versions = device[:platform_versions].reject(&:empty?).join(',')
-        { 'emulators' => [{ 'name' => device[:name],
-                            'orientation' => device[:orientation],
-                            'platformVersions' => platform_versions.split(',') }] }
-      end
-
-      def real_device_options(device)
-        { 'devices' => [rdc_options(device)] }
-      end
-
-      def rdc_options(device)
-        device_type_key = device.key?(:id) ? 'id' : 'name'
-        name = device.key?(:id) ? device[:id] : device[:name]
-
-        base_device_hash = {
-          device_type_key => name,
-          'orientation' => device[:orientation]
-        }.merge('options' => device_options(device))
-
-        unless device[:platform_version].nil?
-          base_device_hash = base_device_hash.merge({ 'platformVersion' => device[:platform_version] })
-        end
-
-        base_device_hash
-      end
-
-      def device_options(device)
-        {
-          'carrierConnectivity' => device[:carrier_connectivity],
-          'deviceType' => device[:device_type].upcase!,
-          'private' => device[:private]
-        }
-      end
-
-      def default_test_options(test_type)
-        test_option_type = @config[:test_distribution].eql?('package') ? 'package' : 'class'
-        if @config[:platform] == 'android'
-          { test_option_type => test_type }.merge(android_test_options)
-        else
-          { 'class' => test_type }
-        end
-      end
-
-      def android_test_options
-        {
-          'clearPackageData' => @config[:clear_data],
-          'useTestOrchestrator' => @config[:use_test_orchestrator]
-        }
-      end
-    end
-  end
-end