branch_io_cli 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b2291799982aa8205535d5f28f0b4b372c2726b
-  data.tar.gz: 9986e2a7e85b74827fda5c4abd30a6b979d1b137
+  metadata.gz: 5f269c7f617c87a8f5850bbb836a909dd272fb0f
+  data.tar.gz: 91b44ebe0922c603e3e89a4725adae1917dce458
 SHA512:
-  metadata.gz: e51e2863451a8deebb9fad4046a797893dcc776ec1eaa88c80fc13d2ea2af6f59fd9594fd88dc0a92a5dc1514b27b73d56bad4f0ab0f8f772e6ef5f8d7707e3a
-  data.tar.gz: 06e4ecb04f1c65eee5636eb1d1dc7f6776ac50d73b511bfd7d47b50f415465d7f24d105c419c7506823a00a18039d28f161371bfd6ffc90f6c6f0b733b1c1e85
+  metadata.gz: 72f42f3ae7b88c0491560360c93ca896c6c18da4d17edef7458df1f741375e50eda5b0bb2eeb6f57e86bdfd6ab38f8b641264ceeba2e91e651b8fcffff581a14
+  data.tar.gz: 0c2ddfedf72348323628c7fcd11b26a9cf30c1b7204b3da66c81c1ba106e8f404a5ab5a6a969837d790cf37dd56310c7e9c1c3b48d3977c754f6ae62919a6818

data/README.md

@@ -46,14 +46,14 @@ location.
 
 If a Podfile or Cartfile is detected, the Branch SDK will be added to the relevant
 configuration file and the dependencies updated to include the Branch framework.
-This behavior may be suppressed using `--no_add_sdk`. If no Podfile or Cartfile
+This behavior may be suppressed using `--no-add-sdk`. If no Podfile or Cartfile
 is found, and Branch.framework is not already among the project's dependencies,
 you will be prompted for a number of choices, including setting up CocoaPods or
 Carthage for the project or directly installing the Branch.framework.
 
 By default, all supplied Universal Link domains are validated. If validation passes,
 the setup continues. If validation fails, no further action is taken. Suppress
-validation using `--no_validate` or force changes when validation fails using
+validation using `--no-validate` or force changes when validation fails using
 `--force`.
 
 By default, this command will look for the first app target in the project. Test
@@ -67,7 +67,7 @@ Optionally, if `--frameworks` is specified, this command can add a list of syste
 frameworks to the target's dependencies (e.g., AdSupport, CoreSpotlight, SafariServices).
 
 A language-specific patch is applied to the AppDelegate (Swift or Objective-C).
-This can be suppressed using `--no_patch_source`.
+This can be suppressed using `--no-patch-source`.
 
 #### Prerequisites
 
@@ -86,26 +86,52 @@ command, respectively, available in your path.
 
 |Option|Description|
 |------|-----------|
-|--live_key key_live_xxxx|Branch live key|
-|--test_key key_test_yyyy|Branch test key|
-|--app_link_subdomain myapp|Branch app.link subdomain, e.g. myapp for myapp.app.link|
-|--domains example.com,www.example.com|Comma-separated list of custom domain(s) or non-Branch domain(s)|
-|--uri_scheme myurischeme[://]|Custom URI scheme used in the Branch Dashboard for this app|
+|-L, --live-key key_live_xxxx|Branch live key|
+|-T, --test-key key_test_yyyy|Branch test key|
+|--app-link-subdomain myapp|Branch app.link subdomain, e.g. myapp for myapp.app.link|
+|-D, --domains example.com,www.example.com|Comma-separated list of custom domain(s) or non-Branch domain(s)|
+|-U, --uri-scheme myurischeme[://]|Custom URI scheme used in the Branch Dashboard for this app|
 |--xcodeproj MyProject.xcodeproj|Path to an Xcode project to update|
 |--target MyAppTarget|Name of a target to modify in the Xcode project|
 |--podfile /path/to/Podfile|Path to the Podfile for the project|
 |--cartfile /path/to/Cartfile|Path to the Cartfile for the project|
 |--frameworks AdSupport,CoreSpotlight,SafariServices|Comma-separated list of system frameworks to add to the project|
-|--no_pod_repo_update|Skip update of the local podspec repo before installing|
-|--no_validate|Skip validation of Universal Link configuration|
-|--force|Update project even if Universal Link validation fails|
-|--no_add_sdk|Don't add the Branch framework to the project|
-|--no_patch_source|Don't add Branch SDK calls to the AppDelegate|
-|--commit|Commit the results to Git|
+|--[no-]pod-repo-update|Update the local podspec repo before installing (default: yes)|
+|--[no-]validate|Validate Universal Link configuration (default: yes)|
+|--[no-]force|Update project even if Universal Link validation fails (default: no)|
+|--[no-]add-sdk|Add the Branch framework to the project (default: yes)|
+|--[no-]patch-source|Add Branch SDK calls to the AppDelegate (default: yes)|
+|--[no-]commit|Commit the results to Git (default: no)|
 
 All parameters are optional. A live key or test key, or both is required, as well as at least one domain.
-Specify --live_key, --test_key or both and --app_link_subdomain, --domains or both. If these are not
-specified, this command will prompt you for this information.
+Specify --live-key, --test-key or both and --app-link-subdomain, --domains or both. If these are not
+specified, this command will prompt you for the information.
+
+#### Examples
+
+##### Test without validation (can use dummy keys and domains)
+
+```bash
+branch_io setup -L key_live_xxxx -D myapp.app.link --no-validate
+```
+
+##### Use both live and test keys
+
+```bash
+branch_io setup -L key_live_xxxx -T key_test_yyyy -D myapp.app.link
+```
+
+##### Use custom or non-Branch domains
+
+```bash
+branch_io setup -D myapp.app.link,example.com,www.example.com
+```
+
+##### Avoid pod repo update
+
+```bash
+branch_io setup --no-pod-repo-update
+```
 
 ### Validate command
 
@@ -128,7 +154,7 @@ targets.
 
 |Option|Description|
 |------|-----------|
-|--domains example.com,www.example.com|Comma-separated list of domains. May include app.link subdomains.|
+|-D, --domains example.com,www.example.com|Comma-separated list of domains. May include app.link subdomains.|
 |--xcodeproj MyProject.xcodeproj|Path to an Xcode project to update|
 |--target MyAppTarget|Name of a target to modify in the Xcode project|
 

data/lib/branch_io_cli.rb

@@ -1,4 +1,4 @@
 require "branch_io_cli/cli"
-require "branch_io_cli/command"
+require "branch_io_cli/commands"
 require "branch_io_cli/helper"
 require "branch_io_cli/version"

data/lib/branch_io_cli/cli.rb

@@ -25,14 +25,14 @@ location.
 
 If a Podfile or Cartfile is detected, the Branch SDK will be added to the relevant
 configuration file and the dependencies updated to include the Branch framework.
-This behavior may be suppressed using <%= color('--no_add_sdk', BOLD) %>. If no Podfile or Cartfile
+This behavior may be suppressed using <%= color('--no-add-sdk', BOLD) %>. If no Podfile or Cartfile
 is found, and Branch.framework is not already among the project's dependencies,
 you will be prompted for a number of choices, including setting up CocoaPods or
 Carthage for the project or directly installing the Branch.framework.
 
 By default, all supplied Universal Link domains are validated. If validation passes,
 the setup continues. If validation fails, no further action is taken. Suppress
-validation using <%= color('--no_validate', BOLD) %> or force changes when validation fails using
+validation using <%= color('--no-validate', BOLD) %> or force changes when validation fails using
 <%= color('--force', BOLD) %>.
 
 By default, this command will look for the first app target in the project. Test
@@ -46,7 +46,7 @@ Optionally, if <%= color('--frameworks', BOLD) %> is specified, this command can
 frameworks to the target's dependencies (e.g., AdSupport, CoreSpotlight, SafariServices).
 
 A language-specific patch is applied to the AppDelegate (Swift or Objective-C).
-This can be suppressed using <%= color('--no_patch_source', BOLD) %>.
+This can be suppressed using <%= color('--no-patch-source', BOLD) %>.
 
 <%= color('Prerequisites', BOLD) %>
 
@@ -64,7 +64,7 @@ To add the SDK with CocoaPods or Carthage, you must have the <%= color('pod', BO
 command, respectively, available in your path.
 
 All parameters are optional. A live key or test key, or both is required, as well
-as at least one domain. Specify <%= color('--live_key', BOLD) %>, <%= color('--test_key', BOLD) %> or both and <%= color('--app_link_subdomain', BOLD) %>,
+as at least one domain. Specify <%= color('--live-key', BOLD) %>, <%= color('--test-key', BOLD) %> or both and <%= color('--app-link-subdomain', BOLD) %>,
 <%= color('--domains', BOLD) %> or both. If these are not specified, this command will prompt you
 for this information.
 
@@ -72,11 +72,11 @@ See https://github.com/BranchMetrics/branch_io_cli#setup-command for more inform
 EOF
 
         # Required Branch params
-        c.option "--live_key key_live_xxxx", String, "Branch live key"
-        c.option "--test_key key_test_yyyy", String, "Branch test key"
-        c.option "--app_link_subdomain myapp", String, "Branch app.link subdomain, e.g. myapp for myapp.app.link"
-        c.option "--domains example.com,www.example.com", Array, "Comma-separated list of custom domain(s) or non-Branch domain(s)"
-        c.option "--uri_scheme myurischeme[://]", String, "Custom URI scheme used in the Branch Dashboard for this app"
+        c.option "-L", "--live-key key_live_xxxx", String, "Branch live key"
+        c.option "-T", "--test-key key_test_yyyy", String, "Branch test key"
+        c.option "--app-link-subdomain myapp", String, "Branch app.link subdomain, e.g. myapp for myapp.app.link"
+        c.option "-D", "--domains example.com,www.example.com", Array, "Comma-separated list of custom domain(s) or non-Branch domain(s)"
+        c.option "-U", "--uri-scheme myurischeme[://]", String, "Custom URI scheme used in the Branch Dashboard for this app"
 
         c.option "--xcodeproj MyProject.xcodeproj", String, "Path to an Xcode project to update"
         c.option "--target MyAppTarget", String, "Name of a target to modify in the Xcode project"
@@ -84,15 +84,29 @@ EOF
         c.option "--cartfile /path/to/Cartfile", String, "Path to the Cartfile for the project"
         c.option "--frameworks AdSupport,CoreSpotlight,SafariServices", Array, "Comma-separated list of system frameworks to add to the project"
 
-        c.option "--no_pod_repo_update", TrueClass, "Skip update of the local podspec repo before installing"
-        c.option "--no_validate", TrueClass, "Skip validation of Universal Link configuration"
-        c.option "--force", TrueClass, "Update project even if Universal Link validation fails"
-        c.option "--no_add_sdk", TrueClass, "Don't add the Branch framework to the project"
-        c.option "--no_patch_source", TrueClass, "Don't add Branch SDK calls to the AppDelegate"
-        c.option "--commit", TrueClass, "Commit the results to Git"
+        c.option "--[no-]pod-repo-update", "Update the local podspec repo before installing (default: yes)"
+        c.option "--[no-]validate", "Validate Universal Link configuration (default: yes)"
+        c.option "--[no-]force", "Update project even if Universal Link validation fails (default: no)"
+        c.option "--[no-]add-sdk", "Add the Branch framework to the project (default: yes)"
+        c.option "--[no-]patch-source", "Add Branch SDK calls to the AppDelegate (default: yes)"
+        c.option "--[no-]commit", "Commit the results to Git (default: no)"
+
+        c.example "Test without validation (can use dummy keys and domains)", "branch_io setup -L key_live_xxxx -D myapp.app.link --no-validate"
+        c.example "Use both live and test keys", "branch_io setup -L key_live_xxxx -T key_test_yyyy -D myapp.app.link"
+        c.example "Use custom or non-Branch domains", "branch_io setup -D myapp.app.link,example.com,www.example.com"
+        c.example "Avoid pod repo update", "branch_io setup --no-pod-repo-update"
 
         c.action do |args, options|
-          Command.setup options
+          options.default(
+            # Defaults for boolean options
+            pod_repo_update: true,
+            validate: true,
+            force: false,
+            add_sdk: true,
+            patch_source: true,
+            commit: false
+          )
+          Commands::SetupCommand.new(options).run!
         end
       end
 
@@ -120,12 +134,12 @@ validation.
 See https://github.com/BranchMetrics/branch_io_cli#validate-command for more information.
 EOF
 
+        c.option "-D", "--domains example.com,www.example.com", Array, "Comma-separated list of domains to validate (Branch domains or non-Branch domains)"
         c.option "--xcodeproj MyProject.xcodeproj", String, "Path to an Xcode project to update"
         c.option "--target MyAppTarget", String, "Name of a target to modify in the Xcode project"
-        c.option "--domains example.com,www.example.com", Array, "Comma-separated list of domains to validate (Branch domains or non-Branch domains)"
 
         c.action do |args, options|
-          valid = Command.validate options
+          valid = Commands::ValidateCommand.new(options).run!
           exit_code = valid ? 0 : 1
           exit exit_code
         end

data/lib/branch_io_cli/commands.rb

@@ -0,0 +1,3 @@
+require "branch_io_cli/commands/command"
+require "branch_io_cli/commands/setup_command"
+require "branch_io_cli/commands/validate_command"

data/lib/branch_io_cli/commands/command.rb

@@ -0,0 +1,23 @@
+module BranchIOCLI
+  module Commands
+    class Command
+      attr_reader :options
+
+      def initialize(options)
+        @options = options
+      end
+
+      def run!
+        # implemented by subclasses
+      end
+
+      def helper
+        Helper::BranchHelper
+      end
+
+      def config_helper
+        Helper::ConfigurationHelper
+      end
+    end
+  end
+end

data/lib/branch_io_cli/commands/setup_command.rb

@@ -0,0 +1,67 @@
+module BranchIOCLI
+  module Commands
+    class SetupCommand < Command
+      def initialize(options)
+        super
+        config_helper.validate_setup_options options
+        @keys = config_helper.keys
+        @domains = config_helper.all_domains
+      end
+
+      # rubocop: disable Metrics/PerceivedComplexity
+      def run!
+        xcodeproj = config_helper.xcodeproj
+
+        case config_helper.sdk_integration_mode
+        when :cocoapods
+          if File.exist? config_helper.podfile_path
+            helper.update_podfile options
+          else
+            helper.add_cocoapods options
+          end
+        when :carthage
+          if File.exist? config_helper.cartfile_path
+            helper.update_cartfile options, xcodeproj
+          else
+            helper.add_carthage options
+          end
+        when :direct
+          helper.add_direct options
+        end
+
+        target_name = options.target # may be nil
+        is_app_target = config_helper.target.extension_target_type?
+
+        if is_app_target && options.validate &&
+           !helper.validate_team_and_bundle_ids_from_aasa_files(xcodeproj, target_name, @domains)
+          say "Universal Link configuration failed validation."
+          helper.errors.each { |error| say " #{error}" }
+          return unless options.force
+        elsif is_app_target && options.validate
+          say "Universal Link configuration passed validation. ✅"
+        end
+
+        # the following calls can all raise IOError
+        helper.add_keys_to_info_plist xcodeproj, target_name, @keys
+        helper.add_branch_universal_link_domains_to_info_plist xcodeproj, target_name, @domains if is_app_target
+        helper.ensure_uri_scheme_in_info_plist if is_app_target # does nothing if already present
+
+        new_path = helper.add_universal_links_to_project xcodeproj, target_name, @domains, false if is_app_target
+        `git add #{new_path}` if options.commit && new_path
+
+        helper.add_system_frameworks xcodeproj, target_name, options.frameworks unless options.frameworks.nil? || options.frameworks.empty?
+
+        xcodeproj.save
+
+        helper.patch_source xcodeproj if options.patch_source
+
+        return unless options.commit
+
+        changes = helper.changes.to_a.map { |c| Pathname.new(File.expand_path(c)).relative_path_from(Pathname.pwd).to_s }
+
+        `git commit #{changes.join(" ")} -m '[branch_io_cli] Branch SDK integration'`
+      end
+      # rubocop: enable Metrics/PerceivedComplexity
+    end
+  end
+end

data/lib/branch_io_cli/commands/validate_command.rb

@@ -0,0 +1,46 @@
+module BranchIOCLI
+  module Commands
+    module ValidateCommand
+      def initialize(options)
+        super
+        config_helper.validate_validation_options options
+      end
+
+      def run!
+        # raises
+        xcodeproj = config_helper.xcodeproj
+
+        valid = true
+
+        unless options.domains.nil? || options.domains.empty?
+          domains_valid = helper.validate_project_domains(
+            options.domains,
+            xcodeproj,
+            options.target
+          )
+
+          if domains_valid
+            say "Project domains match :domains parameter: ✅"
+          else
+            say "Project domains do not match specified :domains"
+            helper.errors.each { |error| say " #{error}" }
+          end
+
+          valid &&= domains_valid
+        end
+
+        configuration_valid = helper.validate_team_and_bundle_ids_from_aasa_files xcodeproj, options.target
+        unless configuration_valid
+          say "Universal Link configuration failed validation."
+          helper.errors.each { |error| say " #{error}" }
+        end
+
+        valid &&= configuration_valid
+
+        say "Universal Link configuration passed validation. ✅" if valid
+
+        valid
+      end
+    end
+  end
+end

data/lib/branch_io_cli/helper/branch_helper.rb

@@ -1,5 +1,6 @@
 require "branch_io_cli/helper/android_helper"
 require "branch_io_cli/helper/ios_helper"
+require "net/http"
 require "pattern_patch"
 require "set"
 
@@ -33,6 +34,64 @@ module BranchIOCLI
             file.write modified
           end
         end
+
+        def fetch(url)
+          response = Net::HTTP.get_response URI(url)
+
+          case response
+          when Net::HTTPSuccess
+            response.body
+          when Net::HTTPRedirection
+            fetch response['location']
+          else
+            raise "Error fetching #{url}: #{response.code} #{response.message}"
+          end
+        end
+
+        def download(url, dest)
+          uri = URI(url)
+
+          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
+            request = Net::HTTP::Get.new uri
+
+            http.request request do |response|
+              case response
+              when Net::HTTPSuccess
+                bytes_downloaded = 0
+                dots_reported = 0
+                # report a dot every 100 kB
+                per_dot = 102_400
+
+                File.open dest, 'w' do |io|
+                  response.read_body do |chunk|
+                    io.write chunk
+
+                    # print progress
+                    bytes_downloaded += chunk.length
+                    while (bytes_downloaded - per_dot * dots_reported) >= per_dot
+                      print "."
+                      dots_reported += 1
+                    end
+                    STDOUT.flush
+                  end
+                end
+                say "\n"
+              when Net::HTTPRedirection
+                download response['location'], dest
+              else
+                raise "Error downloading #{url}: #{response.code} #{response.message}"
+              end
+            end
+          end
+        end
+
+        def ensure_directory(path)
+          return if path == "/" || path == "."
+          parent = File.dirname path
+          ensure_directory parent
+          return if Dir.exist? path
+          Dir.mkdir path
+        end
       end
     end
   end

data/lib/branch_io_cli/helper/configuration_helper.rb

@@ -1,42 +1,73 @@
-require "json"
-require "net/http"
 require "pathname"
-require "tmpdir"
 require "xcodeproj"
-require "zip"
 
 module BranchIOCLI
   module Helper
-    # rubocop: disable Metrics/ClassLength
+    # Processes CLI options.
+    # Validates options.
+    # Prompts for input in a number of cases.
     class ConfigurationHelper
-      class << self
-        APP_LINK_REGEXP = /\.app\.link$|\.test-app\.link$/
+      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_accessor :xcodeproj_path
-        attr_accessor :xcodeproj
-        attr_accessor :keys
-        attr_accessor :all_domains
-        attr_accessor :podfile_path
-        attr_accessor :cartfile_path
-        attr_accessor :target
-        attr_accessor :uri_scheme
+      class << self
+        attr_reader :xcodeproj_path
+        attr_reader :xcodeproj
+        attr_reader :keys
+        attr_reader :all_domains
+        attr_reader :podfile_path
+        attr_reader :cartfile_path
+        attr_reader :target
+        attr_reader :uri_scheme
+        attr_reader :pod_repo_update
+        attr_reader :validate
+        attr_reader :add_sdk
+        attr_reader :force
+        attr_reader :patch_source
+        attr_reader :commit
+        attr_reader :sdk_integration_mode
 
         def validate_setup_options(options)
           print_identification "setup"
 
-          say "--force is ignored when --no_validate is used." if options.no_validate && options.force
+          @pod_repo_update = options.pod_repo_update
+          @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 options
           validate_target options
           validate_keys_from_setup_options options
           validate_all_domains options, !@target.extension_target_type?
           validate_uri_scheme options
-          validate_buildfile_path options, "Podfile"
-          validate_buildfile_path options, "Cartfile"
 
-          print_setup_configuration
+          # 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" if options.cartfile.nil?
+
+          # If --podfile is present or a Podfile was found, don't look for a Cartfile.
+          validate_buildfile_path options, "Cartfile" if @podfile.nil?
 
           validate_sdk_addition options
+
+          print_setup_configuration
         end
 
         def validate_validation_options(options)
@@ -68,6 +99,13 @@ EOF
 <%= color('URI scheme:', BOLD) %> #{@uri_scheme || '(none)'}
 <%= color('Podfile:', BOLD) %> #{@podfile_path || '(none)'}
 <%= color('Cartfile:', BOLD) %> #{@cartfile_path || '(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
         end
@@ -244,10 +282,10 @@ EOF
         end
 
         def validate_buildfile_path(options, filename)
-          # Disable Podfile/Cartfile update if --no_add_sdk is present
-          return if options.no_add_sdk
+          # Disable Podfile/Cartfile update if --no-add-sdk is present
+          return unless options.add_sdk && @sdk_integration_mode.nil?
 
-          buildfile_path = filename == "Podfile" ? options.podfile : options.cartfile
+          buildfile_path = options.send filename.downcase
 
           # Was --podfile/--cartfile used?
           if buildfile_path
@@ -284,10 +322,12 @@ EOF
           else
             @cartfile_path = buildfile_path
           end
+
+          @sdk_integration_mode = filename == "Podfile" ? :cocoapods : :carthage
         end
 
         def validate_sdk_addition(options)
-          return if options.no_add_sdk || @podfile_path || @cartfile_path
+          return if !options.add_sdk || @sdk_integration_mode
 
           # If no CocoaPods or Carthage, check to see if the framework is linked.
           target = BranchHelper.target_from_project @xcodeproj, options.target
@@ -303,222 +343,16 @@ EOF
             menu.prompt = "What would you like to do?"
           end
 
-          option = SDK_OPTIONS[selected]
-
-          case option
-          when :skip
-            return
-          else
-            send "add_#{option}", options
-          end
-        end
-
-        def add_cocoapods(options)
-          @podfile_path = File.expand_path "../Podfile", @xcodeproj_path
-          target = BranchHelper.target_from_project @xcodeproj, options.target
-
-          install_command = "pod install"
-          install_command += " --repo-update" unless options.no_pod_repo_update
-          Dir.chdir(File.dirname(@podfile_path)) do
-            system "pod init"
-            BranchHelper.apply_patch(
-              files: @podfile_path,
-              regexp: /^(\s*)# Pods for #{target.name}$/,
-              mode: :append,
-              text: "\n\\1pod \"Branch\"",
-              global: false
-            )
-            system install_command
-          end
-
-          BranchHelper.add_change @podfile_path
-          BranchHelper.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(@xcodeproj_path.sub(/.xcodeproj$/, ".xcworkspace"))).relative_path_from Pathname.pwd
-          podfile_pathname = Pathname.new(@podfile_path).relative_path_from Pathname.pwd
-          BranchHelper.add_change pods_folder_path
-          BranchHelper.add_change workspace_path
-          `git add #{podfile_pathname} #{podfile_pathname}.lock #{pods_folder_path} #{workspace_path}` if options.commit
-        end
-
-        def add_carthage(options)
-          # TODO: Collapse this and Command::update_cartfile
-
-          # 1. Generate Cartfile
-          @cartfile_path = File.expand_path "../Cartfile", @xcodeproj_path
-          File.open(@cartfile_path, "w") do |file|
-            file.write <<EOF
-github "BranchMetrics/ios-branch-deep-linking"
-EOF
-          end
-
-          # 2. carthage update
-          Dir.chdir(File.dirname(@cartfile_path)) do
-            system "carthage update --platform ios"
-          end
-
-          # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
-          BranchHelper.add_change cartfile_path
-          BranchHelper.add_change "#{cartfile_path}.resolved"
-
-          # 4. Add to target dependencies
-          frameworks_group = @xcodeproj.frameworks_group
-          branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
-          target = BranchHelper.target_from_project @xcodeproj, options.target
-          target.frameworks_build_phase.add_file_reference branch_framework
-
-          # 5. Create a copy-frameworks build phase
-          carthage_build_phase = target.new_shell_script_build_phase "carthage copy-frameworks"
-          carthage_build_phase.shell_script = "/usr/local/bin/carthage copy-frameworks"
-
-          carthage_build_phase.input_paths << "$(SRCROOT)/Carthage/Build/iOS/Branch.framework"
-          carthage_build_phase.output_paths << "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Branch.framework"
-
-          @xcodeproj.save
-
-          # For now, add Carthage folder to SCM
-
-          # 6. Add the Carthage folder to the commit (in case :commit param specified)
-          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
-          BranchHelper.add_change carthage_folder_path
-          `git add #{cartfile_pathname} #{cartfile_pathname}.resolved #{carthage_folder_path}` if options.commit
-        end
-
-        def add_direct(options)
-          # Put the framework in the path for any existing Frameworks group in the project.
-          frameworks_group = @xcodeproj.frameworks_group
-          framework_path = File.join frameworks_group.real_path, "Branch.framework"
-          raise "#{framework_path} exists." if File.exist? framework_path
-
-          say "Finding current framework release"
-
-          # Find the latest release from GitHub.
-          releases = JSON.parse fetch "https://api.github.com/repos/BranchMetrics/ios-branch-deep-linking/releases"
-          current_release = releases.first
-          # Get the download URL for the framework.
-          framework_asset = current_release["assets"][0]
-          framework_url = framework_asset["browser_download_url"]
-
-          say "Downloading Branch.framework v. #{current_release['tag_name']} (#{framework_asset['size']} bytes zipped)"
-
-          Dir.mktmpdir do |download_folder|
-            zip_path = File.join download_folder, "Branch.framework.zip"
-
-            File.unlink zip_path if File.exist? zip_path
-
-            # Download the framework zip
-            download framework_url, zip_path
-
-            say "Unzipping Branch.framework"
-
-            # Unzip
-            Zip::File.open zip_path do |zip_file|
-              # Start with just the framework and add dSYM, etc., later
-              zip_file.glob "Carthage/Build/iOS/Branch.framework/**/*" do |entry|
-                filename = entry.name.sub %r{^Carthage/Build/iOS}, frameworks_group.real_path.to_s
-                ensure_directory File.dirname filename
-                entry.extract filename
-              end
-            end
-          end
-
-          # Now the current framework is in framework_path
-
-          say "Adding to #{@xcodeproj_path}"
-
-          # Add as a dependency in the Frameworks group
-          framework = frameworks_group.new_file "Branch.framework" # relative to frameworks_group.real_path
-          @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
-            @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.
-
-          @xcodeproj.save
+          @sdk_integration_mode = SDK_OPTIONS[selected]
 
-          BranchHelper.add_change framework_path
-          `git add #{framework_path}` if options.commit
-
-          say "Done. ✅"
-        end
-
-        def fetch(url)
-          response = Net::HTTP.get_response URI(url)
-
-          case response
-          when Net::HTTPSuccess
-            response.body
-          when Net::HTTPRedirection
-            fetch response['location']
-          else
-            raise "Error fetching #{url}: #{response.code} #{response.message}"
+          case @sdk_integration_mode
+          when :cocoapods
+            @podfile_path = File.expand_path "../Podfile", @xcodeproj_path
+          when :carthage
+            @cartfile_path = File.expand_path "../Cartfile", @xcodeproj_path
           end
         end
-
-        def download(url, dest)
-          uri = URI(url)
-
-          Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
-            request = Net::HTTP::Get.new uri
-
-            http.request request do |response|
-              case response
-              when Net::HTTPSuccess
-                bytes_downloaded = 0
-                dots_reported = 0
-                # report a dot every 100 kB
-                per_dot = 102_400
-
-                File.open dest, 'w' do |io|
-                  response.read_body do |chunk|
-                    io.write chunk
-
-                    # print progress
-                    bytes_downloaded += chunk.length
-                    while (bytes_downloaded - per_dot * dots_reported) >= per_dot
-                      print "."
-                      dots_reported += 1
-                    end
-                    STDOUT.flush
-                  end
-                end
-                say "\n"
-              when Net::HTTPRedirection
-                download response['location'], dest
-              else
-                raise "Error downloading #{url}: #{response.code} #{response.message}"
-              end
-            end
-          end
-        end
-
-        def ensure_directory(path)
-          return if path == "/" || path == "."
-          parent = File.dirname path
-          ensure_directory parent
-          return if Dir.exist? path
-          Dir.mkdir path
-        end
-
-        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
-          }
       end
     end
   end
-  # rubocop enable: Metrics/ClassLength
 end

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -1,7 +1,10 @@
 require "json"
 require "net/http"
 require "openssl"
+require "pathname"
 require "plist"
+require "tmpdir"
+require "zip"
 
 module BranchIOCLI
   module Helper
@@ -679,6 +682,227 @@ EOF
 
         true
       end
+
+      def add_cocoapods(options)
+        podfile_path = ConfigurationHelper.podfile_path
+
+        install_command = "pod install"
+        install_command += " --repo-update" if options.pod_repo_update
+        Dir.chdir(File.dirname(podfile_path)) do
+          system "pod init"
+          apply_patch(
+            files: podfile_path,
+            regexp: /^(\s*)# Pods for #{ConfigurationHelper.target.name}$/,
+            mode: :append,
+            text: "\n\\1pod \"Branch\"",
+            global: false
+          )
+          system install_command
+        end
+
+        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
+        podfile_pathname = Pathname.new(podfile_path).relative_path_from Pathname.pwd
+        add_change pods_folder_path
+        add_change workspace_path
+        `git add #{podfile_pathname} #{podfile_pathname}.lock #{pods_folder_path} #{workspace_path}` if options.commit
+      end
+
+      def add_carthage(options)
+        # TODO: Collapse this and Command::update_cartfile
+
+        # 1. Generate Cartfile
+        cartfile_path = ConfigurationHelper.cartfile_path
+        File.open(cartfile_path, "w") do |file|
+          file.write <<EOF
+github "BranchMetrics/ios-branch-deep-linking"
+EOF
+        end
+
+        # 2. carthage update
+        Dir.chdir(File.dirname(cartfile_path)) do
+          system "carthage update --platform ios"
+        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
+
+        # 4. Add to target dependencies
+        frameworks_group = ConfigurationHelper.xcodeproj.frameworks_group
+        branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
+        target = ConfigurationHelper.target
+        target.frameworks_build_phase.add_file_reference branch_framework
+
+        # 5. Create a copy-frameworks build phase
+        carthage_build_phase = target.new_shell_script_build_phase "carthage copy-frameworks"
+        carthage_build_phase.shell_script = "/usr/local/bin/carthage copy-frameworks"
+
+        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
+
+        # For now, add Carthage folder to SCM
+
+        # 6. Add the Carthage folder to the commit (in case :commit param specified)
+        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
+        `git add #{cartfile_pathname} #{cartfile_pathname}.resolved #{carthage_folder_path}` if options.commit
+      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
+        framework_path = File.join frameworks_group.real_path, "Branch.framework"
+        raise "#{framework_path} exists." if File.exist? framework_path
+
+        say "Finding current framework release"
+
+        # Find the latest release from GitHub.
+        releases = JSON.parse fetch "https://api.github.com/repos/BranchMetrics/ios-branch-deep-linking/releases"
+        current_release = releases.first
+        # Get the download URL for the framework.
+        framework_asset = current_release["assets"][0]
+        framework_url = framework_asset["browser_download_url"]
+
+        say "Downloading Branch.framework v. #{current_release['tag_name']} (#{framework_asset['size']} bytes zipped)"
+
+        Dir.mktmpdir do |download_folder|
+          zip_path = File.join download_folder, "Branch.framework.zip"
+
+          File.unlink zip_path if File.exist? zip_path
+
+          # Download the framework zip
+          download framework_url, zip_path
+
+          say "Unzipping Branch.framework"
+
+          # Unzip
+          Zip::File.open zip_path do |zip_file|
+            # Start with just the framework and add dSYM, etc., later
+            zip_file.glob "Carthage/Build/iOS/Branch.framework/**/*" do |entry|
+              filename = entry.name.sub %r{^Carthage/Build/iOS}, frameworks_group.real_path.to_s
+              ensure_directory File.dirname filename
+              entry.extract filename
+            end
+          end
+        end
+
+        # Now the current framework is in framework_path
+
+        say "Adding to #{@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
+
+        # 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.
+
+        ConfigurationHelper.xcodeproj.save
+
+        add_change ConfigurationHelper.xcodeproj_path
+        add_change framework_path
+        `git add #{framework_path}` if options.commit
+
+        say "Done. ✅"
+      end
+
+      def update_podfile(options)
+        podfile_path = ConfigurationHelper.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
+
+        # 2. pod install
+        # command = "PATH='#{ENV['PATH']}' pod install"
+        command = 'pod install'
+        command += ' --repo-update' if options.pod_repo_update
+
+        Dir.chdir(File.dirname(podfile_path)) do
+          system command
+        end
+
+        # 3. Add Podfile and Podfile.lock to commit (in case :commit param specified)
+        add_change podfile_path
+        add_change "#{podfile_path}.lock"
+
+        # 4. Check if Pods folder is under SCM
+        pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from Pathname.pwd
+        `git ls-files #{pods_folder_path} --error-unmatch > /dev/null 2>&1`
+        return true unless $?.exitstatus == 0
+
+        # 5. If so, add the Pods folder to the commit (in case :commit param specified)
+        add_change pods_folder_path
+        `git add #{pods_folder_path}` if options.commit
+
+        true
+      end
+
+      def update_cartfile(options, project)
+        cartfile_path = ConfigurationHelper.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
+
+        # 2. carthage update
+        Dir.chdir(File.dirname(cartfile_path)) do
+          system "carthage update --platform ios"
+        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
+
+        # 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.frameworks_build_phase.add_file_reference branch_framework
+
+        # 5. Add to copy-frameworks build phase
+        carthage_build_phase = target.build_phases.find do |phase|
+          phase.respond_to?(:shell_script) && phase.shell_script =~ /carthage\s+copy-frameworks/
+        end
+
+        if carthage_build_phase
+          carthage_build_phase.input_paths << "$(SRCROOT)/Carthage/Build/iOS/Branch.framework"
+          carthage_build_phase.output_paths << "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Branch.framework"
+        end
+
+        # 6. Check if Carthage folder is under SCM
+        carthage_folder_path = Pathname.new(File.expand_path("../Carthage", cartfile_path)).relative_path_from Pathname.pwd
+        `git ls-files #{carthage_folder_path} --error-unmatch > /dev/null 2>&1`
+        return true unless $?.exitstatus == 0
+
+        # 7. If so, add the Carthage folder to the commit (in case :commit param specified)
+        add_change carthage_folder_path
+        `git add #{carthage_folder_path}` if options.commit
+
+        true
+      end
+
+      def patch_source(xcodeproj)
+        patch_app_delegate_swift(xcodeproj) || patch_app_delegate_objc(xcodeproj)
+      end
     end
   end
 end

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Branch
@@ -222,7 +222,10 @@ files:
 - bin/branch_io
 - lib/branch_io_cli.rb
 - lib/branch_io_cli/cli.rb
-- lib/branch_io_cli/command.rb
+- lib/branch_io_cli/commands.rb
+- lib/branch_io_cli/commands/command.rb
+- lib/branch_io_cli/commands/setup_command.rb
+- lib/branch_io_cli/commands/validate_command.rb
 - lib/branch_io_cli/helper.rb
 - lib/branch_io_cli/helper/android_helper.rb
 - lib/branch_io_cli/helper/branch_helper.rb

data/lib/branch_io_cli/command.rb

@@ -1,177 +0,0 @@
-require "pathname"
-require "xcodeproj"
-
-module BranchIOCLI
-  class Command
-    class << self
-      def setup(options)
-        config_helper.validate_setup_options options
-
-        @keys = config_helper.keys
-        @domains = config_helper.all_domains
-        @xcodeproj_path = config_helper.xcodeproj_path
-        xcodeproj = config_helper.xcodeproj
-
-        update_podfile(options) || update_cartfile(options, xcodeproj)
-
-        target_name = options.target # may be nil
-        is_app_target = !Helper::ConfigurationHelper.target.extension_target_type?
-
-        if is_app_target && !options.no_validate &&
-           !helper.validate_team_and_bundle_ids_from_aasa_files(xcodeproj, target_name, @domains)
-          say "Universal Link configuration failed validation."
-          helper.errors.each { |error| say " #{error}" }
-          return unless options.force
-        elsif is_app_target && !options.no_validate
-          say "Universal Link configuration passed validation. ✅"
-        end
-
-        # the following calls can all raise IOError
-        helper.add_keys_to_info_plist xcodeproj, target_name, @keys
-        helper.add_branch_universal_link_domains_to_info_plist xcodeproj, target_name, @domains if is_app_target
-        helper.ensure_uri_scheme_in_info_plist if is_app_target # does nothing if already present
-
-        new_path = helper.add_universal_links_to_project xcodeproj, target_name, @domains, false if is_app_target
-        `git add #{new_path}` if options.commit && new_path
-
-        helper.add_system_frameworks xcodeproj, target_name, options.frameworks unless options.frameworks.nil? || options.frameworks.empty?
-
-        xcodeproj.save
-
-        patch_source xcodeproj unless options.no_patch_source
-
-        return unless options.commit
-
-        changes = helper.changes.to_a.map { |c| Pathname.new(File.expand_path(c)).relative_path_from(Pathname.pwd).to_s }
-
-        `git commit #{changes.join(" ")} -m '[branch_io_cli] Branch SDK integration'`
-      end
-
-      def validate(options)
-        config_helper.validate_validation_options options
-
-        # raises
-        xcodeproj = config_helper.xcodeproj
-
-        valid = true
-
-        unless options.domains.nil? || options.domains.empty?
-          domains_valid = helper.validate_project_domains(
-            options.domains,
-            xcodeproj,
-            options.target
-          )
-
-          if domains_valid
-            say "Project domains match :domains parameter: ✅"
-          else
-            say "Project domains do not match specified :domains"
-            helper.errors.each { |error| say " #{error}" }
-          end
-
-          valid &&= domains_valid
-        end
-
-        configuration_valid = helper.validate_team_and_bundle_ids_from_aasa_files xcodeproj, options.target
-        unless configuration_valid
-          say "Universal Link configuration failed validation."
-          helper.errors.each { |error| say " #{error}" }
-        end
-
-        valid &&= configuration_valid
-
-        say "Universal Link configuration passed validation. ✅" if valid
-
-        valid
-      end
-
-      def helper
-        Helper::BranchHelper
-      end
-
-      def config_helper
-        Helper::ConfigurationHelper
-      end
-
-      def update_podfile(options)
-        podfile_path = config_helper.podfile_path
-        return false if podfile_path.nil?
-
-        # 1. Patch Podfile. Return if no change (Branch pod already present).
-        return false unless helper.patch_podfile podfile_path
-
-        # 2. pod install
-        # command = "PATH='#{ENV['PATH']}' pod install"
-        command = 'pod install'
-        command += ' --repo-update' unless options.no_pod_repo_update
-
-        Dir.chdir(File.dirname(podfile_path)) do
-          system command
-        end
-
-        # 3. Add Podfile and Podfile.lock to commit (in case :commit param specified)
-        helper.add_change podfile_path
-        helper.add_change "#{podfile_path}.lock"
-
-        # 4. Check if Pods folder is under SCM
-        pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from Pathname.pwd
-        `git ls-files #{pods_folder_path} --error-unmatch > /dev/null 2>&1`
-        return true unless $?.exitstatus == 0
-
-        # 5. If so, add the Pods folder to the commit (in case :commit param specified)
-        helper.add_change pods_folder_path
-        `git add #{pods_folder_path}` if options.commit
-
-        true
-      end
-
-      def update_cartfile(options, project)
-        cartfile_path = config_helper.cartfile_path
-        return false if cartfile_path.nil?
-
-        # 1. Patch Cartfile. Return if no change (Branch already present).
-        return false unless helper.patch_cartfile cartfile_path
-
-        # 2. carthage update
-        Dir.chdir(File.dirname(cartfile_path)) do
-          system "carthage update --platform ios"
-        end
-
-        # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
-        helper.add_change cartfile_path
-        helper.add_change "#{cartfile_path}.resolved"
-
-        # 4. Add to target dependencies
-        frameworks_group = project.frameworks_group
-        branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
-        target = Helper::ConfigurationHelper.target
-        target.frameworks_build_phase.add_file_reference branch_framework
-
-        # 5. Add to copy-frameworks build phase
-        carthage_build_phase = target.build_phases.find do |phase|
-          phase.respond_to?(:shell_script) && phase.shell_script =~ /carthage\s+copy-frameworks/
-        end
-
-        if carthage_build_phase
-          carthage_build_phase.input_paths << "$(SRCROOT)/Carthage/Build/iOS/Branch.framework"
-          carthage_build_phase.output_paths << "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Branch.framework"
-        end
-
-        # 6. Check if Carthage folder is under SCM
-        carthage_folder_path = Pathname.new(File.expand_path("../Carthage", cartfile_path)).relative_path_from Pathname.pwd
-        `git ls-files #{carthage_folder_path} --error-unmatch > /dev/null 2>&1`
-        return true unless $?.exitstatus == 0
-
-        # 7. If so, add the Carthage folder to the commit (in case :commit param specified)
-        helper.add_change carthage_folder_path
-        `git add #{carthage_folder_path}` if options.commit
-
-        true
-      end
-
-      def patch_source(xcodeproj)
-        helper.patch_app_delegate_swift(xcodeproj) || helper.patch_app_delegate_objc(xcodeproj)
-      end
-    end
-  end
-end