highway 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee3f2e7b9ef6c3f0c2dbb7147fa76254006735bd77fd5e894a761df266251cd8
-  data.tar.gz: 72487db47f7809ca5b0a2fbdad65fd2a8547fb1aba17f2d5ca535f6c5b167829
+  metadata.gz: 73c3b2d6c45a2813f981ce86191943dba7c3774da04ad24ada4aae9caef2ed76
+  data.tar.gz: 24e6239b66417a222f2ffc21c97060a407442e94c1670b12fb6acfe94b58b46b
 SHA512:
-  metadata.gz: 7df350fea15eed329f597e18d5366a224755317f59a485f32a62e98b041daa1dcc6b26296adc1b5fad8a215c43383aa857a92481b6c54ff70da12a0917707ba5
-  data.tar.gz: 07552066b344a3c52dd7cace48deb46c1d7fa94a1c432a513cb74fca409d941919b0b53a1e0d8725b0148c0e969d6981eac8f8cd53cbbef1617b960143fe8649
+  metadata.gz: c90c5b3b82ae4bf4a65d1c895da8dc3b0c293650351154621478b9fdcecc40ce58d9c98aed012535a66423d58d664334a340cbdeb4df7bdfeeabfa1236db98d9
+  data.tar.gz: 92ed02e66e35dfe8b0f2837f48302d72549770800175066480c2e435388d5813189ce3491c9fc0709ac3c374abfa9dfadac4047b8dc361f505d257d413f7e7de

data/lib/highway/runtime/context.rb

@@ -200,9 +200,9 @@ module Highway
       # @param bundle_exec [Boolean] Whether to use `bundle exec` if possible.
       # @param silent [Boolean] Whether to run the command silently.
       # @param on_error [Proc] Called if command exits with a non-zero code.
-      def run_sh(command, bundle_exec: false, silent: false, rescue_error: nil)
+      def run_sh(command, bundle_exec: false, silent: false, on_error: nil)
         command = ["bundle exec", command].flatten if bundle_exec && should_use_bundle_exec?
-        Fastlane::Actions.sh(command, log: !silent, error_callback: rescue_error)
+        Fastlane::Actions.sh(command, log: !silent, error_callback: on_error)
       end
 
       private

data/lib/highway/steps/library/xcode_test.rb

@@ -68,7 +68,12 @@ module Highway
               name: "code_coverage",
               type: Types::Bool.new(),
               required: false,
-            )
+            ),
+            Parameters::Single.new(
+              name: "fastlane_params",
+              type: Types::Hash.new(Types::Any.new()),
+              required: false
+            ),
           ]
         end
 
@@ -83,6 +88,7 @@ module Highway
           scheme = parameters["scheme"]
           skip_build = parameters["skip_build"]
           code_coverage = parameters["code_coverage"]
+          fastlane_params = parameters["fastlane_params"]
 
           flags = parameters["flags"].join(" ")
           settings = parameters["settings"].map { |setting, value| "#{setting}=\"#{value.shellescape}\"" }.join(" ")
@@ -120,29 +126,31 @@ module Highway
           rescued_error = nil
 
           # Run the build and test.
+          options = {
 
-          begin
-
-            context.run_action("run_tests", options: {
+            project_key => project_value,
 
-              project_key => project_value,
+            clean: clean,
+            configuration: configuration,
+            device: device,
+            scheme: scheme,
+            code_coverage: code_coverage,
+            skip_build: skip_build,
 
-              clean: clean,
-              configuration: configuration,
-              device: device,
-              scheme: scheme,
-              code_coverage: code_coverage,
-              skip_build: skip_build,
+            xcargs: xcargs,
 
-              xcargs: xcargs,
+            buildlog_path: output_raw_temp_dir,
+            output_directory: output_dir,
+            output_types: output_types,
+            output_files: output_files,
+            xcodebuild_formatter: xcodebuild_formatter,
 
-              buildlog_path: output_raw_temp_dir,
-              output_directory: output_dir,
-              output_types: output_types,
-              output_files: output_files,
-              xcodebuild_formatter: xcodebuild_formatter,
+          }
 
-            })
+          begin
+            fastlane_params = fastlane_params.nil? ? {} : fastlane_params
+            combined_options = fastlane_params.merge(options)
+            context.run_action("run_tests", options: combined_options)
 
           rescue FastlaneCore::Interface::FastlaneBuildFailure => error
 
@@ -184,11 +192,15 @@ module Highway
           # That will output a machine-readable information about everything
           # that happened in the build.
 
-          xcpretty_json_formatter_path = context.run_sh("xcpretty-json-formatter", bundle_exec: true, silent: true)
+          error_callback = ->(error) { 
+            rescued_error = error
+          }
+
+          xcpretty_json_formatter_path = context.run_sh("xcpretty-json-formatter", bundle_exec: true, silent: true, on_error: error_callback)
           temp_json_report_path = File.join(Dir.mktmpdir(), "report.json")
 
           context.with_modified_env({"XCPRETTY_JSON_FILE_OUTPUT" => temp_json_report_path}) do
-            context.run_sh(["cat", output_raw_path, "| xcpretty --formatter", xcpretty_json_formatter_path], bundle_exec: true, silent: true)
+            context.run_sh(["cat", output_raw_path, "| xcpretty --formatter", xcpretty_json_formatter_path], bundle_exec: true, silent: true, on_error: error_callback)
           end
 
           # Export JSON file report to environment variable

data/lib/highway/version.rb

@@ -6,6 +6,6 @@
 module Highway
 
   # Version of Highway gem.
-  VERSION = "1.0.7".freeze
+  VERSION = "1.0.8".freeze
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: highway
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Netguru
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2023-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane