branch_io_cli 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '091b67267f6d542453cd8903adf229f0caeec5b763b33ab2474c308a2bfcb6cb'
-  data.tar.gz: 421065a8099c0d6e1087c641dea2d303b21aab989e53f9ae3825ab58ccaeb8f2
+  metadata.gz: d9193658d454dcab2a74341807a6594a25baaa647ec46eac3e44043ee632a696
+  data.tar.gz: afb073e2385911619802a78066f281f9b36fef02d5613cba141ccaf8498dcd11
 SHA512:
-  metadata.gz: 24ff573c11e248b4d9501e1e8d464d37980b3dc998e2150796979714be12c9d1a415946387a4cc8c1df86f532b8297b1e11a908c464cc712c5d8b6016d680890
-  data.tar.gz: 991c8328c42eaf101c7fa780b4b7e18150fd25db9237e0a97b0218f0ba7ca4a5a73af89cc4b3672765940753d832cb0c0f412234c9aa185a9c0b5fc514ba41ba
+  metadata.gz: cfb723a5edc92d5eaae87c3b2673cc1c41cc38aaf694dd19cec96e26a53fd3cb275559de3e442fbcd58c18cf1a5768b790a47643875b21f868b4e4bd21eac74a
+  data.tar.gz: d134244741fe80706d32662edfb08d9212c80428b70aada33d90b2954b77ebe5ad6e88e080809b9d2e3685ce47758a37d03f15cb088dfded0e83aac849fda5ec

data/lib/branch_io_cli/command/report_command.rb

@@ -6,7 +6,10 @@ module BranchIOCLI
       def run!
         say "\n"
 
-        unless xcode_settings.valid?
+        say "Loading settings from Xcode"
+        if xcode_settings.valid?
+          say "Done ✅"
+        else
           say "Failed to load settings from Xcode. Some information may be missing.\n"
         end
 
@@ -15,37 +18,13 @@ module BranchIOCLI
           exit 0
         end
 
-        # Only if a Podfile is detected/supplied at the command line.
-        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/
-            say %{Please run "pod install" or "pod update" first in order to continue.}
-            exit(-1)
-          end
-
-          helper.verify_cocoapods
-
-          install_command = "pod install"
-
-          if config.pod_repo_update
-            install_command += " --repo-update"
-          else
-            say <<EOF
-You have disabled "pod repo update". This can cause "pod install" to fail in
-some cases. If that happens, please rerun without --no-pod-repo-update or run
-"pod install --repo-update" manually.
-EOF
-          end
-
-          sh install_command
-        end
-
         File.open config.report_path, "w" do |report|
           report.write "Branch.io Xcode build report v #{VERSION} #{DateTime.now}\n\n"
           report.write "#{config.report_configuration}\n"
           report.write "#{report_helper.report_header}\n"
 
+          report_helper.pod_install_if_required report
+
           # run xcodebuild -list
           report.log_command "#{report_helper.base_xcodebuild_cmd} -list"
 
@@ -68,13 +47,19 @@ EOF
 
           if config.clean
             say "Cleaning"
-            report.log_command "#{base_cmd} clean"
+            if report.log_command("#{base_cmd} clean").success?
+              say "Done ✅"
+            else
+              say "Clean failed."
+            end
           end
 
           say "Building"
-          report.log_command "#{base_cmd} -verbose"
-
-          say "Done ✅"
+          if report.log_command("#{base_cmd} -verbose").success?
+            say "Done ✅"
+          else
+            say "Build failed."
+          end
         end
 
         say "Report generated in #{config.report_path}"

data/lib/branch_io_cli/command/setup_command.rb

@@ -30,6 +30,17 @@ module BranchIOCLI
           say "Universal Link configuration passed validation. ✅"
         end
 
+        if @keys.count > 1 && helper.has_multiple_info_plists? &&
+           !File.exist?(File.join(File.dirname(config.podfile_path), 'Pods'))
+          # Work around a potential crash for now. The PBXBuildConfiguration#debug?
+          # method may raise in this case.
+          helper.verify_cocoapods
+          say "Installing pods to resolve current build settings"
+          # We haven't modified anything yet. Don't use --repo-update at this stage.
+          # This is unlikely to fail.
+          sh "pod install"
+        end
+
         # the following calls can all raise IOError
         helper.add_keys_to_info_plist @keys
         helper.add_branch_universal_link_domains_to_info_plist @domains if is_app_target

data/lib/branch_io_cli/configuration/report_configuration.rb

@@ -29,10 +29,12 @@ module Xcodeproj
       end
 
       schemes.uniq!
-      if schemes.empty?
+      if schemes.empty? && File.exist?(project_path)
         # 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)
+      elsif schemes.empty?
+        schemes << File.basename(project_path, '.xcodeproj')
       end
       schemes
     end

data/lib/branch_io_cli/helper/patch_helper.rb

@@ -3,12 +3,13 @@ require "pattern_patch"
 module BranchIOCLI
   module Helper
     class PatchHelper
-      class << self
-        def load_patch(name)
-          path = File.expand_path(File.join('..', '..', '..', 'assets', 'patches', "#{name}.yml"), __FILE__)
-          PatternPatch::Patch.from_yaml path
-        end
+      # Adds patch_dir class attr and patch class method
+      extend PatternPatch::Methods
 
+      # Set the patch_dir for PatternPatch
+      @patch_dir = File.expand_path(File.join('..', '..', '..', 'assets', 'patches'), __FILE__)
+
+      class << self
         def config
           Configuration::Configuration.current
         end
@@ -25,6 +26,13 @@ module BranchIOCLI
           config.keys.count > 1 && !helper.has_multiple_info_plists?
         end
 
+        def swift_file_includes_branch?(path)
+          # 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.
+          !/branch.*initsession|^\s*import\s+branch/i.match_file(path).nil?
+        end
+
         def patch_bridging_header
           unless config.bridging_header_path
             say "Modules not available and bridging header not found. Cannot import Branch."
@@ -46,13 +54,13 @@ module BranchIOCLI
 
           if /^\s*(#import|#include|@import)/.match_file config.bridging_header_path
             # Add among other imports
-            load_patch(:objc_import).apply config.bridging_header_path
+            patch(:objc_import).apply config.bridging_header_path
           elsif /\n\s*#ifndef\s+(\w+).*\n\s*#define\s+\1.*?\n/m.match_file config.bridging_header_path
             # Has an include guard. Add inside.
-            load_patch(:objc_import_include_guard).apply config.bridging_header_path
+            patch(:objc_import_include_guard).apply config.bridging_header_path
           else
             # No imports, no include guard. Add at the end.
-            load_patch(:objc_import_at_end).apply config.bridging_header_path
+            patch(:objc_import_at_end).apply config.bridging_header_path
           end
           helper.add_change config.bridging_header_path
         end
@@ -61,21 +69,15 @@ module BranchIOCLI
           return false unless config.patch_source
           app_delegate_swift_path = config.app_delegate_swift_path
 
-          return false unless app_delegate_swift_path
-
-          app_delegate = File.read app_delegate_swift_path
+          return false if app_delegate_swift_path.nil? ||
+                          swift_file_includes_branch?(app_delegate_swift_path)
 
-          # 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
+          say "Patching #{app_delegate_swift_path}"
 
           unless config.bridging_header_required?
-            load_patch(:swift_import).apply app_delegate_swift_path
+            patch(:swift_import).apply app_delegate_swift_path
           end
 
-          say "Patching #{app_delegate_swift_path}"
-
           patch_did_finish_launching_method_swift app_delegate_swift_path
           patch_continue_user_activity_method_swift app_delegate_swift_path
           patch_open_url_method_swift app_delegate_swift_path
@@ -95,7 +97,7 @@ module BranchIOCLI
 
           say "Patching #{app_delegate_objc_path}"
 
-          load_patch(:objc_import).apply app_delegate_objc_path
+          patch(:objc_import).apply app_delegate_objc_path
 
           patch_did_finish_launching_method_objc app_delegate_objc_path
           patch_continue_user_activity_method_objc app_delegate_objc_path
@@ -110,11 +112,11 @@ module BranchIOCLI
 
           is_new_method = app_delegate_swift !~ /didFinishLaunching[^\n]+?\{/m
           if is_new_method
-            patch = load_patch :did_finish_launching_new_swift
+            patch_name = :did_finish_launching_new_swift
           else
-            patch = load_patch :did_finish_launching_swift
+            patch_name = :did_finish_launching_swift
           end
-          patch.apply app_delegate_swift_path, binding: binding
+          patch(patch_name).apply app_delegate_swift_path, binding: binding
         end
 
         def patch_did_finish_launching_method_objc(app_delegate_objc_path)
@@ -122,11 +124,11 @@ module BranchIOCLI
 
           is_new_method = app_delegate_objc !~ /didFinishLaunchingWithOptions/m
           if is_new_method
-            patch = load_patch :did_finish_launching_new_objc
+            patch_name = :did_finish_launching_new_objc
           else
-            patch = load_patch :did_finish_launching_objc
+            patch_name = :did_finish_launching_objc
           end
-          patch.apply app_delegate_objc_path, binding: binding
+          patch(patch_name).apply app_delegate_objc_path, binding: binding
         end
 
         def patch_open_url_method_swift(app_delegate_swift_path)
@@ -134,27 +136,27 @@ module BranchIOCLI
 
           if app_delegate_swift =~ /application.*open\s+url.*options/
             # Has application:openURL:options:
-            patch = load_patch :open_url_swift
+            patch_name = :open_url_swift
           elsif app_delegate_swift =~ /application.*open\s+url.*sourceApplication/
             # Has application:openURL:sourceApplication:annotation:
             # TODO: This method is deprecated.
-            patch = load_patch :open_url_source_application_swift
+            patch_name = :open_url_source_application_swift
           else
             # Has neither
-            patch = load_patch :open_url_new_swift
+            patch_name = :open_url_new_swift
           end
-          patch.apply app_delegate_swift_path
+          patch(patch_name).apply app_delegate_swift_path
         end
 
         def patch_continue_user_activity_method_swift(app_delegate_swift_path)
           app_delegate_swift = File.read app_delegate_swift_path
 
           if app_delegate_swift =~ /application:.*continue userActivity:.*restorationHandler:/
-            patch = load_patch :continue_user_activity_swift
+            patch_name = :continue_user_activity_swift
           else
-            patch = load_patch :continue_user_activity_new_swift
+            patch_name = :continue_user_activity_new_swift
           end
-          patch.apply app_delegate_swift_path
+          patch(patch_name).apply app_delegate_swift_path
         end
 
         def patch_open_url_method_objc(app_delegate_objc_path)
@@ -162,27 +164,27 @@ module BranchIOCLI
 
           if app_delegate_objc =~ /application:.*openURL:.*options/
             # Has application:openURL:options:
-            patch = load_patch :open_url_objc
+            patch_name = :open_url_objc
           elsif app_delegate_objc =~ /application:.*openURL:.*sourceApplication/
             # Has application:openURL:sourceApplication:annotation:
-            patch = load_patch :open_url_source_annotation_objc
+            patch_name = :open_url_source_annotation_objc
             # TODO: This method is deprecated.
           else
             # Has neither
-            patch = load_patch :open_url_new_objc
+            patch_name = :open_url_new_objc
           end
-          patch.apply app_delegate_objc_path
+          patch(patch_name).apply app_delegate_objc_path
         end
 
         def patch_continue_user_activity_method_objc(app_delegate_objc_path)
           app_delegate_swift = File.read app_delegate_objc_path
 
           if app_delegate_swift =~ /application:.*continueUserActivity:.*restorationHandler:/
-            patch = load_patch :continue_user_activity_objc
+            patch_name = :continue_user_activity_objc
           else
-            patch = load_patch :continue_user_activity_new_objc
+            patch_name = :continue_user_activity_new_objc
           end
-          patch.apply app_delegate_objc_path
+          patch(patch_name).apply app_delegate_objc_path
         end
 
         def patch_messages_view_controller
@@ -193,10 +195,10 @@ module BranchIOCLI
           when nil
             return false
           when /\.swift$/
-            return false if /branch.*initSession/m.match_file path
+            return false if swift_file_includes_branch?(path)
 
             unless config.bridging_header_required?
-              load_patch(:swift_import).apply path
+              patch(:swift_import).apply path
             end
 
             is_new_method = !/didBecomeActive\(with.*?\{[^\n]*\n/m.match_file(path)
@@ -204,7 +206,7 @@ module BranchIOCLI
           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
+            patch(:objc_import).apply path
 
             is_new_method = !/didBecomeActiveWithConversation.*?\{[^\n]*\n/m.match_file(path)
             patch_name += "#{is_new_method ? 'new_' : ''}objc"
@@ -212,7 +214,7 @@ module BranchIOCLI
 
           say "Patching #{path}"
 
-          load_patch(patch_name).apply path, binding: binding
+          patch(patch_name).apply path, binding: binding
 
           helper.add_change(path)
           true
@@ -260,7 +262,7 @@ module BranchIOCLI
 
           say "Adding \"Branch\" to #{cartfile_path}"
 
-          load_patch(:cartfile).apply cartfile_path
+          patch(:cartfile).apply cartfile_path
 
           true
         end

data/lib/branch_io_cli/helper/report_helper.rb

@@ -181,6 +181,39 @@ module BranchIOCLI
 
           report
         end
+
+        def pod_install_if_required(report)
+          return unless config.pod_install_required?
+          # Only if a Podfile is detected/supplied at the command line.
+          say "pod install required in order to build."
+          install = ask %{Run "pod install" now (Y/n)? }
+          if install.downcase =~ /^n/
+            say %{Please run "pod install" or "pod update" first in order to continue.}
+            exit(-1)
+          end
+
+          helper.verify_cocoapods
+
+          install_command = "pod install"
+
+          if config.pod_repo_update
+            install_command += " --repo-update"
+          else
+            say <<-EOF
+You have disabled "pod repo update". This can cause "pod install" to fail in
+some cases. If that happens, please rerun without --no-pod-repo-update or run
+"pod install --repo-update" manually.
+        EOF
+          end
+
+          say "Running #{install_command.inspect}"
+          if report.log_command(install_command).success?
+            say "Done ✅"
+          else
+            say "pod install failed. See report for details."
+            exit(-1)
+          end
+        end
       end
     end
   end

data/lib/branch_io_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement