branch_io_cli 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed1b9b67e4bbb2e57d7108b533fd9b77e81d3393eaa229eba07e4964215b6036
-  data.tar.gz: f451658fdddda919cfe70efa48f6a97c0d2458b287ec149b08b392ecb42c8e35
+  metadata.gz: 1f34a0beb6001798fa4ca54e4b69ead8baaa811b313ef7166e6a03ff6d00fb51
+  data.tar.gz: de7f72a71a6f61a893a1b89025d21caf2efa475c100590fda5a48cb3bd9dc838
 SHA512:
-  metadata.gz: a536b08af90fa19f98f20a20a145258784dc677c2098209b5c374d700bba5eacd803a98626e7b0633394ef25d13addad8513af449edf1ef690f0c4f1ef92c7a6
-  data.tar.gz: 2880054b91cdb81cf982d5d445d7a23f3d11aac9abaa5a015a7fdf87695e36523b91ac50a080ac9962b7364aec7c73faa7a24d8446522aad29d483969d568660
+  metadata.gz: 4b3cb56a99bdafeb2dbb47f012a692da84ad37c3e8a836d908d6a0a3286dd91ea1a7669a3d21d42798ab859c8e3f16938a1599c69745834240d07ab29cb33cfa
+  data.tar.gz: 3a3bc8dec22dd6ee83d84fc136b24eadf5a99448cddf73ecf02127ca4f6f44928ac6a04fca6ca1b6c5c06ab2e9e37e806f8da0d806cc9eeca2745d29191e7d1e

data/lib/branch_io_cli/command/report_command.rb

@@ -94,6 +94,10 @@ EOF
         say "Report generated in #{config.report_path}"
       end
 
+      def report_helper
+        Helper::ReportHelper
+      end
+
       def base_xcodebuild_cmd
         cmd = "xcodebuild"
         if config.workspace_path
@@ -376,6 +380,8 @@ EOF
           end
         end
 
+        report += report_helper.report_imports
+
         report
       end
 

data/lib/branch_io_cli/configuration/configuration.rb

@@ -198,6 +198,22 @@ EOF
         podfile && !uses_frameworks?
       end
 
+      def app_delegate_swift_path
+        return nil unless swift_version && swift_version.to_f >= 3.0
+
+        app_delegate = target.source_build_phase.files.find { |f| f.file_ref.path =~ /AppDelegate\.swift$/ }
+        return nil if app_delegate.nil?
+
+        app_delegate.file_ref.real_path.to_s
+      end
+
+      def app_delegate_objc_path
+        app_delegate = target.source_build_phase.files.find { |f| f.file_ref.path =~ /AppDelegate\.m$/ }
+        return nil if app_delegate.nil?
+
+        app_delegate.file_ref.real_path.to_s
+      end
+
       # TODO: How many of these can vary by configuration?
 
       def modules_enabled?
@@ -225,6 +241,25 @@ EOF
         @swift_version = target.resolved_build_setting("SWIFT_VERSION")["Release"]
         @swift_version
       end
+
+      def branch_imports
+        return @branch_imports if @branch_imports
+
+        source_files = [app_delegate_swift_path, app_delegate_objc_path, bridging_header_path]
+        @branch_imports = source_files.compact.map { |f| { f => branch_imports_from_file(f) } }.inject({}, :merge)
+        @branch_imports
+      end
+
+      # Detect anything that appears to be an attempt to import the Branch SDK,
+      # even if it might be wrong.
+      def branch_imports_from_file(path)
+        imports = []
+        File.readlines(path).each_with_index do |line, line_no|
+          next unless line =~ /(include|import).*branch/i
+          imports << "#{line_no}: #{line.chomp}"
+        end
+        imports
+      end
     end
   end
 end

data/lib/branch_io_cli/configuration/setup_configuration.rb

@@ -87,20 +87,35 @@ module BranchIOCLI
       end
 
       def validate_keys_from_setup_options(options)
-        live_key = options.live_key
-        test_key = options.test_key
         @keys = {}
-        keys[:live] = live_key unless live_key.nil?
-        keys[:test] = test_key unless test_key.nil?
 
+        # 1. Check the options passed in. If nothing (nil) passed, continue.
+        validate_key options.live_key, :live, accept_nil: true
+        validate_key options.test_key, :test, accept_nil: true
+
+        # 2. Did we find a valid key above?
         while @keys.empty?
+          # 3. If not, prompt.
           say "A live key, a test key or both is required."
-          live_key = ask "Please enter your live Branch key or use --live_key [enter for none]: "
-          test_key = ask "Please enter your test Branch key or use --test_key [enter for none]: "
+          validate_key nil, :live
+          validate_key nil, :test
+        end
+
+        # 4. We have at least one valid key now.
+      end
+
+      def key_valid?(key, type)
+        return false if key.nil?
+        key.empty? || key =~ /^key_#{type}_/
+      end
 
-          keys[:live] = live_key unless live_key == ""
-          keys[:test] = test_key unless test_key == ""
+      def validate_key(key, type, options = {})
+        return if options[:accept_nil] && key.nil?
+        until key_valid? key, type
+          say "#{key.inspect} is not a valid #{type} Branch key. It must begin with key_#{type}_." if key
+          key = ask "Please enter your #{type} Branch key or use --#{type}-key [enter for none]: "
         end
+        @keys[type] = key unless key.empty?
       end
 
       def validate_all_domains(options, required = true)

data/lib/branch_io_cli/helper.rb

@@ -1,2 +1,3 @@
 require "branch_io_cli/helper/branch_helper"
 require "branch_io_cli/helper/patch_helper"
+require "branch_io_cli/helper/report_helper"

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -645,7 +645,7 @@ EOF
 
         # 2. carthage update
         Dir.chdir(File.dirname(cartfile_path)) do
-          sh "carthage #{config.carthage_command}"
+          sh "carthage #{config.carthage_command} ios-branch-deep-linking"
         end
 
         # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)

data/lib/branch_io_cli/helper/patch_helper.rb

@@ -58,12 +58,10 @@ module BranchIOCLI
         end
 
         def patch_app_delegate_swift(project)
-          return false unless config.swift_version
+          return false unless config.patch_source
+          app_delegate_swift_path = config.app_delegate_swift_path
 
-          app_delegate_swift = project.files.find { |f| f.path =~ /AppDelegate.swift$/ }
-          return false if app_delegate_swift.nil?
-
-          app_delegate_swift_path = app_delegate_swift.real_path.to_s
+          return false unless app_delegate_swift_path
 
           app_delegate = File.read app_delegate_swift_path
 
@@ -87,10 +85,10 @@ module BranchIOCLI
         end
 
         def patch_app_delegate_objc(project)
-          app_delegate_objc = project.files.find { |f| f.path =~ /AppDelegate.m$/ }
-          return false if app_delegate_objc.nil?
+          return false unless config.patch_source
+          app_delegate_objc_path = config.app_delegate_objc_path
 
-          app_delegate_objc_path = app_delegate_objc.real_path.to_s
+          return false unless app_delegate_objc_path
 
           app_delegate = File.read app_delegate_objc_path
           return false if app_delegate =~ %r{^\s+#import\s+<Branch/Branch.h>|^\s+@import\s+Branch\s*;}

data/lib/branch_io_cli/helper/report_helper.rb

@@ -0,0 +1,23 @@
+require "branch_io_cli/configuration/configuration"
+
+module BranchIOCLI
+  module Helper
+    class ReportHelper
+      class << self
+        def report_imports
+          report = "Branch imports:\n"
+          config.branch_imports.each_key do |path|
+            report += " #{config.relative_path path}:\n"
+            report += "  #{config.branch_imports[path].join("\n  ")}"
+            report += "\n"
+          end
+          report
+        end
+
+        def config
+          Configuration::Configuration.current
+        end
+      end
+    end
+  end
+end

data/lib/branch_io_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -302,6 +302,7 @@ files:
 - lib/branch_io_cli/helper/ios_helper.rb
 - lib/branch_io_cli/helper/methods.rb
 - lib/branch_io_cli/helper/patch_helper.rb
+- lib/branch_io_cli/helper/report_helper.rb
 - lib/branch_io_cli/version.rb
 homepage: http://github.com/BranchMetrics/branch_io_cli
 licenses: