branch_io_cli 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 875f76682dccf962d868c7ac37b3e5aab590e9655af0fd2266267d56f87e9d2b
-  data.tar.gz: 453b47d417a6014d219ee5154c395ed435bf136c647d0d5b31aee0f70096259f
+  metadata.gz: 2908cdd4340d1d0d43da1875c4e08c2e4f6e46b56836395aaf47f6d401834218
+  data.tar.gz: bcbfe15c402201a6a6594712b688ca5288a7c54d20a99a9aa0517c6264bbf220
 SHA512:
-  metadata.gz: 1ec7fdaf5b83fd581c5712184082a738d7c07305a9a3ae8bb190ef793e29b99b2952e8ffd031f20d00d30c4b65dc2ad3f87efa6718bdef142bf3ab2775df1c8a
-  data.tar.gz: 144f3cff5bdce88845a687d1f1b188fa1872bd229598b2a56f0c96660c34c1274864ee294f3aece2a795f3e9d45f97138d16eb80a19d2ba0bcbcf26d8540d176
+  metadata.gz: b9edff995284b5a31a39cf22bb02a198b775c35a072046d5c2527730e41055d1e1c3f8dc1d800e0d8768809b8f4b35524453cf2c7d4ce8da7a29491d97c340d4
+  data.tar.gz: 2ea56d6e150521ea6e956584fb0fc8f4c7774702746724eb6d94418840387a2ee0fa42ce2945a34e5d05daddcdb13d81a182e9775be8b99c2f5ad04110c4ec9a

data/lib/assets/completions/completion.bash

@@ -19,7 +19,7 @@ _branch_io_complete()
     validate_opts="$global_opts -D --domains --xcodeproj --target"
 
     report_opts="$global_opts --xcodeproj --workspace --header-only --no-clean --scheme --target --configuration --sdk --out"
-    report_opts="$global_opts --podfile --cartfile --no-pod-repo-update"
+    report_opts="$report_opts --podfile --cartfile --no-pod-repo-update"
 
     if [[ ${cur} == -* ]] ; then
       case "${cmd}" in

data/lib/assets/patches/ContinueUserActivity.swift

@@ -1,4 +1,4 @@
         // TODO: Adjust your method as you see fit.
-        if Branch.getInstance.continue(userActivity) {
+        if Branch.getInstance().continue(userActivity) {
             return true
         }

data/lib/assets/patches/continue_user_activity_new_objc.yml

@@ -1,2 +1,3 @@
+regexp: '/\n\s*@end[^@]*\Z/m'
 mode: prepend
 text_file: ContinueUserActivityNew.m

data/lib/assets/patches/continue_user_activity_new_swift.yml

@@ -1,2 +1,3 @@
+regexp: '/\n\s*\}[^{}]*\Z/m'
 mode: prepend
 text_file: ContinueUserActivityNew.swift

data/lib/assets/patches/continue_user_activity_objc.yml

@@ -1,2 +1,3 @@
+regexp: '/application:.*continueUserActivity:.*restorationHandler:.*?\{.*?\n/m'
 mode: append
 text_file: ContinueUserActivity.m

data/lib/assets/patches/continue_user_activity_swift.yml

@@ -1,2 +1,3 @@
+regexp: '/application:.*continue userActivity:.*restorationHandler:.*?\{.*?\n/m'
 mode: append
 text_file: ContinueUserActivity.swift

data/lib/assets/patches/did_finish_launching_new_objc.yml

@@ -0,0 +1,3 @@
+regexp: '/^@implementation.*?\n/m'
+mode: append
+text_file: DidFinishLaunching.m

data/lib/assets/patches/did_finish_launching_new_swift.yml

@@ -0,0 +1,3 @@
+regexp: '/var\s+window\s?:\s?UIWindow\?.*?\n/m'
+mode: append
+text_file: DidFinishLaunching.swift

data/lib/assets/patches/did_finish_launching_objc.yml

@@ -1,2 +1,3 @@
+regexp: '/didFinishLaunchingWithOptions.*?\{[^\n]*\n/m'
 mode: append
 text_file: DidFinishLaunching.m

data/lib/assets/patches/did_finish_launching_swift.yml

@@ -1,2 +1,3 @@
+regexp: '/didFinishLaunchingWithOptions.*?\{[^\n]*\n/m'
 mode: append
 text_file: DidFinishLaunching.swift

data/lib/assets/patches/open_url_new_objc.yml

@@ -1,2 +1,3 @@
+regexp: '/\n\s*@end[^@]*\Z/m'
 mode: prepend
 text_file: OpenUrlNew.m

data/lib/assets/patches/open_url_new_swift.yml

@@ -1,2 +1,3 @@
+regexp: '/\n\s*\}[^{}]*\Z/m'
 mode: prepend
 text_file: OpenUrlNew.swift

data/lib/assets/patches/open_url_objc.yml

@@ -1,2 +1,3 @@
+regexp: '/application:.*openURL:.*options:.*?\{.*?\n/m'
 mode: append
 text_file: OpenUrl.m

data/lib/assets/patches/open_url_source_application_objc.yml

@@ -1,2 +1,3 @@
+regexp: '/application:.*openURL:.*sourceApplication:.*?\{.*?\n/m'
 mode: append
 text_file: OpenUrlSourceApplication.m

data/lib/assets/patches/open_url_source_application_swift.yml

@@ -1,2 +1,3 @@
+regexp: '/application.*open\s+url.*sourceApplication:.*?\{.*?\n/m'
 mode: append
 text_file: OpenUrlSourceApplication.swift

data/lib/assets/patches/open_url_swift.yml

@@ -1,2 +1,3 @@
+regexp: '/application.*open\s+url.*options:.*?\{.*?\n/m'
 mode: append
 text_file: OpenUrl.swift

data/lib/branch_io_cli/command/report_command.rb

@@ -118,7 +118,7 @@ EOF
       def version_from_podfile_lock
         return nil unless config.podfile_path && File.exist?("#{config.podfile_path}.lock")
         podfile_lock = Pod::Lockfile.from_file Pathname.new "#{config.podfile_path}.lock"
-        version = podfile_lock.version "Branch"
+        version = podfile_lock.version("Branch") || podfile_lock.version("Branch-SDK")
 
         version ? "#{version} [Podfile.lock]" : nil
       end
@@ -246,17 +246,19 @@ EOF
 
           # Already verified existence.
           podfile = Pod::Podfile.from_file Pathname.new config.podfile_path
-          target_definition = podfile.target_definition_list.find { |t| t.name == config.target.name }
+          target_definition = podfile.target_definitions[config.target.name]
           if target_definition
-            branch_dep = target_definition.dependencies.find { |p| p.name == "Branch" }
+            branch_deps = target_definition.dependencies.select { |p| p.name =~ %r{^(Branch|Branch-SDK)(/.*)?$} }
             header += "Podfile target #{target_definition.name}:"
             header += "\n use_frameworks!" if target_definition.uses_frameworks?
             header += "\n platform: #{target_definition.platform}"
             header += "\n build configurations: #{target_definition.build_configurations}"
             header += "\n inheritance: #{target_definition.inheritance}"
-            header += "\n pod 'Branch', '#{branch_dep.requirement}'" if branch_dep
-            header += ", #{branch_dep.external_source}" if branch_dep && branch_dep.external_source
-            header += "\n"
+            branch_deps.each do |dep|
+              header += "\n pod '#{dep.name}', '#{dep.requirement}'"
+              header += ", #{dep.external_source}" if dep.external_source
+              header += "\n"
+            end
           else
             header += "Target #{config.target.name.inspect} not found in Podfile.\n"
           end

data/lib/branch_io_cli/configuration/configuration.rb

@@ -13,7 +13,7 @@ module BranchIOCLI
       attr_reader :xcodeproj
       attr_reader :xcodeproj_path
       attr_reader :target
-      attr_reader :podfile
+      attr_accessor :podfile
       attr_reader :podfile_path
       attr_reader :cartfile_path
       attr_reader :sdk_integration_mode

data/lib/branch_io_cli/configuration/setup_configuration.rb

@@ -187,7 +187,6 @@ module BranchIOCLI
         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.

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -1,3 +1,4 @@
+require "cocoapods-core"
 require "json"
 require "net/http"
 require "openssl"
@@ -402,6 +403,9 @@ module BranchIOCLI
             mode: :append,
             text: "\n\\1pod \"Branch\""
           ).apply podfile_path
+          # Store a Pod::Podfile representation of this file.
+          # TODO: Might want to move this to Configuration.
+          config.podfile = Pod::Podfile.from_file Pathname.new "Podfile"
           sh install_command
         end
 

data/lib/branch_io_cli/helper/patch_helper.rb

@@ -58,8 +58,10 @@ module BranchIOCLI
 
           app_delegate = File.read app_delegate_swift_path
 
-          # Can't check for the import here, since there may be a bridging header.
-          return false if app_delegate =~ /Branch\.initSession/
+          # Can't just check for the import here, since there may be a bridging header.
+          # This may match branch.initSession (if the Branch instance is stored) or
+          # Branch.getInstance().initSession, etc.
+          return false if app_delegate =~ /(import\s+branch|branch\.*initsession)/i
 
           unless config.bridging_header_required?
             load_patch(:swift_import).apply app_delegate_swift_path
@@ -99,14 +101,11 @@ module BranchIOCLI
         def patch_did_finish_launching_method_swift(app_delegate_swift_path)
           app_delegate_swift = File.read app_delegate_swift_path
 
-          patch = load_patch(:did_finish_launching_swift)
           is_new_method = app_delegate_swift !~ /didFinishLaunching[^\n]+?\{/m
           if is_new_method
-            # method not present. add entire method
-            patch.regexp = /var\s+window\s?:\s?UIWindow\?.*?\n/m
+            patch = load_patch :did_finish_launching_new_swift
           else
-            # method already present
-            patch.regexp = /didFinishLaunchingWithOptions.*?\{[^\n]*\n/m
+            patch = load_patch :did_finish_launching_swift
           end
           patch.apply app_delegate_swift_path, binding: binding
         end
@@ -114,105 +113,85 @@ module BranchIOCLI
         def patch_did_finish_launching_method_objc(app_delegate_objc_path)
           app_delegate_objc = File.read app_delegate_objc_path
 
-          patch = load_patch(:did_finish_launching_objc)
           is_new_method = app_delegate_objc !~ /didFinishLaunchingWithOptions/m
           if is_new_method
-            # method does not exist. add it.
-            patch.regexp = /^@implementation.*?\n/m
+            patch = load_patch :did_finish_launching_new_objc
           else
-            # method exists. patch it.
-            patch.regexp = /didFinishLaunchingWithOptions.*?\{[^\n]*\n/m
+            patch = load_patch :did_finish_launching_objc
           end
           patch.apply app_delegate_objc_path, binding: binding
         end
 
         def patch_open_url_method_swift(app_delegate_swift_path)
           app_delegate_swift = File.read app_delegate_swift_path
-          patch_name = "open_url_"
+
           if app_delegate_swift =~ /application.*open\s+url.*options/
             # Has application:openURL:options:
-            patch_name += "swift"
-            patch = load_patch patch_name
-            patch.regexp = /application.*open\s+url.*options:.*?\{.*?\n/m
+            patch = load_patch :open_url_swift
           elsif app_delegate_swift =~ /application.*open\s+url.*sourceApplication/
             # Has application:openURL:sourceApplication:annotation:
             # TODO: This method is deprecated.
-            patch_name += "source_application_swift"
-            patch = load_patch patch_name
-            patch.regexp = /application.*open\s+url.*sourceApplication:.*?\{.*?\n/m
+            patch = load_patch :open_url_source_application_swift
           else
             # Has neither
-            patch_name += "new_swift"
-            patch = load_patch patch_name
-            patch.regexp = /\n\s*\}[^{}]*\Z/m
+            patch = load_patch :open_url_new_swift
           end
           patch.apply app_delegate_swift_path
         end
 
         def patch_continue_user_activity_method_swift(app_delegate_swift_path)
-          app_delegate = File.read app_delegate_swift_path
-          patch_name = "continue_user_activity_"
-          if app_delegate =~ /application:.*continue userActivity:.*restorationHandler:/
-            # Add something to the top of the method
-            patch_name += "swift"
-            patch = load_patch patch_name
-            patch.regexp = /application:.*continue userActivity:.*restorationHandler:.*?\{.*?\n/m
+          app_delegate_swift = File.read app_delegate_swift_path
+
+          if app_delegate_swift =~ /application:.*continue userActivity:.*restorationHandler:/
+            patch = load_patch :continue_user_activity_swift
           else
-            # Add the application:continueUserActivity:restorationHandler method if it does not exist
-            patch_name += "new_swift"
-            patch = load_patch patch_name
-            patch.regexp = /\n\s*\}[^{}]*\Z/m
+            patch = load_patch :continue_user_activity_new_swift
           end
           patch.apply app_delegate_swift_path
         end
 
         def patch_open_url_method_objc(app_delegate_objc_path)
           app_delegate_objc = File.read app_delegate_objc_path
-          patch_name = "open_url_"
+
           if app_delegate_objc =~ /application:.*openURL:.*options/
             # Has application:openURL:options:
-            patch_name += "objc"
-            patch = load_patch patch_name
-            patch.regexp = /application:.*openURL:.*options:.*?\{.*?\n/m
+            patch = load_patch :open_url_objc
           elsif app_delegate_objc =~ /application:.*openURL:.*sourceApplication/
             # Has application:openURL:sourceApplication:annotation:
-            patch_name += "source_application_objc"
-            patch = load_patch patch_name
-            patch.regexp = /application:.*openURL:.*sourceApplication:.*?\{.*?\n/m
+            patch = load_patch :open_url_source_annotation_objc
+            # TODO: This method is deprecated.
           else
             # Has neither
-            patch_name += "new_objc"
-            patch = load_patch patch_name
-            patch.regexp = /\n\s*@end[^@]*\Z/m
+            patch = load_patch :open_url_new_objc
           end
           patch.apply app_delegate_objc_path
         end
 
         def patch_continue_user_activity_method_objc(app_delegate_objc_path)
-          app_delegate = File.read app_delegate_objc_path
-          patch_name = "continue_user_activity_"
-          if app_delegate =~ /application:.*continueUserActivity:.*restorationHandler:/
-            patch_name += "objc"
-            patch = load_patch patch_name
-            patch.regexp = /application:.*continueUserActivity:.*restorationHandler:.*?\{.*?\n/m
+          app_delegate_swift = File.read app_delegate_objc_path
+
+          if app_delegate_swift =~ /application:.*continueUserActivity:.*restorationHandler:/
+            patch = load_patch :continue_user_activity_objc
           else
-            # Add the application:continueUserActivity:restorationHandler method if it does not exist
-            patch_name += "new_objc"
-            patch = load_patch patch_name
-            patch.regexp = /\n\s*@end[^@]*\Z/m
+            patch = load_patch :continue_user_activity_new_objc
           end
           patch.apply app_delegate_objc_path
         end
 
         def patch_podfile(podfile_path)
-          podfile = File.read podfile_path
+          target_definition = config.podfile.target_definitions[config.target.name]
+          raise "Target #{config.target.name} not found in Podfile" unless target_definition
 
-          # Podfile already contains the Branch pod
-          # TODO: Allow for adding to multiple targets in the Podfile
-          return false if podfile =~ /pod\s+('Branch'|"Branch")/
+          # Podfile already contains the Branch pod, possibly just a subspec
+          return false if target_definition.dependencies.any? { |d| d.name =~ %r{^(Branch|Branch-SDK)(/.*)?$} }
 
           say "Adding pod \"Branch\" to #{podfile_path}"
 
+          # It may not be clear from the Pod::Podfile whether the target has a do block.
+          # It doesn't seem to be possible to update the Podfile object and write it out.
+          # So we patch.
+          podfile = File.read config.podfile_path
+
           if podfile =~ /target\s+(["'])#{config.target.name}\1\s+do.*?\n/m
             # if there is a target block for this target:
             patch = PatternPatch::Patch.new(

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Branch
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
@@ -267,6 +267,8 @@ files:
 - lib/assets/patches/continue_user_activity_new_swift.yml
 - lib/assets/patches/continue_user_activity_objc.yml
 - lib/assets/patches/continue_user_activity_swift.yml
+- lib/assets/patches/did_finish_launching_new_objc.yml
+- lib/assets/patches/did_finish_launching_new_swift.yml
 - lib/assets/patches/did_finish_launching_objc.yml
 - lib/assets/patches/did_finish_launching_swift.yml
 - lib/assets/patches/objc_import.yml