highline 1.6.15 → 1.6.16

data/lib/highline/system_extensions.rb

@@ -11,13 +11,13 @@ class HighLine
   module SystemExtensions
     JRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
-    def initialize
-      if JRUBY
+    if JRUBY
+      def initialize_system_extensions
         require 'java'
         if JRUBY_VERSION =~ /^1.7/
           java_import 'jline.console.ConsoleReader'
 
-          @java_console = ConsoleReader.new($stdin.to_inputstream, $stdout.to_outputstream)
+          @java_console = ConsoleReader.new(@input.to_inputstream, @output.to_outputstream)
           @java_console.set_history_enabled(false)
           @java_console.set_bell_enabled(true)
           @java_console.set_pagination_enabled(false)
@@ -28,8 +28,8 @@ class HighLine
           java_import 'jline.ConsoleReader'
           java_import 'jline.Terminal'
 
-          @java_input = Channels.newInputStream($stdin.to_channel)
-          @java_output = OutputStreamWriter.new(Channels.newOutputStream($stdout.to_channel))
+          @java_input = Channels.newInputStream(@input.to_channel)
+          @java_output = OutputStreamWriter.new(Channels.newOutputStream(@output.to_channel))
           @java_terminal = Terminal.getTerminal
           @java_console = ConsoleReader.new(@java_input, @java_output)
           @java_console.setUseHistory(false)
@@ -41,10 +41,6 @@ class HighLine
 
     module_function
 
-    def get_character( input = STDIN )
-      input.getbyte
-    end
-
     #
     # This section builds character reading and terminal size functions
     # to suit the proper platform we're running on.  Be warned:  Here be
@@ -186,5 +182,11 @@ class HighLine
         end
       end
     end
+
+    if not defined?(get_character)
+      def get_character( input = STDIN )
+        input.getbyte
+      end
+    end
   end
 end

data/setup.rb

@@ -538,7 +538,7 @@ module FileOperations
   def ruby(str)
     command config('rubyprog') + ' ' + str
   end
-  
+
   def make(task = '')
     command config('makeprog') + ' ' + task
   end
@@ -629,7 +629,7 @@ module HookScriptAPI
   def srcdirectory?(path)
     File.dir?(srcfile(path))
   end
-  
+
   def srcfile?(path)
     File.file? srcfile(path)
   end
@@ -710,7 +710,7 @@ class ToplevelInstaller
       __send__ "exec_#{task}"
     end
   end
-  
+
   def run_metaconfigs
     eval_file_ifexist "#{@ardir}/metaconfig"
   end
@@ -775,7 +775,7 @@ class ToplevelInstaller
       when '-v', '--version'
         puts "#{File.basename($0)} version #{Version}"
         exit 0
-      
+
       when '--copyright'
         puts Copyright
         exit 0
@@ -1197,9 +1197,9 @@ class Installer
   def ruby_scripts
     collect_filenames_auto().select {|n| /\.rb\z/ =~ n }
   end
-  
+
   # picked up many entries from cvs-1.11.1/src/ignore.c
-  reject_patterns = %w( 
+  reject_patterns = %w(
     core RCSLOG tags TAGS .make.state
     .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
     *~ *.old *.bak *.BAK *.orig *.rej _$* *$

data/site/index.html

@@ -15,7 +15,7 @@
 
 	<p>Command line interfaces are meant to be easy.  So why shouldn&#8217;t building
 them be easy, too?  HighLine provides a solid toolset to help you get
-the job done cleanly so you can focus on the real task at hand, 
+the job done cleanly so you can focus on the real task at hand,
 <em>your task.</em></p>
 
 

data/test/tc_highline.rb

@@ -69,7 +69,73 @@ class TestHighLine < Test::Unit::TestCase
 
     assert_raise(EOFError) { @terminal.ask("Any input left?  ", String) }
   end
+
+  def test_indent
+    text = "Testing...\n"
+    @terminal.indent_level=1
+    @terminal.say(text)
+    assert_equal(' '*3+text, @output.string)
+
+    @output.truncate(@output.rewind)
+    @terminal.indent_level=3
+    @terminal.say(text)
+    assert_equal(' '*9+text, @output.string)
+
+    @output.truncate(@output.rewind)
+    @terminal.indent_level=0
+    @terminal.indent_size=5
+    @terminal.indent(2, text)
+    assert_equal(' '*10+text, @output.string)
+
+    @output.truncate(@output.rewind)
+    @terminal.indent_size=4
+    @terminal.indent {
+        @terminal.say(text)
+    }
+    assert_equal(' '*4+text, @output.string)
+
+    @output.truncate(@output.rewind)
+    @terminal.indent_size=2
+    @terminal.indent(3) { |t|
+        t.say(text)
+    }
+    assert_equal(' '*6+text, @output.string)
+
+    @output.truncate(@output.rewind)
+    @terminal.indent { |t|
+        t.indent {
+            t.indent {
+                t.indent { |tt|
+                    tt.say(text)
+                }
+            }
+        }
+    }
+    assert_equal(' '*8+text, @output.string)
+
+    text = "Multi\nLine\nIndentation\n"
+    indent = ' '*4
+    @terminal.indent_level=2
+    @output.truncate(@output.rewind)
+    @terminal.say(text)
+    assert_equal("#{indent}Multi\n#{indent}Line\n#{indent}Indentation\n", @output.string)
+
+    @output.truncate(@output.rewind)
+    @terminal.multi_indent = false
+    @terminal.say(text)
+    assert_equal("#{indent}Multi\nLine\nIndentation\n", @output.string)
+
+    @output.truncate(@output.rewind)
+    @terminal.indent(0, text, true)
+    assert_equal("#{indent}Multi\n#{indent}Line\n#{indent}Indentation\n", @output.string)
+  end
   
+  def test_newline
+    @terminal.newline
+    @terminal.newline
+    assert_equal("\n\n", @output.string)
+  end
+
   def test_bug_fixes
     # auto-complete bug
     @input << "ruby\nRuby\n"
@@ -153,10 +219,10 @@ class TestHighLine < Test::Unit::TestCase
       @input << "\b\b"
       @input.rewind
       answer = @terminal.ask("Please enter your password: ") do |q| 
-          q.echo = "*" 
+        q.echo = "*" 
       end
       assert_equal("", answer)
-      assert_equal("Please enter your password: \n",@output.string)
+      assert_equal("Please enter your password: \n", @output.string)
   end
   
   def test_readline_on_non_echo_question_has_prompt
@@ -167,7 +233,7 @@ class TestHighLine < Test::Unit::TestCase
       q.echo = "*"
     end
     assert_equal("you can't see me", answer)
-    assert_equal("Please enter some hidden text: ****************\n",@output.string)
+    assert_equal("Please enter some hidden text: ****************\n", @output.string)
   end
   
   def test_character_reading
@@ -839,6 +905,28 @@ class TestHighLine < Test::Unit::TestCase
 
     @terminal.say("This will not have a newline.  ")
     assert_equal("This will not have a newline.  ", @output.string)
+
+    @output.truncate(@output.rewind)
+    
+    @terminal.say("This will not\n end with a newline. ")
+    assert_equal("This will not\n end with a newline. ", @output.string)
+
+    @output.truncate(@output.rewind)
+
+    @terminal.say("This will \nend with a newline.")
+    assert_equal("This will \nend with a newline.\n", @output.string)
+
+    @output.truncate(@output.rewind)
+
+    colorized = @terminal.color("This will not have a newline. ", :green)
+    @terminal.say(colorized)
+    assert_equal("\e[32mThis will not have a newline. \e[0m", @output.string)
+
+    @output.truncate(@output.rewind)
+
+    colorized = @terminal.color("This will have a newline.", :green)
+    @terminal.say(colorized)
+    assert_equal("\e[32mThis will have a newline.\e[0m\n", @output.string)
   end
 
   def test_type_conversion

data/test/tc_style.rb

@@ -379,7 +379,7 @@ class TestStyle < Test::Unit::TestCase
     
     # Add a Style with a new name and code
     assert_nil HighLine::Style.code_index['chewie']
-    s8 = HighLine::Style.new(:name=>:s8, :code=>'chewie')
+    HighLine::Style.new(:name=>:s8, :code=>'chewie')
     assert_equal list_size+1, HighLine::Style.code_index.size
     assert_instance_of Array, HighLine::Style.code_index['chewie']
     assert_equal 1, HighLine::Style.code_index['chewie'].size
@@ -388,7 +388,7 @@ class TestStyle < Test::Unit::TestCase
 
     # Add another Style with a new name and code
     assert_nil HighLine::Style.code_index['c3po']
-    s9 = HighLine::Style.new(:name=>:s9, :code=>'c3po')
+    HighLine::Style.new(:name=>:s9, :code=>'c3po')
     assert_equal list_size+2,  HighLine::Style.code_index.size
     assert_instance_of Array, HighLine::Style.code_index['c3po']
     assert_equal 1, HighLine::Style.code_index['c3po'].size
@@ -397,7 +397,7 @@ class TestStyle < Test::Unit::TestCase
 
     # Add a Style with an existing code
     assert_equal 1, HighLine::Style.code_index['c3po'].size
-    s10 = HighLine::Style.new(:name=>:s10, :code=>'c3po')
+    HighLine::Style.new(:name=>:s10, :code=>'c3po')
     assert_equal list_size+2,  HighLine::Style.code_index.size
     assert_equal 2, HighLine::Style.code_index['c3po'].size
     assert_equal :s10, HighLine::Style.code_index['c3po'].last.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 1.6.15
+  version: 1.6.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies: []
 description: ! 'A high-level IO library that provides validation, type conversion,
   and more for
@@ -45,6 +45,7 @@ files:
 - examples/asking_for_arrays.rb
 - examples/basic_usage.rb
 - examples/color_scheme.rb
+- examples/get_character.rb
 - examples/limit.rb
 - examples/menus.rb
 - examples/overwrite.rb
@@ -79,7 +80,8 @@ files:
 - test/tc_style.rb
 - test/ts_all.rb
 homepage: http://highline.rubyforge.org
-licenses: []
+licenses:
+- Ruby
 post_install_message: 
 rdoc_options:
 - --title