fastlane-plugin-bugsnag 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f2f91641496dae26549b47215b4cf137e6c03d7307f38b491903a8505cb26c1
-  data.tar.gz: eca880b9cd9aa3afaca45892e01ba63130fb29d069a40eb2f2a8fef98c5dee51
+  metadata.gz: cb02bbcd07f8414b53af7ca55a5f34f5ac8179277956fcb3844a51df3c0e876d
+  data.tar.gz: 730aba51c05865a47636d8238771dbbe877b06d31ea47b7027ef0b790857edfc
 SHA512:
-  metadata.gz: 56875d0eb5b5d644030466ab85c80817524d953c3286593fdbc7c2d9db4e81d919f90d6875a40d6d4adce8d81846db0b85069fbf07cc470d927bc6530f4b2836
-  data.tar.gz: 456b9b1d0ece3dcedd9302654ac25be698b075a44bb108c6c11257f6b8c4d23ebd4e6c641bccf41d40aaabf2d83c074a13d92ceca9647dfffbfb0e7c488f496b
+  metadata.gz: 78559861f0166bbd2289efb4680737fcc7f72a40c7f0453ddeea8579caa30f599733f21d3d69dd51029b8ffe876d52a12119ab6e67969d54b7fd42f296976323
+  data.tar.gz: 9b98fddce9e3f8cc31ca6d5ac077f29f8e5d464a1026ce67dca80bc70024efb06b9e3e90d3e2242e002721e4b47184c6983086d9c692ac490012b70cb2007d79

data/bugsnag-dsym-upload

@@ -13,18 +13,22 @@
 function print_usage() {
     echo "Usage: $0 [--symbol-maps DIR] dSYMS_PATH"
     echo
-    echo "-h, --help          Displays this message"
-    echo "-v, --verbose       Print verbose logging output during execution"
-    echo "--api-key API_KEY   The API key of the project the dSYM should be applied to"
-    echo "--symbol-maps DIR   Path to a directory of bitcode symbol maps. The"
-    echo "                    dSYM files will be restored with symbols prior to"
-    echo "                    upload. Requires dsymutil."
-    echo "--upload-server URL The server receiving dSYM files. Set this value if"
-    echo "                    using an on-premise Bugsnag installation"
-    echo "--project-root DIR  The root directory of the project. This will help to"
-    echo "                    group error reports by project"
-    echo "dSYMS_PATH          A directory or .zip file containing *.dSYM bundles to"
-    echo "                    upload"
+    echo "-h, --help                 Displays this message"
+    echo "-v, --verbose              Print verbose logging output during execution"
+    echo "--api-key API_KEY          The API key of the project the dSYM should be applied to"
+    echo "--symbol-maps DIR          Path to a directory of bitcode symbol maps. The"
+    echo "                           dSYM files will be restored with symbols prior to"
+    echo "                           upload. Requires dsymutil."
+    echo "--upload-server URL        The server receiving dSYM files. Set this value if"
+    echo "                           using an on-premise Bugsnag installation"
+    echo "--project-root DIR         The root directory of the project. This will help to"
+    echo "                           group error reports by project"
+    echo "--ignore-missing-dwarf     Throw warnings instead of errors when a dSYM with missing"
+    echo "                           DWARF data is found"
+    echo "--ignore-empty-dsym        Throw warnings instead of errors when a *.dSYM file is found"
+    echo "                           rather than the expected *.dSYM directory"
+    echo "dSYMS_PATH                 A directory or .zip file containing *.dSYM bundles to"
+    echo "                           upload"
 }
 
 function exit_with_usage() {
@@ -50,6 +54,8 @@ upload_server=https://upload.bugsnag.com
 unset symbol_maps
 unset dsym_dir
 unset verbose
+unset ignore_empty_dsym
+unset ignore_missing_dwarf
 unset silent
 unset project_root
 unset api_key
@@ -65,6 +71,12 @@ while [[ $# -gt 0 ]]; do
         -v|--verbose)
             verbose=1
             shift;;
+        --ignore-missing-dwarf)
+            ignore_missing_dwarf=1
+            shift;;
+        --ignore-empty-dsym)
+            ignore_empty_dsym=1
+            shift;;
         --symbol-maps)
             symbol_maps=$2
             shift
@@ -117,11 +129,27 @@ fi
 
 log_verbose "Uploading files to $upload_server"
 success_count=0
+warning_count=0
 fail_count=0
 
-for dsym in $dsym_dir/*.dSYM; do
+# Find all files and directories matching *.dSYM, except those in dir __MAXCOSX generated when using macOS Archive Utility
+for dsym in $(find $dsym_dir -name "*.dSYM" ! -path "*/__MACOSX/*"); do
     log_verbose "Preparing to upload $dsym"
 
+    # check if the .dSYM is a file. Throw an error (warning if --ignore-empty-dsym set) if detected as such;
+    # it should be a directory. This can happen due to a bug in Xcode: https://developer.apple.com/forums/thread/659187
+    if [ -f $dsym ]; then
+        dsym_size=$(wc -c < "$dsym" | xargs)
+        if [[ $ignore_empty_dsym == 1 ]]; then
+            log "[WARNING] Skipping $dsym as it is a file ($dsym_size bytes), not a directory with DWARF data";
+            warning_count=$((warning_count+1))
+        else
+            log "[ERROR] Skipping $dsym as it is a file ($dsym_size bytes), not a directory with DWARF data";
+            fail_count=$((fail_count+1))
+        fi
+        continue
+    fi
+
     if [[ -d $symbol_maps ]]; then
         log_verbose "Updating file with bitcode symbol maps in $symbol_maps"
         dsymutil "$dsym" --symbol-map "$symbol_maps"
@@ -129,8 +157,13 @@ for dsym in $dsym_dir/*.dSYM; do
 
     dwarf_data=$dsym/Contents/Resources/DWARF
     if [[ ! -d $dwarf_data ]]; then
-        log_verbose "Skipping file missing DWARF data: $dsym"
-        fail_count=$((fail_count+1))
+        if [[ $ignore_missing_dwarf == 1 ]]; then
+            log "[WARNING] Skipping file missing DWARF data: $dsym"
+            warning_count=$((warning_count+1))
+        else
+            log "[ERROR] Skipping file missing DWARF data: $dsym"
+            fail_count=$((fail_count+1))
+        fi
         continue
     fi
     for file in $dwarf_data/*; do
@@ -150,29 +183,40 @@ for dsym in $dsym_dir/*.dSYM; do
 
             # We need to shell out to perform the curl as there seems to be some indirect
             # wrapping of this script which causes the command to fail if called directly.
-            curl_cmd="curl --fail --silent --show-error --http1.1 $upload_server -F dsym=@\"$file\" $args"
+            curl_cmd="curl --fail --silent --show-error --http1.1 $upload_server -F 'dsym=@\"$file\"' $args"
             output=$(sh -c "$curl_cmd")
 
             if [ $? -eq 0 ] && [ "$output" != "invalid apiKey" ]; then
                 success_count=$((success_count+1))
             else
                 fail_count=$((fail_count+1))
-                log_verbose "Failed to upload file: $file"
+                log "[ERROR] Failed to upload file: $file"
             fi
             echo $output | grep -v '^OK$'
             log
         else
-            log_verbose "Skipping file without UUID: $file"
+            log "[ERROR] Skipping file without UUID: $file"
             fail_count=$((fail_count+1))
         fi
     done
 done
 
+exit_code=0
 if [ $success_count -gt 0 ]; then
-    log "$success_count files uploaded successfully"
+    log "$success_count file(s) uploaded successfully"
+fi
+
+if [ $warning_count -gt 0 ]; then
+    log "$warning_count file(s) failed to upload with warnings"
 fi
 
 if [ $fail_count -gt 0 ]; then
-    log "$fail_count files failed to upload"
-    exit 1
+    exit_code=1
+    log "$fail_count file(s) failed to upload with errors"
+fi
+
+if [[ $fail_count -gt 0 || $warning_count -gt 0 ]] && [[ $verbose != 1 ]]; then
+    log "Re-run the bugsnag-dsym-upload tool with the --verbose option for more information"
 fi
+
+exit $exit_code

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

@@ -225,7 +225,7 @@ module Fastlane
       end
 
       def self.default_info_plist_path
-        Dir.glob("./{ios/,}*/Info.plist").reject {|path| path =~ /build|test/i }.first
+        Dir.glob("./{ios/,}*/Info.plist").reject {|path| path =~ /build|test/i }.sort.first
       end
 
       def self.load_options_from_plist file_path
@@ -245,12 +245,12 @@ module Fastlane
       end
 
       def self.default_android_manifest_path
-        Dir.glob("./{android/,}{app,}/src/main/AndroidManifest.xml").first
+        Dir.glob("./{android/,}{app,}/src/main/AndroidManifest.xml").sort.first
       end
 
       def self.load_options_from_xml file_path
         options = options_from_android_manifest(file_path)
-        build_gradle_path = Dir.glob("{android/,}app/build.gradle").first || Dir.glob("build.gradle").first
+        build_gradle_path = Dir.glob("{android/,}app/build.gradle").sort.first || Dir.glob("build.gradle").sort.first
         options.merge!(options_from_build_gradle(build_gradle_path)) if build_gradle_path
         return options
       end

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

@@ -23,7 +23,7 @@ module Fastlane
 
         parse_dsym_paths(params[:dsym_path]).each do |dsym_path|
           if dsym_path.end_with?(".zip") or File.directory?(dsym_path)
-            args = upload_args(dsym_path, params[:symbol_maps_path], params[:upload_url], params[:project_root], api_key, verbose)
+            args = upload_args(dsym_path, params[:symbol_maps_path], params[:upload_url], params[:project_root], api_key, verbose, params[:ignore_missing_dwarf], params[:ignore_empty_dsym])
             success = Kernel.system(UPLOAD_SCRIPT_PATH, *args)
             if success
               UI.success("Uploaded dSYMs in #{dsym_path}")
@@ -112,6 +112,18 @@ module Fastlane
                                        description: "Root path of the project",
                                        default_value: Dir::pwd,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :ignore_missing_dwarf,
+                                       env_name: "BUGSNAG_IGNORE_MISSING_DWARF",
+                                       description: "Throw warnings instead of errors when a dSYM with missing DWARF data is found",
+                                       optional: true,
+                                       default_value: false,
+                                       is_string: false),
+          FastlaneCore::ConfigItem.new(key: :ignore_empty_dsym,
+                                       env_name: "BUGSNAG_IGNORE_EMPTY_DSYM",
+                                       description: "Throw warnings instead of errors when a *.dSYM file is found rather than the expected *.dSYM directory",
+                                       optional: true,
+                                       default_value: false,
+                                       is_string: false),
           FastlaneCore::ConfigItem.new(key: :config_file,
                                        env_name: "BUGSNAG_CONFIG_FILE",
                                        description: "Info.plist location",
@@ -125,7 +137,7 @@ module Fastlane
       def self.default_info_plist_path
         # Find first 'Info.plist' in the current working directory
         # ignoring any in 'build', or 'test' folders
-        return Dir.glob("./{ios/,}*/Info.plist").reject{|path| path =~ /build|test/i }.first
+        return Dir.glob("./{ios/,}*/Info.plist").reject{|path| path =~ /build|test/i }.sort.first
       end
 
       def self.options_from_info_plist file_path
@@ -143,8 +155,10 @@ module Fastlane
         }
       end
 
-      def self.upload_args dir, symbol_maps_dir, upload_url, project_root, api_key, verbose
+      def self.upload_args dir, symbol_maps_dir, upload_url, project_root, api_key, verbose, ignore_missing_dwarf, ignore_empty_dsym
         args = [verbose ? "--verbose" : "--silent"]
+        args += ["--ignore-missing-dwarf"] if ignore_missing_dwarf
+        args += ["--ignore-empty-dsym"] if ignore_empty_dsym
         args += ["--api-key", api_key] unless api_key.nil?
         args += ["--upload-server", upload_url] unless upload_url.nil?
         args += ["--symbol-maps", symbol_maps_dir] unless symbol_maps_dir.nil?

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Delisa Mason
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.20.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.20.0
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.28.5
-description: 
+description:
 email: iskanamagus@gmail.com
 executables: []
 extensions: []
@@ -153,7 +167,7 @@ homepage: https://github.com/bugsnag/bugsnag-dsym-upload
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Uploads dSYM files to Bugsnag
 test_files: