fastlane-plugin-run_tests_firebase_testlab 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd77d3df648dfd0f3228e53dd2c869c0c4c2d4d7
-  data.tar.gz: c3db685dec065ee58c9cc26b8b6accbdf26914cf
+  metadata.gz: c6a2f08d5395b10f14f913b802d1f34bdd0efdc3
+  data.tar.gz: ee7be8d83547a5dc1c3133d8009023c651095363
 SHA512:
-  metadata.gz: e51d57e579196d0d0815764219ac787b40abf17354ede3d01001bbe4932be20f833b526cca5475244be0427427005b5d6e66644739207f7555a3ad7f659da370
-  data.tar.gz: e4a8b9ac6f94e24c4a2bc7e9b59cd391aa63077ca60e1d6b3cad4c0657a07317c298d393a9edd05326ab6845bb3c80dcd9a93b34cdf130f2b7d227c460add202
+  metadata.gz: 58cc561b4d8c90f8c017767d5fd8d6745f7ca8566ea389222fb73a7044d0076671afed0a7fe7580f34bfa4e58fcac1fed9f0be6fa1d843154fe5e1a686d14e87
+  data.tar.gz: b100b3dd863eea12dc3df707faeb177ee3c413f11033068847a237678aa2662ce3319de51f77dabef12ad216bbb81e4bd7e93dc749e1b6143aaae3c1e8fdc53b

data/README.md

