fastlane-plugin-waldo 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0312eb8f82f68eaaa890579f32df69021f403e15
-  data.tar.gz: 517fa6efaa6b61874e22cf5ef28446e28fcebf63
+  metadata.gz: 056a17e44467bd00b33113d8cf52829a6b849c29
+  data.tar.gz: 38c5bdbe260672b4ad39c59fdcbc3498118350e5
 SHA512:
-  metadata.gz: 96627fe481183b67111d6e3d61e6bd2c6f77e916f562308f0c9d7ad486667890ae438affcf41d8982bc9feb7b359732c93b971bacbc4ed8dd7cba962f1cd9528
-  data.tar.gz: d644bb93a1f79e0f4d30f5495df16ed71234e142c4c01d1a2c8af45b26b751028731c3b42f4a0575dd85775455a949418796c6bb57cfdaf36ff976ce7ada6400
+  metadata.gz: 58a2fc1db402ef97db5a7215fb23d5ee61ad017cbfb4d963e8c661ded128e4894da651ba783911f3fd5d0459a68a72f7ec5756d3a009111d460439d450aa3f08
+  data.tar.gz: bdb76754572891b23d5ad91a5627e1245ad9a0acae7eb157903c61e5873a1f9fbc70d01fae55c51dc538b5d55d9c2a3097df9e688c2bbedba2d3f20da1289fe8

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

@@ -2,9 +2,11 @@ module Fastlane
   module Actions
     class WaldoAction < Action
       def self.run(params)
-        return unless Helper::WaldoHelper.validate_parameters(params)
+        mparams = Helper::WaldoHelper.filter_parameters(params)
 
-        FastlaneCore::PrintTable.print_values(config: params,
+        return unless Helper::WaldoHelper.validate_parameters(mparams)
+
+        FastlaneCore::PrintTable.print_values(config: mparams,
                                               title: "Summary for waldo #{Fastlane::Waldo::VERSION.to_s}")
 
         Helper::WaldoHelper.upload_build

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

@@ -25,6 +25,42 @@ module Fastlane
         puts "#{response.body}"
       end
 
+      def self.filter_parameters(in_params)
+        out_params = {}
+
+        apk_path = in_params[:apk_path]
+        app_path = in_params[:app_path]
+        ipa_path = in_params[:ipa_path]
+        upload_token = in_params[:upload_token]
+        variant_name = in_params[:variant_name]
+
+        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
+          elsif !File.exist?(ipa_path)
+            out_params[:app_path] = app_path
+          elsif File.mtime(app_path) < File.mtime(ipa_path)
+            out_params[:ipa_path] = ipa_path
+          else
+            out_params[:app_path] = app_path
+          end
+        else
+          out_params[:app_path] = app_path if app_path
+          out_params[:ipa_path] = ipa_path if ipa_path
+        end
+
+        out_params[:upload_token] = upload_token if upload_token && !upload_token.empty?
+        out_params[:variant_name] = variant_name if variant_name
+
+        out_params
+      end
+
       def self.get_authorization
         "Upload-Token #{@upload_token}"
       end
@@ -200,10 +236,6 @@ module Fastlane
         @upload_token = params[:upload_token]
         @variant_name = params[:variant_name]
 
-        if @upload_token && @upload_token.empty?
-          @upload_token = nil                       # easier to test
-        end
-
         unless @upload_token
           handle_error('You must pass a nonempty upload token to the Waldo action')
 
@@ -218,8 +250,6 @@ module Fastlane
             return false
           end
 
-          @apk_path.gsub!("\\ ", ' ')
-
           unless File.exist?(@apk_path)
             handle_error("Unable to find APK at path '#{@apk_path.to_s}'")
 
@@ -239,8 +269,6 @@ module Fastlane
           end
 
           if @app_path
-            @app_path.gsub!("\\ ", ' ')
-
             unless File.exist?(@app_path)
               handle_error("Unable to find app at path '#{@app_path.to_s}'")
 
@@ -253,8 +281,6 @@ module Fastlane
               return false
             end
           elsif @ipa_path
-            @ipa_path.gsub!("\\ ", ' ')
-
             unless File.exist?(@ipa_path)
               handle_error("Unable to find IPA at path '#{@ipa_path.to_s}'")
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Waldo
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-waldo
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - J. G. Pusey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler