highline 1.7.10 → 2.0.0.pre.develop.2

data/test/{tc_import.rb → test_import.rb}

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
 # tc_import.rb
 #
 #  Created by James Edward Gray II on 2005-04-26.
@@ -5,12 +8,12 @@
 #
 #  This is Free Software.  See LICENSE and COPYING for details.
 
-require "test/unit"
+require "test_helper"
 
 require "highline/import"
 require "stringio"
 
-class TestImport < Test::Unit::TestCase
+class TestImport < Minitest::Test
   def test_import
     assert_respond_to(self, :agree)
     assert_respond_to(self, :ask)

data/test/test_list.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
+require "test_helper"
+
+require "highline/list"
+
+class TestHighLineList < Minitest::Test
+  def setup
+    @items = [ "a", "b", "c", "d", "e", "f", "g", "h", "i", "j" ]
+  end
+
+  def test_in_2_cols
+    list_in_two_cols =
+      [ [ "a", "b" ],
+        [ "c", "d" ],
+        [ "e", "f" ],
+        [ "g", "h" ],
+        [ "i", "j" ] ]
+
+    highline_list = HighLine::List.new(@items, cols: 2)
+
+    assert_equal list_in_two_cols, highline_list.list
+  end
+
+  def test_in_2_cols_col_down
+    col_down_list =
+      [ [ "a", "f"],
+        [ "b", "g"],
+        [ "c", "h"],
+        [ "d", "i"],
+        [ "e", "j"] ]
+
+    highline_list = HighLine::List.new(@items, cols: 2, col_down: true)
+
+    assert_equal col_down_list, highline_list.list
+  end
+
+  def test_in_2_cols_transposed
+    transposed_list =
+      [ [ "a", "c", "e", "g", "i" ],
+        [ "b", "d", "f", "h", "j" ] ]
+
+    highline_list = HighLine::List.new(@items, cols: 2, transpose: true)
+
+    assert_equal transposed_list, highline_list.list
+  end
+
+  def test_in_3_cols
+    list_in_three_cols =
+      [ [ "a", "b", "c" ],
+        [ "d", "e", "f" ],
+        [ "g", "h", "i" ],
+        [ "j" ] ]
+
+    highline_list = HighLine::List.new(@items, cols: 3)
+
+    assert_equal list_in_three_cols, highline_list.list
+  end
+end

data/test/{tc_menu.rb → test_menu.rb}

@@ -1,4 +1,6 @@
+#!/usr/bin/env ruby
 # coding: utf-8
+
 # tc_menu.rb
 #
 #  Created by Gregory Thomas Brown on 2005-05-10.
@@ -6,13 +8,14 @@
 #
 #  This is Free Software. See LICENSE and COPYING for details.
 
-require "test/unit"
+require "test_helper"
 
 require "highline"
 require "stringio"
 
-class TestMenu < Test::Unit::TestCase
+class TestMenu < Minitest::Test
   def setup
+    HighLine.reset
     @input    = StringIO.new
     @output   = StringIO.new
     @terminal = HighLine.new(@input, @output)
@@ -201,7 +204,7 @@ class TestMenu < Test::Unit::TestCase
     @output.truncate(@output.rewind)
 
     @terminal.choose(:load, :save, :quit) do |menu|
-      menu.layout = '<%= list(@menu) %>File Menu:  '
+      menu.layout = '<%= list(menu) %>File Menu:  '
     end
     assert_equal("1. load\n2. save\n3. quit\nFile Menu:  ", @output.string)
   end

data/test/test_paginator.rb

@@ -0,0 +1,73 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
+require "test_helper"
+
+require "highline"
+
+class TestHighLinePaginator < Minitest::Test
+  def setup
+    HighLine.reset
+    @input    = StringIO.new
+    @output   = StringIO.new
+    @terminal = HighLine.new(@input, @output)
+  end
+
+  def test_paging
+    @terminal.page_at = 22
+
+    @input << "\n\n"
+    @input.rewind
+
+    @terminal.say((1..50).map { |n| "This is line #{n}.\n"}.join)
+    assert_equal( (1..22).map { |n| "This is line #{n}.\n"}.join +
+                  "\n-- press enter/return to continue or q to stop -- \n\n" +
+                  (23..44).map { |n| "This is line #{n}.\n"}.join +
+                  "\n-- press enter/return to continue or q to stop -- \n\n" +
+                  (45..50).map { |n| "This is line #{n}.\n"}.join,
+                  @output.string )
+  end
+
+  def test_statement_lines_count_equal_to_page_at_shouldnt_paginate
+    @terminal.page_at = 6
+
+    @input << "\n"
+    @input.rewind
+
+    list = "a\nb\nc\nd\ne\nf\n"
+
+    @terminal.say(list)
+    assert_equal(list, @output.string)
+  end
+
+  def test_statement_with_one_line_bigger_than_page_at_should_paginate
+    @terminal.page_at = 6
+
+    @input << "\n"
+    @input.rewind
+
+    list = "a\nb\nc\nd\ne\nf\ng\n"
+
+    paginated =
+      "a\nb\nc\nd\ne\nf\n" \
+      "\n-- press enter/return to continue or q to stop -- \n\n" \
+      "g\n"
+
+    @terminal.say(list)
+    assert_equal(paginated, @output.string)
+  end
+
+  def test_quiting_paging_shouldnt_raise
+    # See https://github.com/JEG2/highline/issues/168
+
+    @terminal.page_at = 6
+
+    @input << "q"
+    @input.rewind
+
+    list = "a\nb\nc\nd\ne\nf\n"
+
+    # expect not to raise an error on next line
+    @terminal.say(list)
+  end
+end

data/test/test_question_asker.rb

@@ -0,0 +1,20 @@
+require "test_helper"
+
+class TestQuestion < Minitest::Test
+  def setup
+    @input    = StringIO.new
+    @output   = StringIO.new
+    @highline = HighLine.new(@input, @output)
+
+    @question = HighLine::Question.new("How are you?", nil)
+    @asker    = HighLine::QuestionAsker.new(@question, @highline)
+  end
+
+  def test_ask_once
+    answer = "Very good, thanks for asking!"
+
+    @input.string = answer
+
+    assert_equal answer, @asker.ask_once
+  end
+end

data/test/test_simulator.rb

@@ -0,0 +1,24 @@
+require "test_helper"
+
+require "highline/import"
+require "highline/simulate"
+
+class SimulatorTest < Minitest::Test
+  def setup
+    input     = StringIO.new
+    output    = StringIO.new
+    $terminal = HighLine.new(input, output)
+  end
+
+  def test_simulator
+    HighLine::Simulate.with("Bugs Bunny", "18") do
+      name = ask("What is your name?")
+
+      assert_equal "Bugs Bunny", name
+
+      age = ask("What is your age?")
+
+      assert_equal "18", age
+    end
+  end
+end

data/test/test_string_extension.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
+# tc_string_extension.rb
+#
+#  Created by Richard LeBer 2011-06-27
+#
+#  This is Free Software.  See LICENSE and COPYING for details.
+
+require "test_helper"
+
+require "highline"
+require "stringio"
+require "string_methods"
+
+
+# FakeString is here just to avoid
+# using HighLine.colorize_strings
+# on tests
+
+class FakeString < String
+  include HighLine::StringExtensions
+end
+
+class TestStringExtension < Minitest::Test
+  def setup
+    HighLine.reset
+    @string = FakeString.new "string"
+  end
+
+  def teardown
+    HighLine.reset
+  end
+
+  include StringMethods
+
+  def test_Highline_String_is_yaml_serializable
+    require 'yaml'
+    unless Gem::Version.new(YAML::VERSION) < Gem::Version.new("2.0.2")
+      highline_string = HighLine::String.new("Yaml didn't messed with HighLine::String")
+      yaml_highline_string = highline_string.to_yaml
+      yaml_loaded_string = YAML.load(yaml_highline_string)
+
+      assert_equal "Yaml didn't messed with HighLine::String", yaml_loaded_string
+      assert_equal highline_string, yaml_loaded_string
+      assert_instance_of HighLine::String, yaml_loaded_string
+    end
+  end
+
+  def test_highline_string_respond_to_color
+    assert HighLine::String.new("highline string").respond_to? :color
+  end
+
+  def test_normal_string_doesnt_respond_to_color
+    refute "normal_string".respond_to? :color
+  end
+
+  def test_highline_string_still_raises_for_non_available_messages
+    assert_raises(NoMethodError) do
+      @string.unknown_message
+    end
+  end
+
+  def test_String_includes_StringExtension_when_receives_colorize_strings
+    @include_received = 0
+    caller = Proc.new { @include_received += 1 }
+    ::String.stub :include, caller do
+      HighLine.colorize_strings
+    end
+    assert_equal 1, @include_received
+  end
+end

data/test/{tc_string_highline.rb → test_string_highline.rb}

@@ -1,17 +1,21 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
 # tc_highline_string.rb
 #
 #  Created by Richard LeBer 2011-06-27
 #
 #  This is Free Software.  See LICENSE and COPYING for details.
 
-require "test/unit"
+require "test_helper"
 
 require "highline"
 require "stringio"
 require "string_methods"
 
-class TestHighLineString < Test::Unit::TestCase
+class TestHighLineString < Minitest::Test
   def setup
+    HighLine.reset
     @string = HighLine::String.new("string")
   end
 
@@ -33,6 +37,6 @@ class TestHighLineString < Test::Unit::TestCase
   include StringMethods
   
   def test_string_class_is_unchanged
-    assert_raise(::NoMethodError) { "string".color(:blue) }
+    assert_raises(::NoMethodError) { "string".color(:blue) }
   end
 end

data/test/{tc_style.rb → test_style.rb}

@@ -1,17 +1,21 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
 # tc_style.rb
 #
 #  Created by Richard LeBer on 2011-06-11.
 #
 #  This is Free Software.  See LICENSE and COPYING for details.
 
-require "test/unit"
+require "test_helper"
 
 require "highline"
 require "stringio"
 
-class TestStyle < Test::Unit::TestCase
+class TestStyle < Minitest::Test
   
   def setup
+    HighLine.reset
     @input    = StringIO.new
     @output   = StringIO.new
     @terminal = HighLine.new(@input, @output)  
@@ -19,12 +23,33 @@ class TestStyle < Test::Unit::TestCase
     @style2   = HighLine::Style.new(:name=>:lando, :code=>"\e[98m")
     @style3   = HighLine::Style.new(:name=>[:foo, :lando], :list=>[:foo, :lando])
     @style4   = HighLine::Style(:rgb_654321)
+    @added_styles_on_setup = 4 # update here if added more styles
+    @added_codes_to_index  = 3 # :foo, :lando and :rgb_654321
   end
-  
-  def teardown
-    # HighLine::Style.clear_index
+
+  def test_clear_index_reset_styles_to_builtin
+    styles_size_after_setup = HighLine::Style.list.size
+    expected_styles_size = styles_size_after_setup - @added_styles_on_setup
+
+    HighLine::Style.clear_index
+    styles_size_after_clear_index = HighLine::Style.list.size
+
+    assert_equal expected_styles_size, styles_size_after_clear_index
   end
-  
+
+  def test_clear_index_reset_code_index_to_builtin
+    code_index = HighLine::Style.code_index
+    code_index_array = code_index.map { |code, style_array| style_array }.flatten
+    expected_code_index_array_size = code_index_array.size - @added_codes_to_index
+
+    HighLine::Style.clear_index
+
+    cleared_code_index = HighLine::Style.code_index
+    cleared_code_index_array = cleared_code_index.map { |code, style_array| style_array }.flatten
+
+    assert_equal  expected_code_index_array_size, cleared_code_index_array.size
+  end
+
   def test_style_method
     # Retrieve a style from an existing Style (no new Style created)
     new_style = @style1.dup # This will replace @style1 in the indexes
@@ -44,18 +69,28 @@ class TestStyle < Test::Unit::TestCase
     assert_nil s.list
     assert_equal "\e[1m", s.code
     assert_equal :bold, s.name
+    assert s.builtin
 
     # Create a builtin style from a new ANSI escape string
     s = HighLine.Style("\e[96m")
     assert_instance_of HighLine::Style, s
     assert_nil s.list
     assert_equal "\e[96m", s.code
+    assert s.builtin
+
+    # Create a non-builtin style from a string
+    s = HighLine.Style("\e[109m")
+    assert_instance_of HighLine::Style, s
+    assert_nil s.list
+    assert_equal "\e[109m", s.code
+    refute s.builtin
 
     # Create a builtin style from a symbol
     s = HighLine.Style(:red)
     assert_instance_of HighLine::Style, s
     assert_nil s.list
     assert_equal :red, s.name
+    assert s.builtin
 
     # Retrieve an existing style by name (no new Style created)
     s = HighLine.Style(@style2.name)
@@ -101,12 +136,12 @@ class TestStyle < Test::Unit::TestCase
     assert_equal [:underline, :blue], s1.list
     
     # Raise an error for an undefined style
-    assert_raise(::NameError) { HighLine.Style(:fubar) }
+    assert_raises(::NameError) { HighLine.Style(:fubar) }
   end
   
   def test_no_color_scheme
     HighLine.color_scheme = nil
-    assert_raise(::NameError) { HighLine.Style(:critical) }
+    assert_raises(::NameError) { HighLine.Style(:critical) }
   end
   
   def test_with_color_scheme
@@ -155,7 +190,7 @@ class TestStyle < Test::Unit::TestCase
     assert_nil HighLine::Style.list[:s1]
     assert_nil HighLine::Style.code_index['foo']
     s1 = HighLine::Style.new(:name=>:s1, :code=>'foo')
-    assert_not_nil HighLine::Style.list[:s1]
+    refute_nil HighLine::Style.list[:s1]
     assert_same s1, HighLine::Style.list[:s1]
     assert_equal :s1, HighLine::Style.list[:s1].name
     assert_equal 'foo', HighLine::Style.list[:s1].code
@@ -173,7 +208,7 @@ class TestStyle < Test::Unit::TestCase
     s2 = HighLine::Style.new(:name=>:s2, :code=>'bar')
     assert_equal styles+1, HighLine::Style.list.size
     assert_equal codes+1,  HighLine::Style.code_index.size
-    assert_not_nil HighLine::Style.list[:s2]
+    refute_nil HighLine::Style.list[:s2]
     assert_same s2, HighLine::Style.list[:s2]
     assert_equal :s2, HighLine::Style.list[:s2].name
     assert_equal 'bar', HighLine::Style.list[:s2].code
@@ -185,16 +220,16 @@ class TestStyle < Test::Unit::TestCase
     
     # Add a Style with an existing name
     s3_before = HighLine::Style.list[:s2]
-    assert_not_nil HighLine::Style.list[:s2]
+    refute_nil HighLine::Style.list[:s2]
     assert_nil HighLine::Style.code_index['baz']
     s3 = HighLine::Style.new(:name=>:s2, :code=>'baz')
-    assert_not_same s2, s3
-    assert_not_same s3_before, s3
+    refute_same s2, s3
+    refute_same s3_before, s3
     assert_equal styles+1, HighLine::Style.list.size
     assert_equal codes+2,  HighLine::Style.code_index.size
-    assert_not_nil HighLine::Style.list[:s2]
+    refute_nil HighLine::Style.list[:s2]
     assert_same s3, HighLine::Style.list[:s2]
-    assert_not_same s2, HighLine::Style.list[:s2]
+    refute_same s2, HighLine::Style.list[:s2]
     assert_equal :s2, HighLine::Style.list[:s2].name
     assert_equal 'baz', HighLine::Style.list[:s2].code
     assert_instance_of Array, HighLine::Style.code_index['baz']
@@ -208,7 +243,7 @@ class TestStyle < Test::Unit::TestCase
     s4 = HighLine::Style.new(:name=>:s4, :code=>'baz')
     assert_equal styles+2, HighLine::Style.list.size
     assert_equal codes+2,  HighLine::Style.code_index.size
-    assert_not_nil HighLine::Style.list[:s4]
+    refute_nil HighLine::Style.list[:s4]
     assert_same s4, HighLine::Style.list[:s4]
     assert_equal :s4, HighLine::Style.list[:s4].name
     assert_equal 'baz', HighLine::Style.list[:s4].code
