branch_io_cli 0.11.0 → 0.12.0

data/lib/branch_io_cli/configuration/option.rb

@@ -2,6 +2,7 @@ module BranchIOCLI
   module Configuration
     class Option
       attr_accessor :name
+      attr_accessor :env_name
       attr_accessor :type
       attr_accessor :description
       attr_accessor :default_value
@@ -9,9 +10,16 @@ module BranchIOCLI
       attr_accessor :argument_optional
       attr_accessor :aliases
       attr_accessor :negatable
+      attr_accessor :confirm_symbol
+      attr_accessor :valid_values_proc
+      attr_accessor :validate_proc
+      attr_accessor :convert_proc
+      attr_accessor :label
+      attr_accessor :skip_confirmation
 
       def initialize(options)
         @name = options[:name]
+        @env_name = options[:env_name]
         @type = options[:type]
         @description = options[:description]
         @default_value = options[:default_value]
@@ -19,10 +27,80 @@ module BranchIOCLI
         @argument_optional = options[:argument_optional] || false
         @aliases = options[:aliases] || []
         @aliases = [@aliases] unless @aliases.kind_of?(Array)
+        @negatable = options[:negatable]
         @negatable = options[:type].nil? if options[:negatable].nil?
+        @confirm_symbol = options[:confirm_symbol] || @name
+        @valid_values_proc = options[:valid_values_proc]
+        @validate_proc = options[:validate_proc]
+        @convert_proc = options[:convert_proc]
+        @label = options[:label] || @name.to_s.capitalize.gsub(/_/, ' ')
+        @skip_confirmation = options[:skip_confirmation]
 
+        raise ArgumentError, "Use :validate_proc or :valid_values_proc, but not both." if @valid_values_proc && @validate_proc
+
+        @env_name = "BRANCH_#{@name.to_s.upcase}" if @env_name.nil?
         @argument_optional ||= @negatable
       end
+
+      def valid_values
+        return valid_values_proc.call if valid_values_proc && valid_values_proc.kind_of?(Proc)
+      end
+
+      def ui_type
+        if type.nil?
+          "Boolean"
+        elsif type == Array
+          "Comma-separated list"
+        else
+          type.to_s
+        end
+      end
+
+      def env_value
+        convert(ENV[env_name]) if env_name
+      end
+
+      def convert(value)
+        return convert_proc.call(value) if convert_proc
+
+        if type == Array
+          value = value.split(",") if value.kind_of?(String)
+        elsif type == String && value.kind_of?(String)
+          value = value.strip
+          value = nil if value.empty?
+        elsif type.nil?
+          value = true if value.kind_of?(String) && value =~ /^[ty]/i
+          value = false if value.kind_of?(String) && value =~ /^[fn]/i
+        end
+
+        value
+      end
+
+      def display_value(value)
+        if type.nil?
+          value ? "yes" : "no"
+        elsif value.nil?
+          "(none)"
+        else
+          value.to_s
+        end
+      end
+
+      def valid?(value)
+        return validate_proc.call(value) if validate_proc
+
+        return true if value.nil?
+
+        if valid_values && type != Array
+          valid_values.include? value
+        elsif valid_values
+          value.all? { |v| valid_values.include?(v) }
+        elsif type
+          value.kind_of? type
+        else
+          value == true || value == false
+        end
+      end
     end
   end
 end

data/lib/branch_io_cli/configuration/option_wrapper.rb

@@ -7,7 +7,7 @@ module BranchIOCLI
       attr_reader :add_defaults
 
       def initialize(hash, options, add_defaults = true)
-        raise ArgumentError if hash.nil?
+        hash ||= {}
 
         @hash = hash
         @options = options
@@ -22,7 +22,10 @@ module BranchIOCLI
 
         value = hash[method_sym]
         return value unless add_defaults && value.nil?
-        option.default_value
+
+        default_value = option.env_value
+        default_value = option.default_value if default_value.nil?
+        default_value
       end
 
       def build_option_hash

data/lib/branch_io_cli/configuration/report_configuration.rb

@@ -1,51 +1,15 @@
 require "plist"
 require "xcodeproj"
 
-module Xcodeproj
-  class Project
-    # Local override to allow for user schemes.
-    #
-    # Get list of shared and user schemes in project
-    #
-    # @param [String] path
-    #         project path
-    #
-    # @return [Array]
-    #
-    def self.schemes(project_path)
-      base_dirs = [File.join(project_path, 'xcshareddata', 'xcschemes'),
-                   File.join(project_path, 'xcuserdata', "#{ENV['USER']}.xcuserdatad", 'xcschemes')]
-
-      # Take any .xcscheme file from base_dirs
-      schemes = base_dirs.inject([]) { |memo, dir| memo + Dir[File.join dir, '*.xcscheme'] }
-                         .map { |f| File.basename(f, '.xcscheme') }
-
-      # Include any scheme defined in the xcschememanagement.plist, if it exists.
-      base_dirs.map { |d| File.join d, 'xcschememanagement.plist' }
-               .select { |f| File.exist? f }.each do |plist_path|
-        plist = File.open(plist_path) { |f| ::Plist.parse_xml f }
-        scheme_user_state = plist["SchemeUserState"]
-        schemes += scheme_user_state.keys.map { |k| File.basename k, '.xcscheme' }
-      end
-
-      schemes.uniq!
-      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
-  end
-end
-
 module BranchIOCLI
   module Configuration
     # rubocop: disable Metrics/ClassLength
     class ReportConfiguration < Configuration
       class << self
+        def summary
+          "Generate and optionally submit a build diagnostic report."
+        end
+
         def available_options
           [
             Option.new(
@@ -119,7 +83,8 @@ module BranchIOCLI
               default_value: "./report.txt",
               aliases: "-o",
               example: "./report.txt",
-              type: String
+              type: String,
+              env_name: "BRANCH_REPORT_PATH"
             )
           ]
         end
@@ -456,7 +421,7 @@ EOF
       def branch_key_setting_from_info_plist(config = configuration || "Release")
         return @branch_key_setting_from_info_plist if @branch_key_setting_from_info_plist
 
-        infoplist_path = helper.expanded_build_setting target, "INFOPLIST_FILE", config
+        infoplist_path = target.expanded_build_setting "INFOPLIST_FILE", config
         infoplist_path = File.expand_path infoplist_path, File.dirname(xcodeproj_path)
         info_plist = File.open(infoplist_path) { |f| Plist.parse_xml f }
         branch_key = info_plist["branch_key"]

data/lib/branch_io_cli/configuration/setup_configuration.rb

@@ -3,6 +3,10 @@ module BranchIOCLI
     # rubocop: disable Metrics/ClassLength
     class SetupConfiguration < Configuration
       class << self
+        def summary
+          "Integrates the Branch SDK into a native app project"
+        end
+
         def examples
           {
             "Test without validation (can use dummy keys and domains)" => "branch_io setup -L key_live_xxxx -D myapp.app.link --no-validate",
@@ -34,20 +38,24 @@ module BranchIOCLI
               description: "Comma-separated list of custom domain(s) or non-Branch domain(s)",
               example: "example.com,www.example.com",
               type: Array,
-              aliases: "-D"
+              aliases: "-D",
+              confirm_symbol: :all_domains
             ),
             Option.new(
               name: :app_link_subdomain,
               description: "Branch app.link subdomain, e.g. myapp for myapp.app.link",
               example: "myapp",
-              type: String
+              type: String,
+              label: "app.link subdomain",
+              skip_confirmation: true
             ),
             Option.new(
               name: :uri_scheme,
               description: "Custom URI scheme used in the Branch Dashboard for this app",
               example: "myurischeme[://]",
               type: String,
-              aliases: "-U"
+              aliases: "-U",
+              label: "URI scheme"
             ),
             Option.new(
               name: :setting,
@@ -55,38 +63,49 @@ module BranchIOCLI
               example: "BRANCH_KEY_SETTING",
               type: String,
               argument_optional: true,
-              aliases: "-s"
+              aliases: "-s",
+              label: "User-defined setting for Branch key"
             ),
             Option.new(
               name: :test_configurations,
-              description: "List of configurations that use the test key with a custom build setting (default: Debug configurations)",
+              description: "List of configurations that use the test key with a user-defined setting (default: Debug configurations)",
               example: "config1,config2",
               type: Array,
-              negatable: true
+              negatable: true,
+              valid_values_proc: ->() { Configuration.current.xcodeproj.build_configurations.map(&:name) }
             ),
             Option.new(
               name: :xcodeproj,
               description: "Path to an Xcode project to update",
               example: "MyProject.xcodeproj",
-              type: String
+              type: String,
+              confirm_symbol: :xcodeproj_path,
+              validate_proc: ->(path) { Configuration.open_xcodeproj path }
             ),
             Option.new(
               name: :target,
               description: "Name of a target to modify in the Xcode project",
               example: "MyAppTarget",
-              type: String
+              type: String,
+              confirm_symbol: :target_name,
+              valid_values_proc: ->() { Configuration.current.xcodeproj.targets.map(&:name) }
             ),
             Option.new(
               name: :podfile,
               description: "Path to the Podfile for the project",
               example: "/path/to/Podfile",
-              type: String
+              type: String,
+              confirm_symbol: :podfile_path,
+              validate_proc: ->(path) { Configuration.open_podfile path }
             ),
             Option.new(
               name: :cartfile,
               description: "Path to the Cartfile for the project",
               example: "/path/to/Cartfile",
-              type: String
+              type: String,
+              confirm_symbol: :cartfile_path,
+              validate_proc: ->(path) { !path.nil? && File.exist?(path.to_s) },
+              convert_proc: ->(path) { Configuration.absolute_path(path.to_s) unless path.nil? }
             ),
             Option.new(
               name: :carthage_command,
@@ -128,15 +147,17 @@ module BranchIOCLI
             ),
             Option.new(
               name: :commit,
-              description: "Commit the results to Git",
+              description: "Commit the results to Git if non-blank",
               type: String,
               example: "message",
-              argument_optional: true
+              argument_optional: true,
+              label: "Commit message"
             ),
             Option.new(
-              name: :check_repo_changes,
-              description: "Check for uncommitted changes to a git repo",
-              default_value: true
+              name: :confirm,
+              description: "Confirm configuration before proceeding",
+              default_value: true,
+              skip_confirmation: true
             )
           ]
         end
@@ -155,6 +176,12 @@ module BranchIOCLI
       attr_reader :keys
       attr_reader :all_domains
 
+      def initialize(options)
+        super
+        # Configuration has been validated and logged to the screen.
+        confirm_with_user if options.confirm
+      end
+
       def validate_options
         @validate = options.validate
         @patch_source = options.patch_source
@@ -266,6 +293,7 @@ module BranchIOCLI
           key = ask "Please enter your #{type} Branch key or use --#{type}-key [enter for none]: "
         end
         @keys[type] = key unless key.empty?
+        instance_variable_set "@#{type}_key", key
       end
 
       def validate_all_domains(options, required = true)

data/lib/branch_io_cli/configuration/validate_configuration.rb

@@ -2,6 +2,10 @@ module BranchIOCLI
   module Configuration
     class ValidateConfiguration < Configuration
       class << self
+        def summary
+          "Validates all Universal Link domains configured in a project"
+        end
+
         def return_value
           "If validation passes, this command returns 0. If validation fails, it returns 1."
         end

data/lib/branch_io_cli/format.rb

@@ -1,4 +1,4 @@
-require "branch_io_cli/format/commander_format"
+require "branch_io_cli/format/highline_format"
 require "branch_io_cli/format/markdown_format"
 
 module BranchIOCLI

data/lib/branch_io_cli/format/{commander_format.rb → highline_format.rb}

@@ -2,7 +2,7 @@ require "erb"
 
 module BranchIOCLI
   module Format
-    module CommanderFormat
+    module HighlineFormat
       include Format
 
       def header(text, level = 1)

data/lib/branch_io_cli/format/markdown_format.rb

@@ -45,6 +45,10 @@ module BranchIOCLI
         if default_value
           text += " (default: #{default_value})"
         end
+
+        text += "|"
+        text += option.env_name if option.env_name
+
         text += "|"
         text
       end

data/lib/branch_io_cli/helper.rb

@@ -1,3 +1,6 @@
 require "branch_io_cli/helper/branch_helper"
+require "branch_io_cli/helper/methods"
 require "branch_io_cli/helper/patch_helper"
 require "branch_io_cli/helper/report_helper"
+require "branch_io_cli/helper/util"
+require "branch_io_cli/helper/xcodeproj_ext"

data/lib/branch_io_cli/helper/ios_helper.rb

@@ -15,6 +15,8 @@ require "branch_io_cli/helper/methods"
 module BranchIOCLI
   module Helper
     module IOSHelper
+      include Methods
+
       APPLINKS = "applinks"
       ASSOCIATED_DOMAINS = "com.apple.developer.associated-domains"
       CODE_SIGN_ENTITLEMENTS = "CODE_SIGN_ENTITLEMENTS"
@@ -28,7 +30,7 @@ module BranchIOCLI
 
       def has_multiple_info_plists?
         config.xcodeproj.build_configurations.inject([]) do |files, c|
-          files + [expanded_build_setting(config.target, "INFOPLIST_FILE", c.name)]
+          files + [config.target.expanded_build_setting("INFOPLIST_FILE", c.name)]
         end.uniq.count > 1
       end
 
@@ -117,7 +119,7 @@ module BranchIOCLI
 
       def update_info_plist_setting(configuration = RELEASE_CONFIGURATION, &b)
         # find the Info.plist paths for this configuration
-        info_plist_path = expanded_build_setting config.target, "INFOPLIST_FILE", configuration
+        info_plist_path = config.target.expanded_build_setting "INFOPLIST_FILE", configuration
 
         raise "Info.plist not found for configuration #{configuration}" if info_plist_path.nil?
 
@@ -139,7 +141,7 @@ module BranchIOCLI
         project = config.xcodeproj
         target = config.target
 
-        relative_entitlements_path = expanded_build_setting target, CODE_SIGN_ENTITLEMENTS, configuration
+        relative_entitlements_path = target.expanded_build_setting CODE_SIGN_ENTITLEMENTS, configuration
         project_parent = File.dirname project.path
 
         if relative_entitlements_path.nil?
@@ -312,8 +314,8 @@ module BranchIOCLI
       def validate_team_and_bundle_ids(domain, configuration)
         target = config.target
 
-        product_bundle_identifier = expanded_build_setting target, PRODUCT_BUNDLE_IDENTIFIER, configuration
-        development_team = expanded_build_setting target, DEVELOPMENT_TEAM, configuration
+        product_bundle_identifier = target.expanded_build_setting PRODUCT_BUNDLE_IDENTIFIER, configuration
+        development_team = target.expanded_build_setting DEVELOPMENT_TEAM, configuration
 
         identifiers = app_ids_from_aasa_file domain
         return false if identifiers.nil?
@@ -380,7 +382,7 @@ module BranchIOCLI
         project = config.xcodeproj
         target = config.target
 
-        relative_entitlements_path = expanded_build_setting target, CODE_SIGN_ENTITLEMENTS, configuration
+        relative_entitlements_path = target.expanded_build_setting CODE_SIGN_ENTITLEMENTS, configuration
         return [] if relative_entitlements_path.nil?
 
         project_parent = File.dirname project.path
@@ -393,98 +395,33 @@ module BranchIOCLI
         entitlements[ASSOCIATED_DOMAINS].select { |d| d =~ /^applinks:/ }.map { |d| d.sub(/^applinks:/, "") }
       end
 
-      def expanded_build_setting(target, setting_name, configuration)
-        # second arg true means if there is an xcconfig, also consult that
-        begin
-          setting_value = target.resolved_build_setting(setting_name, true)[configuration]
-        rescue Errno::ENOENT
-          # If not found, look up without it
-          setting_value = target.resolved_build_setting(setting_name, false)[configuration]
-        end
-
-        return if setting_value.nil?
-
-        expand_build_settings setting_value, target, configuration
-      end
-
-      def expand_build_settings(string, target, configuration)
-        search_position = 0
-        # It's safest to make a copy of this string, though we probably get a
-        # copy from PBXNativeTarget#resolve_build_setting anyway. Copying here
-        # avoids a copy on every match.
-        string = string.clone
-
-        # HACK: When matching against an xcconfig, as here, sometimes the macro is just returned
-        # without delimiters, e.g. TARGET_NAME or BUILT_PRODUCTS_DIR/Branch.framework. We allow
-        # these two patterns for now.
-        while (matches = %r{\$\(([^(){}]*)\)|\$\{([^(){}]*)\}|^([A-Z_]+)(/.*)?$}.match(string, search_position))
-          original_macro = matches[1] || matches[2] || matches[3]
-          delimiter_length = matches[3] ? 0 : 3 # $() or ${}
-          delimiter_offset = matches[3] ? 0 : 2 # $( or ${
-          search_position = string.index(original_macro) - delimiter_offset
-
-          modifier_regexp = /^(.+):(.+)$/
-          if (matches = modifier_regexp.match original_macro)
-            macro_name = matches[1]
-            modifier = matches[2]
-          else
-            macro_name = original_macro
-          end
-
-          case macro_name
-          when "SRCROOT"
-            expanded_macro = "."
-          when "TARGET_NAME"
-            # Clone in case of modifier processing
-            expanded_macro = target.name.clone
-          else
-            expanded_macro = expanded_build_setting(target, macro_name, configuration)
-          end
-
-          search_position += original_macro.length + delimiter_length and next if expanded_macro.nil?
-
-          if modifier == "rfc1034identifier"
-            # From the Apple dev portal when creating a new app ID:
-            # You cannot use special characters such as @, &, *, ', "
-            # From trial and error with Xcode, it appears that only letters, digits and hyphens are allowed.
-            # Everything else becomes a hyphen, including underscores.
-            special_chars = /[^A-Za-z0-9-]/
-            expanded_macro.gsub!(special_chars, '-')
-          end
-
-          string.gsub!(/\$\(#{original_macro}\)|\$\{#{original_macro}\}|^#{original_macro}/, expanded_macro)
-          search_position += expanded_macro.length
-        end
-        string
-      end
-
       def add_cocoapods(options)
         verify_cocoapods
 
-        podfile_path = config.podfile_path
+        podfile_path = options.podfile_path
 
         install_command = "pod install"
         install_command += " --repo-update" if options.pod_repo_update
         Dir.chdir(File.dirname(podfile_path)) do
           sh "pod init"
           PatternPatch::Patch.new(
-            regexp: /^(\s*)# Pods for #{config.target.name}$/,
+            regexp: /^(\s*)# Pods for #{options.target.name}$/,
             mode: :append,
             text: "\n\\1pod \"Branch\""
           ).apply podfile_path
           # Store a Pod::Podfile representation of this file.
-          config.open_podfile
+          options.open_podfile
           sh install_command
         end
 
-        return unless config.commit
+        return unless options.commit
 
         add_change podfile_path
         add_change "#{podfile_path}.lock"
 
         # For now, add Pods folder to SCM.
         pods_folder_path = Pathname.new(File.expand_path("../Pods", podfile_path)).relative_path_from Pathname.pwd
-        workspace_path = Pathname.new(File.expand_path(config.xcodeproj_path.sub(/.xcodeproj$/, ".xcworkspace"))).relative_path_from Pathname.pwd
+        workspace_path = Pathname.new(File.expand_path(options.xcodeproj_path.sub(/.xcodeproj$/, ".xcworkspace"))).relative_path_from Pathname.pwd
         podfile_pathname = Pathname.new(podfile_path).relative_path_from Pathname.pwd
         add_change pods_folder_path
         add_change workspace_path
@@ -504,7 +441,7 @@ module BranchIOCLI
         verify_carthage
 
         # 1. Generate Cartfile
-        cartfile_path = config.cartfile_path
+        cartfile_path = options.cartfile_path
         File.open(cartfile_path, "w") do |file|
           file.write <<EOF
 github "BranchMetrics/ios-branch-deep-linking"
@@ -513,18 +450,18 @@ EOF
 
         # 2. carthage update
         Dir.chdir(File.dirname(cartfile_path)) do
-          sh "carthage #{config.carthage_command}"
+          sh "carthage #{options.carthage_command}"
         end
 
         # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
         add_change cartfile_path
         add_change "#{cartfile_path}.resolved"
-        add_change config.xcodeproj_path
+        add_change options.xcodeproj_path
 
         # 4. Add to target dependencies
-        frameworks_group = config.xcodeproj.frameworks_group
+        frameworks_group = options.xcodeproj.frameworks_group
         branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
-        target = config.target
+        target = options.target
         target.frameworks_build_phase.add_file_reference branch_framework
 
         # 5. Create a copy-frameworks build phase
@@ -536,9 +473,9 @@ EOF
 
         update_framework_search_paths "$(SRCROOT)/Carthage/Build/iOS"
 
-        config.xcodeproj.save
+        options.xcodeproj.save
 
-        return unless config.commit
+        return unless options.commit
 
         # For now, add Carthage folder to SCM
 
@@ -551,7 +488,7 @@ EOF
 
       def add_direct(options)
         # Put the framework in the path for any existing Frameworks group in the project.
-        frameworks_group = config.xcodeproj.frameworks_group
+        frameworks_group = options.xcodeproj.frameworks_group
         framework_path = File.join frameworks_group.real_path, "Branch.framework"
         raise "#{framework_path} exists." if File.exist? framework_path
 
@@ -589,17 +526,17 @@ EOF
 
         # Now the current framework is in framework_path
 
-        say "Adding to #{config.xcodeproj_path}"
+        say "Adding to #{options.xcodeproj_path}"
 
         # Add as a dependency in the Frameworks group
         framework = frameworks_group.new_file "Branch.framework" # relative to frameworks_group.real_path
-        config.target.frameworks_build_phase.add_file_reference framework, true
+        options.target.frameworks_build_phase.add_file_reference framework, true
 
         update_framework_search_paths "$(SRCROOT)"
 
-        config.xcodeproj.save
+        options.xcodeproj.save
 
-        add_change config.xcodeproj_path
+        add_change options.xcodeproj_path
         add_change framework_path
         sh ["git", "add", framework_path] if options.commit
 
@@ -625,7 +562,7 @@ EOF
       def update_podfile(options)
         verify_cocoapods
 
-        podfile_path = config.podfile_path
+        podfile_path = options.podfile_path
         return false if podfile_path.nil?
 
         # 1. Patch Podfile. Return if no change (Branch pod already present).
@@ -659,7 +596,7 @@ EOF
       def update_cartfile(options, project)
         verify_carthage
 
-        cartfile_path = config.cartfile_path
+        cartfile_path = options.cartfile_path
         return false if cartfile_path.nil?
 
         # 1. Patch Cartfile. Return if no change (Branch already present).
@@ -667,18 +604,18 @@ EOF
 
         # 2. carthage update
         Dir.chdir(File.dirname(cartfile_path)) do
-          sh "carthage #{config.carthage_command} ios-branch-deep-linking"
+          sh "carthage #{options.carthage_command} ios-branch-deep-linking"
         end
 
         # 3. Add Cartfile and Cartfile.resolved to commit (in case :commit param specified)
         add_change cartfile_path
         add_change "#{cartfile_path}.resolved"
-        add_change config.xcodeproj_path
+        add_change options.xcodeproj_path
 
         # 4. Add to target dependencies
         frameworks_group = project.frameworks_group
         branch_framework = frameworks_group.new_file "Carthage/Build/iOS/Branch.framework"
-        target = config.target
+        target = options.target
         target.frameworks_build_phase.add_file_reference branch_framework
 
         # 5. Add to copy-frameworks build phase
@@ -713,8 +650,8 @@ EOF
           exit(-1)
         end
 
-        install = ask "'pod' command not available in PATH. Install cocoapods (may require a sudo password) (Y/n)? "
-        if install.downcase =~ /^n/
+        install = confirm "'pod' command not available in PATH. Install cocoapods (may require a sudo password)?", true
+        unless install
           say "Please install cocoapods or use --no-add-sdk to continue."
           exit(-1)
         end
@@ -740,8 +677,8 @@ EOF
           exit(-1)
         end
 
-        install = ask "'carthage' command not available in PATH. Use Homebrew to install carthage (Y/n)? "
-        if install.downcase =~ /^n/
+        install = confirm "'carthage' command not available in PATH. Use Homebrew to install carthage?", true
+        unless install
           say "Please install carthage or use --no-add-sdk to continue."
           exit(-1)
         end
@@ -761,8 +698,8 @@ EOF
           exit(-1)
         end
 
-        install = ask "'git' command not available in PATH. Install Xcode command-line tools (requires password) (Y/n)? "
-        if install.downcase =~ /^n/
+        install = confirm "'git' command not available in PATH. Install Xcode command-line tools (requires password)?", true
+        unless install
           say "Please install Xcode command tools or leave out the --commit option to continue."
           exit(-1)
         end