branch_io_cli 0.9.0 → 0.9.1

data/lib/branch_io_cli/configuration/setup_configuration.rb

@@ -0,0 +1,215 @@
+module BranchIOCLI
+  module Configuration
+    class SetupConfiguration < Configuration
+      APP_LINK_REGEXP = /\.app\.link$|\.test-app\.link$/
+      SDK_OPTIONS =
+        {
+          "Set this project up to use CocoaPods and add the Branch SDK." => :cocoapods,
+          "Set this project up to use Carthage and add the Branch SDK." => :carthage,
+          "Add Branch.framework directly to the project's dependencies." => :direct,
+          "Skip adding the framework to the project." => :skip
+        }
+
+      attr_reader :keys
+      attr_reader :all_domains
+      attr_reader :carthage_command
+      attr_reader :uri_scheme
+      attr_reader :validate
+      attr_reader :add_sdk
+      attr_reader :force
+      attr_reader :patch_source
+      attr_reader :commit
+
+      def validate_options
+        @validate = options.validate
+        @patch_source = options.patch_source
+        @add_sdk = options.add_sdk
+        @force = options.force
+        @commit = options.commit
+
+        say "--force is ignored when --no-validate is used." if !options.validate && options.force
+        if options.cartfile && options.podfile
+          say "--cartfile and --podfile are mutually exclusive. Please specify the file to patch."
+          exit 1
+        end
+
+        validate_xcodeproj_path
+        validate_target
+        validate_keys_from_setup_options options
+        validate_all_domains options, !target.extension_target_type?
+        validate_uri_scheme options
+
+        # If neither --podfile nor --cartfile is present, arbitrarily look for a Podfile
+        # first.
+
+        # If --cartfile is present, don't look for a Podfile. Just validate that
+        # Cartfile.
+        validate_buildfile_path options.podfile, "Podfile" if options.cartfile.nil? && options.add_sdk
+
+        # If --podfile is present or a Podfile was found, don't look for a Cartfile.
+        validate_buildfile_path options.cartfile, "Cartfile" if sdk_integration_mode.nil? && options.add_sdk
+        @carthage_command = options.carthage_command if sdk_integration_mode == :carthage
+
+        validate_sdk_addition options
+      end
+
+      def log
+        super
+        message = <<-EOF
+<%= color('Xcode project:', BOLD) %> #{xcodeproj_path}
+<%= color('Target:', BOLD) %> #{target.name}
+<%= color('Live key:', BOLD) %> #{keys[:live] || '(none)'}
+<%= color('Test key:', BOLD) %> #{keys[:test] || '(none)'}
+<%= color('Domains:', BOLD) %> #{all_domains}
+<%= color('URI scheme:', BOLD) %> #{uri_scheme || '(none)'}
+<%= color('Podfile:', BOLD) %> #{podfile_path || '(none)'}
+<%= color('Cartfile:', BOLD) %> #{cartfile_path || '(none)'}
+<%= color('Carthage command:', BOLD) %> #{carthage_command || '(none)'}
+<%= color('Pod repo update:', BOLD) %> #{pod_repo_update.inspect}
+<%= color('Validate:', BOLD) %> #{validate.inspect}
+<%= color('Force:', BOLD) %> #{force.inspect}
+<%= color('Add SDK:', BOLD) %> #{add_sdk.inspect}
+<%= color('Patch source:', BOLD) %> #{patch_source.inspect}
+<%= color('Commit:', BOLD) %> #{commit.inspect}
+<%= color('SDK integration mode:', BOLD) %> #{sdk_integration_mode || '(none)'}
+        EOF
+
+        if swift_version
+          message += <<-EOF
+<%= color('Swift version:', BOLD) %> #{swift_version}
+          EOF
+        end
+
+        message += "\n"
+
+        say message
+      end
+
+      def validate_keys_from_setup_options(options)
+        live_key = options.live_key
+        test_key = options.test_key
+        @keys = {}
+        keys[:live] = live_key unless live_key.nil?
+        keys[:test] = test_key unless test_key.nil?
+
+        while @keys.empty?
+          say "A live key, a test key or both is required."
+          live_key = ask "Please enter your live Branch key or use --live_key [enter for none]: "
+          test_key = ask "Please enter your test Branch key or use --test_key [enter for none]: "
+
+          keys[:live] = live_key unless live_key == ""
+          keys[:test] = test_key unless test_key == ""
+        end
+      end
+
+      def validate_all_domains(options, required = true)
+        app_link_roots = app_link_roots_from_domains options.domains
+
+        unless options.app_link_subdomain.nil? || app_link_roots.include?(options.app_link_subdomain)
+          app_link_roots << options.app_link_subdomain
+        end
+
+        # app_link_roots now contains options.app_link_subdomain, if supplied, and the roots of any
+        # .app.link or .test-app.link domains provided via options.domains.
+
+        app_link_subdomains = app_link_subdomains_from_roots app_link_roots
+
+        custom_domains = custom_domains_from_domains options.domains
+
+        @all_domains = (app_link_subdomains + custom_domains).uniq
+
+        while required && @all_domains.empty?
+          domains = ask "Please enter domains as a comma-separated list: ", ->(str) { str.split "," }
+
+          @all_domains = all_domains_from_domains domains
+        end
+      end
+
+      def validate_uri_scheme(options)
+        # No validation at the moment. Just strips off any trailing ://
+        @uri_scheme = uri_scheme_without_suffix options.uri_scheme
+      end
+
+      def app_link_roots_from_domains(domains)
+        return [] if domains.nil?
+
+        domains.select { |d| d =~ APP_LINK_REGEXP }
+               .map { |d| d.sub(APP_LINK_REGEXP, '').sub(/-alternate$/, '') }
+               .uniq
+      end
+
+      def custom_domains_from_domains(domains)
+        return [] if domains.nil?
+        domains.reject { |d| d =~ APP_LINK_REGEXP }.uniq
+      end
+
+      def app_link_subdomains(root)
+        app_link_subdomain = root
+        return [] if app_link_subdomain.nil?
+
+        live_key = keys[:live]
+        test_key = keys[:test]
+
+        domains = []
+        unless live_key.nil?
+          domains += [
+            "#{app_link_subdomain}.app.link",
+            "#{app_link_subdomain}-alternate.app.link"
+          ]
+        end
+        unless test_key.nil?
+          domains += [
+            "#{app_link_subdomain}.test-app.link",
+            "#{app_link_subdomain}-alternate.test-app.link"
+          ]
+        end
+        domains
+      end
+
+      def app_link_subdomains_from_roots(roots)
+        roots.inject([]) { |domains, root| domains + app_link_subdomains(root) }
+      end
+
+      def all_domains_from_domains(domains)
+        app_link_roots = app_link_roots_from_domains domains
+        app_link_subdomains = app_link_subdomains_from_roots app_link_roots
+        custom_domains = custom_domains_from_domains domains
+        custom_domains + app_link_subdomains
+      end
+
+      # Removes any trailing :// from the argument and returns a copy
+      def uri_scheme_without_suffix(scheme)
+        return nil if scheme.nil?
+        scheme.sub %r{://$}, ""
+      end
+
+      def validate_sdk_addition(options)
+        return if !options.add_sdk || sdk_integration_mode
+
+        # If no CocoaPods or Carthage, check to see if the framework is linked.
+        target = helper.target_from_project xcodeproj, options.target
+        return if target.frameworks_build_phase.files.map(&:file_ref).map(&:path).any? { |p| p =~ /Branch.framework$/ }
+
+        # --podfile, --cartfile not specified. No Podfile found. No Cartfile found. No Branch.framework in project.
+        # Prompt the user:
+        selected = choose do |menu|
+          menu.header = "No Podfile or Cartfile specified or found. Here are your options"
+
+          SDK_OPTIONS.each_key { |k| menu.choice k }
+
+          menu.prompt = "What would you like to do?"
+        end
+
+        @sdk_integration_mode = SDK_OPTIONS[selected]
+
+        case sdk_integration_mode
+        when :cocoapods
+          @podfile_path = File.expand_path "../Podfile", xcodeproj_path
+        when :carthage
+          @cartfile_path = File.expand_path "../Cartfile", xcodeproj_path
+          @carthage_command = options.carthage_command
+        end
+      end
+    end
+  end
+end

data/lib/branch_io_cli/configuration/validate_configuration.rb

@@ -0,0 +1,26 @@
+module BranchIOCLI
+  module Configuration
+    class ValidateConfiguration < Configuration
+      attr_reader :domains
+
+      def initialize(options)
+        super
+        @domains = options.domains
+      end
+
+      def validate_options
+        validate_xcodeproj_path
+        validate_target
+      end
+
+      def log
+        super
+        say <<EOF
+<%= color('Xcode project:', BOLD) %> #{xcodeproj_path}
+<%= color('Target:', BOLD) %> #{target.name}
+<%= color('Domains:', BOLD) %> #{domains || '(none)'}
+EOF
+      end
+    end
+  end
+end

data/lib/branch_io_cli/core_ext/io.rb

@@ -7,7 +7,7 @@ class IO
   # object.
   #
   # :command: [String] a shell command to execute and report
-  def report_command(command)
+  def log_command(command)
     write "$ #{command}\n\n"
 
     Open3.popen2e(command) do |stdin, output, thread|
@@ -32,7 +32,7 @@ end
 # Returns a Process::Status object.
 #
 # :command: [String] a shell command to execute and report
-def STDOUT.report_command(command)
+def STDOUT.log_command(command)
   # TODO: Improve this implementation?
   say "<%= color(%q{$ #{command}}, [MAGENTA, BOLD]) %>\n\n"
   # May also write to stderr

data/lib/branch_io_cli/helper.rb

@@ -1,2 +1,2 @@
 require "branch_io_cli/helper/branch_helper"
-require "branch_io_cli/helper/configuration_helper"
+require "branch_io_cli/helper/patch_helper"

data/lib/branch_io_cli/helper/branch_helper.rb

@@ -19,22 +19,6 @@ module BranchIOCLI
           @changes << change.to_s
         end
 
-        # Shim around PatternPatch for now
-        def apply_patch(options)
-          modified = File.open(options[:files]) do |file|
-            PatternPatch::Utilities.apply_patch file.read,
-                                                options[:regexp],
-                                                options[:text],
-                                                options[:global],
-                                                options[:mode],
-                                                options[:offset] || 0
-          end
-
-          File.open(options[:files], "w") do |file|
-            file.write modified
-          end
-        end
-
         def fetch(url)
           response = Net::HTTP.get_response URI(url)
 

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -2,10 +2,13 @@ require "json"
 require "net/http"
 require "openssl"
 require "pathname"
+require "pattern_patch"
 require "plist"
+require "shellwords"
 require "tmpdir"
 require "zip"
 
+require "branch_io_cli/configuration"
 require "branch_io_cli/helper/methods"
 
 module BranchIOCLI
@@ -18,19 +21,23 @@ module BranchIOCLI
       PRODUCT_BUNDLE_IDENTIFIER = "PRODUCT_BUNDLE_IDENTIFIER"
       RELEASE_CONFIGURATION = "Release"
 
+      def config
+        Configuration::Configuration.current
+      end
+
       def has_multiple_info_plists?
-        ConfigurationHelper.xcodeproj.build_configurations.inject([]) do |files, config|
-          files + [expanded_build_setting(ConfigurationHelper.target, "INFOPLIST_FILE", config.name)]
+        config.xcodeproj.build_configurations.inject([]) do |files, c|
+          files + [expanded_build_setting(config.target, "INFOPLIST_FILE", c.name)]
         end.uniq.count > 1
       end
 
       def add_keys_to_info_plist(keys)
         if has_multiple_info_plists?
-          ConfigurationHelper.xcodeproj.build_configurations.each do |config|
-            update_info_plist_setting config.name do |info_plist|
+          config.xcodeproj.build_configurations.each do |c|
+            update_info_plist_setting c.name do |info_plist|
               if keys.count > 1
                 # Use test key in debug configs and live key in release configs
-                info_plist["branch_key"] = config.debug? ? keys[:test] : keys[:live]
+                info_plist["branch_key"] = c.debug? ? keys[:test] : keys[:live]
               else
                 info_plist["branch_key"] = keys[:live] ? keys[:live] : keys[:test]
               end
@@ -54,21 +61,21 @@ module BranchIOCLI
         # Add all supplied domains unless all are app.link domains.
         return if domains.all? { |d| d =~ /app\.link$/ }
 
-        ConfigurationHelper.xcodeproj.build_configurations.each do |config|
-          update_info_plist_setting config.name do |info_plist|
+        config.xcodeproj.build_configurations.each do |c|
+          update_info_plist_setting c.name do |info_plist|
             info_plist["branch_universal_link_domains"] = domains
           end
         end
       end
 
       def ensure_uri_scheme_in_info_plist
-        uri_scheme = ConfigurationHelper.uri_scheme
+        uri_scheme = config.uri_scheme
 
         # No URI scheme specified. Do nothing.
         return if uri_scheme.nil?
 
-        ConfigurationHelper.xcodeproj.build_configurations.each do |config|
-          update_info_plist_setting config.name do |info_plist|
+        config.xcodeproj.build_configurations.each do |c|
+          update_info_plist_setting c.name do |info_plist|
             url_types = info_plist["CFBundleURLTypes"] || []
             uri_schemes = url_types.inject([]) { |schemes, t| schemes + t["CFBundleURLSchemes"] }
 
@@ -89,11 +96,11 @@ module BranchIOCLI
 
       def update_info_plist_setting(configuration = RELEASE_CONFIGURATION, &b)
         # find the Info.plist paths for this configuration
-        info_plist_path = expanded_build_setting ConfigurationHelper.target, "INFOPLIST_FILE", configuration
+        info_plist_path = expanded_build_setting config.target, "INFOPLIST_FILE", configuration
 
         raise "Info.plist not found for configuration #{configuration}" if info_plist_path.nil?
 
-        project_parent = File.dirname ConfigurationHelper.xcodeproj_path
+        project_parent = File.dirname config.xcodeproj_path
 
         info_plist_path = File.expand_path info_plist_path, project_parent
 
@@ -108,8 +115,8 @@ module BranchIOCLI
       end
 
       def add_universal_links_to_project(domains, remove_existing, configuration = RELEASE_CONFIGURATION)
-        project = ConfigurationHelper.xcodeproj
-        target = ConfigurationHelper.target
+        project = config.xcodeproj
+        target = config.target
 
         relative_entitlements_path = expanded_build_setting target, CODE_SIGN_ENTITLEMENTS, configuration
         project_parent = File.dirname project.path
@@ -168,7 +175,7 @@ module BranchIOCLI
         team, bundle = team_and_bundle_from_app_id identifier
 
         update_team_and_bundle_ids team, bundle
-        add_change ConfigurationHelper.xcodeproj_path
+        add_change config.xcodeproj_path
       end
 
       def validate_team_and_bundle_ids_from_aasa_files(domains = [], remove_existing = false, configuration = RELEASE_CONFIGURATION)
@@ -282,7 +289,7 @@ module BranchIOCLI
       end
 
       def validate_team_and_bundle_ids(domain, configuration)
-        target = ConfigurationHelper.target
+        target = config.target
 
         product_bundle_identifier = expanded_build_setting target, PRODUCT_BUNDLE_IDENTIFIER, configuration
         development_team = expanded_build_setting target, DEVELOPMENT_TEAM, configuration
@@ -321,7 +328,7 @@ module BranchIOCLI
       end
 
       def update_team_and_bundle_ids(team, bundle)
-        target = ConfigurationHelper.target
+        target = config.target
 
         target.build_configuration_list.set_setting PRODUCT_BUNDLE_IDENTIFIER, bundle
         target.build_configuration_list.set_setting DEVELOPMENT_TEAM, team
@@ -347,8 +354,8 @@ module BranchIOCLI
       end
 
       def domains_from_project(configuration = RELEASE_CONFIGURATION)
-        project = ConfigurationHelper.xcodeproj
-        target = ConfigurationHelper.target
+        project = config.xcodeproj
+        target = config.target
 
         relative_entitlements_path = expanded_build_setting target, CODE_SIGN_ENTITLEMENTS, configuration
         return [] if relative_entitlements_path.nil?
@@ -381,438 +388,40 @@ module BranchIOCLI
         setting_value
       end
 
-      def patch_app_delegate_swift(project)
-        app_delegate_swift = project.files.find { |f| f.path =~ /AppDelegate.swift$/ }
-        return false if app_delegate_swift.nil?
-
-        app_delegate_swift_path = app_delegate_swift.real_path.to_s
-
-        app_delegate = File.read app_delegate_swift_path
-        return false if app_delegate =~ /import\s+Branch/
-
-        say "Patching #{app_delegate_swift_path}"
-
-        apply_patch(
-          files: app_delegate_swift_path,
-          regexp: /^\s*import .*$/,
-          text: "\nimport Branch",
-          mode: :prepend
-        )
-
-        patch_did_finish_launching_method_swift app_delegate_swift_path
-        patch_continue_user_activity_method_swift app_delegate_swift_path
-        patch_open_url_method_swift app_delegate_swift_path
-
-        add_change app_delegate_swift_path
-        true
-      end
-
-      def patch_app_delegate_objc(project)
-        app_delegate_objc = project.files.find { |f| f.path =~ /AppDelegate.m$/ }
-        return false if app_delegate_objc.nil?
-
-        app_delegate_objc_path = app_delegate_objc.real_path.to_s
-
-        app_delegate = File.read app_delegate_objc_path
-        return false if app_delegate =~ %r{^\s+#import\s+<Branch/Branch.h>|^\s+@import\s+Branch;}
-
-        say "Patching #{app_delegate_objc_path}"
-
-        apply_patch(
-          files: app_delegate_objc_path,
-          regexp: /^\s+@import|^\s+#import.*$/,
-          text: "\n#import <Branch/Branch.h>",
-          mode: :prepend
-        )
-
-        patch_did_finish_launching_method_objc app_delegate_objc_path
-        patch_continue_user_activity_method_objc app_delegate_objc_path
-        patch_open_url_method_objc app_delegate_objc_path
-
-        add_change app_delegate_objc_path
-        true
-      end
-
-      def patch_did_finish_launching_method_swift(app_delegate_swift_path)
-        app_delegate_swift = File.read app_delegate_swift_path
-
-        if app_delegate_swift =~ /didFinishLaunching[^\n]+?\{/m
-          # method already present
-          init_session_text = ConfigurationHelper.keys.count <= 1 || has_multiple_info_plists? ? "" : <<EOF
-        #if DEBUG
-            Branch.setUseTestBranchKey(true)
-        #endif
-
-EOF
-
-          init_session_text += <<-EOF
-        Branch.getInstance().initSession(launchOptions: launchOptions) {
-            universalObject, linkProperties, error in
-
-            // TODO: Route Branch links
-        }
-        EOF
-
-          apply_patch(
-            files: app_delegate_swift_path,
-            regexp: /didFinishLaunchingWithOptions.*?\{[^\n]*\n/m,
-            text: init_session_text,
-            mode: :append
-          )
-        else
-          # method not present. add entire method
-
-          method_text = <<EOF
-
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-EOF
-
-          if ConfigurationHelper.keys.count > 1 && !has_multiple_info_plists?
-            method_text += <<EOF
-        #if DEBUG
-          Branch.setUseTestBranchKey(true)
-        #endif
-
-EOF
-          end
-
-          method_text += <<-EOF
-        Branch.getInstance().initSession(launchOptions: launchOptions) {
-            universalObject, linkProperties, error in
-
-            // TODO: Route Branch links
-        }
-        return true
-    }
-        EOF
-
-          apply_patch(
-            files: app_delegate_swift_path,
-            regexp: /var\s+window\s?:\s?UIWindow\?.*?\n/m,
-            text: method_text,
-            mode: :append
-          )
-        end
-      end
-
-      def patch_did_finish_launching_method_objc(app_delegate_objc_path)
-        app_delegate_objc = File.read app_delegate_objc_path
-
-        if app_delegate_objc =~ /didFinishLaunchingWithOptions/m
-          # method exists. patch it.
-          init_session_text = ConfigurationHelper.keys.count <= 1 || has_multiple_info_plists? ? "" : <<EOF
-#ifdef DEBUG
-    [Branch setUseTestBranchKey:YES];
-#endif // DEBUG
-
-EOF
-
-          init_session_text += <<-EOF
-    [[Branch getInstance] initSessionWithLaunchOptions:launchOptions
-        andRegisterDeepLinkHandlerUsingBranchUniversalObject:^(BranchUniversalObject *universalObject, BranchLinkProperties *linkProperties, NSError *error){
-        // TODO: Route Branch links
-    }];
-          EOF
-
-          apply_patch(
-            files: app_delegate_objc_path,
-            regexp: /didFinishLaunchingWithOptions.*?\{[^\n]*\n/m,
-            text: init_session_text,
-            mode: :append
-          )
-        else
-          # method does not exist. add it.
-          method_text = <<EOF
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-EOF
-
-          if ConfigurationHelper.keys.count > 1 && !has_multiple_info_plists?
-            method_text += <<EOF
-#ifdef DEBUG
-    [Branch setUseTestBranchKey:YES];
-#endif // DEBUG
-
-EOF
-          end
-
-          method_text += <<-EOF
-    [[Branch getInstance] initSessionWithLaunchOptions:launchOptions
-        andRegisterDeepLinkHandlerUsingBranchUniversalObject:^(BranchUniversalObject *universalObject, BranchLinkProperties *linkProperties, NSError *error){
-        // TODO: Route Branch links
-    }];
-    return YES;
-}
-          EOF
-
-          apply_patch(
-            files: app_delegate_objc_path,
-            regexp: /^@implementation.*?\n/m,
-            text: method_text,
-            mode: :append
-          )
-        end
-      end
-
-      def patch_open_url_method_swift(app_delegate_swift_path)
-        app_delegate_swift = File.read app_delegate_swift_path
-        if app_delegate_swift =~ /application.*open\s+url.*options/
-          # Has application:openURL:options:
-          open_url_text = <<-EOF
-        // TODO: Adjust your method as you see fit.
-        if Branch.getInstance().application(app, open: url, options: options) {
-            return true
-        }
-
-          EOF
-
-          apply_patch(
-            files: app_delegate_swift_path,
-            regexp: /application.*open\s+url.*options:.*?\{.*?\n/m,
-            text: open_url_text,
-            mode: :append
-          )
-        elsif app_delegate_swift =~ /application.*open\s+url.*sourceApplication/
-          # Has application:openURL:sourceApplication:annotation:
-          # TODO: This method is deprecated.
-          open_url_text = <<-EOF
-        // TODO: Adjust your method as you see fit.
-        if Branch.getInstance().application(application, open: url, sourceApplication: sourceApplication, annotation: annotation) {
-            return true
-        }
-
-          EOF
-
-          apply_patch(
-            files: app_delegate_swift_path,
-            regexp: /application.*open\s+url.*sourceApplication:.*?\{.*?\n/m,
-            text: open_url_text,
-            mode: :append
-          )
-        else
-          # Has neither
-          open_url_text = <<EOF
-
-
-    func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {
-        return Branch.getInstance().application(app, open: url, options: options)
-    }
-EOF
-
-          apply_patch(
-            files: app_delegate_swift_path,
-            regexp: /\n\s*\}[^{}]*\Z/m,
-            text: open_url_text,
-            mode: :prepend
-          )
-        end
-      end
-
-      def patch_continue_user_activity_method_swift(app_delegate_swift_path)
-        app_delegate = File.read app_delegate_swift_path
-        if app_delegate =~ /application:.*continue userActivity:.*restorationHandler:/
-          # Add something to the top of the method
-          continue_user_activity_text = <<-EOF
-        // TODO: Adjust your method as you see fit.
-        if Branch.getInstance.continue(userActivity) {
-            return true
-        }
-
-          EOF
-
-          apply_patch(
-            files: app_delegate_swift_path,
-            regexp: /application:.*continue userActivity:.*restorationHandler:.*?\{.*?\n/m,
-            text: continue_user_activity_text,
-            mode: :append
-          )
-        else
-          # Add the application:continueUserActivity:restorationHandler method if it does not exist
-          continue_user_activity_text = <<-EOF
-
-
-    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
-        return Branch.getInstance().continue(userActivity)
-    }
-          EOF
-
-          apply_patch(
-            files: app_delegate_swift_path,
-            regexp: /\n\s*\}[^{}]*\Z/m,
-            text: continue_user_activity_text,
-            mode: :prepend
-          )
-        end
-      end
-
-      def patch_open_url_method_objc(app_delegate_objc_path)
-        app_delegate_objc = File.read app_delegate_objc_path
-        if app_delegate_objc =~ /application:.*openURL:.*options/
-          # Has application:openURL:options:
-          open_url_text = <<-EOF
-    // TODO: Adjust your method as you see fit.
-    if ([[Branch getInstance] application:app openURL:url options:options]) {
-        return YES;
-    }
-
-EOF
-
-          apply_patch(
-            files: app_delegate_objc_path,
-            regexp: /application:.*openURL:.*options:.*?\{.*?\n/m,
-            text: open_url_text,
-            mode: :append
-          )
-        elsif app_delegate_objc =~ /application:.*openURL:.*sourceApplication/
-          # Has application:openURL:sourceApplication:annotation:
-          open_url_text = <<-EOF
-    // TODO: Adjust your method as you see fit.
-    if ([[Branch getInstance] application:application openURL:url sourceApplication:sourceApplication annotation:annotation]) {
-        return YES;
-    }
-
-EOF
-
-          apply_patch(
-            files: app_delegate_objc_path,
-            regexp: /application:.*openURL:.*sourceApplication:.*?\{.*?\n/m,
-            text: open_url_text,
-            mode: :append
-          )
-        else
-          # Has neither
-          open_url_text = <<-EOF
-
-
-- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
-{
-    return [[Branch getInstance] application:app openURL:url options:options];
-}
-          EOF
-
-          apply_patch(
-            files: app_delegate_objc_path,
-            regexp: /\n\s*@end[^@]*\Z/m,
-            text: open_url_text,
-            mode: :prepend
-          )
-        end
-      end
-
-      def patch_continue_user_activity_method_objc(app_delegate_objc_path)
-        app_delegate = File.read app_delegate_objc_path
-        if app_delegate =~ /application:.*continueUserActivity:.*restorationHandler:/
-          continue_user_activity_text = <<-EOF
-    // TODO: Adjust your method as you see fit.
-    if ([[Branch getInstance] continueUserActivity:userActivity]) {
-        return YES;
-    }
-
-EOF
-
-          apply_patch(
-            files: app_delegate_objc_path,
-            regexp: /application:.*continueUserActivity:.*restorationHandler:.*?\{.*?\n/m,
-            text: continue_user_activity_text,
-            mode: :append
-          )
-        else
-          # Add the application:continueUserActivity:restorationHandler method if it does not exist
-          continue_user_activity_text = <<-EOF
-
-
-- (BOOL)application:(UIApplication *)app continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray * _Nullable))restorationHandler
-{
-    return [[Branch getInstance] continueUserActivity:userActivity];
-}
-          EOF
-
-          apply_patch(
-            files: app_delegate_objc_path,
-            regexp: /\n\s*@end[^@]*\Z/m,
-            text: continue_user_activity_text,
-            mode: :prepend
-          )
-        end
-      end
-
-      def patch_podfile(podfile_path)
-        podfile = File.read podfile_path
-
-        # Podfile already contains the Branch pod
-        # TODO: Allow for adding to multiple targets in the Podfile
-        return false if podfile =~ /pod\s+('Branch'|"Branch")/
-
-        say "Adding pod \"Branch\" to #{podfile_path}"
-
-        if podfile =~ /target\s+(["'])#{ConfigurationHelper.target.name}\1\s+do.*?\n/m
-          # if there is a target block for this target:
-          apply_patch(
-            files: podfile_path,
-            regexp: /\n(\s*)target\s+(["'])#{ConfigurationHelper.target.name}\2\s+do.*?\n/m,
-            text: "\\1  pod \"Branch\"\n",
-            mode: :append
-          )
-        else
-          # add to the abstract_target for this target
-          apply_patch(
-            files: podfile_path,
-            regexp: /^(\s*)target\s+["']#{ConfigurationHelper.target.name}/,
-            text: "\\1pod \"Branch\"\n",
-            mode: :prepend
-          )
-        end
-
-        true
-      end
-
-      def patch_cartfile(cartfile_path)
-        cartfile = File.read cartfile_path
-
-        # Cartfile already contains the Branch framework
-        return false if cartfile =~ /git.+Branch/
-
-        say "Adding \"Branch\" to #{cartfile_path}"
-
-        apply_patch(
-          files: cartfile_path,
-          regexp: /\z/,
-          text: "github \"BranchMetrics/ios-branch-deep-linking\"\n",
-          mode: :append
-        )
-
-        true
-      end
-
       def add_cocoapods(options)
         verify_cocoapods
 
-        podfile_path = ConfigurationHelper.podfile_path
+        podfile_path = config.podfile_path
 
         install_command = "pod install"
         install_command += " --repo-update" if options.pod_repo_update
         Dir.chdir(File.dirname(podfile_path)) do
           sh "pod init"
-          apply_patch(
-            files: podfile_path,
-            regexp: /^(\s*)# Pods for #{ConfigurationHelper.target.name}$/,
+          PatternPatch::Patch.new(
+            regexp: /^(\s*)# Pods for #{config.target.name}$/,
             mode: :append,
-            text: "\n\\1pod \"Branch\"",
-            global: false
-          )
+            text: "\n\\1pod \"Branch\""
+          ).apply podfile_path
           sh install_command
         end
 
+        return unless config.commit
+
         add_change podfile_path
         add_change "#{podfile_path}.lock"
 
         # For now, add Pods folder to SCM.
         pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from Pathname.pwd
-        workspace_path = Pathname.new(File.expand_path(ConfigurationHelper.xcodeproj_path.sub(/.xcodeproj$/, ".xcworkspace"))).relative_path_from Pathname.pwd
+        workspace_path = Pathname.new(File.expand_path(config.xcodeproj_path.sub(/.xcodeproj$/, ".xcworkspace"))).relative_path_from Pathname.pwd
         podfile_pathname = Pathname.new(podfile_path).relative_path_from Pathname.pwd
         add_change pods_folder_path
         add_change workspace_path
-        sh "git add #{podfile_pathname} #{podfile_pathname}.lock #{pods_folder_path} #{workspace_path}" if options.commit
+
+        cmd = "git add #{Shellwords.escape(podfile_pathname)} " \
+          "#{Shellwords.escape(podfile_pathname)}.lock " \
+          "#{Shellwords.escape(pods_folder_path)} " \
+          "#{Shellwords.escape(workspace_path)}"
+        sh cmd
       end
 
       def add_carthage(options)
@@ -820,7 +429,7 @@ EOF
         verify_carthage
 
         # 1. Generate Cartfile
-        cartfile_path = ConfigurationHelper.cartfile_path
+        cartfile_path = config.cartfile_path
         File.open(cartfile_path, "w") do |file|
           file.write <<EOF
 github "BranchMetrics/ios-branch-deep-linking"
@@ -829,18 +438,18 @@ EOF
 
         # 2. carthage update
         Dir.chdir(File.dirname(cartfile_path)) do
-          sh "carthage #{ConfigurationHelper.carthage_command}"
+          sh "carthage #{config.carthage_command}"
         end
 
         # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
         add_change cartfile_path
         add_change "#{cartfile_path}.resolved"
-        add_change ConfigurationHelper.xcodeproj_path
+        add_change config.xcodeproj_path
 
         # 4. Add to target dependencies
-        frameworks_group = ConfigurationHelper.xcodeproj.frameworks_group
+        frameworks_group = config.xcodeproj.frameworks_group
         branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
-        target = ConfigurationHelper.target
+        target = config.target
         target.frameworks_build_phase.add_file_reference branch_framework
 
         # 5. Create a copy-frameworks build phase
@@ -850,7 +459,11 @@ EOF
         carthage_build_phase.input_paths << "$(SRCROOT)/Carthage/Build/iOS/Branch.framework"
         carthage_build_phase.output_paths << "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Branch.framework"
 
-        ConfigurationHelper.xcodeproj.save
+        update_framework_search_paths "$(SRCROOT)/Carthage/Build/iOS"
+
+        config.xcodeproj.save
+
+        return unless config.commit
 
         # For now, add Carthage folder to SCM
 
@@ -858,12 +471,15 @@ EOF
         carthage_folder_path = Pathname.new(File.expand_path("../Carthage", cartfile_path)).relative_path_from(Pathname.pwd)
         cartfile_pathname = Pathname.new(cartfile_path).relative_path_from Pathname.pwd
         add_change carthage_folder_path
-        sh "git add #{cartfile_pathname} #{cartfile_pathname}.resolved #{carthage_folder_path}" if options.commit
+        cmd = "git add #{Shellwords.escape(cartfile_pathname)} " \
+          "#{Shellwords.escape(cartfile_pathname)}.resolved " \
+          "#{Shellwords.escape(carthage_folder_path)}"
+        sh cmd
       end
 
       def add_direct(options)
         # Put the framework in the path for any existing Frameworks group in the project.
-        frameworks_group = ConfigurationHelper.xcodeproj.frameworks_group
+        frameworks_group = config.xcodeproj.frameworks_group
         framework_path = File.join frameworks_group.real_path, "Branch.framework"
         raise "#{framework_path} exists." if File.exist? framework_path
 
@@ -901,40 +517,47 @@ EOF
 
         # Now the current framework is in framework_path
 
-        say "Adding to #{ConfigurationHelper.xcodeproj_path}"
+        say "Adding to #{config.xcodeproj_path}"
 
         # Add as a dependency in the Frameworks group
         framework = frameworks_group.new_file "Branch.framework" # relative to frameworks_group.real_path
-        ConfigurationHelper.target.frameworks_build_phase.add_file_reference framework, true
+        config.target.frameworks_build_phase.add_file_reference framework, true
 
-        # Make sure this is in the FRAMEWORK_SEARCH_PATHS if we just added it.
-        if frameworks_group.files.count == 1
-          ConfigurationHelper.target.build_configurations.each do |config|
-            paths = config.build_settings["FRAMEWORK_SEARCH_PATHS"] || []
-            next if paths.any? { |p| p == '$(SRCROOT)' || p == '$(SRCROOT)/**' }
-            paths << '$(SRCROOT)'
-            config.build_settings["FRAMEWORK_SEARCH_PATHS"] = paths
-          end
-        end
-        # If it already existed, it's almost certainly already in FRAMEWORK_SEARCH_PATHS.
+        update_framework_search_paths "$(SRCROOT)"
 
-        ConfigurationHelper.xcodeproj.save
+        config.xcodeproj.save
 
-        add_change ConfigurationHelper.xcodeproj_path
+        add_change config.xcodeproj_path
         add_change framework_path
-        sh "git add #{framework_path}" if options.commit
+        sh "git add #{Shellwords.escape(framework_path)}" if options.commit
 
         say "Done. ✅"
       end
 
+      def update_framework_search_paths(path)
+        # Make sure this is in the FRAMEWORK_SEARCH_PATHS if we just added it.
+        if config.xcodeproj.frameworks_group.files.count == 1
+          target = config.target
+          target.build_configurations.each do |c|
+            # this accounts for project-level settings as well
+            setting = target.resolved_build_setting("FRAMEWORK_SEARCH_PATHS")[c.name] || []
+            next if setting.include?(path) || setting.include?("#{path}/**")
+            setting << path
+
+            c.build_settings["FRAMEWORK_SEARCH_PATHS"] = setting
+          end
+        end
+        # If it already existed, it's almost certainly already in FRAMEWORK_SEARCH_PATHS.
+      end
+
       def update_podfile(options)
         verify_cocoapods
 
-        podfile_path = ConfigurationHelper.podfile_path
+        podfile_path = config.podfile_path
         return false if podfile_path.nil?
 
         # 1. Patch Podfile. Return if no change (Branch pod already present).
-        return false unless patch_podfile podfile_path
+        return false unless PatchHelper.patch_podfile podfile_path
 
         # 2. pod install
         # command = "PATH='#{ENV['PATH']}' pod install"
@@ -956,7 +579,7 @@ EOF
 
         # 5. If so, add the Pods folder to the commit (in case :commit param specified)
         add_change pods_folder_path
-        sh "git add #{pods_folder_path}" if options.commit
+        sh "git add #{Shellwords.escape(pods_folder_path)}" if options.commit
 
         true
       end
@@ -964,26 +587,26 @@ EOF
       def update_cartfile(options, project)
         verify_carthage
 
-        cartfile_path = ConfigurationHelper.cartfile_path
+        cartfile_path = config.cartfile_path
         return false if cartfile_path.nil?
 
         # 1. Patch Cartfile. Return if no change (Branch already present).
-        return false unless patch_cartfile cartfile_path
+        return false unless PatchHelper.patch_cartfile cartfile_path
 
         # 2. carthage update
         Dir.chdir(File.dirname(cartfile_path)) do
-          sh "carthage #{ConfigurationHelper.carthage_command}"
+          sh "carthage #{config.carthage_command}"
         end
 
         # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
         add_change cartfile_path
         add_change "#{cartfile_path}.resolved"
-        add_change ConfigurationHelper.xcodeproj_path
+        add_change config.xcodeproj_path
 
         # 4. Add to target dependencies
         frameworks_group = project.frameworks_group
         branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
-        target = ConfigurationHelper.target
+        target = config.target
         target.frameworks_build_phase.add_file_reference branch_framework
 
         # 5. Add to copy-frameworks build phase
@@ -1003,15 +626,11 @@ EOF
 
         # 7. If so, add the Carthage folder to the commit (in case :commit param specified)
         add_change carthage_folder_path
-        sh "git add #{carthage_folder_path}" if options.commit
+        sh "git add #{Shellwords.escape(carthage_folder_path)}" if options.commit
 
         true
       end
 
-      def patch_source(xcodeproj)
-        patch_app_delegate_swift(xcodeproj) || patch_app_delegate_objc(xcodeproj)
-      end
-
       def verify_cocoapods
         pod_cmd = `which pod`
         return unless pod_cmd.empty?
@@ -1059,7 +678,7 @@ EOF
       end
 
       def verify_git
-        return unless ConfigurationHelper.commit
+        return unless config.commit
 
         git_cmd = `which git`
         return unless git_cmd.empty?