cocoapods-bugsnag 2.1.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b6be2d67d8a7328337375f824d428008832765847d254e443c524ac9eacc0e6
-  data.tar.gz: d94c59ef08d73b5cc15c0b679bb7c40226c2c3ac8e2d1740a17d2fbe56d483ba
+  metadata.gz: 9e5d8c650540e96f7ad51cbae072b074762bdfb8d1bb2552dad68763fec1d0e3
+  data.tar.gz: 4c8c98a9e980e8c1b7fdf86a9119134ea84052ce7375d0ab25c276c32e84734c
 SHA512:
-  metadata.gz: 8e1cdcba0c5564af91b44a6ef46afef0eb4a49618d7eee82cf9e3641ced0ae82043ecac4ad0f68f07d461b9fce8442f22e32bdfa8be89800f3b255b63e0349eb
-  data.tar.gz: 2888cc1f3cecce524327ca998791e996d3919c77dbe9dc6b052183776b0f00dfe3c961747e918ebc198f093b7b53f7c319edfb21161539f88e42e87876bc607e
+  metadata.gz: 5ee6032be77a768e5fc2230005a2a84c26fbb26e61d025f805b1491b63dca26a6b47e41bb560e1e0305ae407b6d215043aa7e2af2cd3ddece1cbf63086696270
+  data.tar.gz: 0040e50681ec86f21aad3fac88bb661701de9696afe426ca491e0807a646bbea306381eadfac377443f7a742145233cbed3dc043e589b31c77062853f7dc710b

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 2.2.2 (17 May 2022)
+
+### Enhancements
+
+* Uploading can now be skipped by setting `DISABLE_COCOAPODS_BUGSNAG=YES` via Xcode's Build Settings, `xcconfig` or `xcodebuild`.
+  | [#25](https://github.com/bugsnag/cocoapods-bugsnag/pull/25)
+
+## 2.2.1 (20 Nov 2020)
+
+### Bug fixes
+
+* The Xcode build phase now specifies its dependencies for improved reliability with Xcode's new build system.
+  | [#20](https://github.com/bugsnag/cocoapods-bugsnag/pull/20)
+
+## 2.2.0 (30 Sept 2020)
+
+### Enhancements
+
+* This plugin now finds `Info.plist` using Xcode environment variables, rather than a `glob` operation for robustness.
+  | [#15](https://github.com/bugsnag/cocoapods-bugsnag/pull/15)
+
+* This plugin will now only add itself to your Xcode project if it is explicitly added as a plugin in your `Podfile`. Previously it would install if `Bugsnag` was detected in your `Podfile`.
+  | [#16](https://github.com/bugsnag/cocoapods-bugsnag/pull/16)
+
 ## 2.1.0 (14 Aug 2020)
 
 ### Enhancements

data/README.md

@@ -24,20 +24,36 @@ install, run:
 
 ## Usage
 
-To add the build phase to your project, add pod ‘Bugsnag’ to your Podfile and run:
+To add the build phase to your project, add `pod 'Bugsnag'`, and `plugin 'cocoapods-bugsnag'` to your `Podfile`:
+
+```ruby
+pod 'Bugsnag'
+plugin 'cocoapods-bugsnag'
+```
+
+Then, install with: 
 
 ```bash
 pod install
 ```
 
+Once added, uploading your dSYM files to Bugsnag will occur automatically.
+
 By default, your Bugsnag API key will either be read from the `BUGSNAG_API_KEY`
 environment variable or from the `:bugsnag:apiKey` (or `BugsnagAPIKey`) value in your
 `Info.plist`. Alternatively edit the script in the new "Upload Bugsnag dSYM" build 
 phase in Xcode.
 
+Uploading can be disabled by setting `DISABLE_COCOAPODS_BUGSNAG=YES` in Xcode's
+Build Settings or an `xcconfig` file, or as an argument to `xcodebuild`.
+
 ## Support
 
 * [Symbolication guide](https://docs.bugsnag.com/platforms/ios/symbolication-guide/)
 * [Search open and closed issues](https://github.com/bugsnag/cocoapods-bugsnag/issues?utf8=✓&q=is%3Aissue)
   for similar problems
 * [Open an issue](https://github.com/bugsnag/cocoapods-bugsnag/issues/new)
+
+## License
+
+This module is free software released under the MIT License. See [LICENSE.txt](./LICENSE.txt) for details.

data/cocoapods-bugsnag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "cocoapods-bugsnag"
-  spec.version = "2.1.0"
+  spec.version = "2.2.2"
   spec.homepage = "https://bugsnag.com"
   spec.description = "Configures the dSYM upload phase of your project when integrated with bugsnag."
   spec.summary = "To get meaningful stacktraces from your crashes, the Bugsnag service needs your dSYM file for your build. This plugin adds an upload phase to your project where needed."

data/lib/cocoapods_bugsnag.rb

@@ -2,7 +2,17 @@ module Pod
   class Installer::UserProjectIntegrator::TargetIntegrator
 
     BUGSNAG_PHASE_NAME = "Upload Bugsnag dSYM"
+    BUGSNAG_PHASE_INPUT_PATHS = [
+      "${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}",
+      "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}"]
+    BUGSNAG_PHASE_SHELL_PATH = "/usr/bin/env ruby"
     BUGSNAG_PHASE_SCRIPT = <<'RUBY'
+# Set DISABLE_COCOAPODS_BUGSNAG=YES via Xcode's Build Settings, xcconfig or xcodebuild to skip upload
+if ENV['DISABLE_COCOAPODS_BUGSNAG'] == 'YES'
+  p 'Skipping dSYM upload'
+  return
+end
+
 api_key = nil # Insert your key here to use it directly from this script
 
 # Attempt to get the API key from an environment variable
@@ -11,7 +21,7 @@ unless api_key
 
   # If not present, attempt to lookup the value from the Info.plist
   unless api_key
-    info_plist_path = Dir.glob("./{ios/,}*/Info.plist").reject {|path| path =~ /build|test/i }.first
+    info_plist_path = "#{ENV["BUILT_PRODUCTS_DIR"]}/#{ENV["INFOPLIST_PATH"]}"
     plist_buddy_response = `/usr/libexec/PlistBuddy -c "print :bugsnag:apiKey" "#{info_plist_path}"`
     plist_buddy_response = `/usr/libexec/PlistBuddy -c "print :BugsnagAPIKey" "#{info_plist_path}"` if !$?.success?
     api_key = plist_buddy_response if $?.success?
@@ -40,7 +50,7 @@ RUBY
     alias_method :integrate_without_bugsnag!, :integrate!
     def integrate!
       integrate_without_bugsnag!
-      return unless has_bugsnag_dependency?
+      return unless should_add_build_phase?
       return if bugsnag_native_targets.empty?
       UI.section("Integrating with Bugsnag") do
         add_bugsnag_upload_script_phase
@@ -56,23 +66,26 @@ RUBY
           bp.name == BUGSNAG_PHASE_NAME
         end.first || native_target.new_shell_script_build_phase(BUGSNAG_PHASE_NAME)
 
-        phase.shell_path = "/usr/bin/env ruby"
+        phase.input_paths = BUGSNAG_PHASE_INPUT_PATHS
+        phase.shell_path = BUGSNAG_PHASE_SHELL_PATH
         phase.shell_script = BUGSNAG_PHASE_SCRIPT
         phase.show_env_vars_in_log = '0'
       end
     end
 
-    def has_bugsnag_dependency?
-      target.target_definition.dependencies.detect do |dep|
+    def should_add_build_phase?
+      has_bugsnag_dep = target.target_definition.dependencies.any? do |dep|
         dep.name.include?('Bugsnag')
-      end != nil
+      end
+      uses_bugsnag_plugin = target.target_definition.podfile.plugins.key?('cocoapods-bugsnag')
+      return has_bugsnag_dep && uses_bugsnag_plugin
     end
 
     def bugsnag_native_targets
       @bugsnag_native_targets ||=(
         native_targets.reject do |native_target|
           native_target.shell_script_build_phases.any? do |bp|
-            bp.name == BUGSNAG_PHASE_NAME && bp.shell_script == BUGSNAG_PHASE_SCRIPT
+            bp.name == BUGSNAG_PHASE_NAME && bp.input_paths == BUGSNAG_PHASE_INPUT_PATHS && bp.shell_path == BUGSNAG_PHASE_SHELL_PATH && bp.shell_script == BUGSNAG_PHASE_SCRIPT
           end
         end
       )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Delisa Mason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: To get meaningful stacktraces from your crashes, the Bugsnag service needs