branch_io_cli 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5010d2220f3412bda298fa667173dd26b6142f20
-  data.tar.gz: 91b25b66bd4c3d4b9e6bf9ea9051763c5bd5cc01
+SHA256:
+  metadata.gz: 989a943d54479ffb6d3267bdf57872a68597f9d77675add48c258a2ab915baf1
+  data.tar.gz: 4f3eb86d6364cba95221dbd6f29e84ba725ab1c04034abd49ee452930a88ba99
 SHA512:
-  metadata.gz: 3bffd545175fc581e8ae95b7ea13002386a36c994fbff76169538d2ee4cb047b10ea4b41457526b707bab99755763bf6a3589ab91086da68578f882a79676df4
-  data.tar.gz: 07af2fa0b8aad5aec93df27be95a4707c58b196f5f761b1c1f276ec80c0a51974f21cb2f5d5ad84c1ec16c1c2f73f06d72d9435debb7d0ffc7910332b392a5da
+  metadata.gz: bbc1488e06f6518d460b7095f01bd5ec28f27c53a1f3799acccab60e2924addb0f6679d4956332384794e7dedca39e1505bce0f5576085d8d418604d64d6b478
+  data.tar.gz: 686b31264af06559b23f2d2e39713aac5df2f50802c82de3f459157722afa14c816feac24b2b148dc60160ca4bd59c1a36ab9747a7745a32b0214972c480dcb9

data/README.md

@@ -233,6 +233,7 @@ report with additional diagnostic information suitable for opening a support tic
 |--sdk iphonesimulator|Name of an SDK to use with xcodebuild (default: iphonesimulator)|
 |--[no-]clean|Clean before building (default: yes)|
 |--[no-]header-only|Show a diagnostic header and exit without cleaning or building (default: no)|
+|--[no-]pod-repo-update|Update the local podspec repo before installing (default: yes)|
 |--podfile /path/to/Podfile|Path to the Podfile for the project|
 |--cartfile /path/to/Cartfile|Path to the Cartfile for the project|
 |--out ./report.txt|Path to use for the generated report (default: ./report.txt)|

data/lib/assets/completions/completion.bash

@@ -18,7 +18,8 @@ _branch_io_complete()
 
     validate_opts="$global_opts -D --domains --xcodeproj --target"
 
-    report_opts="$global_opts --xcodeproj --workspace --header-only --no-clean --scheme --target --configuration --out"
+    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"
 
     if [[ ${cur} == -* ]] ; then
       case "${cmd}" in

data/lib/branch_io_cli/cli.rb

@@ -168,14 +168,17 @@ EOF
         c.option "--cartfile /path/to/Cartfile", String, "Path to the Cartfile for the project"
         c.option "--[no-]clean", "Clean before attempting to build (default: yes)"
         c.option "--[no-]header-only", "Write a report header to standard output and exit"
-        c.option "--out branch-report.txt", String, "Report output path (default: ./branch-report.txt)"
+        c.option "--[no-]pod-repo-update", "Update the local podspec repo before installing (default: yes)"
+        c.option "--out ./report.txt", String, "Report output path (default: ./report.txt)"
 
         c.action do |args, options|
           options.default(
             clean: true,
             header_only: false,
             configuration: "Release",
-            sdk: "iphonesimulator"
+            sdk: "iphonesimulator",
+            out: "./report.txt",
+            pod_repo_update: true
           )
           Commands::ReportCommand.new(options).run!
         end

data/lib/branch_io_cli/commands/report_command.rb

@@ -1,4 +1,5 @@
 require "cocoapods-core"
+require "branch_io_cli/helper/methods"
 
 module BranchIOCLI
   module Commands
@@ -16,6 +17,32 @@ module BranchIOCLI
           exit 0
         end
 
+        # Only if a Podfile is detected/supplied at the command line.
+        if 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_helper.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_helper.report_path, "w" do |report|
           report.write "Branch.io Xcode build report v #{VERSION} #{DateTime.now}\n\n"
           report.write "#{report_configuration}\n"
@@ -153,13 +180,42 @@ Configuration: #{config_helper.configuration || '(none)'}
 SDK: #{config_helper.sdk}
 Podfile: #{config_helper.podfile_path || '(none)'}
 Cartfile: #{config_helper.cartfile_path || '(none)'}
+Pod repo update: #{config_helper.pod_repo_update.inspect}
 Clean: #{config_helper.clean.inspect}
 EOF
       end
 
+      def pod_install_required?
+        # If this is set, its existence has been verified.
+        return false unless config_helper.podfile_path
+
+        lockfile_path = "#{config_helper.podfile_path}.lock"
+        manifest_path = File.expand_path "../Pods/Manifest.lock", config_helper.podfile_path
+
+        return true unless File.exist?(lockfile_path) && File.exist?(manifest_path)
+
+        podfile = Pod::Podfile.from_file Pathname.new config_helper.podfile_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
+
       # rubocop: disable Metrics/PerceivedComplexity
       def report_header
-        header = `xcodebuild -version`
+        header = "cocoapods-core: #{Pod::CORE_VERSION}\n"
+
+        header += `xcodebuild -version`
 
         header += "\nTarget #{config_helper.target.name} deploy target: #{config_helper.target.deployment_target}\n"
 
@@ -202,6 +258,7 @@ EOF
             header += "Target #{config_helper.target.name.inspect} not found in Podfile.\n"
           end
 
+          header += "\npod install #{pod_install_required? ? '' : 'not '}required.\n"
         end
 
         if config_helper.cartfile_path

data/lib/branch_io_cli/commands/setup_command.rb

@@ -12,6 +12,9 @@ module BranchIOCLI
 
       # rubocop: disable Metrics/PerceivedComplexity
       def run!
+        # Make sure the user stashes or commits before continuing.
+        check_repo_status
+
         xcodeproj = config_helper.xcodeproj
 
         case config_helper.sdk_integration_mode
@@ -63,6 +66,44 @@ module BranchIOCLI
         sh "git commit -qm '[branch_io_cli] Branch SDK integration' #{changes.join(' ')}"
       end
       # rubocop: enable Metrics/PerceivedComplexity
+
+      def check_repo_status
+        # If the git command is not installed, there's not much we can do.
+        # Don't want to use verify_git here, which will insist on installing
+        # the command. The logic of that method could change.
+        return if `which git`.empty?
+
+        unless Dir.exist? ".git"
+          `git rev-parse --git-dir > /dev/null 2>&1`
+          # Not a git repo
+          return unless $?.success?
+        end
+
+        `git diff-index --quiet HEAD --`
+        return if $?.success?
+
+        # Show the user
+        sh "git status"
+
+        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 "Quit"
+          menu.prompt = "Please enter one of the options above: "
+        end
+
+        case choice
+        when /^Stash/
+          sh "git stash -q"
+        when /^Commit/
+          message = ask "Please enter a commit message: "
+          sh "git commit -aqm'#{message}'"
+        else
+          say "Please stash or commit your changes before continuing."
+          exit(-1)
+        end
+      end
     end
   end
 end

data/lib/branch_io_cli/helper/configuration_helper.rb

@@ -100,8 +100,9 @@ module BranchIOCLI
           @scheme = options.scheme
           @target = options.target
           @configuration = options.configuration
-          @report_path = options.out || "./report.txt"
+          @report_path = options.out
           @sdk = options.sdk
+          @pod_repo_update = options.pod_repo_update
 
           validate_xcodeproj_and_workspace options
           validate_target options
@@ -174,6 +175,7 @@ EOF
 <%= color('SDK:', BOLD) %> #{@sdk}
 <%= color('Podfile:', BOLD) %> #{@podfile_path || '(none)'}
 <%= color('Cartfile:', BOLD) %> #{@cartfile_path || '(none)'}
+<%= color('Pod repo update:', BOLD) %> #{@pod_repo_update.inspect}
 <%= color('Clean:', BOLD) %> #{@clean.inspect}
 <%= color('Report path:', BOLD) %> #{@report_path}
 EOF

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Branch
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.0
 signing_key: 
 specification_version: 4
 summary: Branch.io command-line interface for mobile app integration