branch_io_cli 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f34a0beb6001798fa4ca54e4b69ead8baaa811b313ef7166e6a03ff6d00fb51
-  data.tar.gz: de7f72a71a6f61a893a1b89025d21caf2efa475c100590fda5a48cb3bd9dc838
+  metadata.gz: '091b67267f6d542453cd8903adf229f0caeec5b763b33ab2474c308a2bfcb6cb'
+  data.tar.gz: 421065a8099c0d6e1087c641dea2d303b21aab989e53f9ae3825ab58ccaeb8f2
 SHA512:
-  metadata.gz: 4b3cb56a99bdafeb2dbb47f012a692da84ad37c3e8a836d908d6a0a3286dd91ea1a7669a3d21d42798ab859c8e3f16938a1599c69745834240d07ab29cb33cfa
-  data.tar.gz: 3a3bc8dec22dd6ee83d84fc136b24eadf5a99448cddf73ecf02127ca4f6f44928ac6a04fca6ca1b6c5c06ab2e9e37e806f8da0d806cc9eeca2745d29191e7d1e
+  metadata.gz: 24ff573c11e248b4d9501e1e8d464d37980b3dc998e2150796979714be12c9d1a415946387a4cc8c1df86f532b8297b1e11a908c464cc712c5d8b6016d680890
+  data.tar.gz: 991c8328c42eaf101c7fa780b4b7e18150fd25db9237e0a97b0218f0ba7ca4a5a73af89cc4b3672765940753d832cb0c0f412234c9aa185a9c0b5fc514ba41ba

data/lib/assets/patches/MessagesDidBecomeActive.m

@@ -0,0 +1,16 @@
+<% if is_new_method %>
+
+-(void)didBecomeActiveWithConversation:(MSConversation *)conversation {
+<% end %>
+<% if use_conditional_test_key? %>
+#ifdef DEBUG
+    [Branch setUseTestBranchKey:YES];
+#endif // DEBUG
+<% end %>
+    [[Branch getInstance] initSessionWithLaunchOptions:@{}
+        andRegisterDeepLinkHandlerUsingBranchUniversalObject:^(BranchUniversalObject *universalObject, BranchLinkProperties *linkProperties, NSError *error){
+        // TODO: Route Branch links
+    }];
+<% if is_new_method %>
+}
+<% end %>

data/lib/assets/patches/MessagesDidBecomeActive.swift

@@ -0,0 +1,16 @@
+<% if is_new_method %>
+    override func didBecomeActive(with conversation: MSConversation) {
+<% end %>
+<% if use_conditional_test_key? %>
+        #if DEBUG
+            Branch.setUseTestBranchKey(true)
+        #endif
+<% end %>
+        Branch.getInstance().initSession(launchOptions: [:]) {
+            universalObject, linkProperties, error in
+
+            // TODO: Route Branch links
+        }
+<% if is_new_method %>
+    }
+<% end %>

data/lib/assets/patches/messages_did_become_active_new_objc.yml

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

data/lib/assets/patches/messages_did_become_active_new_swift.yml

@@ -0,0 +1,3 @@
+regexp: '/class.*:\s+MSMessagesAppViewController\s*{\n/m'
+mode: append
+text_file: MessagesDidBecomeActive.swift

data/lib/assets/patches/messages_did_become_active_objc.yml

@@ -0,0 +1,3 @@
+regexp: '/didBecomeActiveWithConversation.*?\{[^\n]*\n/m'
+mode: append
+text_file: MessagesDidBecomeActive.m

data/lib/assets/patches/messages_did_become_active_swift.yml

@@ -0,0 +1,3 @@
+regexp: '/didBecomeActive\(with.*?\{[^\n]*\n/m'
+mode: append
+text_file: MessagesDidBecomeActive.swift

data/lib/branch_io_cli/command/command.rb

@@ -1,11 +1,17 @@
 module BranchIOCLI
   module Command
     class Command
-      attr_reader :options
+      attr_reader :options # command-specific options from CLI
       attr_reader :config # command-specific configuration object
 
       def initialize(options)
         @options = options
+        matches = /BranchIOCLI::Command::(\w+)Command/.match self.class.name
+        root = matches[1]
+
+        @config = Object.const_get("BranchIOCLI")
+                        .const_get("Configuration")
+                        .const_get("#{root}Configuration").new options
       end
 
       def run!

data/lib/branch_io_cli/command/report_command.rb

@@ -1,31 +1,22 @@
-require "cocoapods-core"
-require "branch_io_cli/helper/methods"
-require "open3"
-require "plist"
-require "xcodeproj"
+require "shellwords"
 
 module BranchIOCLI
   module Command
     class ReportCommand < Command
-      def initialize(options)
-        super
-        @config = Configuration::ReportConfiguration.new options
-      end
-
       def run!
         say "\n"
 
-        unless load_settings_from_xcode
+        unless xcode_settings.valid?
           say "Failed to load settings from Xcode. Some information may be missing.\n"
         end
 
         if config.header_only
-          say report_header
+          say report_helper.report_header
           exit 0
         end
 
         # Only if a Podfile is detected/supplied at the command line.
-        if pod_install_required?
+        if config.pod_install_required?
           say "pod install required in order to build."
           install = ask %{Run "pod install" now (Y/n)? }
           if install.downcase =~ /^n/
@@ -52,33 +43,28 @@ EOF
 
         File.open config.report_path, "w" do |report|
           report.write "Branch.io Xcode build report v #{VERSION} #{DateTime.now}\n\n"
-          report.write "#{report_configuration}\n"
-          report.write "#{report_header}\n"
+          report.write "#{config.report_configuration}\n"
+          report.write "#{report_helper.report_header}\n"
 
           # run xcodebuild -list
-          report.log_command "#{base_xcodebuild_cmd} -list"
+          report.log_command "#{report_helper.base_xcodebuild_cmd} -list"
 
           # If using a workspace, -list all the projects as well
           if config.workspace_path
             config.workspace.file_references.map(&:path).each do |project_path|
               path = File.join File.dirname(config.workspace_path), project_path
-              report.log_command "xcodebuild -list -project #{path}"
+              report.log_command "xcodebuild -list -project #{Shellwords.escape path}"
             end
           end
 
-          base_cmd = base_xcodebuild_cmd
+          base_cmd = report_helper.base_xcodebuild_cmd
           # Add more options for the rest of the commands
-          base_cmd = "#{base_cmd} -scheme #{config.scheme}"
-          base_cmd = "#{base_cmd} -configuration #{config.configuration} -sdk #{config.sdk}"
+          base_cmd += " -scheme #{Shellwords.escape config.scheme}"
+          base_cmd += " -configuration #{Shellwords.escape config.configuration}"
+          base_cmd += " -sdk #{Shellwords.escape config.sdk}"
 
           # xcodebuild -showBuildSettings
-          report.write "$ #{base_cmd} -showBuildSettings\n\n"
-          report.write @xcodebuild_showbuildsettings_output
-          if @xcodebuild_showbuildsettings_status.success?
-            report.write "Success.\n\n"
-          else
-            report.write "#{@xcodebuild_showbuildsettings_status}.\n\n"
-          end
+          xcode_settings.log_xcodebuild_showbuildsettings report
 
           if config.clean
             say "Cleaning"
@@ -98,308 +84,8 @@ EOF
         Helper::ReportHelper
       end
 
-      def base_xcodebuild_cmd
-        cmd = "xcodebuild"
-        if config.workspace_path
-          cmd = "#{cmd} -workspace #{config.workspace_path}"
-        else
-          cmd = "#{cmd} -project #{config.xcodeproj_path}"
-        end
-        cmd
-      end
-
-      def branch_version
-        version_from_podfile_lock ||
-          version_from_cartfile_resolved ||
-          version_from_branch_framework ||
-          version_from_bnc_config_m
-      end
-
-      def requirement_from_podfile
-        return nil unless config.podfile_path
-        podfile = File.read config.podfile_path
-        matches = /\n?\s*pod\s+("Branch"|'Branch').*?\n/m.match podfile
-        matches ? matches[0].strip : nil
-      end
-
-      def requirement_from_cartfile
-        return nil unless config.cartfile_path
-        cartfile = File.read config.cartfile_path
-        matches = %r{^git(hub\s+"|\s+"https://github.com/)BranchMetrics/(ios-branch-deep-linking|iOS-Deferred-Deep-Linking-SDK.*?).*?\n}m.match cartfile
-        matches ? matches[0].strip : nil
-      end
-
-      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") || podfile_lock.version("Branch-SDK")
-
-        version ? "#{version} [Podfile.lock]" : nil
-      end
-
-      def version_from_cartfile_resolved
-        return nil unless config.cartfile_path && File.exist?("#{config.cartfile_path}.resolved")
-        cartfile_resolved = File.read "#{config.cartfile_path}.resolved"
-
-        # Matches:
-        # git "https://github.com/BranchMetrics/ios-branch-deep-linking"
-        # git "https://github.com/BranchMetrics/ios-branch-deep-linking/"
-        # git "https://github.com/BranchMetrics/iOS-Deferred-Deep-Linking-SDK"
-        # git "https://github.com/BranchMetrics/iOS-Deferred-Deep-Linking-SDK/"
-        # github "BranchMetrics/ios-branch-deep-linking"
-        # github "BranchMetrics/ios-branch-deep-linking/"
-        # github "BranchMetrics/iOS-Deferred-Deep-Linking-SDK"
-        # github "BranchMetrics/iOS-Deferred-Deep-Linking-SDK/"
-        matches = %r{(ios-branch-deep-linking|iOS-Deferred-Deep-Linking-SDK)/?" "(\d+\.\d+\.\d+)"}m.match cartfile_resolved
-        return nil unless matches
-        version = matches[2]
-        "#{version} [Cartfile.resolved]"
-      end
-
-      def version_from_branch_framework
-        framework = config.target.frameworks_build_phase.files.find { |f| f.file_ref.path =~ /Branch.framework$/ }
-        return nil unless framework
-
-        if framework.file_ref.isa == "PBXFileReference"
-          project_path = config.relative_path(config.xcodeproj_path)
-          framework_path = framework.file_ref.real_path
-        elsif framework.file_ref.isa == "PBXReferenceProxy" && @xcode_settings
-          project_path = config.relative_path framework.file_ref.remote_ref.proxied_object.project.path
-          framework_path = File.expand_path framework.file_ref.path, @xcode_settings[framework.file_ref.source_tree]
-        end
-        info_plist_path = File.join framework_path.to_s, "Info.plist"
-        return nil unless File.exist? info_plist_path
-
-        require "cfpropertylist"
-
-        raw_info_plist = CFPropertyList::List.new file: info_plist_path
-        info_plist = CFPropertyList.native_types raw_info_plist.value
-        version = info_plist["CFBundleVersion"]
-        return nil unless version
-        "#{version} [Branch.framework/Info.plist:#{project_path}]"
-      end
-
-      def version_from_bnc_config_m(project = @config.xcodeproj)
-        # Look for BNCConfig.m in embedded source
-        bnc_config_m_ref = project.files.find { |f| f.path =~ /BNCConfig\.m$/ }
-        unless bnc_config_m_ref
-          subprojects = project.files.select { |f| f.path =~ /\.xcodeproj$/ }
-          subprojects.each do |subproject|
-            p = Xcodeproj::Project.open subproject.real_path
-            version = version_from_bnc_config_m p
-            return version if version
-          end
-        end
-
-        return nil unless bnc_config_m_ref
-        bnc_config_m = File.read bnc_config_m_ref.real_path
-        matches = /BNC_SDK_VERSION\s+=\s+@"(\d+\.\d+\.\d+)"/m.match bnc_config_m
-        return nil unless matches
-        version = matches[1]
-        "#{version} [BNCConfig.m:#{config.relative_path project.path}]"
-      end
-
-      def report_configuration
-        <<EOF
-Configuration:
-
-Xcode workspace: #{config.workspace_path || '(none)'}
-Xcode project: #{config.xcodeproj_path || '(none)'}
-Scheme: #{config.scheme || '(none)'}
-Target: #{config.target || '(none)'}
-Configuration: #{config.configuration || '(none)'}
-SDK: #{config.sdk}
-Podfile: #{config.relative_path(config.podfile_path) || '(none)'}
-Cartfile: #{config.relative_path(config.cartfile_path) || '(none)'}
-Pod repo update: #{config.pod_repo_update.inspect}
-Clean: #{config.clean.inspect}
-EOF
-      end
-
-      def pod_install_required?
-        # If this is set, its existence has been verified.
-        return false unless config.podfile_path
-
-        lockfile_path = "#{config.podfile_path}.lock"
-        manifest_path = File.expand_path "../Pods/Manifest.lock", config.podfile_path
-
-        return true unless File.exist?(lockfile_path) && File.exist?(manifest_path)
-
-        lockfile = Pod::Lockfile.from_file Pathname.new lockfile_path
-        manifest = Pod::Lockfile.from_file Pathname.new manifest_path
-
-        # diff the contents of Podfile.lock and Pods/Manifest.lock
-        # This is just what is done in the "[CP] Check Pods Manifest.lock" script build phase
-        # in a project using CocoaPods.
-        return true unless lockfile == manifest
-
-        # compare checksum of Podfile with checksum in Podfile.lock
-        # This is a good sanity check, but perhaps unnecessary. It means pod install
-        # has not been run since the Podfile was modified, which is probably an oversight.
-        return true unless lockfile.to_hash["PODFILE CHECKSUM"] == config.podfile.checksum
-
-        false
-      end
-
-      # rubocop: disable Metrics/PerceivedComplexity
-      def report_header
-        header = "cocoapods-core: #{Pod::CORE_VERSION}\n"
-
-        header += `xcodebuild -version`
-        header += "SDK: #{@xcode_settings['SDK_NAME']}\n" if @xcode_settings
-
-        bundle_identifier = helper.expanded_build_setting config.target, "PRODUCT_BUNDLE_IDENTIFIER", config.configuration
-        dev_team = helper.expanded_build_setting config.target, "DEVELOPMENT_TEAM", config.configuration
-        infoplist_path = helper.expanded_build_setting config.target, "INFOPLIST_FILE", config.configuration
-        entitlements_path = helper.expanded_build_setting config.target, "CODE_SIGN_ENTITLEMENTS", config.configuration
-
-        header += "\nTarget #{config.target.name}:\n"
-        header += " Bundle identifier: #{bundle_identifier || '(none)'}\n"
-        header += " Development team: #{dev_team || '(none)'}\n"
-        header += " Deployment target: #{config.target.deployment_target}\n"
-        header += " Modules #{config.modules_enabled? ? '' : 'not '}enabled\n"
-        header += " Swift #{config.swift_version}\n" if config.swift_version
-        header += " Bridging header: #{config.relative_path(config.bridging_header_path)}\n" if config.bridging_header_path
-        header += " Info.plist: #{config.relative_path(infoplist_path) || '(none)'}\n"
-        header += " Entitlements file: #{config.relative_path(entitlements_path) || '(none)'}\n"
-
-        if config.podfile_path
-          begin
-            cocoapods_version = `pod --version`.chomp
-          rescue Errno::ENOENT
-            header += "\n(pod command not found)\n"
-          end
-
-          if File.exist?("#{config.podfile_path}.lock")
-            podfile_lock = Pod::Lockfile.from_file Pathname.new "#{config.podfile_path}.lock"
-          end
-
-          if cocoapods_version || podfile_lock
-            header += "\nUsing CocoaPods v. "
-            if cocoapods_version
-              header += "#{cocoapods_version} (CLI) "
-            end
-            if podfile_lock
-              header += "#{podfile_lock.cocoapods_version} (Podfile.lock)"
-            end
-            header += "\n"
-          end
-
-          target_definition = config.podfile.target_definitions[config.target.name]
-          if target_definition
-            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}"
-            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
-
-          header += "\npod install #{pod_install_required? ? '' : 'not '}required.\n"
-        end
-
-        if config.cartfile_path
-          begin
-            carthage_version = `carthage version`.chomp
-            header += "\nUsing Carthage v. #{carthage_version}\n"
-          rescue Errno::ENOENT
-            header += "\n(carthage command not found)\n"
-          end
-        end
-
-        cartfile_requirement = requirement_from_cartfile
-        header += "\nFrom Cartfile:\n#{cartfile_requirement}\n" if cartfile_requirement
-
-        version = branch_version
-        if version
-          header += "\nBranch SDK v. #{version}\n"
-        else
-          header += "\nBranch SDK not found.\n"
-        end
-
-        header += "\n#{branch_report}"
-
-        header
-      end
-      # rubocop: enable Metrics/PerceivedComplexity
-
-      # String containing information relevant to Branch setup
-      def branch_report
-        infoplist_path = helper.expanded_build_setting config.target, "INFOPLIST_FILE", config.configuration
-        infoplist_path = File.expand_path infoplist_path, File.dirname(config.xcodeproj_path)
-
-        report = "Branch configuration:\n"
-
-        begin
-          info_plist = File.open(infoplist_path) { |f| Plist.parse_xml f }
-          branch_key = info_plist["branch_key"]
-          report += " Branch key(s) (Info.plist):\n"
-          if branch_key.kind_of? Hash
-            branch_key.each_key do |key|
-              resolved_key = helper.expand_build_settings branch_key[key], config.target, config.configuration
-              report += "  #{key.capitalize}: #{resolved_key}\n"
-            end
-          elsif branch_key
-            resolved_key = helper.expand_build_settings branch_key, config.target, config.configuration
-            report += "  #{resolved_key}\n"
-          else
-            report += "  (none found)\n"
-          end
-
-          branch_universal_link_domains = info_plist["branch_universal_link_domains"]
-          if branch_universal_link_domains
-            if branch_universal_link_domains.kind_of? Array
-              report += " branch_universal_link_domains (Info.plist):\n"
-              branch_universal_link_domains.each do |domain|
-                report += "  #{domain}\n"
-              end
-            else
-              report += " branch_universal_link_domains (Info.plist): #{branch_universal_link_domains}\n"
-            end
-          end
-        rescue StandardError => e
-          report += " (Failed to open Info.plist: #{e.message})\n"
-        end
-
-        unless config.target.extension_target_type?
-          begin
-            domains = helper.domains_from_project config.configuration
-            report += " Universal Link domains (entitlements):\n"
-            domains.each do |domain|
-              report += "  #{domain}\n"
-            end
-          rescue StandardError => e
-            report += " (Failed to get Universal Link domains from entitlements file: #{e.message})\n"
-          end
-        end
-
-        report += report_helper.report_imports
-
-        report
-      end
-
-      def load_settings_from_xcode
-        cmd = "#{base_xcodebuild_cmd} -scheme #{config.scheme}"
-        cmd += " -configuration #{config.configuration} -sdk #{config.sdk} -showBuildSettings"
-        @xcodebuild_showbuildsettings_output = ""
-        @xcode_settings = {}
-        Open3.popen2e(cmd) do |stdin, output, thread|
-          while (line = output.gets)
-            @xcodebuild_showbuildsettings_output += line
-            line.strip!
-            next unless (matches = /^(.+)\s+=\s+(.+)$/.match line)
-            @xcode_settings[matches[1]] = matches[2]
-          end
-          @xcodebuild_showbuildsettings_status = thread.value
-          return @xcodebuild_showbuildsettings_status.success?
-        end
+      def xcode_settings
+        Configuration::XcodeSettings.settings
       end
     end
   end

data/lib/branch_io_cli/command/setup_command.rb

@@ -8,7 +8,6 @@ module BranchIOCLI
 
       def initialize(options)
         super
-        @config = Configuration::SetupConfiguration.new options
         @keys = config.keys
         @domains = config.all_domains
       end

data/lib/branch_io_cli/command/validate_command.rb

@@ -3,11 +3,6 @@ module BranchIOCLI
     class ValidateCommand < Command
       attr_reader :config
 
-      def initialize(options)
-        super
-        @config = Configuration::ValidateConfiguration.new options
-      end
-
       def run!
         valid = true
 

data/lib/branch_io_cli/configuration.rb

@@ -2,3 +2,4 @@ require "branch_io_cli/configuration/configuration"
 require "branch_io_cli/configuration/report_configuration"
 require "branch_io_cli/configuration/setup_configuration"
 require "branch_io_cli/configuration/validate_configuration"
+require "branch_io_cli/configuration/xcode_settings"

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_accessor :podfile
+      attr_reader :podfile
       attr_reader :podfile_path
       attr_reader :cartfile_path
       attr_reader :sdk_integration_mode
@@ -184,6 +184,31 @@ EOF
         end
       end
 
+      def pod_install_required?
+        # If this is set, its existence has been verified.
+        return false unless podfile_path
+
+        lockfile_path = "#{podfile_path}.lock"
+        manifest_path = File.expand_path "../Pods/Manifest.lock", podfile_path
+
+        return true unless File.exist?(lockfile_path) && File.exist?(manifest_path)
+
+        lockfile = Pod::Lockfile.from_file Pathname.new lockfile_path
+        manifest = Pod::Lockfile.from_file Pathname.new manifest_path
+
+        # diff the contents of Podfile.lock and Pods/Manifest.lock
+        # This is just what is done in the "[CP] Check Pods Manifest.lock" script build phase
+        # in a project using CocoaPods.
+        return true unless lockfile == manifest
+
+        # compare checksum of Podfile with checksum in Podfile.lock
+        # This is a good sanity check, but perhaps unnecessary. It means pod install
+        # has not been run since the Podfile was modified, which is probably an oversight.
+        return true unless lockfile.to_hash["PODFILE CHECKSUM"] == podfile.checksum
+
+        false
+      end
+
       def uses_frameworks?
         return nil unless podfile
         target_definition = podfile.target_definition_list.find { |t| t.name == target.name }
@@ -214,6 +239,26 @@ EOF
         app_delegate.file_ref.real_path.to_s
       end
 
+      def messages_view_controller_path
+        return nil unless target.symbol_type == :messages_extension
+
+        all_paths = target.source_build_phase.files.map { |f| f.file_ref.real_path.to_s }
+        swift_paths = all_paths.grep(/\.swift$/)
+
+        # We're looking for the @interface declaration for a class that inherits from
+        # MSMessagesAppViewController. The target probably doesn't have a headers
+        # build phase. Include all .ms from the source build phase and any .h
+        # with the same root.
+        objc_paths = all_paths.grep(/\.m$/)
+        objc_paths += objc_paths.map { |p| p.sub(/\.m$/, '.h') }.select { |f| File.exist? f }
+
+        path = swift_paths.find { |f| /class.*:\s+MSMessagesAppViewController\s*{\n/m.match_file f } ||
+               objc_paths.find { |f| /@interface.*:\s+MSMessagesAppViewController/.match_file f }
+
+        # If we found a .h, patch the corresponding .m.
+        path && path.sub(/\.h$/, '.m')
+      end
+
       # TODO: How many of these can vary by configuration?
 
       def modules_enabled?
@@ -245,7 +290,8 @@ EOF
       def branch_imports
         return @branch_imports if @branch_imports
 
-        source_files = [app_delegate_swift_path, app_delegate_objc_path, bridging_header_path]
+        source_files = target.source_build_phase.files.map { |f| f.file_ref.real_path.to_s }
+        source_files << bridging_header_path if bridging_header_path
         @branch_imports = source_files.compact.map { |f| { f => branch_imports_from_file(f) } }.inject({}, :merge)
         @branch_imports
       end

data/lib/branch_io_cli/configuration/report_configuration.rb

@@ -1,3 +1,44 @@
+require "plist"
+require "xcodeproj"
+
+module Xcodeproj
+  class Project
+    # Local override to allow for user schemes.
+    #
+    # Get list of shared and user schemes in project
+    #
+    # @param [String] path
+    #         project path
+    #
+    # @return [Array]
+    #
+    def self.schemes(project_path)
+      base_dirs = [File.join(project_path, 'xcshareddata', 'xcschemes'),
+                   File.join(project_path, 'xcuserdata', "#{ENV['USER']}.xcuserdatad", 'xcschemes')]
+
+      # Take any .xcscheme file from base_dirs
+      schemes = base_dirs.inject([]) { |memo, dir| memo + Dir[File.join dir, '*.xcscheme'] }
+                         .map { |f| File.basename(f, '.xcscheme') }
+
+      # Include any scheme defined in the xcschememanagement.plist, if it exists.
+      base_dirs.map { |d| File.join d, 'xcschememanagement.plist' }
+               .select { |f| File.exist? f }.each do |plist_path|
+        plist = File.open(plist_path) { |f| ::Plist.parse_xml f }
+        scheme_user_state = plist["SchemeUserState"]
+        schemes += scheme_user_state.keys.map { |k| File.basename k, '.xcscheme' }
+      end
+
+      schemes.uniq!
+      if schemes.empty?
+        # Open the project, get all targets. Add one scheme per target.
+        project = self.open project_path
+        schemes += project.targets.reject(&:test_target_type?).map(&:name)
+      end
+      schemes
+    end
+  end
+end
+
 module BranchIOCLI
   module Configuration
     class ReportConfiguration < Configuration
@@ -8,6 +49,10 @@ module BranchIOCLI
       attr_reader :report_path
       attr_reader :sdk
 
+      def xcode_settings
+        XcodeSettings.settings
+      end
+
       def validate_options
         @clean = options.clean
         @header_only = options.header_only
@@ -33,6 +78,24 @@ module BranchIOCLI
         validate_buildfile_path(options.cartfile, "Cartfile") if sdk_integration_mode.nil?
       end
 
+      # TODO: Collapse the following methods with support for formatting.
+      def report_configuration
+        <<EOF
+Configuration:
+
+Xcode workspace: #{workspace_path || '(none)'}
+Xcode project: #{xcodeproj_path || '(none)'}
+Scheme: #{scheme || '(none)'}
+Target: #{target || '(none)'}
+Configuration: #{configuration || '(none)'}
+SDK: #{sdk}
+Podfile: #{relative_path(podfile_path) || '(none)'}
+Cartfile: #{relative_path(cartfile_path) || '(none)'}
+Pod repo update: #{pod_repo_update.inspect}
+Clean: #{clean.inspect}
+EOF
+      end
+
       def log
         super
         say <<EOF
@@ -189,8 +252,7 @@ EOF
 
         unless scheme_path
           # Look for a local scheme
-          user = @xcode_settings["USER"] if @xcode_settings
-          user ||= ENV["USER"] || ENV["LOGNAME"]
+          user = ENV["USER"]
           xcuserdata_path = File.join project_path, "xcuserdata", "#{user}.xcuserdatad", "xcschemes", "#{@scheme}.xcscheme"
           scheme_path = xcuserdata_path if File.exist?(xcuserdata_path)
         end
@@ -222,6 +284,97 @@ EOF
 
         @configuration = xcscheme.launch_action.build_configuration
       end
+
+      def branch_version
+        version_from_podfile_lock ||
+          version_from_cartfile_resolved ||
+          version_from_branch_framework ||
+          version_from_bnc_config_m
+      end
+
+      def requirement_from_podfile
+        return nil unless podfile_path
+        podfile = File.read podfile_path
+        matches = /\n?\s*pod\s+("Branch"|'Branch').*?\n/m.match podfile
+        matches ? matches[0].strip : nil
+      end
+
+      def requirement_from_cartfile
+        return nil unless cartfile_path
+        cartfile = File.read cartfile_path
+        matches = %r{^git(hub\s+"|\s+"https://github.com/)BranchMetrics/(ios-branch-deep-linking|iOS-Deferred-Deep-Linking-SDK.*?).*?\n}m.match cartfile
+        matches ? matches[0].strip : nil
+      end
+
+      def version_from_podfile_lock
+        return nil unless podfile_path && File.exist?("#{podfile_path}.lock")
+        podfile_lock = Pod::Lockfile.from_file Pathname.new "#{podfile_path}.lock"
+        version = podfile_lock.version("Branch") || podfile_lock.version("Branch-SDK")
+
+        version ? "#{version} [Podfile.lock]" : nil
+      end
+
+      def version_from_cartfile_resolved
+        return nil unless cartfile_path && File.exist?("#{cartfile_path}.resolved")
+        cartfile_resolved = File.read "#{cartfile_path}.resolved"
+
+        # Matches:
+        # git "https://github.com/BranchMetrics/ios-branch-deep-linking"
+        # git "https://github.com/BranchMetrics/ios-branch-deep-linking/"
+        # git "https://github.com/BranchMetrics/iOS-Deferred-Deep-Linking-SDK"
+        # git "https://github.com/BranchMetrics/iOS-Deferred-Deep-Linking-SDK/"
+        # github "BranchMetrics/ios-branch-deep-linking"
+        # github "BranchMetrics/ios-branch-deep-linking/"
+        # github "BranchMetrics/iOS-Deferred-Deep-Linking-SDK"
+        # github "BranchMetrics/iOS-Deferred-Deep-Linking-SDK/"
+        matches = %r{(ios-branch-deep-linking|iOS-Deferred-Deep-Linking-SDK)/?" "(\d+\.\d+\.\d+)"}m.match cartfile_resolved
+        return nil unless matches
+        version = matches[2]
+        "#{version} [Cartfile.resolved]"
+      end
+
+      def version_from_branch_framework
+        framework = target.frameworks_build_phase.files.find { |f| f.file_ref.path =~ /Branch.framework$/ }
+        return nil unless framework
+
+        if framework.file_ref.isa == "PBXFileReference"
+          project_path = relative_path(config.xcodeproj_path)
+          framework_path = framework.file_ref.real_path
+        elsif framework.file_ref.isa == "PBXReferenceProxy" && xcode_settings
+          project_path = relative_path framework.file_ref.remote_ref.proxied_object.project.path
+          framework_path = File.expand_path framework.file_ref.path, xcode_settings[framework.file_ref.source_tree]
+        end
+        info_plist_path = File.join framework_path.to_s, "Info.plist"
+        return nil unless File.exist? info_plist_path
+
+        require "cfpropertylist"
+
+        raw_info_plist = CFPropertyList::List.new file: info_plist_path
+        info_plist = CFPropertyList.native_types raw_info_plist.value
+        version = info_plist["CFBundleVersion"]
+        return nil unless version
+        "#{version} [Branch.framework/Info.plist:#{project_path}]"
+      end
+
+      def version_from_bnc_config_m(project = xcodeproj)
+        # Look for BNCConfig.m in embedded source
+        bnc_config_m_ref = project.files.find { |f| f.path =~ /BNCConfig\.m$/ }
+        unless bnc_config_m_ref
+          subprojects = project.files.select { |f| f.path =~ /\.xcodeproj$/ }
+          subprojects.each do |subproject|
+            p = Xcodeproj::Project.open subproject.real_path
+            version = version_from_bnc_config_m p
+            return version if version
+          end
+        end
+
+        return nil unless bnc_config_m_ref
+        bnc_config_m = File.read bnc_config_m_ref.real_path
+        matches = /BNC_SDK_VERSION\s+=\s+@"(\d+\.\d+\.\d+)"/m.match bnc_config_m
+        return nil unless matches
+        version = matches[1]
+        "#{version} [BNCConfig.m:#{relative_path project.path}]"
+      end
     end
   end
 end

data/lib/branch_io_cli/configuration/xcode_settings.rb

@@ -0,0 +1,66 @@
+require "open3"
+require "shellwords"
+
+module BranchIOCLI
+  module Configuration
+    class XcodeSettings
+      class << self
+        def settings
+          return @settings if @settings
+          @settings = self.new
+          @settings
+        end
+      end
+
+      def initialize
+        load_settings_from_xcode
+      end
+
+      def valid?
+        @xcodebuild_showbuildsettings_status.success?
+      end
+
+      def config
+        Configuration.current
+      end
+
+      def [](key)
+        @xcode_settings[key]
+      end
+
+      def xcodebuild_cmd
+        cmd = "xcodebuild"
+        cmd = "#{cmd} -project #{Shellwords.escape config.xcodeproj_path}"
+        cmd += " -target #{Shellwords.escape config.target.name}"
+        cmd += " -configuration #{Shellwords.escape config.configuration}"
+        cmd += " -sdk #{Shellwords.escape config.sdk}"
+        cmd += " -showBuildSettings"
+        cmd
+      end
+
+      def load_settings_from_xcode
+        @xcodebuild_showbuildsettings_output = ""
+        @xcode_settings = {}
+        Open3.popen2e(xcodebuild_cmd) do |stdin, output, thread|
+          while (line = output.gets)
+            @xcodebuild_showbuildsettings_output += line
+            line.strip!
+            next unless (matches = /^(.+)\s+=\s+(.+)$/.match line)
+            @xcode_settings[matches[1]] = matches[2]
+          end
+          @xcodebuild_showbuildsettings_status = thread.value
+        end
+      end
+
+      def log_xcodebuild_showbuildsettings(report = STDOUT)
+        report.write "$ #{xcodebuild_cmd}\n\n"
+        report.write @xcodebuild_showbuildsettings_output
+        if valid?
+          report.write "Success.\n\n"
+        else
+          report.write "#{@xcodebuild_showbuildsettings_status}.\n\n"
+        end
+      end
+    end
+  end
+end

data/lib/branch_io_cli/helper/branch_helper.rb

@@ -1,7 +1,6 @@
 require "branch_io_cli/helper/android_helper"
 require "branch_io_cli/helper/ios_helper"
 require "net/http"
-require "pattern_patch"
 require "set"
 
 module BranchIOCLI

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -345,11 +345,13 @@ module BranchIOCLI
         if target_name
           target = project.targets.find { |t| t.name == target_name }
           raise "Target #{target} not found" if target.nil?
+        elsif config.respond_to?(:scheme) && project.targets.map(&:name).include?(config.scheme)
+          # Return a target with the same name as the scheme, if there is one.
+          target = project.targets.find { |t| t.name == config.scheme }
         else
           # find the first application target
-          targets = project.targets.select { |t| !t.extension_target_type? && !t.test_target_type? }
-          target = targets.find { |t| t.name == File.basename(project.path).sub(/\.xcodeproj$/, "") } || targets.first
-          raise "No application target found" if target.nil?
+          target = project.targets.find { |t| t.name == File.basename(project.path, '.xcodeproj') } ||
+                   project.targets.select { |t| !t.extension_target_type? && !t.test_target_type? }.first
         end
         target
       end

data/lib/branch_io_cli/helper/methods.rb

@@ -1,6 +1,13 @@
 module BranchIOCLI
   module Helper
-    class CommandError < RuntimeError; end
+    class CommandError < RuntimeError
+      attr_reader :status
+      def initialize(args)
+        message, status = *args
+        super message
+        @status = status
+      end
+    end
 
     module Methods
       # Execute a shell command with reporting.
@@ -16,7 +23,7 @@ module BranchIOCLI
       # :output: [IO] An optional IO object to receive stdout and stderr from the command
       def sh(command, output = STDOUT)
         status = output.log_command command
-        raise CommandError, %{Error executing "#{command}": #{status}.} unless status.success?
+        raise CommandError, [%{Error executing "#{command}": #{status}.}, status] unless status.success?
       end
     end
   end

data/lib/branch_io_cli/helper/patch_helper.rb

@@ -185,6 +185,39 @@ module BranchIOCLI
           patch.apply app_delegate_objc_path
         end
 
+        def patch_messages_view_controller
+          path = config.messages_view_controller_path
+
+          patch_name = "messages_did_become_active_"
+          case path
+          when nil
+            return false
+          when /\.swift$/
+            return false if /branch.*initSession/m.match_file path
+
+            unless config.bridging_header_required?
+              load_patch(:swift_import).apply path
+            end
+
+            is_new_method = !/didBecomeActive\(with.*?\{[^\n]*\n/m.match_file(path)
+            patch_name += "#{is_new_method ? 'new_' : ''}swift"
+          else
+            return false if %r{^\s+#import\s+<Branch/Branch.h>|^\s+@import\s+Branch\s*;}.match_file(path)
+
+            load_patch(:objc_import).apply path
+
+            is_new_method = !/didBecomeActiveWithConversation.*?\{[^\n]*\n/m.match_file(path)
+            patch_name += "#{is_new_method ? 'new_' : ''}objc"
+          end
+
+          say "Patching #{path}"
+
+          load_patch(patch_name).apply path, binding: binding
+
+          helper.add_change(path)
+          true
+        end
+
         def patch_podfile(podfile_path)
           target_definition = config.podfile.target_definitions[config.target.name]
           raise "Target #{config.target.name} not found in Podfile" unless target_definition
@@ -238,6 +271,7 @@ module BranchIOCLI
           # is in Swift or Objective-C.
           patch_bridging_header if config.bridging_header_required?
           patch_app_delegate_swift(xcodeproj) || patch_app_delegate_objc(xcodeproj)
+          patch_messages_view_controller
         end
       end
     end

data/lib/branch_io_cli/helper/report_helper.rb

@@ -1,3 +1,5 @@
+require "plist"
+require "shellwords"
 require "branch_io_cli/configuration/configuration"
 
 module BranchIOCLI
@@ -17,6 +19,168 @@ module BranchIOCLI
         def config
           Configuration::Configuration.current
         end
+
+        def helper
+          Helper::BranchHelper
+        end
+
+        def xcode_settings
+          Configuration::XcodeSettings.settings
+        end
+
+        def base_xcodebuild_cmd
+          cmd = "xcodebuild"
+          if config.workspace_path
+            cmd = "#{cmd} -workspace #{Shellwords.escape config.workspace_path}"
+          else
+            cmd = "#{cmd} -project #{Shellwords.escape config.xcodeproj_path}"
+          end
+          cmd
+        end
+
+        # rubocop: disable Metrics/PerceivedComplexity
+        def report_header
+          header = "cocoapods-core: #{Pod::CORE_VERSION}\n"
+
+          header += `xcodebuild -version`
+          header += "SDK: #{xcode_settings['SDK_NAME']}\n" if xcode_settings
+
+          bundle_identifier = helper.expanded_build_setting config.target, "PRODUCT_BUNDLE_IDENTIFIER", config.configuration
+          dev_team = helper.expanded_build_setting config.target, "DEVELOPMENT_TEAM", config.configuration
+          infoplist_path = helper.expanded_build_setting config.target, "INFOPLIST_FILE", config.configuration
+          entitlements_path = helper.expanded_build_setting config.target, "CODE_SIGN_ENTITLEMENTS", config.configuration
+
+          header += "\nTarget #{config.target.name}:\n"
+          header += " Bundle identifier: #{bundle_identifier || '(none)'}\n"
+          header += " Development team: #{dev_team || '(none)'}\n"
+          header += " Deployment target: #{config.target.deployment_target}\n"
+          header += " Modules #{config.modules_enabled? ? '' : 'not '}enabled\n"
+          header += " Swift #{config.swift_version}\n" if config.swift_version
+          header += " Bridging header: #{config.relative_path(config.bridging_header_path)}\n" if config.bridging_header_path
+          header += " Info.plist: #{config.relative_path(infoplist_path) || '(none)'}\n"
+          header += " Entitlements file: #{config.relative_path(entitlements_path) || '(none)'}\n"
+
+          if config.podfile_path
+            begin
+              cocoapods_version = `pod --version`.chomp
+            rescue Errno::ENOENT
+              header += "\n(pod command not found)\n"
+            end
+
+            if File.exist?("#{config.podfile_path}.lock")
+              podfile_lock = Pod::Lockfile.from_file Pathname.new "#{config.podfile_path}.lock"
+            end
+
+            if cocoapods_version || podfile_lock
+              header += "\nUsing CocoaPods v. "
+              if cocoapods_version
+                header += "#{cocoapods_version} (CLI) "
+              end
+              if podfile_lock
+                header += "#{podfile_lock.cocoapods_version} (Podfile.lock)"
+              end
+              header += "\n"
+            end
+
+            target_definition = config.podfile.target_definitions[config.target.name]
+            if target_definition
+              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}"
+              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
+
+            header += "\npod install #{config.pod_install_required? ? '' : 'not '}required.\n"
+          end
+
+          if config.cartfile_path
+            begin
+              carthage_version = `carthage version`.chomp
+              header += "\nUsing Carthage v. #{carthage_version}\n"
+            rescue Errno::ENOENT
+              header += "\n(carthage command not found)\n"
+            end
+          end
+
+          cartfile_requirement = config.requirement_from_cartfile
+          header += "\nFrom Cartfile:\n#{cartfile_requirement}\n" if cartfile_requirement
+
+          version = config.branch_version
+          if version
+            header += "\nBranch SDK v. #{version}\n"
+          else
+            header += "\nBranch SDK not found.\n"
+          end
+
+          header += "\n#{branch_report}"
+
+          header
+        end
+        # rubocop: enable Metrics/PerceivedComplexity
+
+        # String containing information relevant to Branch setup
+        def branch_report
+          infoplist_path = helper.expanded_build_setting config.target, "INFOPLIST_FILE", config.configuration
+          infoplist_path = File.expand_path infoplist_path, File.dirname(config.xcodeproj_path)
+
+          report = "Branch configuration:\n"
+
+          begin
+            info_plist = File.open(infoplist_path) { |f| Plist.parse_xml f }
+            branch_key = info_plist["branch_key"]
+            report += " Branch key(s) (Info.plist):\n"
+            if branch_key.kind_of? Hash
+              branch_key.each_key do |key|
+                resolved_key = helper.expand_build_settings branch_key[key], config.target, config.configuration
+                report += "  #{key.capitalize}: #{resolved_key}\n"
+              end
+            elsif branch_key
+              resolved_key = helper.expand_build_settings branch_key, config.target, config.configuration
+              report += "  #{resolved_key}\n"
+            else
+              report += "  (none found)\n"
+            end
+
+            branch_universal_link_domains = info_plist["branch_universal_link_domains"]
+            if branch_universal_link_domains
+              if branch_universal_link_domains.kind_of? Array
+                report += " branch_universal_link_domains (Info.plist):\n"
+                branch_universal_link_domains.each do |domain|
+                  report += "  #{domain}\n"
+                end
+              else
+                report += " branch_universal_link_domains (Info.plist): #{branch_universal_link_domains}\n"
+              end
+            end
+          rescue StandardError => e
+            report += " (Failed to open Info.plist: #{e.message})\n"
+          end
+
+          unless config.target.extension_target_type?
+            begin
+              domains = helper.domains_from_project config.configuration
+              report += " Universal Link domains (entitlements):\n"
+              domains.each do |domain|
+                report += "  #{domain}\n"
+              end
+            rescue StandardError => e
+              report += " (Failed to get Universal Link domains from entitlements file: #{e.message})\n"
+            end
+          end
+
+          report += report_imports
+
+          report
+        end
       end
     end
   end

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-13 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -256,6 +256,8 @@ files:
 - lib/assets/patches/ContinueUserActivityNew.swift
 - lib/assets/patches/DidFinishLaunching.m
 - lib/assets/patches/DidFinishLaunching.swift
+- lib/assets/patches/MessagesDidBecomeActive.m
+- lib/assets/patches/MessagesDidBecomeActive.swift
 - lib/assets/patches/OpenUrl.m
 - lib/assets/patches/OpenUrl.swift
 - lib/assets/patches/OpenUrlNew.m
@@ -271,6 +273,10 @@ files:
 - 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/messages_did_become_active_new_objc.yml
+- lib/assets/patches/messages_did_become_active_new_swift.yml
+- lib/assets/patches/messages_did_become_active_objc.yml
+- lib/assets/patches/messages_did_become_active_swift.yml
 - lib/assets/patches/objc_import.yml
 - lib/assets/patches/objc_import_at_end.yml
 - lib/assets/patches/objc_import_include_guard.yml
@@ -293,6 +299,7 @@ files:
 - lib/branch_io_cli/configuration/report_configuration.rb
 - lib/branch_io_cli/configuration/setup_configuration.rb
 - lib/branch_io_cli/configuration/validate_configuration.rb
+- lib/branch_io_cli/configuration/xcode_settings.rb
 - lib/branch_io_cli/core_ext.rb
 - lib/branch_io_cli/core_ext/io.rb
 - lib/branch_io_cli/core_ext/regexp.rb