branch_io_cli 0.12.4 → 0.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73ff4ce1216540062fb5538541b2872eec3acdebb1471fa7a8b24d2154a3fcfe
-  data.tar.gz: d4b975f00a121acb6ea440e0fdd25de305a00e82625a2469742a07b790cb64ed
+  metadata.gz: 48e336c69b9c5ad8f7ab8de92720aa3b1c9cb7d5d207d21d5555dd91c3ca3e32
+  data.tar.gz: 180282031893b9e7b7277ceb3e2bc11143f803879ad094e3d5290e4bfca6df66
 SHA512:
-  metadata.gz: eeaf64c3d4944edcf6edd1d97ebc284c5bd60a5ef6770fbba2fabef05874982cd1add06aee1cd735de01d4dc21c2a46c4b5d883f3d915f95e556bfd90b46d35c
-  data.tar.gz: db25f0205240eb879fd92d76ec5f959f62c1f26d7bd2b96d96425c1c4476aa1d6ca8f3af49ade8bdd3df7024371745081beade2f1c4f6537e17d44e2dba2be14
+  metadata.gz: 3187f68f3c2ed85eb3b57ae2cd21cb58d4f9d57b04062fa157ac8f9fce77724c7b0d37d82733f9d520ba72e34172311825fd2dcc7d24676d23b799c4aa21a214
+  data.tar.gz: db654aa13ac717e8294cbe0a66b6f199490642ec8a47180a8e6bfbf0bc8f9acc2ef113a791b2cf8986c63c602ac16861c2ec0da8df997a1d971fdb578fd2c373

data/README.md

@@ -16,6 +16,8 @@ This is a preliminary release of this gem. Please report any problems by opening
 See also the [Branch Fastlane plugin](https://github.com/BranchMetrics/fastlane-plugin-branch), which offers
 the same support via Fastlane.
 
+![CLI in action](./assets/branch3.gif)
+
 ## Getting started
 
 ```bash
@@ -150,7 +152,7 @@ See https://github.com/BranchMetrics/branch_io_cli#setup-command for more inform
 |--target MyAppTarget|Name of a target to modify in the Xcode project|BRANCH_TARGET|
 |--podfile /path/to/Podfile|Path to the Podfile for the project|BRANCH_PODFILE|
 |--cartfile /path/to/Cartfile|Path to the Cartfile for the project|BRANCH_CARTFILE|
-|--carthage-command <command>|Command to run when installing from Carthage (default: update --platform ios)|BRANCH_CARTHAGE_COMMAND|
+|--carthage-command bootstrap --no-use-binaries|Command to run when installing from Carthage (default: update --platform ios)|BRANCH_CARTHAGE_COMMAND|
 |--frameworks AdSupport,CoreSpotlight,SafariServices|Comma-separated list of system frameworks to add to the project|BRANCH_FRAMEWORKS|
 |--[no-]pod-repo-update|Update the local podspec repo before installing (default: yes)|BRANCH_POD_REPO_UPDATE|
 |--[no-]validate|Validate Universal Link configuration (default: yes)|BRANCH_VALIDATE|
@@ -283,6 +285,7 @@ building.
 |-H, --[no-]header-only|Write a report header to standard output and exit (default: no)|BRANCH_HEADER_ONLY|
 |--[no-]pod-repo-update|Update the local podspec repo before installing (default: yes)|BRANCH_POD_REPO_UPDATE|
 |-o, --out ./report.txt|Report output path (default: ./report.txt)|BRANCH_REPORT_PATH|
+|--[no-]confirm|Confirm before running certain commands (default: yes)|BRANCH_CONFIRM|
 
 
 

data/lib/assets/completions/completion.bash

@@ -15,7 +15,7 @@ _branch_io_complete()
 
     setup_opts="-L --live-key -T --test-key -D --domains --app-link-subdomain -U --uri-scheme -s --setting --test-configurations --xcodeproj --target --podfile --cartfile --carthage-command --frameworks --no-pod-repo-update --no-validate --force --no-add-sdk --no-patch-source --commit --no-confirm"
 
-    report_opts="--workspace --xcodeproj --scheme --target --configuration --sdk --podfile --cartfile --no-clean -H --header-only --no-pod-repo-update -o --out"
+    report_opts="--workspace --xcodeproj --scheme --target --configuration --sdk --podfile --cartfile --no-clean -H --header-only --no-pod-repo-update -o --out --no-confirm"
 
     validate_opts="-D --domains --xcodeproj --target --configurations"
 

data/lib/branch_io_cli/command/report_command.rb

@@ -33,11 +33,12 @@ module BranchIOCLI
       end
 
       def write_report(report)
-        report.write "Branch.io Xcode build report v #{VERSION} #{DateTime.now}\n\n"
+        report.write "Branch.io Xcode build report v #{VERSION} #{Time.now}\n\n"
         report.write "#{config.report_configuration}\n"
         report.write "#{report_helper.report_header}\n"
 
         report_helper.pod_install_if_required report
+        report_helper.carthage_bootstrap_if_required report
 
         # run xcodebuild -list
         report.sh(*report_helper.base_xcodebuild_cmd, "-list")

data/lib/branch_io_cli/configuration/configuration.rb

@@ -213,9 +213,7 @@ EOF
         end
 
         # Validate. Prompt if not valid.
-        while !buildfile_path || !validate_buildfile_at_path(buildfile_path, filename)
-          buildfile_path = ask "Please enter the path to your #{filename}: "
-        end
+        buildfile_path = ask "Please enter the path to your #{filename}: " while !buildfile_path || !validate_buildfile_at_path(buildfile_path, filename)
 
         @sdk_integration_mode = filename == "Podfile" ? :cocoapods : :carthage
       end
@@ -470,7 +468,9 @@ EOF
           new_value = ask "Please enter one or more of the above, separated by commas: " do |q|
             q.readline = true
             q.completion = valid_values
-          end.split(",") # comma-split with Array not working
+          end
+
+          new_value = new_value.split(",") # comma-split with ask("...", Array) not working
         elsif option.type.nil?
           new_value = Helper::Util.confirm "#{option.label}? ", value
         else

data/lib/branch_io_cli/configuration/report_options.rb

@@ -77,6 +77,12 @@ module BranchIOCLI
               example: "./report.txt",
               type: String,
               env_name: "BRANCH_REPORT_PATH"
+            ),
+            Option.new(
+              name: :confirm,
+              description: "Confirm before running certain commands",
+              default_value: true,
+              skip_confirmation: true
             )
           ]
         end

data/lib/branch_io_cli/configuration/setup_options.rb

@@ -57,7 +57,7 @@ module BranchIOCLI
               example: "config1,config2",
               type: Array,
               negatable: true,
-              valid_values_proc: ->() { Configuration.current.xcodeproj.build_configurations.map(&:name) }
+              valid_values_proc: -> { Configuration.current.xcodeproj.build_configurations.map(&:name) }
             ),
             Option.new(
               name: :xcodeproj,
@@ -73,7 +73,7 @@ module BranchIOCLI
               example: "MyAppTarget",
               type: String,
               confirm_symbol: :target_name,
-              valid_values_proc: ->() { Configuration.current.xcodeproj.targets.map(&:name) }
+              valid_values_proc: -> { Configuration.current.xcodeproj.targets.map(&:name) }
             ),
             Option.new(
               name: :podfile,
@@ -95,7 +95,7 @@ module BranchIOCLI
             Option.new(
               name: :carthage_command,
               description: "Command to run when installing from Carthage",
-              example: "<command>",
+              example: "bootstrap --no-use-binaries",
               type: String,
               default_value: "update --platform ios"
             ),

data/lib/branch_io_cli/helper/methods.rb

@@ -3,8 +3,8 @@ module BranchIOCLI
     class CommandError < RuntimeError
       attr_reader :status
       def initialize(args)
-        @args = args.first
-        @status = args.second
+        @args = args[0]
+        @status = args[1]
         super message
       end
 

data/lib/branch_io_cli/helper/report_helper.rb

@@ -217,12 +217,15 @@ module BranchIOCLI
         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 = confirm 'Run "pod install" now?', true
+          if config.confirm
+            install = confirm 'Run "pod install" now?', true
 
-          unless install
-            say 'Please run "pod install" or "pod update" first in order to continue.'
-            exit(-1)
+            unless install
+              say 'Please run "pod install" or "pod update" first in order to continue.'
+              exit(-1)
+            end
           end
 
           ToolHelper.verify_cocoapods
@@ -243,7 +246,34 @@ some cases. If that happens, please rerun without --no-pod-repo-update or run
           if report.sh(install_command).success?
             say "Done ✅"
           else
-            say "pod install failed. See report for details."
+            say "#{install_command.inspect} failed. See report for details."
+            exit(-1)
+          end
+        end
+
+        def carthage_bootstrap_if_required(report)
+          return unless config.cartfile_path
+          return if Dir.exist?(File.join(File.dirname(config.cartfile_path), "Carthage", "Build", "iOS"))
+
+          say "carthage checkout required in order to build."
+          if config.confirm
+            install = confirm 'Run "carthage checkout && carthage build --platform ios" now?', true
+
+            unless install
+              say 'Please build your Carthage dependencies first in order to continue.'
+              exit(-1)
+            end
+          end
+
+          ToolHelper.verify_carthage
+
+          install_command = "carthage checkout && carthage build --platform ios"
+
+          say "Running #{install_command.inspect}"
+          if report.sh(install_command).success?
+            say "Done ✅"
+          else
+            say "#{install_command.inspect} failed. See report for details."
             exit(-1)
           end
         end

data/lib/branch_io_cli/helper/tool_helper.rb

@@ -219,8 +219,10 @@ github "BranchMetrics/ios-branch-deep-linking"
           # 1. Patch Cartfile. Return if no change (Branch already present).
           return false unless PatchHelper.patch_cartfile cartfile_path
 
-          # 2. carthage update
-          sh "carthage #{options.carthage_command} ios-branch-deep-linking", chdir: File.dirname(config.cartfile_path)
+          # 2. carthage bootstrap (or other command)
+          cmd = "carthage #{options.carthage_command}"
+          cmd << " ios-branch-deep-linking" if options.carthage_command =~ /^(update|build)/
+          sh cmd, chdir: File.dirname(config.cartfile_path)
 
           # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
           helper.add_change cartfile_path

data/lib/branch_io_cli/version.rb

@@ -1,3 +1,3 @@
 module BranchIOCLI
-  VERSION = "0.12.4"
+  VERSION = "0.12.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: branch_io_cli
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.5
 platform: ruby
 authors:
 - Branch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
@@ -180,7 +180,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: rspec-simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -194,7 +194,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-simplecov
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -211,16 +211,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement