fastlane-plugin-bugsnag 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb02bbcd07f8414b53af7ca55a5f34f5ac8179277956fcb3844a51df3c0e876d
-  data.tar.gz: 730aba51c05865a47636d8238771dbbe877b06d31ea47b7027ef0b790857edfc
+  metadata.gz: 57b215435ee483ac067b8476b40366d4040791e56311709e1e73533f356a0658
+  data.tar.gz: 27f72d72fff57102bc787434b2b06dc5272b7001877d4993e99122fd15a1c5d7
 SHA512:
-  metadata.gz: 78559861f0166bbd2289efb4680737fcc7f72a40c7f0453ddeea8579caa30f599733f21d3d69dd51029b8ffe876d52a12119ab6e67969d54b7fd42f296976323
-  data.tar.gz: 9b98fddce9e3f8cc31ca6d5ac077f29f8e5d464a1026ce67dca80bc70024efb06b9e3e90d3e2242e002721e4b47184c6983086d9c692ac490012b70cb2007d79
+  metadata.gz: 7ca750f77a93d83b0d786eff7e99a843551bdd4a59ee0585dfe83f2239c777381b33188810844ca1a227cc7e3fd489f90712cf470ab2ad19bc0c05a515caf757
+  data.tar.gz: a819e53c15fa5cfa35da10d4021535b91b5b52eddc56b0a22bb86f8c77ac0c21e2abc46b83d3d5ccad33cf0864ec2bc71aab97a50777058c2177e717a12968ee

data/lib/fastlane/plugin/bugsnag/actions/upload_symbols_to_bugsnag.rb

@@ -17,9 +17,12 @@ module Fastlane
         # If verbose flag is enabled (`--verbose`), display the plugin action debug info
         # Store the verbose flag for use in the upload arguments.
         verbose = UI.verbose("Uploading dSYMs to Bugsnag with the following parameters:")
+        rjust = 30 # set justification width for keys for the list of parameters to output
         params.values.each do |param|
-          UI.verbose("  #{param[0].to_s.rjust(18)}: #{param[1]}")
+          UI.verbose("  #{param[0].to_s.rjust(rjust)}: #{param[1]}")
         end
+        UI.verbose("  #{"SharedValues::DSYM_PATHS".to_s.rjust(rjust)}: #{gym_dsyms? ? Actions.lane_context[SharedValues::DSYM_PATHS] : "not set"}")
+        UI.verbose("  #{"SharedValues::DSYM_OUTPUT_PATH".to_s.rjust(rjust)}: #{download_dsym_dsyms? ? Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] : "not set"}")
 
         parse_dsym_paths(params[:dsym_path]).each do |dsym_path|
           if dsym_path.end_with?(".zip") or File.directory?(dsym_path)
@@ -41,7 +44,7 @@ module Fastlane
       end
 
       def self.authors
-        ["kattrali"]
+        ["kattrali", "xander-jones"]
       end
 
       def self.return_value
@@ -92,8 +95,8 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :dsym_path,
                                        type: Array,
                                        env_name: "BUGSNAG_DSYM_PATH",
-                                       description: "Path to the DSYM directory, file, or zip to upload",
-                                       default_value: default_dsym_path,
+                                       description: "Path to the dSYM directory, file, or zip to upload",
+                                       default_value: default_dsym_paths,
                                        optional: true,
                                        verify_block: validate_dsym_path),
           FastlaneCore::ConfigItem.new(key: :upload_url,
@@ -167,19 +170,44 @@ module Fastlane
         args
       end
 
+      # returns an array of unique dSYM-containing directory paths to upload
       def self.parse_dsym_paths dsym_path
-        dsym_paths = dsym_path.is_a?(Array) ? dsym_path : [dsym_path]
-        dsym_paths.compact.map do |path|
+        dsym_path.compact.map do |path|
           path.end_with?(".dSYM") ? File.dirname(path) : path
         end.uniq
       end
 
-      def self.default_dsym_path
-        path = Dir["./**/*.dSYM.zip"] + Dir["./**/*.dSYM"]
-        dsym_paths = Actions.lane_context[SharedValues::DSYM_PATHS] if defined? SharedValues::DSYM_PATHS
-        dsyms_output_path = Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] if defined? SharedValues::DSYM_OUTPUT_PATH
-        default_value = dsyms_output_path || dsym_paths || path
-        parse_dsym_paths(default_value)
+      # if input is an Array, return that array, else coerce the input into an array
+      def self.coerce_array dsym_path
+        dsym_path.is_a?(Array) ? dsym_path : [dsym_path]
+      end
+
+      # returns true if `gym` created some dSYMs for us to upload
+      # https://docs.fastlane.tools/actions/gym/#lane-variables
+      def self.gym_dsyms?
+        if defined?(SharedValues::DSYM_PATHS)
+          if Actions.lane_context[SharedValues::DSYM_PATHS]
+            true
+          end
+        end
+      end
+
+      # returns true if `download_dsyms` created some dSYMs for us to upload
+      # https://docs.fastlane.tools/actions/download_dsyms/#lane-variables
+      def self.download_dsym_dsyms?
+        if defined?(SharedValues::DSYM_OUTPUT_PATH)
+          if Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH]
+            true
+          end
+        end
+      end
+
+      def self.default_dsym_paths
+        vendor_regex = %r{\.\/vendor.*}
+        paths = Dir["./**/*.dSYM.zip"].reject{|f| f[vendor_regex] } + Dir["./**/*.dSYM"].reject{|f| f[vendor_regex] } # scrape the sub directories for zips and dSYMs
+        paths += coerce_array(Actions.lane_context[SharedValues::DSYM_PATHS]) if gym_dsyms?                      # set by `download_dsyms` Fastlane action
+        paths += coerce_array(Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH]) if download_dsym_dsyms?      # set by `gym` Fastlane action
+        parse_dsym_paths(paths.uniq)
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Bugsnag
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Delisa Mason
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple