highline 2.0.0.pre.develop.6 → 2.0.0.pre.develop.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e2a946fd059cbf2c25bff77dc7e70b299fccab
-  data.tar.gz: c35a2236e1ce0d83cac30b9e2464abf4f61fc421
+  metadata.gz: c639e0a0e863970d33dd5f04f0503770980f79cb
+  data.tar.gz: 4e23a7f040b753da355772655775c3a66e6dced3
 SHA512:
-  metadata.gz: dadda880956f0ecb41ffca76a81cb89cd26fc63e3dea10f54bc7753d7af95e7f04a7185b0a1caab7a2b0ea31cc0cb932fb25971094252925af9cd52759176a4f
-  data.tar.gz: 54aa4ee03370b217bb9dacb8e94ba129f70cab24513297fe24f863a99b635ba45992091d5dea60c08ee94f5d77138329d9385f6ff01808336bdf8ac1d859d219
+  metadata.gz: 5d5f0ce4b01d5d777dbf46c01b4f5276aa1aaa1a1411240b690ad137fb9dc4c676dc4bf399eb90dfd1572aa1549d18afcb74e8c211d423b5c9b38bd5ab5ad2e4
+  data.tar.gz: 97f72ad639d2b0b2bd40cc828ff4d10d552b0932e2fb946e8755a2c5c52dcdce957ac2db0a5e53a596f2e128db45878a314e202a1b6a6e70ac77010b8d7481e6

data/.gitignore

@@ -3,3 +3,5 @@ pkg
 .DS_Store
 coverage
 Gemfile.lock
+*.swp
+*.swo

data/.rubocop.yml

@@ -0,0 +1,31 @@
+# Bellow the changes to default Rubocop behavior.
+
+# See options at:
+# https://github.com/bbatsov/rubocop/tree/master/config
+
+# General
+
+# Multi-line method chaining should be done with leading dots.
+Style/DotPosition:
+  EnforcedStyle: trailing
+  SupportedStyles:
+    - leading
+    - trailing
+
+# Enabling!
+
+Style/CollectionMethods:
+  Description: 'Preferred collection methods.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#map-find-select-reduce-size'
+  Enabled: true
+
+Style/StringMethods:
+  Description: 'Checks if configured preferred methods are used over non-preferred.'
+  Enabled: true
+
+# Disabling!
+
+Style/StringLiterals:
+  Description: 'Checks if uses of quotes match the configured preference.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#consistent-string-literals'
+  Enabled: false

data/.travis.yml

@@ -1,5 +1,6 @@
 ---
 language: ruby
+dist: trusty
 sudo: false
 script: "bundle exec rake test"
 rvm:
@@ -8,7 +9,7 @@ rvm:
   - 2.1
   - 2.2
   - ruby-head
-  - rbx-2
+  - rbx-3.81
   - jruby-19mode # JRuby in 1.9 mode
   - jruby-head
 
@@ -16,7 +17,12 @@ notifications:
   email: false
 matrix:
   allow_failures:
+    - rvm: 1.9
     - rvm: ruby-head
-    - rvm: rbx-2
+    - rvm: rbx-3.81
     - rvm: jruby-19mode # JRuby in 1.9 mode
     - rvm: jruby-head
+  include:
+    - rvm: 2.3
+      script: "bundle exec rake test && bundle exec codeclimate-test-reporter" # Run only for 2.3
+bundler_args: --without development

data/Changelog.md

@@ -2,7 +2,27 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+### 2.0.0-develop.9 / 2017-06-24
+
+* PR #211 / PR #212 - HighLine#use_color= and use_color? as instance methods (@abinoam, @phiggins)
+* PR #203 / I #191 - Default values are shown in menus by Frederico (@fredrb)
+* PR #201 / I #198 - Confirm in question now accepts Proc (@mmihira)
+* PR #197 - Some HighLine::Menu improvements
+  * Move Menu::MenuItem to Menu::Item with its own file
+  * Some small refactorings
+
+### 2.0.0-develop.8 / 2016-06-03
+
+* PR #195 - Add PRONTO to development group at Gemfile by Abinoam Jr. (@abinoam)
+
+### 2.0.0-develop.7 / 2016-05-31
+
+* PR #194 - Indices coloring on HighLine::Menu by Aregic (@aregic)
+* PR #190 - Add Ruby 2.3.0 to travis matrix by Koichi (@koic/ruby-23)
+* PR #189 - Improve #agree tests by @kevinoid
+
 ### 2.0.0-develop.6 / 2016-02-01
+
 * PR #184 - Menu improvements, bug fixes, and more tests by Geoff Lee (@matrinox)
   * Add third arg to menu that overides the choice displayed to the user
   * FIX: autocomplete prompt does not include menu choices after the first
@@ -10,9 +30,11 @@ Below is a complete listing of changes for each revision of HighLine.
 * PR #183 - Fix menu example in README.md by Fabien Foerster (@fabienfoerster)
 
 ### 2.0.0-develop.5 / 2015-12-27
+
 * Fix #180 with PR #181 - Make it possible to overwrite the menu prompt shown on errors.
 
 ### 2.0.0-develop.4 / 2015-12-14
+
 This versions makes the code documentation 100% 'A' grade on inch.
 We have used inch and http://inch-ci.org to guide the priorities
 on documentation production.

data/Gemfile

@@ -8,5 +8,25 @@ group :development, :test do
   gem "minitest", require: false
 end
 
+
+# Reporting only at one ruby version of travis matrix (no repetition)
 gem "codeclimate-test-reporter", group: :test, require: false
-gem "simplecov", group: :test, require: false
+
+platform :ruby do
+  # Running only on MRI
+  gem "simplecov", group: :test
+end
+
+group :development do
+  gem 'pronto'
+  gem 'pronto-reek', require: false
+  gem 'pronto-rubocop', require: false
+  gem 'pronto-poper', require: false
+
+  # Using strict versions of flay and pronto-flay while
+  # PR https://github.com/mmozuras/pronto-flay/pull/11/files
+  # is not merged
+  gem 'flay', '2.7.0'
+  gem 'pronto-flay', '0.6.1', require: false
+  gem 'flog'
+end

data/README.md

@@ -74,6 +74,19 @@ cli.choose do |menu|
   menu.prompt = "Please choose your favorite programming language?  "
   menu.choice(:ruby) { cli.say("Good choice!") }
   menu.choices(:python, :perl) { cli.say("Not from around here, are you?") }
+  menu.default = :ruby
+end
+
+## Using colored indices on Menus
+
+HighLine::Menu.index_color   = :rgb_77bbff # set default index color
+
+cli.choose do |menu|
+  menu.index_color  = :rgb_999999      # override default color of index
+                                       # you can also use constants like :blue
+  menu.prompt = "Please choose your favorite programming language?  "
+  menu.choice(:ruby) { cli.say("Good choice!") }
+  menu.choices(:python, :perl) { cli.say("Not from around here, are you?") }
 end
 ```
 
@@ -143,7 +156,7 @@ Contributing
 
 4. Add the main HighLine repository as the __upstream__ remote
   - ```cd highline``` # to enter the cloned repository directory.
-  - ```git remote add -v upstream https://github.com/JEG2/highline```
+  - ```git remote add upstream https://github.com/JEG2/highline```
 
 5. Keep your fork in sync with __upstream__
   - ```git fetch upstream```
@@ -153,9 +166,10 @@ Contributing
 6. Create your feature branch
   - ```git checkout -b your_branch```
 
-7. Hack the source code and run the tests
+7. Hack the source code, run the tests and __pronto__
   - ```rake test```
   - ```rake acceptance```
+  - ```pronto run```
 
 8. Commit your changes
   - ```git commit -am "Your commit message"```

data/appveyor.yml

@@ -10,7 +10,7 @@ environment:
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - gem install bundler --no-document -v 1.10.5
-  - bundle install --retry=3
+  - bundle install --retry=3 --without development
 
 test_script:
   - bundle exec rake

data/examples/menus.rb

@@ -26,6 +26,9 @@ choose do |menu|
 
   menu.choice :ruby do say("Good choice!") end
   menu.choices(:python, :perl) do say("Not from around here, are you?") end
+
+  menu.default = :ruby
+
 end
 
 say("\nThis is letter indexing...")

data/lib/highline.rb

@@ -44,17 +44,17 @@ class HighLine
   include BuiltinStyles
   include CustomErrors
 
-  # The setting used to disable color output.
-  @use_color = true
+  # Set it to false to disable ANSI coloring
+  attr_writer :use_color
 
-  # Pass +false+ to _setting_ to turn off HighLine's color escapes.
-  def self.use_color=( setting )
-    @use_color = setting
+  # Returns true if HighLine instance is currently using color escapes.
+  def use_color?
+    @use_color
   end
 
-  # Returns true if HighLine is currently using color escapes.
-  def self.use_color?
-    @use_color
+  # Resets the use of color.
+  def reset_use_color
+    @use_color = true
   end
 
   # For checking if the current version of HighLine supports RGB colors
@@ -101,10 +101,11 @@ class HighLine
   end
 
   # Reset HighLine to default.
-  # Clears Style index and reset color scheme.
+  # Clears Style index and resets color_scheme and use_color settings.
   def self.reset
     Style.clear_index
     reset_color_scheme
+    reset_use_color
   end
 
   # Reset color scheme to default (+nil+)
@@ -138,6 +139,7 @@ class HighLine
     @header   = nil
     @prompt   = nil
     @key      = nil
+    @use_color = true
 
     @terminal = HighLine::Terminal.get_terminal(input, output)
   end
@@ -190,7 +192,7 @@ class HighLine
   # @see Question#character
   def agree( yes_or_no_question, character = nil )
     ask(yes_or_no_question, lambda { |yn| yn.downcase[0] == ?y}) do |q|
-      q.validate                 = /\Ay(?:es)?|no?\Z/i
+      q.validate                 = /\A(?:y(?:es)?|no?)\Z/i
       q.responses[:not_valid]    = 'Please enter "yes" or "no".'
       q.responses[:ask_on_error] = :question
       q.character                = character
@@ -307,9 +309,11 @@ class HighLine
   end
 
   # (see .color)
-  # Convenience instance method. It delegates to the class method.
+  # This method is a clone of the HighLine.color class method.
+  # But it checks for use_color? per instance
   def color(string, *colors)
-    self.class.color(string, *colors)
+    return string unless use_color?
+    HighLine.Style(*colors).color(string)
   end
 
   # In case you just want the color code, without the embedding and

data/lib/highline/import.rb

@@ -24,7 +24,8 @@ $terminal = HighLine.new
 #
 module Kernel
   extend Forwardable
-  def_delegators :$terminal, :agree, :ask, :choose, :say
+  def_delegators :$terminal, :agree, :ask, :choose, :say,
+                 :use_color=, :use_color?, :reset_use_color
 end
 
 # When requiring 'highline/import' HighLine adds {#or_ask} to Object so

data/lib/highline/menu.rb

@@ -9,6 +9,7 @@
 #  This is Free Software.  See LICENSE and COPYING for details.
 
 require "highline/question"
+require "highline/menu/item"
 
 class HighLine
   #
@@ -17,6 +18,21 @@ class HighLine
   # to {HighLine#choose} can detail all aspects of menu display and control.
   #
   class Menu < Question
+    # Pass +false+ to _color_ to turn off HighLine::Menu's
+    # index coloring.
+    # Pass a color and the Menu's indices will be colored.
+    def self.index_color=(color = :rgb_77bbff)
+      @index_color = color
+    end
+
+    # Initialize it
+    self.index_color = false
+
+    # Returns color used for coloring Menu's indices
+    def self.index_color
+      @index_color
+    end
+
     #
     # Create an instance of HighLine::Menu.  All customization is done
     # through the passed block, which should call accessors, {#choice} and
@@ -32,7 +48,7 @@ class HighLine
     #     menu.choices(:python, :perl) { say("Not from around here, are you?") }
     #   end
 
-    def initialize(  )
+    def initialize
       #
       # Initialize Question objects with ignored values, we'll
       # adjust ours as needed.
@@ -54,6 +70,10 @@ class HighLine
       @shell           = false
       @nil_on_handled  = false
 
+      # Used for coloring Menu indices.
+      # Set it to default. But you may override it.
+      @index_color     = self.class.index_color
+
       # Override Questions responses, we'll set our own.
       @responses       = { }
       # Context for action code.
@@ -130,6 +150,11 @@ class HighLine
     # Defaults to +false+.
     #
     attr_accessor :nil_on_handled
+    #
+    # The color of the index when displaying the menu. See Style class for
+    # available colors.
+    #
+    attr_accessor :index_color
 
     #
     # Adds _name_ to the list of available menu items.  Menu items will be
@@ -162,7 +187,7 @@ class HighLine
     #   end
 
     def choice( name, help = nil, text = nil, &action )
-      item = MenuItem.new(name, text: text, help: help, action: action)
+      item = Menu::Item.new(name, text: text, help: help, action: action)
       @items << item
       @help.merge!(item.item_help)
       update_responses  # rebuild responses based on our settings
@@ -170,21 +195,21 @@ class HighLine
 
     #
     # This method helps reduce the namespaces in the original call, which would look
-    # like this: HighLine::Menu::MenuItem.new(...)
+    # like this: HighLine::Menu::Item.new(...)
     # With #build_item, it looks like this: menu.build_item(...)
     # @param *args splat args, the same args you would pass to an initialization of
-    #        HighLine::Menu::MenuItem
-    # @return [HighLine::Menu::MenuItem] the menu item
+    #        HighLine::Menu::Item
+    # @return [HighLine::Menu::Item] the menu item
 
     def build_item(*args)
-      MenuItem.new(*args)
+      Menu::Item.new(*args)
     end
 
     #
     # Adds an item directly to the menu. If you want more configuraiton or options,
     # use this method
     #
-    # @param item [Menu::MenuItem] item containing choice fields and more
+    # @param item [Menu::Item] item containing choice fields and more
     # @return [void]
 
     def add_item(item)
@@ -218,7 +243,7 @@ class HighLine
     # @return (see #choice)
 
     def hidden( name, help = nil, &action )
-      item = MenuItem.new(name, text: name, help: help, action: action)
+      item = Menu::Item.new(name, text: name, help: help, action: action)
       @hidden_items << item
       @help.merge!(item.item_help)
     end
@@ -329,29 +354,30 @@ class HighLine
     # This method returns all possible options for auto-completion, based
     # on the settings of _index_ and _select_by_.
     #
-    def options(  )
-      # add in any hidden menu commands
-      items = all_items
-
+    def options
       case @select_by
-      when :index then
-        map_items_by_index(items, @index)
+      when :index
+        map_items_by_index
       when :name
-        items.map(&:name)
+        map_items_by_name
       else
-        map_items_by_index(items, @index) + items.map(&:name)
+        map_items_by_index + map_items_by_name
       end
     end
 
-    def map_items_by_index(items, index = nil)
-      if index == :letter
+    def map_items_by_index
+      if @index == :letter
         l_index = "`"
-        items.map { "#{l_index.succ!}" }
+        all_items.map { l_index.succ!.dup }
       else
-        (1 .. items.size).map(&:to_s)
+        (1..all_items.size).map(&:to_s)
       end
     end
 
+    def map_items_by_name
+      all_items.map(&:name)
+    end
+
     def all_items
       @items + @hidden_items
     end
@@ -447,22 +473,38 @@ class HighLine
       end
     end
 
+    def decorate_index(index)
+      if index_color
+        HighLine.color(index, index_color)
+      else
+        index
+      end
+    end
+
     #
     # Allows Menu objects to pass as Arrays, for use with HighLine.list().
     # This method returns all menu items to be displayed, complete with
     # indexes.
     #
-    def to_ary(  )
+    def to_ary
+      @items.map.with_index { |item, ix| decorate_item(item.text.to_s, ix) }
+    end
+
+    def decorate_item(text, ix)
+      decorated, non_decorated = mark_for_decoration(text, ix)
+      decorate_index(decorated) + non_decorated
+    end
+
+    def mark_for_decoration(text, ix)
       case @index
       when :number
-        @items.map { |i| "#{@items.index(i) + 1}#{@index_suffix}#{i.text}" }
+        ["#{ix + 1}#{@index_suffix}", text]
       when :letter
-        l_index = "`"
-        @items.map { |i| "#{l_index.succ!}#{@index_suffix}#{i.text}" }
+        ["#{('a'.ord + ix).chr}#{@index_suffix}", text]
       when :none
-        @items.map { |i| "#{i.text}" }
+        [text, ""]
       else
-        @items.map { |i| "#{index}#{@index_suffix}#{i.text}" }
+        ["#{index}#{@index_suffix}", text]
       end
     end
 
@@ -474,23 +516,33 @@ class HighLine
       case @layout
       when :list
         %(<%= header ? "#{header}:\n" : '' %>) +
-        "<%= list( menu, #{@flow.inspect},
-                          #{@list_option.inspect} ) %>" +
+        parse_list +
+        show_default_if_any + 
         "<%= prompt %>"
       when :one_line
         %(<%= header ? "#{header}:  " : '' %>) +
         "<%= prompt %>" +
-        "(<%= list( menu, #{@flow.inspect},
-                           #{@list_option.inspect} ) %>)" +
+        "(" + parse_list + ")" +
+        show_default_if_any +
         "<%= prompt[/\s*$/] %>"
       when :menu_only
-        "<%= list( menu, #{@flow.inspect},
-                          #{@list_option.inspect} ) %><%= prompt %>"
+        parse_list +
+        show_default_if_any +
+        "<%= prompt %>"
       else
         @layout
       end
     end
 
+    def parse_list
+      "<%= list( menu, #{@flow.inspect},
+           #{@list_option.inspect} ) %>" 
+    end
+
+    def show_default_if_any
+      return default.to_s.empty? ? "" : "(#{default}) "
+    end
+
     #
     # This method will update the intelligent responses to account for
     # Menu specific differences.  Calls the superclass' (Question's)
@@ -500,27 +552,5 @@ class HighLine
     def update_responses
       build_responses(options)
     end
-
-    class MenuItem
-      attr_reader :name, :text, :help, :action
-
-      #
-      # @param name [String] The name that is matched against the user input
-      # @param text: [String] The text that displays for that choice (defaults to name)
-      # @param help: [String] help, see above (not sure how it works)
-      # @param action: [Block] a block that gets called when choice is selected
-      #
-      def initialize(name, attributes)
-        @name = name
-        @text = attributes[:text] || @name
-        @help = attributes[:help]
-        @action = attributes[:action]
-      end
-
-      def item_help
-        return {} unless help
-        { name.to_s.downcase => help }
-      end
-    end
   end
 end

data/lib/highline/menu/item.rb

@@ -0,0 +1,30 @@
+class HighLine
+  class Menu < Question
+    # Represents an Item of a HighLine::Menu.
+    #
+    class Item
+      attr_reader :name, :text, :help, :action
+
+      #
+      # @param name [String] The name that is matched against the user input
+      # @param attributes [Hash] options Hash to tailor menu item to your needs
+      # @option attributes text: [String] The text that displays for that
+      #   choice (defaults to name)
+      # @option attributes help: [String] help/hint string to be displayed.
+      # @option attributes action: [Block] a block that gets called when choice
+      #   is selected
+      #
+      def initialize(name, attributes)
+        @name = name
+        @text = attributes[:text] || @name
+        @help = attributes[:help]
+        @action = attributes[:action]
+      end
+
+      def item_help
+        return {} unless help
+        { name.to_s.downcase => help }
+      end
+    end
+  end
+end

data/lib/highline/question.rb

@@ -147,11 +147,15 @@ class HighLine
     attr_accessor :in
     #
     # Asks a yes or no confirmation question, to ensure a user knows what
-    # they have just agreed to.  If set to +true+ the question will be,
-    # "Are you sure?  "  Any other true value for this attribute is assumed
-    # to be the question to ask.  When +false+ or +nil+ (the default),
-    # answers are not confirmed.
-    #
+    # they have just agreed to.  The confirm attribute can be set to :
+    # +true+  :     In this case the question will be, "Are you sure?". 
+    # Proc    :     The Proc is yielded the answer given. The Proc must 
+    #               output a string which is then used as the confirm 
+    #               question. 
+    # String  :     The String must use ERB syntax. The String is 
+    #               evaluated with access to question and answer and
+    #               is then used as the confirm question.
+    # When set to +false+ or +nil+ (the default), answers are not confirmed.
     attr_accessor :confirm
     #
     # When set, the user will be prompted for multiple answers which will
@@ -529,6 +533,8 @@ class HighLine
     def confirm_question(highline)
       if confirm == true
         "Are you sure?  "
+      elsif confirm.is_a?(Proc)
+        confirm.call(self.answer)
       else
         # evaluate ERb under initial scope, so it will have
         # access to question and answer

data/lib/highline/version.rb

@@ -2,5 +2,5 @@
 
 class HighLine
   # The version of the installed library.
-  VERSION = "2.0.0-develop.6".freeze
+  VERSION = "2.0.0-develop.9".freeze
 end

data/test/test_helper.rb

@@ -1,12 +1,8 @@
 #!/usr/bin/env ruby
 # coding: utf-8
 
-require 'simplecov'
-
-if ENV['CODECLIMATE_REPO_TOKEN']
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-end
+# Run code coverage only for mri
+require 'simplecov' if RUBY_ENGINE == 'ruby'
 
 # Compatibility module for StringIO, File
 # and Tempfile. Necessary for some tests.

data/test/test_highline.rb

@@ -34,15 +34,55 @@ class TestHighLine < Minitest::Test
     @terminal = HighLine.new(@input, @output)  
   end
   
-  def test_agree
-    @input << "y\nyes\nYES\nHell no!\nNo\n"
-    @input.rewind
+  def test_agree_valid_yes_answers
+    valid_yes_answers = %w{ y yes Y YES }
 
-    assert_equal(true, @terminal.agree("Yes or no?  "))
-    assert_equal(true, @terminal.agree("Yes or no?  "))
-    assert_equal(true, @terminal.agree("Yes or no?  "))
-    assert_equal(false, @terminal.agree("Yes or no?  "))
-    
+    valid_yes_answers.each do |user_input|
+      @input << "#{user_input}\n"
+      @input.rewind
+
+      assert_equal true, @terminal.agree("Yes or no?  ")
+      assert_equal "Yes or no?  ", @output.string
+
+      @input.truncate(@input.rewind)
+      @output.truncate(@output.rewind)
+    end
+  end
+
+  def test_agree_valid_no_answers
+    valid_no_answers = %w{ n no N NO }
+
+    valid_no_answers.each do |user_input|
+      @input << "#{user_input}\n"
+      @input.rewind
+
+      assert_equal false, @terminal.agree("Yes or no?  ")
+      assert_equal "Yes or no?  ", @output.string
+
+      @input.truncate(@input.rewind)
+      @output.truncate(@output.rewind)
+    end
+  end
+
+  def test_agree_invalid_answers
+    invalid_answers = [ "ye", "yuk", "nope", "Oh yes", "Oh no", "Hell no!"]
+
+    invalid_answers.each do |user_input|
+      # Each invalid answer, should be followed by a 'y' (as the question is reasked)
+      @input << "#{user_input}\ny\n"
+      @input.rewind
+
+      assert_equal true, @terminal.agree("Yes or no?  ")
+
+      # It reasks the question if the answer is invalid
+      assert_equal "Yes or no?  Please enter \"yes\" or \"no\".\nYes or no?  ", @output.string
+
+      @input.truncate(@input.rewind)
+      @output.truncate(@output.rewind)
+    end
+  end
+
+  def test_agree_with_getc
     @input.truncate(@input.rewind)
     @input << "yellow"
     @input.rewind
@@ -462,9 +502,119 @@ class TestHighLine < Minitest::Test
     # turn off color
     old_setting = HighLine.use_color?
     HighLine.use_color = false
+    @terminal.use_color = false
     @terminal.say("This should be <%= color('cyan', CYAN) %>!")
     assert_equal("This should be cyan!\n", @output.string)
     HighLine.use_color = old_setting
+    @terminal.use_color = old_setting
+  end
+
+  def test_color_setting_per_instance
+    require 'highline/import'
+    old_glob_term = $terminal
+    old_setting = HighLine.use_color?
+
+    gterm_input = StringIO.new
+    gterm_output = StringIO.new
+    $terminal = HighLine.new(gterm_input, gterm_output)
+
+    # It can set coloring at HighLine class
+    cli_input = StringIO.new
+    cli_output = StringIO.new
+
+    cli = HighLine.new(cli_input, cli_output)
+
+    # Testing with both use_color setted to true
+    HighLine.use_color = true
+    @terminal.use_color = true
+    cli.use_color = true
+
+    say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be \e[36mcyan\e[0m!\n", gterm_output.string)
+
+    @terminal.say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be \e[36mcyan\e[0m!\n", @output.string)
+
+    cli.say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be \e[36mcyan\e[0m!\n", cli_output.string)
+
+    gterm_output.truncate(gterm_output.rewind)
+    @output.truncate(@output.rewind)
+    cli_output.truncate(cli_output.rewind)
+
+    # Testing with both use_color setted to false
+    HighLine.use_color = false
+    @terminal.use_color = false
+    cli.use_color = false
+
+    say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be cyan!\n", gterm_output.string)
+
+    @terminal.say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be cyan!\n", @output.string)
+
+    cli.say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be cyan!\n", cli_output.string)
+
+    gterm_output.truncate(gterm_output.rewind)
+    @output.truncate(@output.rewind)
+    cli_output.truncate(cli_output.rewind)
+
+    # Now check when class and instance doesn't agree about use_color
+
+    # Class false, instance true
+    HighLine.use_color = false
+    @terminal.use_color = false
+    cli.use_color = true
+
+    say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be cyan!\n", gterm_output.string)
+
+    @terminal.say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be cyan!\n", @output.string)
+
+    cli.say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be \e[36mcyan\e[0m!\n", cli_output.string)
+
+    gterm_output.truncate(gterm_output.rewind)
+    @output.truncate(@output.rewind)
+    cli_output.truncate(cli_output.rewind)
+
+    # Class true, instance false
+    HighLine.use_color = true
+    @terminal.use_color = true
+    cli.use_color = false
+
+    say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be \e[36mcyan\e[0m!\n", gterm_output.string)
+
+    @terminal.say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be \e[36mcyan\e[0m!\n", @output.string)
+
+    cli.say("This should be <%= color('cyan', CYAN) %>!")
+    assert_equal("This should be cyan!\n", cli_output.string )
+
+    gterm_output.truncate(gterm_output.rewind)
+    @output.truncate(@output.rewind)
+    cli_output.truncate(cli_output.rewind)
+
+    HighLine.use_color = old_setting
+    @terminal.use_color = old_setting
+    $terminal = old_glob_term
+  end
+
+  def test_reset_use_color
+    HighLine.use_color = false
+    refute HighLine.use_color?
+    HighLine.reset_use_color
+    assert HighLine.use_color?
+  end
+
+  def test_reset_use_color_when_highline_reset
+    HighLine.use_color = false
+    refute HighLine.use_color?
+    HighLine.reset
+    assert HighLine.use_color?
   end
 
   def test_uncolor
@@ -539,6 +689,24 @@ class TestHighLine < Minitest::Test
     assert_equal( "Enter a filename:  " +
                   "Are you sure you want to overwrite junk.txt?  ",
                   @output.string )
+
+    @input.truncate(@input.rewind)
+    @input << "junk.txt\nyes\nsave.txt\nn\n"
+    @input.rewind
+    @output.truncate(@output.rewind)
+
+    scoped_variable = { "junk.txt" => '20mb' }
+    answer = @terminal.ask("Enter a filename:  ") do |q|
+      q.confirm = Proc.new do |answer| 
+        "Are you sure you want to overwrite #{answer} with size " +
+         "of #{scoped_variable[answer]}? "
+      end
+    end
+    assert_equal("junk.txt", answer)
+    assert_equal( "Enter a filename:  " +
+                  "Are you sure you want to overwrite junk.txt " +
+                  "with size of 20mb? ",
+                  @output.string )
   end
   
   def test_generic_confirm_with_true

data/test/test_menu.rb

@@ -31,6 +31,18 @@ class TestMenu < Minitest::Test
     assert_equal("Sample2", output)
   end
 
+  def test_default
+    @input << "\n"
+    @input.rewind
+
+    output = @terminal.choose do |menu|
+      menu.choices("Sample1", "Sample2", "Sample3")
+      menu.default = "Sample1"
+    end
+
+    assert_equal("Sample1", output)
+  end
+
   def test_flow
     @input << "Sample1\n"
     @input.rewind
@@ -114,8 +126,8 @@ class TestMenu < Minitest::Test
     @input.rewind
 
     selected = @terminal.choose do |menu|
-      menu.add_item(HighLine::Menu::MenuItem.new("Sample1", text: "Sample2"))
-      menu.add_item(HighLine::Menu::MenuItem.new("Sample2", text: "Sample1"))
+      menu.add_item(HighLine::Menu::Item.new("Sample1", text: "Sample2"))
+      menu.add_item(HighLine::Menu::Item.new("Sample2", text: "Sample1"))
     end
     assert_equal(selected, "Sample1")
     assert_equal("1. Sample2\n" +
@@ -128,8 +140,8 @@ class TestMenu < Minitest::Test
     @input.rewind
 
     selected = @terminal.choose do |menu|
-      menu.add_item(HighLine::Menu::MenuItem.new("Sample1", text: "Sample2"))
-      menu.add_item(HighLine::Menu::MenuItem.new("Sample2", text: "Sample1"))
+      menu.add_item(HighLine::Menu::Item.new("Sample1", text: "Sample2"))
+      menu.add_item(HighLine::Menu::Item.new("Sample2", text: "Sample1"))
     end
     assert_equal(selected, "Sample2")
     assert_equal("1. Sample2\n" +
@@ -235,6 +247,89 @@ class TestMenu < Minitest::Test
     assert_equal("* Sample1\n* Sample2\n* Sample3\n?  ", @output.string)
   end
 
+  def test_index_with_color
+    index_color = :rgb_77bbff
+
+    @input << "Sample1\n"
+    @input.rewind
+
+    @terminal.choose do |menu|
+      # Default:  menu.index = :number
+      menu.index_color = index_color
+
+      menu.choice "Sample1"
+      menu.choice "Sample2"
+      menu.choice "Sample3"
+    end
+
+    assert_equal(
+      HighLine.color("1. ", index_color) + "Sample1\n" +
+      HighLine.color("2. ", index_color) + "Sample2\n" +
+      HighLine.color("3. ", index_color) + "Sample3\n" +
+      "?  ",
+      @output.string
+    )
+
+    @output.truncate(@output.rewind)
+    @input.rewind
+
+    @terminal.choose do |menu|
+      menu.index        = :letter
+      menu.index_suffix = ") "
+      menu.index_color = index_color
+
+      menu.choice "Sample1"
+      menu.choice "Sample2"
+      menu.choice "Sample3"
+    end
+
+    assert_equal(
+      HighLine.color("a) ", index_color) + "Sample1\n" +
+      HighLine.color("b) ", index_color) + "Sample2\n" +
+      HighLine.color("c) ", index_color) + "Sample3\n?  ",
+      @output.string
+    )
+
+    @output.truncate(@output.rewind)
+    @input.rewind
+
+    @terminal.choose do |menu|
+      menu.index = :none
+      menu.index_color = index_color
+
+      menu.choice "Sample1"
+      menu.choice "Sample2"
+      menu.choice "Sample3"
+    end
+
+    assert_equal(
+      HighLine.color("Sample1", index_color) + "\n" +
+      HighLine.color("Sample2", index_color) + "\n" +
+      HighLine.color("Sample3", index_color) + "\n?  ",
+      @output.string
+    )
+
+    @output.truncate(@output.rewind)
+    @input.rewind
+
+    @terminal.choose do |menu|
+      menu.index = "*"
+      menu.index_color = index_color
+
+      menu.choice "Sample1"
+      menu.choice "Sample2"
+      menu.choice "Sample3"
+    end
+
+    colored_asterix = HighLine.color("* ", index_color)
+    assert_equal(
+      "#{colored_asterix}Sample1\n" +
+      "#{colored_asterix}Sample2\n" +
+      "#{colored_asterix}Sample3\n?  ",
+      @output.string
+    )
+  end
+
   def test_layouts
     @input << "save\n"
     @input.rewind

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.develop.6
+  version: 2.0.0.pre.develop.9
 platform: ruby
 authors:
 - James Edward Gray II
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_statistics
@@ -39,6 +39,7 @@ extra_rdoc_files:
 - LICENSE
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".simplecov"
 - ".travis.yml"
 - AUTHORS
@@ -74,6 +75,7 @@ files:
 - lib/highline/list.rb
 - lib/highline/list_renderer.rb
 - lib/highline/menu.rb
+- lib/highline/menu/item.rb
 - lib/highline/paginator.rb
 - lib/highline/question.rb
 - lib/highline/question/answer_converter.rb
@@ -135,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: highline
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: HighLine is a high-level command-line IO library.