fastlane-plugin-waldo 3.2.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8382365c0ea6f5bbeb6bf55302d06ff08b9c2b58f20b70a65a7519b6c6b19a7d
-  data.tar.gz: 6e9cadfb12cea129d362cda805ced4e6b3bb96b4b075af5345ce794f886d6b88
+  metadata.gz: 262f2c56bf49ff9cc6896fa725a266eab835f5a99d9f92cabdefd51c0068be7c
+  data.tar.gz: c901f8111d55dbe421985e1e0b149f48e5a2141c3c20002b637782aea9a44ed9
 SHA512:
-  metadata.gz: c53abad57353855c54c9dec994b3af36234db443df0552c7a8e3e9fe7e52d1414359b3dd5f59bcb445d9dfeabf457ab1a52eac891ba5f9a0dd78a604b9e875ff
-  data.tar.gz: 2baeb36edcc08caf4a51318eb6d6d9b0566ba9bfdfc035b8cb5c3a2378474b7c17788951792664ba0d0bfb7b08df3dfa76b0d4823f5fb7b67eb8b7f10a7201fa
+  metadata.gz: 07fcae2e1d6786e5cf0a474369cc3be9e698fc2bafac5eb97786c4b6b7505bdd64e6b3950e3c9659784ea3c5668d851f8deecae9b4eac06b31641c56963d999c
+  data.tar.gz: 7dd6cb3c6ed22aecc2233e8b6c14e4ce3976a63276c7f7d214dae0469d4cfb15064dde550b87138e2419bb622cdf25910769e829069a988bd8c54889bdf0bcec

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-© 2018–2022 Amolo Atelier, Inc.
+© 2018–2024 Amolo Atelier, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -19,7 +19,7 @@ which allows you to upload an iOS or Android build to Waldo for processing.
 
 ## Usage
 
-To get started, first obtain an upload token from Waldo for your app. These are
+To get started, first obtain a CI token from Waldo for your app. These are
 used to authenticate with the Waldo backend on each call.
 
 ### Uploading an iOS Simulator Build
@@ -44,7 +44,7 @@ You can then find your app relative to the derived data path:
 app_path = File.join(derived_data_path,
                      'Build',
                      'Products',
-                     'ReleaseSim-iphonesimulator',
+                     'Release-iphonesimulator',
                      'YourApp.app')
 ```
 
@@ -56,30 +56,9 @@ waldo(upload_token: '0123456789abcdef0123456789abcdef',
       app_path: '/path/to/YourApp.app')
 ```
 
-> **Note:** You _must_ specify _both_ the Waldo upload token _and_ the path of
+> **Note:** You _must_ specify _both_ the Waldo CI token _and_ the path of
 > the `.app`.
 
-### Uploading an iOS Device Build
-
-Build a new IPA for your app. If you use `gym` (aka `build_ios_app`) to build
-your IPA, `waldo` will automatically find and upload the generated IPA.
-
-```ruby
-gym(export_method: 'ad-hoc')                            # or 'development'
-
-waldo(upload_token: '0123456789abcdef0123456789abcdef')
-```
-
-> **Note:** You _must_ specify the Waldo upload token.
-
-If you do _not_ use `gym` to build your IPA, you will need to explicitly
-specify the IPA path to `waldo`:
-
-```ruby
-waldo(upload_token: '0123456789abcdef0123456789abcdef',
-      ipa_path: '/path/to/YourApp.ipa')
-```
-
 ### Uploading an Android Build
 
 Build a new APK for your app. If you use `gradle` to build your APK, `waldo`
@@ -92,7 +71,7 @@ gradle(task: 'assemble',
 waldo(upload_token: '0123456789abcdef0123456789abcdef')
 ```
 
-> **Note:** You _must_ specify the Waldo upload token.
+> **Note:** You _must_ specify the Waldo CI token.
 
 If you do _not_ use `gradle` to build your APK, you will need to explicitly
 specify the APK path to `waldo`:

data/lib/fastlane/plugin/waldo/actions/waldo_action.rb

@@ -1,5 +1,9 @@
 module Fastlane
   module Actions
+    module SharedValues
+      WALDO_BUILD_ID = :WALDO_BUILD_ID
+    end
+
     class WaldoAction < Action
       def self.run(params)
         mparams = Helper::WaldoHelper.filter_parameters(params)
@@ -21,12 +25,6 @@ module Fastlane
                                        env_name: 'WALDO_APP_PATH',
                                        description: 'Path to your app file',
                                        optional: true),
-          FastlaneCore::ConfigItem.new(key: :ipa_path,
-                                       env_name: 'WALDO_IPA_PATH',
-                                       description: 'Path to your IPA file (optional if you use the _gym_ or _xcodebuild_ action)',
-                                       default_value: Actions.lane_context[Actions::SharedValues::IPA_OUTPUT_PATH],
-                                       default_value_dynamic: true,
-                                       optional: true),
           # Android-specific
           FastlaneCore::ConfigItem.new(key: :apk_path,
                                        env_name: 'WALDO_APK_PATH',
@@ -73,10 +71,6 @@ module Fastlane
             apk_path: './YourApp.apk',
             upload_token: '...'
           )",
-          "waldo(
-            ipa_path: './YourApp.ipa',
-            upload_token: '...'
-          )",
           "waldo(
             app_path: './YourApp.app',
             upload_token: '...'
@@ -87,6 +81,12 @@ module Fastlane
       def self.is_supported?(platform)
         [:android, :ios].include?(platform)
       end
+
+      def self.output
+        [
+          ['WALDO_BUILD_ID', 'ID of the uploaded build']
+        ]
+      end
     end
   end
 end

data/lib/fastlane/plugin/waldo/helper/waldo_helper.rb

@@ -1,6 +1,7 @@
 module Fastlane
   module Helper
     class WaldoHelper
+      require 'json'
       require 'net/http'
 
       def self.determine_asset_name
@@ -30,7 +31,7 @@ module Fastlane
         "waldo-agent-#{os}-#{arch}#{ext}"
       end
 
-      def self.download(uri, path)
+      def self.download(uri, path, retryAllowed)
         begin
           request_uri = uri.request_uri
           response = nil
@@ -43,14 +44,26 @@ module Fastlane
             uri = URI.parse(response['location'])
           end
 
+          code = response.code.to_i
+
+          if code < 200 || code > 299
+            UI.error("Unable to download #{request_uri}, HTTP status: #{response.code}")
+
+            return retryAllowed && shouldRetry?(response)
+          end
+
           fp = File.open(path, 'wb')
 
           fp.write(response.body)
         rescue => exc
           UI.error("Unable to download #{request_uri}: #{exc.inspect.to_s}")
+
+          return retryAllowed
         ensure
           fp.close if fp
         end
+
+        return false
       end
 
       def self.download_binary
@@ -62,13 +75,27 @@ module Fastlane
 
         binary_path = File.join(Dir.tmpdir, 'waldo-agent')
 
-        download(URI(uri_string), binary_path)
+		maxDownloadAttempts = 2
+
+		for attempts in 1..maxDownloadAttempts do
+          doRetry = download(URI(uri_string), binary_path, attempts < maxDownloadAttempts)
+
+          break unless doRetry
+
+		  UI.message("Failed download attempts: #{attempts} -- retrying…")
+        end
 
         File.chmod(0755, binary_path)
 
         binary_path
       end
 
+      def self.extract_build_id(output)
+        last_line = output.lines(chomp: true).last
+
+		JSON.parse(last_line, {symbolize_names: true})[:appVersionID]
+      end
+
       def self.filter_parameters(in_params)
         out_params = {}
 
@@ -76,39 +103,14 @@ module Fastlane
         app_path = in_params[:app_path]
         git_branch = in_params[:git_branch]
         git_commit = in_params[:git_commit]
-        ipa_path = in_params[:ipa_path]
         upload_token = in_params[:upload_token]
         variant_name = in_params[:variant_name] || Actions.lane_context[Actions::SharedValues::GRADLE_BUILD_TYPE]
 
         apk_path.gsub!('\\ ', ' ') if apk_path
         app_path.gsub!('\\ ', ' ') if app_path
-        ipa_path.gsub!('\\ ', ' ') if ipa_path
 
         out_params[:apk_path] = apk_path if apk_path
-
-        if app_path && ipa_path
-          if !File.exist?(app_path)
-            out_params[:ipa_path] = ipa_path
-
-            app_path = nil
-          elsif !File.exist?(ipa_path)
-            out_params[:app_path] = app_path
-
-            ipa_path = nil
-          elsif File.mtime(app_path) < File.mtime(ipa_path)
-            out_params[:ipa_path] = ipa_path
-
-            app_path = nil
-          else
-            out_params[:app_path] = app_path
-
-            ipa_path = nil
-          end
-        else
-          out_params[:app_path] = app_path if app_path
-          out_params[:ipa_path] = ipa_path if ipa_path
-        end
-
+        out_params[:app_path] = app_path if app_path
         out_params[:git_branch] = git_branch if git_branch
         out_params[:git_commit] = git_commit if git_commit
         out_params[:upload_token] = upload_token if upload_token
@@ -117,17 +119,18 @@ module Fastlane
         out_params
       end
 
+      def self.shouldRetry?(response)
+        [408, 429, 500, 502, 503, 504].include?(response.code.to_i)
+      end
+
       def self.upload_build(params)
         apk_path = params[:apk_path]
         app_path = params[:app_path]
-        ipa_path = params[:ipa_path]
 
         if apk_path
           build_path = apk_path
         elsif app_path
           build_path = app_path
-        elsif ipa_path
-          build_path = ipa_path
         else
           build_path = ''
         end
@@ -164,11 +167,11 @@ module Fastlane
 
         command << build_path.shellescape
 
-        Actions.sh_control_output(command.join(' '),
-                                  print_command: FastlaneCore::Globals.verbose?,
-                                  print_command_output: true) do |error|
-          # do nothing special, for now
-        end
+        output = Actions.sh_control_output(command.join(' '),
+                                           print_command: FastlaneCore::Globals.verbose?,
+                                           print_command_output: true)
+
+        Actions.lane_context[Actions::SharedValues::WALDO_BUILD_ID] = extract_build_id(output)
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Waldo
-    VERSION = "3.2.0"
+    VERSION = "3.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-waldo
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.4.0
 platform: ruby
 authors:
 - John Pusey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email: john@waldo.io
+email: j.pusey@tricentis.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Upload build to Waldo