fastlane-plugin-waldo 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c63c5e44aa13f38c39db0a944c6ac663ed82b1c568c839cee17563e5d0f659d2
-  data.tar.gz: 1874dcff9398d14a9cd6b0587fc2e1a3bd129c49bdbf228fb9ee9a3a7d444f39
+  metadata.gz: 930bf4de096a32ef717f5f4e9a488cf85e13ec1a8c58058ace10ebf583948302
+  data.tar.gz: 1d044beebccaaf38e426370990f046fd3fbc59d08d657bccfa8321cf757fa733
 SHA512:
-  metadata.gz: cbcbbf1b372bfcdaefcce1c1b211f0bbfa8e0142780abe73a7863006356e321ec18b7b22778a6a82effa4a2f59963c233cc8ba6b08fd8707370bab77b508adc4
-  data.tar.gz: 38fb3a7fb99ca9572cf7a573cd85abe0179e7b21b126e4c23958929d903ed21e83c72527d4859fc51a1feb126b367dc7ce1bc7a2df7d945fc5b6044a2e8d51f0
+  metadata.gz: df074478d0982a2851bc5d2e936859d5843735002dfb505bd12c60a3e5db091618894db725d0734a23540b4106ff254134534b42e2a3f003301429bd4fd52cb2
+  data.tar.gz: 533d8fae7a307686e93af2908bc11d3e858f8b6f8cd7ef1136e97851873e425103bf7a85015ce455989685147d7222075289cfe82e724fa8e3762bf54e61e2c9

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

@@ -23,8 +23,6 @@ module Fastlane
           apk_path_default = Dir["*.apk"].last || Dir[File.join('app', 'build', 'outputs', 'apk', 'app-release.apk')].last
         when :ios
           app_path_default = Dir["*.app"].sort_by { |x| File.mtime(x) }.last
-          # No default dsym_path for now; user must specify it explicitly:
-          # dsym_path_default = (Dir["./**/*.dSYM"] + Dir["./**/*.dSYM.zip"]).sort_by { |x| File.mtime(x) }.last
           ipa_path_default = Dir["*.ipa"].sort_by { |x| File.mtime(x) }.last
         end
 
@@ -44,12 +42,14 @@ module Fastlane
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :dsym_path,
                                        env_name: 'WALDO_DSYM_PATH',
-                                       # No default dsym_path for now; user must specify it explicitly:
                                        description: 'Path to your dSYM file(s)',
-                                       # description: 'Path to your dSYM file(s) (optional if you use the _gym_ or _xcodebuild_ action)',
-                                       # default_value: Actions.lane_context[Actions::SharedValues::DSYM_OUTPUT_PATH] || dsym_path_default,
-                                       # default_value_dynamic: true,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :include_symbols,
+                                       env_name: 'WALDO_INCLUDE_SYMBOLS',
+                                       description: 'Include symbols in upload if true',
+                                       optional: true,
+                                       default_value: false,
+                                       is_string: false),
           # Android-specific
           FastlaneCore::ConfigItem.new(key: :apk_path,
                                        env_name: 'WALDO_APK_PATH',

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

@@ -50,6 +50,7 @@ module Fastlane
         apk_path = in_params[:apk_path]
         app_path = in_params[:app_path]
         dsym_path = in_params[:dsym_path]
+        include_symbols = in_params[:include_symbols]
         ipa_path = in_params[:ipa_path]
         upload_token = in_params[:upload_token]
         variant_name = in_params[:variant_name]
@@ -64,19 +65,44 @@ module Fastlane
         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[:dsym_path] = dsym_path if dsym_path && (app_path || ipa_path)
+        if app_path
+            if include_symbols
+                if !dsym_path
+                    tmp_path = "#{app_path}.dSYM.zip"
+                    dsym_path = tmp_path if File.exist?(tmp_path)
+                end
+
+                if !dsym_path
+                    tmp_path = "#{app_path}.dSYM"
+                    dsym_path = tmp_path if File.exist?(tmp_path)
+                end
+            end
+
+            out_params[:dsym_path] = dsym_path if dsym_path
+        else
+            out_params[:dsym_path] = dsym_path if dsym_path && ipa_path
+        end
+
         out_params[:upload_token] = upload_token if upload_token && !upload_token.empty?
         out_params[:variant_name] = variant_name if variant_name
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Waldo
-    VERSION = "1.5.0"
+    VERSION = "1.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-waldo
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - J. G. Pusey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Upload build to Waldo