@@ -348,9 +383,9 @@ class TestStyle < Test::Unit::TestCase
     # Add a Style with a new name and code
     assert_nil HighLine::Style.list[:s5]
     s5 = HighLine::Style.new(:name=>:s5, :code=>'foo')
-    assert_not_nil HighLine::Style.list[:s5]
+    refute_nil HighLine::Style.list[:s5]
     assert_equal list_size+1, HighLine::Style.list.size
-    assert_not_nil HighLine::Style.list[:s5]
+    refute_nil HighLine::Style.list[:s5]
     assert_same s5, HighLine::Style.list[:s5]
     assert_equal :s5, HighLine::Style.list[:s5].name
     assert_equal 'foo', HighLine::Style.list[:s5].code
@@ -359,7 +394,7 @@ class TestStyle < Test::Unit::TestCase
     assert_nil HighLine::Style.list[:s6]
     s6 = HighLine::Style.new(:name=>:s6, :code=>'bar')
     assert_equal list_size+2, HighLine::Style.list.size
-    assert_not_nil HighLine::Style.list[:s6]
+    refute_nil HighLine::Style.list[:s6]
     assert_same s6, HighLine::Style.list[:s6]
     assert_equal :s6, HighLine::Style.list[:s6].name
     assert_equal 'bar', HighLine::Style.list[:s6].code
@@ -367,9 +402,9 @@ class TestStyle < Test::Unit::TestCase
     # Add a Style with an existing name
     s7 = HighLine::Style.new(:name=>:s6, :code=>'baz')
     assert_equal list_size+2, HighLine::Style.list.size # No net addition to list
-    assert_not_nil HighLine::Style.list[:s6]
+    refute_nil HighLine::Style.list[:s6]
     assert_same s7, HighLine::Style.list[:s6] # New one replaces old one
-    assert_not_same s6, HighLine::Style.list[:s6]
+    refute_same s6, HighLine::Style.list[:s6]
     assert_equal :s6, HighLine::Style.list[:s6].name
     assert_equal 'baz', HighLine::Style.list[:s6].code
   end
@@ -460,35 +495,35 @@ class TestStyle < Test::Unit::TestCase
     
     s1 = @style1.variant(:new_foo1, :code=>'abracadabra')
     assert_instance_of HighLine::Style, s1
-    assert_not_same @style1, s1 # This is a copy
+    refute_same @style1, s1 # This is a copy
     assert_equal :new_foo1, s1.name # Changed
     assert_equal 'abracadabra', s1.code # Changed
     assert_equal [1,2,3], s1.rgb # Unchanged
     
     s2 = @style1.variant(:new_foo2, :increment=>-15)
     assert_instance_of HighLine::Style, s2
-    assert_not_same @style1, s2     # This is a copy
+    refute_same @style1, s2     # This is a copy
     assert_equal :new_foo2, s2.name # Changed
     assert_equal "\e[84m", s2.code  # 99 (original code) - 15
     assert_equal [1,2,3], s2.rgb    # Unchanged
     
     s3 = @style1.variant(:new_foo3, :code=>"\e[55m", :increment=>15)
     assert_instance_of HighLine::Style, s3
-    assert_not_same @style1, s3     # This is a copy
+    refute_same @style1, s3     # This is a copy
     assert_equal :new_foo3, s3.name # Changed
     assert_equal "\e[70m", s3.code  # 99 (new code) + 15
     assert_equal [1,2,3], s3.rgb    # Unchanged
     
     s4 = @style1.variant(:new_foo4, :code=>"\e[55m", :increment=>15, :rgb=>"blah")
     assert_instance_of HighLine::Style, s4
-    assert_not_same @style1, s4     # This is a copy
+    refute_same @style1, s4     # This is a copy
     assert_equal :new_foo4, s4.name # Changed
     assert_equal "\e[70m", s4.code  # 99 (new code) + 15
     assert_equal 'blah', s4.rgb     # Changed
 
     s5 = @style1.variant(:new_foo5)
     assert_instance_of HighLine::Style, s5
-    assert_not_same @style1, s5     # This is a copy
+    refute_same @style1, s5     # This is a copy
     assert_equal :new_foo5, s5.name # Changed
     assert_equal "\e[99m", s5.code  # Unchanged
     assert_equal [1,2,3], s5.rgb    # Unchanged
@@ -498,7 +533,7 @@ class TestStyle < Test::Unit::TestCase
     assert_equal style1_code, @style1.code
     assert_equal style1_rgb,  @style1.rgb
     
-    assert_raise(::RuntimeError) { @style3.variant(:new_foo6) } # Can't create a variant of a list style
+    assert_raises(::RuntimeError) { @style3.variant(:new_foo6) } # Can't create a variant of a list style
   end
   
   def test_on
@@ -508,7 +543,7 @@ class TestStyle < Test::Unit::TestCase
     
     s1 = @style1.on
     assert_instance_of HighLine::Style, s1
-    assert_not_same @style1, s1     # This is a copy
+    refute_same @style1, s1     # This is a copy
     assert_equal :on_foo, s1.name   # Changed
     assert_equal "\e[109m", s1.code # Changed
     assert_equal [1,2,3], s1.rgb    # Unchanged
@@ -518,7 +553,7 @@ class TestStyle < Test::Unit::TestCase
     assert_equal style1_code, @style1.code
     assert_equal style1_rgb,  @style1.rgb
     
-    assert_raise(::RuntimeError) { @style3.on } # Can't create a variant of a list style
+    assert_raises(::RuntimeError) { @style3.on } # Can't create a variant of a list style
   end
   
   def test_bright
@@ -528,7 +563,7 @@ class TestStyle < Test::Unit::TestCase
     
     s1 = @style1.bright
     assert_instance_of HighLine::Style, s1
-    assert_not_same @style1, s1         # This is a copy
+    refute_same @style1, s1         # This is a copy
     assert_equal :bright_foo, s1.name   # Changed
     assert_equal "\e[159m", s1.code     # Changed
     assert_equal [129,130,131], s1.rgb  # Changed
@@ -541,7 +576,7 @@ class TestStyle < Test::Unit::TestCase
     s2_base = HighLine::Style.new(:name=>:leia, :code=>"\e[92m", :rgb=>[0,0,14])
     s2 = s2_base.bright
     assert_instance_of HighLine::Style, s2
-    assert_not_same s2_base, s2         # This is a copy
+    refute_same s2_base, s2         # This is a copy
     assert_equal :bright_leia, s2.name  # Changed
     assert_equal "\e[152m", s2.code     # Changed
     assert_equal [0,0,142], s2.rgb      # Changed
@@ -549,7 +584,7 @@ class TestStyle < Test::Unit::TestCase
     s3_base = HighLine::Style.new(:name=>:luke, :code=>"\e[93m", :rgb=>[20,21,0])
     s3 = s3_base.bright
     assert_instance_of HighLine::Style, s3
-    assert_not_same s3_base, s3         # This is a copy
+    refute_same s3_base, s3         # This is a copy
     assert_equal :bright_luke, s3.name  # Changed
     assert_equal "\e[153m", s3.code     # Changed
     assert_equal [148,149,0], s3.rgb    # Changed
@@ -557,19 +592,19 @@ class TestStyle < Test::Unit::TestCase
     s4_base = HighLine::Style.new(:name=>:r2d2, :code=>"\e[94m", :rgb=>[0,0,0])
     s4 = s4_base.bright
     assert_instance_of HighLine::Style, s4
-    assert_not_same s4_base, s4         # This is a copy
+    refute_same s4_base, s4         # This is a copy
     assert_equal :bright_r2d2, s4.name  # Changed
     assert_equal "\e[154m", s4.code     # Changed
     assert_equal [128,128,128], s4.rgb  # Changed; special case
     
-    assert_raise(::RuntimeError) { @style3.bright } # Can't create a variant of a list style
+    assert_raises(::RuntimeError) { @style3.bright } # Can't create a variant of a list style
   end
 
   def test_light_do_the_same_as_bright
     bright_style = @style1.bright
     light_style  = @style1.light
 
-    assert_not_equal bright_style, light_style
+    refute_equal bright_style, light_style
     assert_equal :bright_foo, bright_style.name
     assert_equal :light_foo, light_style.name
     assert_equal bright_style.code, light_style.code