branch_io_cli 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2908cdd4340d1d0d43da1875c4e08c2e4f6e46b56836395aaf47f6d401834218
-  data.tar.gz: bcbfe15c402201a6a6594712b688ca5288a7c54d20a99a9aa0517c6264bbf220
+  metadata.gz: 96b0f856a2de3dbd4c63841fd112a8477cdb4694eee1201fd862ee653304160b
+  data.tar.gz: abb2546fdb310dea4075e5bc018885974a6e4fd97236c3bc2870a90b61aeab91
 SHA512:
-  metadata.gz: b9edff995284b5a31a39cf22bb02a198b775c35a072046d5c2527730e41055d1e1c3f8dc1d800e0d8768809b8f4b35524453cf2c7d4ce8da7a29491d97c340d4
-  data.tar.gz: 2ea56d6e150521ea6e956584fb0fc8f4c7774702746724eb6d94418840387a2ee0fa42ce2945a34e5d05daddcdb13d81a182e9775be8b99c2f5ad04110c4ec9a
+  metadata.gz: 9b1a6513a50d3dc45ac060759de51964d51dd51752517b6d7ccb8d77e00922c580cdb76c3384a489766ee57ce59642ee722354f4d298bdee4292f0e04ec8c42b
+  data.tar.gz: fdd5c4d1d8c5c08ce0b2601ed4b413644b5ad7097a32628276733d06fed649de5e6ab8baa95fb236430b5112bb4acd17328b80d480ba4cd4db9f3cd8086357e8

data/lib/branch_io_cli/command/report_command.rb

@@ -1,5 +1,6 @@
 require "cocoapods-core"
 require "branch_io_cli/helper/methods"
+require "plist"
 
 module BranchIOCLI
   module Command
@@ -216,11 +217,20 @@ EOF
 
         header += `xcodebuild -version`
 
+        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.bridging_header_path}\n" if config.bridging_header_path
+        header += " Info.plist: #{infoplist_path || '(none)'}\n"
+        header += " Entitlements file: #{entitlements_path || '(none)'}\n"
 
         if config.podfile_path
           begin
@@ -244,9 +254,7 @@ EOF
             header += "\n"
           end
 
-          # Already verified existence.
-          podfile = Pod::Podfile.from_file Pathname.new config.podfile_path
-          target_definition = podfile.target_definitions[config.target.name]
+          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}:"
@@ -285,9 +293,61 @@ EOF
           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
+
+        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|
+              report += "  #{key.capitalize}: #{branch_key[key]}\n"
+            end
+          elsif branch_key
+            report += "  #{branch_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
+      end
     end
   end
 end

data/lib/branch_io_cli/command/setup_command.rb

@@ -91,8 +91,9 @@ module BranchIOCLI
         choice = choose do |menu|
           menu.header = "There are uncommitted changes in this repo. It's best to stash or commit them before continuing."
           menu.choice "Stash"
-          menu.choice "Commit (you will be prompted for a commit message)"
+          menu.choice "Commit (You will be prompted for a commit message.)"
           menu.choice "Quit"
+          menu.choice "Ignore and continue"
           menu.prompt = "Please enter one of the options above: "
         end
 
@@ -102,7 +103,7 @@ module BranchIOCLI
         when /^Commit/
           message = ask "Please enter a commit message: "
           sh "git commit -aqm #{Shellwords.escape(message)}"
-        else
+        when /^Quit/
           say "Please stash or commit your changes before continuing."
           exit(-1)
         end

data/lib/branch_io_cli/configuration/configuration.rb

@@ -137,7 +137,7 @@ EOF
         @sdk_integration_mode = filename == "Podfile" ? :cocoapods : :carthage
       end
 
-      def open_podfile(path)
+      def open_podfile(path = @podfile_path)
         @podfile = Pod::Podfile.from_file path
         @podfile_path = path
         true

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -404,8 +404,7 @@ module BranchIOCLI
             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"
+          config.open_podfile
           sh install_command
         end
 
@@ -651,7 +650,7 @@ EOF
           exit(-1)
         end
 
-        gem_home = ENV["GEM_HOME"]
+        gem_home = Gem.dir
         if gem_home && File.writable?(gem_home)
           sh "gem install cocoapods"
         else

data/lib/branch_io_cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList