branch_io_cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ed6a08fd41a779e66e95b3d4bbfd60b73f9f1a7
-  data.tar.gz: 86d0ab68a447fa963a9bb40810aec4c9e7a54d13
+  metadata.gz: 9adda8f92100e01cd272fa97fe2bf8b71db6b664
+  data.tar.gz: c91ec03d311711ea448aec62ffa1db6f1f401e77
 SHA512:
-  metadata.gz: 6853fe36957e1364ee1d3cfabfc43126d49570c8799838648619ddba431f62a0ddab9de3bdb641a9907d5f48d2fd3968226cb91b7e2001b65496dafdc5629ba2
-  data.tar.gz: f37d61ba24b28fb17663d2ae71d7c38c800458fb58c12fb68ef2381e4e243c4688936b5ee4a9d16cfe1d57bfa87378d9ed24ab37ee04840bc3167974d1068d69
+  metadata.gz: 3ce717958b072775a9fbd789c249c23a80972ba8fe45cd2a546074d03b2b019d9fa6fdc2a580539193abe289579470617db34d7a46e8d7a396b30c4d6cbe7325
+  data.tar.gz: 84a1f6ef67c575e34c31c9306eeb62aea5858bf3005d7990769d5eba1bc8e4adbcdaa3561aca91cf4324b008a3d0114cefc049b9693e0ba704b649320cc054ab

data/README.md

@@ -46,8 +46,8 @@ the project location using the `--xcodeproj` option.
 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
-is found, the SDK dependency must be added manually. This will improve in a future
-release.
+is found, and Branch.framework is not already among the project's dependencies,
+you will be prompted for a number of choices.
 
 By default, all supplied Universal Link domains are validated. If validation passes,
 the setup continues. If validation fails, no further action is taken. Suppress

data/lib/branch_io_cli/cli.rb

@@ -25,8 +25,8 @@ the project location using the <%= color('--xcodeproj', BOLD) %> option.
 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
-is found, the SDK dependency must be added manually. This will improve in a future
-release.
+is found, and Branch.framework is not already among the project's dependencies,
+you will be prompted for a number of choices.
 
 By default, all supplied Universal Link domains are validated. If validation passes,
 the setup continues. If validation fails, no further action is taken. Suppress

data/lib/branch_io_cli/helper/configuration_helper.rb

@@ -189,20 +189,18 @@ module BranchIOCLI
           @podfile_path = File.expand_path "../Podfile", @xcodeproj_path
           target = BranchHelper.target_from_project @xcodeproj, options.target
 
-          File.open(@podfile_path, "w") do |file|
-            file.write <<EOF
-platform :ios, "#{target.deployment_target}"
-
-pod "Branch"
-
-#{@xcodeproj.targets.map { |t| "target \"#{t.name}\"" }.join("\n")}
-EOF
-          end
-
-          command = "pod install"
-          command += " --repo-update" unless options.no_pod_repo_update
+          install_command = "pod install"
+          install_command += " --repo-update" unless options.no_pod_repo_update
           Dir.chdir(File.dirname(@podfile_path)) do
-            system command
+            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
@@ -309,6 +307,17 @@ EOF
           framework = frameworks_group.new_file "Branch.framework"
           target = BranchHelper.target_from_project @xcodeproj, options.target
           target.frameworks_build_phase.add_file_reference framework, true
+
+          # Make sure this is in the FRAMEWORK_SEARCH_PATHS
+          @xcodeproj.build_configurations.each do |config|
+            setting = config.build_settings["FRAMEWORK_SEARCH_PATHS"] || []
+            setting = [setting] if setting.kind_of? String
+            next if setting.any? { |p| p == "$(SRCROOT)" }
+
+            setting << "$(SRCROOT)"
+            config.build_settings["FRAMEWORK_SEARCH_PATHS"] = setting
+          end
+
           @xcodeproj.save
 
           BranchHelper.add_change File.expand_path "Branch.framework"

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -357,12 +357,14 @@ module BranchIOCLI
           mode: :prepend
         )
 
-        # TODO: This is Swift 3. Support other versions, esp. 4.
-        init_session_text = <<-EOF
+        init_session_text = ConfigurationHelper.keys.count <= 1 ? "" : <<EOF
         #if DEBUG
             Branch.setUseTestBranchKey(true)
         #endif
 
+EOF
+
+        init_session_text += <<-EOF
         Branch.getInstance().initSession(launchOptions: launchOptions) {
             universalObject, linkProperties, error in
 
@@ -377,13 +379,29 @@ module BranchIOCLI
           mode: :append
         )
 
-        unless app_delegate =~ /application:.*continueUserActivity:.*restorationHandler:/
+        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(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {
-      return Branch.getInstance().continue(userActivity)
+    func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
+        return Branch.getInstance().continue(userActivity)
     }
           EOF
 
@@ -417,11 +435,14 @@ module BranchIOCLI
           mode: :prepend
         )
 
-        init_session_text = <<-EOF
+        init_session_text = ConfigurationHelper.keys.count <= 1 ? "" : <<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
@@ -435,7 +456,22 @@ module BranchIOCLI
           mode: :append
         )
 
-        unless app_delegate =~ /application:.*continueUserActivity:.*restorationHandler:/
+        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
 

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Branch