highline 1.0.2 → 1.0.4

data/CHANGELOG

@@ -2,12 +2,20 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.0.4
+
+* Moved the HighLine project to Subversion.
+* HighLine's color escapes can now be disabled.
+* Fixed EOF bug introduced in the last release.
+* Updated HighLine web page.
+* Moved to a forked development/stable version numbering.
+
 == 1.0.2
 
 * Removed old and broken help tests.
 * Fixed test case typo found by David A. Black.
 * Added ERb escapes processing to lists, for coloring list items.  Color escapes
-  Do nod add to list element size.
+  do not add to list element size.
 * HighLine now throws EOFError when input is exhausted.
 
 == 1.0.1

data/README

@@ -27,5 +27,5 @@ See the INSTALL file for instructions.
 
 == Questions and/or Comments
 
-Feel free to email {James Edward Gray II}[mailto:james@grayproductions.net] with
-any questions.
+Feel free to email {James Edward Gray II}[mailto:james@grayproductions.net] or
+{Grregory Brown}[mailto:gregory.t.brown@gmail.com] with any questions.

data/Rakefile

@@ -24,15 +24,15 @@ end
 
 desc "Upload current documentation to Rubyforge"
 task :upload_docs => [:rdoc] do
-  sh "scp -r site/* " +
-     "bbazzarrakk@rubyforge.org:/var/www/gforge-projects/highline/"
   sh "scp -r doc/html/* " +
      "bbazzarrakk@rubyforge.org:/var/www/gforge-projects/highline/doc/"
+  sh "scp -r site/* " +
+     "bbazzarrakk@rubyforge.org:/var/www/gforge-projects/highline/"
 end
 
 spec = Gem::Specification.new do |spec|
   spec.name     = "highline"
-  spec.version  = "1.0.2"
+  spec.version  = "1.0.4"
   spec.platform = Gem::Platform::RUBY
   spec.summary  = "HighLine is a high-level line oriented console interface."
   spec.files    = Dir.glob("{examples,lib,test}/**/*.rb").

data/lib/highline.rb

@@ -6,6 +6,8 @@
 #  Copyright 2005 Gray Productions. All rights reserved.
 #
 # See HighLine for documentation.
+#
+# This is Free Software.  See LICENSE and COPYING for details
 
 require "highline/question"
 require "highline/menu"
@@ -28,6 +30,19 @@ class HighLine
   class QuestionError < StandardError
     # do nothing, just creating a unique error type
   end
+  
+  # The setting used to disable color output.
+  @@use_color = true
+  
+  # Pass +false+ to _setting_ to turn off HighLine's color escapes.
+  def self.use_color=( setting )
+    @@use_color = setting
+  end
+  
+  # Returns true if HighLine is currently using color escapes.
+  def self.use_color?
+    @@use_color
+  end
 
   #
   # Embed in a String to clear all previous ANSI sequences.  This *MUST* be 
@@ -168,8 +183,7 @@ class HighLine
         if @question.confirm
           # need to add a layer of scope to ask a question inside a
           # question, without destroying instance data
-          context_change = self.class.new( @input, @output,
-                                           @wrap_at, @page_at )
+          context_change = self.class.new(@input, @output, @wrap_at, @page_at)
           if @question.confirm == true
             confirm_question = "Are you sure?  "
           else
@@ -264,8 +278,13 @@ class HighLine
   # affected by.  The _colors_ can be HighLine class constants, or symbols 
   # (:blue for BLUE, for example).  A CLEAR will automatically be embedded to
   # the end of the returned String.
+  # 
+  # This method returns the original _string_ unchanged if HighLine::use_color? 
+  # is +false+.
   #
   def color( string, *colors )
+    return string unless self.class.use_color?
+    
     colors.map! do |c|
       if c.is_a?(Symbol)
         self.class.const_get(c.to_s.upcase)
@@ -523,6 +542,8 @@ class HighLine
   # 
   # If Question's _readline_ property is set, that library will be used to
   # fetch input.  *WARNING*:  This ignores the currently set input stream.
+  # 
+  # Raises EOFError if input is exhausted.
   #
   def get_line(  )
     if @question.readline
@@ -549,6 +570,8 @@ class HighLine
 
       answer
     else
+      raise EOFError, "The input stream is exhausted." if @input.eof?
+
       @question.change_case(@question.remove_whitespace(@input.gets))
     end
   end
@@ -561,8 +584,6 @@ class HighLine
   # Raises EOFError if input is exhausted.
   #
   def get_response(  )
-    raise EOFError, "The input stream is exhausted." if @input.eof?
-    
     if @question.character.nil?
       if @question.echo == true and @question.limit.nil?
         get_line

data/lib/highline/import.rb

@@ -4,6 +4,8 @@
 #
 #  Created by James Edward Gray II on 2005-04-26.
 #  Copyright 2005 Gray Productions. All rights reserved.
+#
+#  This is Free Software.  See LICENSE and COPYING for details
 
 require "highline"
 require "forwardable"

data/lib/highline/menu.rb

@@ -4,6 +4,8 @@
 #
 #  Created by Gregory Thomas Brown on 2005-05-10.
 #  Copyright 2005. All rights reserved.
+#
+#  This is Free Software.  See LICENSE and COPYING for details
 
 require "highline/question"
 

data/lib/highline/question.rb

@@ -4,7 +4,9 @@
 #
 #  Created by James Edward Gray II on 2005-04-26.
 #  Copyright 2005 Gray Productions. All rights reserved.
-
+#
+#  This is Free Software.  See LICENSE and COPYING for details 
+ 
 require "optparse"
 require "date"
 require "pathname"

data/test/tc_highline.rb

@@ -4,6 +4,8 @@
 #
 #  Created by James Edward Gray II on 2005-04-26.
 #  Copyright 2005 Gray Productions. All rights reserved.
+#
+#  This is Free Software.  See LICENSE and COPYING for details.
 
 require "test/unit"
 
@@ -155,6 +157,15 @@ class TestHighLine < Test::Unit::TestCase
                    "<%= color('blinking on red', :blink, :on_red) %>!" )
     assert_equal( "This should be \e[5m\e[41mblinking on red\e[0m!\n",
                   @output.string )
+
+    @output.truncate(@output.rewind)
+
+    # turn off color
+    old_setting = HighLine.use_color?
+    assert_nothing_raised(Exception) { HighLine.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
   end
                                   
   def test_confirm

data/test/tc_import.rb

@@ -4,6 +4,8 @@
 #
 #  Created by James Edward Gray II on 2005-04-26.
 #  Copyright 2005 Gray Productions. All rights reserved.
+#
+#  This is Free Software.  See LICENSE and COPYING for details.
 
 require "test/unit"
 

data/test/tc_menu.rb

@@ -4,6 +4,8 @@
 #
 #  Created by Gregory Thomas Brown on 2005-05-10.
 #  Copyright 2005. All rights reserved.
+#
+#  This is Free Software. See LICENSE and COPYING for details.
 
 require "test/unit"
 

data/test/ts_all.rb

@@ -4,7 +4,8 @@
 #
 #  Created by James Edward Gray II on 2005-04-26.
 #  Copyright 2005 Gray Productions. All rights reserved.
-
+#
+#  This is Free Software.  See LICENSE and COPYING for details.
 require "test/unit"
 
 require "tc_highline"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: highline
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2006-02-20 00:00:00 -06:00
+  version: 1.0.4
+date: 2006-02-26 00:00:00 -06:00
 summary: HighLine is a high-level line oriented console interface.
 require_paths: 
 - lib