@@ -6,13 +6,11 @@ Status](https://travis-ci.org/pink-room/fastlane-plugin-run_tests_firebase_testl
 [![Gem
 Version](https://badge.fury.io/rb/fastlane-plugin-run_tests_firebase_testlab.svg)](https://badge.fury.io/rb/fastlane-plugin-run_tests_firebase_testlab)
 
-Please, read [this](https://medium.com/pink-room-club/android-continuous-integration-using-fastlane-and-circleci-2-0-part-i-7204e2e7b8b) blog post if you want to know better
-how to use this plugin.
+Please, read [this](https://medium.com/pink-room-club/android-continuous-integration-using-fastlane-and-circleci-2-0-part-i-7204e2e7b8b) blog post if you want to know better how to use this plugin.
 
 ## Getting Started
 
 This project is a [_fastlane_](https://github.com/fastlane/fastlane) plugin. To get started with `fastlane-plugin-run_tests_firebase_testlab`, add it to your project by running:
-
 ```bash
 fastlane add_plugin run_tests_firebase_testlab
 ```
@@ -36,8 +34,12 @@ Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plu
 ```
 run_tests_firebase_testlab(
     project_id: "your-firebase-project-id",
-    model: "Nexus6P",
-    version: "27")
+    devices: [
+      {
+        model: "Nexus6P",
+        version: "27"
+      }
+    ]);
 ```
 
 ### Parameters
@@ -61,45 +63,52 @@ run_tests_firebase_testlab(
 </tr>
 
 <tr>
-<td><b>model</b></td>
-<td>The device's model on which the tests will be run</td>
+<td><b>devices</b></td>
+<td>A list of devices to test the App on</td>
 <td>No</td>
 <td>-</td>
 </tr>
 
 <tr>
-<td><b>version</b></td>
+<td><b>device[model]</b></td>
+<td>A device model on which the tests will run</td>
+<td>No</td>
+<td>-</td>
+</tr>
+
+<tr>
+<td><b>device[version]</b></td>
 <td>The Android api version of the device</td>
 <td>No</td>
 <td>-</td>
 </tr>
 
 <tr>
-<td>app_apk</td>
-<td>The path for your app apk</td>
+<td>device[locale]</td>
+<td>The locale to test against</td>
 <td>Yes</td>
-<td>app/build/outputs/apk/debug/<br>app-debug.apk</td>
+<td>en_US</td>
 </tr>
 
 <tr>
-<td>android_test_apk</td>
-<td>The path for your android test apk</td>
+<td>device[orientation]</td>
+<td>The orientation of the device</td>
 <td>Yes</td>
-<td>app/build/outputs/apk/androidTest/<br>debug/app-debug-androidTest.apk</td>
+<td>portrait</td>
 </tr>
 
 <tr>
-<td>locale</td>
-<td>The locale to test against</td>
+<td>app_apk</td>
+<td>The path for your app apk</td>
 <td>Yes</td>
-<td>en_US</td>
+<td>app/build/outputs/apk/debug/<br>app-debug.apk</td>
 </tr>
 
 <tr>
-<td>orientation</td>
-<td>The orientation of the device</td>
+<td>android_test_apk</td>
+<td>The path for your android test apk</td>
 <td>Yes</td>
-<td>portrait</td>
+<td>app/build/outputs/apk/androidTest/<br>debug/app-debug-androidTest.apk</td>
 </tr>
 
 <tr>

data/lib/fastlane/plugin/run_tests_firebase_testlab/actions/run_tests_firebase_testlab_action.rb

@@ -12,6 +12,8 @@ module Fastlane
       def self.run(params)
         UI.message("Starting run_tests_firebase_testlab plugin...")
 
+        validate_params(params)
+
         if params[:gcloud_service_key_file].nil?
           UI.message("Save Google Cloud credentials.")
           File.open(@client_secret_file, 'w') do |file|
@@ -35,7 +37,7 @@ module Fastlane
                   "--type instrumentation "\
                   "--app #{params[:app_apk]} "\
                   "--test #{params[:android_test_apk]} "\
-                  "--device model=#{params[:model]},version=#{params[:version]},locale=#{params[:locale]},orientation=#{params[:orientation]} "\
+                  "#{create_devices_params(params)}"\
                   "--timeout #{params[:timeout]} "\
                   "#{params[:extra_options]} > #{PIPE} 2>&1")
         remove_pipe_if_exists
@@ -94,16 +96,32 @@ module Fastlane
                                        description: "Your Firebase project id",
                                        is_string: true,
                                        optional: false),
+          FastlaneCore::ConfigItem.new(key: :devices,
+                                       env_name: "DEVICES",
+                                       description: "Devices to test the App on",
+                                       type: Array,
+                                       optional: true,
+                                       verify_block: proc do |devices|
+                                         devices.each do |d|
+                                           if d.class != Hash
+                                             UI.user_error!("Each device must be represented by a Hash object, #{d.class} found")
+                                           end
+                                           check_has_property(d, :model)
+                                           check_has_property(d, :version)
+                                           set_default_property(d, :locale, "en_US")
+                                           set_default_property(d, :orientation, "portrait")
+                                         end
+                                       end),
           FastlaneCore::ConfigItem.new(key: :model,
                                        env_name: "MODEL",
                                        description: "The device's model on which the tests will be run",
                                        is_string: true,
-                                       optional: false),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "VERSION",
                                        description: "The Android api version of the device",
                                        is_string: true,
-                                       optional: false),
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :app_apk,
                                        env_name: "APP_APK",
                                        description: "The path for your app apk. Default: app/build/outputs/apk/debug/app-debug.apk",
@@ -181,8 +199,12 @@ module Fastlane
         [
           'run_tests_firebase_testlab(
               project_id: "your-firebase-project-id",
-              model: "Nexus6P",
-              version: "27",
+              devices: [
+                {
+                  model: "Nexus6P",
+                  version: "27"
+                }
+              ],
               delete_firebase_files: true
           )'
         ]
@@ -192,6 +214,67 @@ module Fastlane
         :testing
       end
 
+      def self.check_has_property(device, property)
+        UI.user_error!("Each device must have #{property} property") unless device.key?(property)
+      end
+
+      private_class_method :check_has_property
+
+      def self.set_default_property(device, property, default)
+        unless device.key?(property)
+          device[property] = default
+        end
+      end
+
+      private_class_method :set_default_property
+
+      def self.validate_params(params)
+        if has_old_device_params(params)
+          UI.deprecated("The 'model', 'version', 'locale' and 'orientation' params are deprecated and will be removed in version 1.0!")
+          unless params[:devices].nil?
+            UI.user_error!("You can't use 'devices' param and 'model', 'version', "\
+                           "'locale' and 'orientation' params at the same time")
+          end
+        end
+      end
+
+      private_class_method :validate_params
+
+      def self.has_old_device_params(params)
+        !(params[:model].nil? || params[:version].nil? || params[:locale].nil? || params[:orientation].nil?)
+      end
+
+      private_class_method :has_old_device_params
+
+      def self.create_devices_params(params)
+        if has_old_device_params(params)
+          params[:devices] = [
+            {
+              model: params[:model],
+              version: params[:version],
+              locale: params[:locale],
+              orientation: params[:orientation]
+            }
+          ]
+        end
+
+        devices_params = ""
+
+        params[:devices].each do |device|
+          devices_params += create_device_param(device)
+        end
+
+        devices_params
+      end
+
+      private_class_method :create_devices_params
+
+      def self.create_device_param(device)
+        "--device model=#{device[:model]},version=#{device[:version]},locale=#{device[:locale]},orientation=#{device[:orientation]} "
+      end
+
+      private_class_method :create_device_param
+
       def self.scrape_bucket_url
         File.open(@test_console_output_file).each do |line|
           url = line.scan(/\[(.*)\]/).last&.first

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

@@ -1,5 +1,5 @@
 module Fastlane
   module RunTestsFirebaseTestlab
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-run_tests_firebase_testlab
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Bruno Correia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry