cocoapods-bugsnag 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e5d8c650540e96f7ad51cbae072b074762bdfb8d1bb2552dad68763fec1d0e3
-  data.tar.gz: 4c8c98a9e980e8c1b7fdf86a9119134ea84052ce7375d0ab25c276c32e84734c
+  metadata.gz: 9bd7a73528694640aa6a5d4029fcf1cdbef07d71a0da73ab2b859272e491a8ca
+  data.tar.gz: 2c00d5eea8c273f5d30b2683cb04fb0bc446f17bdf2b2f6f3e6a0233bda6bb9d
 SHA512:
-  metadata.gz: 5ee6032be77a768e5fc2230005a2a84c26fbb26e61d025f805b1491b63dca26a6b47e41bb560e1e0305ae407b6d215043aa7e2af2cd3ddece1cbf63086696270
-  data.tar.gz: 0040e50681ec86f21aad3fac88bb661701de9696afe426ca491e0807a646bbea306381eadfac377443f7a742145233cbed3dc043e589b31c77062853f7dc710b
+  metadata.gz: '042861a83266e07106633d6b236fe5e3ac5271d2bacfd73bf2eb43e50388e81b7e371a7df0ee2bce2a3762f139629ef7a37a2beaa77b8cf73af2120dea75466e'
+  data.tar.gz: 9708b8a7b945b3e99c18df3d5768d1369f0353e83d1266fcf92b90dc2626b258140b55c58bde738fb040f1d1f4121d8fbcdbc9b906ca45c97e96d8ad5d4ecf4b

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.3.0 (13 Sept 2022)
+
+### Enhancements
+
+* The Xcode build phase is now compatible with Xcode 14's `ENABLE_USER_SCRIPT_SANDBOXING` build setting.
+  This requires all dSYM files to be specified in the build phase's "Input Files" list.
+  | [#28](https://github.com/bugsnag/cocoapods-bugsnag/pull/28)
+
 ## 2.2.2 (17 May 2022)
 
 ### Enhancements

data/README.md

@@ -40,9 +40,8 @@ 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.
+environment variable (add an Xcode build setting with this name to set it) or
+from the `:bugsnag:apiKey` (or `BugsnagAPIKey`) value in your `Info.plist`.
 
 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`.

data/cocoapods-bugsnag.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "cocoapods-bugsnag"
-  spec.version = "2.2.2"
+  spec.version = "2.3.0"
   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."
@@ -12,11 +12,13 @@ Gem::Specification.new do |spec|
     "cocoapods-bugsnag.gemspec"
   ]
   spec.extra_rdoc_files = [ "README.md", "CHANGELOG.md" ]
-  spec.test_files = [ "spec/cocoapods_bugsnag_spec.rb" ]
+  spec.test_files = [
+    "spec/cocoapods_bugsnag_spec.rb",
+    "spec/spec_helper.rb"
+  ]
   spec.require_paths = [ "lib" ]
   spec.license = "MIT"
 
   spec.add_dependency "cocoapods", "~> 1.0"
   spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "bacon", "~> 1.0"
 end

data/lib/cocoapods_bugsnag.rb

@@ -9,41 +9,48 @@ module Pod
     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'
+  puts '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 (or Xcode build setting)
+api_key = ENV["BUGSNAG_API_KEY"]
 
-# Attempt to get the API key from an environment variable
+# If not present, attempt to lookup the value from the Info.plist
 unless api_key
-  api_key = ENV["BUGSNAG_API_KEY"]
-
-  # If not present, attempt to lookup the value from the Info.plist
-  unless api_key
-    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?
-  end
+  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?
 end
 
-fail("No Bugsnag API key detected - add your key to your Info.plist, BUGSNAG_API_KEY environment variable or this Run Script phase") unless api_key
-
-fork do
-  Process.setsid
-  STDIN.reopen("/dev/null")
-  STDOUT.reopen("/dev/null", "a")
-  STDERR.reopen("/dev/null", "a")
+fail("No Bugsnag API key detected - add your key to your Info.plist or BUGSNAG_API_KEY environment variable") unless api_key
 
-  require 'shellwords'
-
-  Dir["#{ENV["DWARF_DSYM_FOLDER_PATH"]}/*/Contents/Resources/DWARF/*"].each do |dsym|
-    curl_command = "curl --http1.1 -F dsym=@#{Shellwords.escape(dsym)} -F projectRoot=#{Shellwords.escape(ENV["PROJECT_DIR"])} "
-    curl_command += "-F apiKey=#{Shellwords.escape(api_key)} "
-    curl_command += "https://upload.bugsnag.com/"
-    system(curl_command)
+if ENV['ENABLE_USER_SCRIPT_SANDBOXING'] == 'YES'
+  count = ENV['SCRIPT_INPUT_FILE_COUNT'].to_i
+  abort 'error: dSYMs must be specified as build phase "Input Files" because ENABLE_USER_SCRIPT_SANDBOXING is enabled' unless count > 0
+  dsyms = []
+  for i in 0 .. count - 1
+    file = ENV["SCRIPT_INPUT_FILE_#{i}"]
+    next if file.end_with? '.plist'
+    if File.exist? file
+      dsyms.append file
+    else
+      abort "error: cannot read #{file}" unless ENV['DEBUG_INFORMATION_FORMAT'] != 'dwarf-with-dsym'
+    end
   end
+else
+  dsyms = Dir["#{ENV['DWARF_DSYM_FOLDER_PATH']}/*/Contents/Resources/DWARF/*"]
+end
+
+dsyms.each do |dsym|
+  Process.detach Process.spawn('/usr/bin/curl', '--http1.1',
+    '-F', "apiKey=#{api_key}",
+    '-F', "dsym=@#{dsym}",
+    '-F', "projectRoot=#{ENV['PROJECT_DIR']}",
+    'https://upload.bugsnag.com/',
+    %i[err out] => :close
+  )
 end
 RUBY
 
@@ -51,44 +58,54 @@ RUBY
     def integrate!
       integrate_without_bugsnag!
       return unless should_add_build_phase?
-      return if bugsnag_native_targets.empty?
+
       UI.section("Integrating with Bugsnag") do
         add_bugsnag_upload_script_phase
         user_project.save
       end
-      UI.puts "Added 'Upload Bugsnag dSYM' build phase"
     end
 
-
     def add_bugsnag_upload_script_phase
-      bugsnag_native_targets.each do |native_target|
+      native_targets.each do |native_target|
         phase = native_target.shell_script_build_phases.select do |bp|
           bp.name == BUGSNAG_PHASE_NAME
-        end.first || native_target.new_shell_script_build_phase(BUGSNAG_PHASE_NAME)
+        end.first || add_shell_script_build_phase(native_target, BUGSNAG_PHASE_NAME)
 
-        phase.input_paths = BUGSNAG_PHASE_INPUT_PATHS
+        phase.input_paths = dsym_phase_input_paths(phase)
         phase.shell_path = BUGSNAG_PHASE_SHELL_PATH
         phase.shell_script = BUGSNAG_PHASE_SCRIPT
         phase.show_env_vars_in_log = '0'
       end
     end
 
+    def add_shell_script_build_phase(native_target, name)
+      UI.puts "Adding '#{name}' build phase to '#{native_target.name}'"
+      native_target.new_shell_script_build_phase(name)
+    end
+
+    def dsym_phase_input_paths(phase)
+      (phase.input_paths + BUGSNAG_PHASE_INPUT_PATHS + target.framework_dsym_paths).uniq
+    end
+
     def should_add_build_phase?
       has_bugsnag_dep = target.target_definition.dependencies.any? do |dep|
-        dep.name.include?('Bugsnag')
+        dep.name.match?(/bugsnag/i)
       end
       uses_bugsnag_plugin = target.target_definition.podfile.plugins.key?('cocoapods-bugsnag')
       return has_bugsnag_dep && uses_bugsnag_plugin
     end
+  end
+end
+
+module Pod
+  class AggregateTarget
+    def framework_dsym_paths
+      return [] unless includes_frameworks?
 
-    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.input_paths == BUGSNAG_PHASE_INPUT_PATHS && bp.shell_path == BUGSNAG_PHASE_SHELL_PATH && bp.shell_script == BUGSNAG_PHASE_SCRIPT
-          end
-        end
-      )
+      framework_paths_by_config['Release'].map do |framework|
+        name = File.basename(framework.source_path, '.framework')
+        "#{framework.source_path}.dSYM/Contents/Resources/DWARF/#{name}"
+      end
     end
   end
 end

data/spec/cocoapods_bugsnag_spec.rb

@@ -1,3 +1,128 @@
-require 'bacon'
+# frozen_string_literal: true
 
+require 'cocoapods'
+require 'cocoapods_bugsnag'
+require 'tmpdir'
 
+# rubocop:disable Lint/MissingCopEnableDirective, Metrics/BlockLength
+
+RSpec.describe 'cocoapods-bugsnag' do
+  context 'with a user project' do
+    around(:each) do |t|
+      Dir.chdir(Dir.mktmpdir) { t.run }
+    end
+
+    let(:config) { Pod::Config.instance }
+
+    before do
+      user_project = Xcodeproj::Project.new('App.xcodeproj')
+      Pod::Generator::AppTargetHelper.add_app_target(user_project, :osx, '10.11')
+      user_project.save
+
+      CLAide::Command::PluginManager.load_plugins('cocoapods')
+    end
+
+    it 'adds a build phase if included in Podfile' do
+      File.write 'Podfile', <<~RUBY
+        use_frameworks!
+        plugin 'cocoapods-bugsnag'
+        target 'App' do
+          pod 'AFNetworking'
+          pod 'Bugsnag'
+        end
+      RUBY
+
+      installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
+      installer.install!
+
+      expect(Pod::UI.output).to include "Adding 'Upload Bugsnag dSYM' build phase to 'App'"
+
+      expect(installer.aggregate_targets.flat_map(&:user_targets)).to all(satisfy do |target|
+        upload_phase = target.shell_script_build_phases.find { |bp| bp.name == 'Upload Bugsnag dSYM' }
+        expect(upload_phase.shell_path).to eq '/usr/bin/env ruby'
+        expect(upload_phase.shell_script).to include 'BUGSNAG_API_KEY'
+        expect(upload_phase.shell_script).to include 'SCRIPT_INPUT_FILE_COUNT'
+        expect(upload_phase.show_env_vars_in_log).to eq '0'
+        expect(upload_phase.input_paths).to eq %w[
+          ${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}
+          ${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}
+          ${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework.dSYM/Contents/Resources/DWARF/AFNetworking
+          ${BUILT_PRODUCTS_DIR}/Bugsnag/Bugsnag.framework.dSYM/Contents/Resources/DWARF/Bugsnag
+        ]
+      end)
+    end
+
+    it 'does not remove existing input phases' do
+      File.write 'Podfile', <<~RUBY
+        use_frameworks!
+        plugin 'cocoapods-bugsnag'
+        target 'App' do
+          pod 'AFNetworking'
+          pod 'Bugsnag'
+        end
+      RUBY
+
+      installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
+      installer.install!
+
+      expect(Pod::UI.output).to include "Adding 'Upload Bugsnag dSYM' build phase to 'App'"
+      Pod::UI.output = ''.dup
+
+      File.write 'Podfile', <<~RUBY
+        use_frameworks!
+        plugin 'cocoapods-bugsnag'
+        target 'App' do
+          # AFNetworking now omitted
+          pod 'Bugsnag'
+        end
+      RUBY
+
+      installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
+      installer.install!
+
+      expect(Pod::UI.output).not_to include "Adding 'Upload Bugsnag dSYM' build phase to 'App'"
+
+      expect(installer.aggregate_targets.flat_map(&:user_targets)).to all(satisfy do |target|
+        upload_phase = target.shell_script_build_phases.find { |bp| bp.name == 'Upload Bugsnag dSYM' }
+        expect(upload_phase.input_paths).to include(
+          '${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework.dSYM/Contents/Resources/DWARF/AFNetworking'
+        )
+      end)
+    end
+
+    it 'does nothing if Bugsnag is not a dependency' do
+      File.write 'Podfile', <<~RUBY
+        plugin 'cocoapods-bugsnag'
+        target 'App'
+      RUBY
+
+      installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
+      installer.install!
+
+      expect(Pod::UI.output).not_to include "Adding 'Upload Bugsnag dSYM' build phase to 'App'"
+
+      expect(installer.aggregate_targets.flat_map(&:user_targets)).to all(satisfy do |target|
+        upload_phase = target.shell_script_build_phases.find { |bp| bp.name == 'Upload Bugsnag dSYM' }
+        expect(upload_phase).to be_nil
+      end)
+    end
+
+    it 'does nothing if not added as a plugin' do
+      File.write 'Podfile', <<~RUBY
+        target 'App' do
+          pod 'Bugsnag'
+        end
+      RUBY
+
+      installer = Pod::Installer.new(config.sandbox, config.podfile, config.lockfile)
+      installer.install!
+
+      expect(Pod::UI.output).not_to include "Adding 'Upload Bugsnag dSYM' build phase to 'App'"
+
+      expect(installer.aggregate_targets.flat_map(&:user_targets)).to all(satisfy do |target|
+        upload_phase = target.shell_script_build_phases.find { |bp| bp.name == 'Upload Bugsnag dSYM' }
+        expect(upload_phase).to be_nil
+      end)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'cocoapods'
+
+module Pod
+  # Disable the wrapping so the output is deterministic in the tests.
+  #
+  UI.disable_wrap = true
+
+  # Redirects the messages to an internal store.
+  #
+  module UI
+    class << self
+      attr_accessor :output, :warnings, :next_input
+
+      def puts(message = '')
+        @output << "#{message}\n"
+      end
+
+      def warn(message = '', _actions = [])
+        @warnings << "#{message}\n"
+      end
+
+      def print(message)
+        @output << message
+      end
+
+      alias gets next_input
+
+      def print_warnings; end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:each) do
+    Pod::UI.output = ''.dup
+    Pod::UI.warnings = ''.dup
+    Pod::UI.next_input = ''.dup
+    Pod::Config.instance = nil
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Delisa Mason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Configures the dSYM upload phase of your project when integrated with
   bugsnag.
 email:
@@ -68,6 +54,7 @@ files:
 - lib/cocoapods_bugsnag.rb
 - lib/cocoapods_plugin.rb
 - spec/cocoapods_bugsnag_spec.rb
+- spec/spec_helper.rb
 homepage: https://bugsnag.com
 licenses:
 - MIT
@@ -95,3 +82,4 @@ summary: To get meaningful stacktraces from your crashes, the Bugsnag service ne
   where needed.
 test_files:
 - spec/cocoapods_bugsnag_spec.rb
+- spec/spec_helper.rb