highline 1.6.11 → 1.6.12

data/CHANGELOG

@@ -2,6 +2,10 @@
 
 Below is a complete listing of changes for each revision of HighLine.
 
+== 1.6.12
+
+* Silenced warnings (by James McEwan).
+
 == 1.6.11
 
 * Fixed a bad test.  (Fix by Diego Elio Pettenò.)

data/Rakefile

@@ -4,24 +4,21 @@ require "rubygems/package_task"
 
 require "rubygems"
 
-dir     = File.dirname(__FILE__)
-lib     = File.join(dir, "lib", "highline.rb")
-version = File.read(lib)[/^\s*VERSION\s*=\s*(['"])(\d+\.\d+\.\d+)\1/, 2]
-
 task :default => [:test]
 
 Rake::TestTask.new do |test|
   test.libs       << "test"
   test.test_files =  [ "test/ts_all.rb"]
   test.verbose    =  true
+  test.ruby_opts  << "-w"
 end
 
 Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_files.include( "README", "INSTALL",
+  rdoc.rdoc_files.include( "README.rdoc", "INSTALL",
                            "TODO", "CHANGELOG",
                            "AUTHORS", "COPYING",
                            "LICENSE", "lib/" )
-  rdoc.main     = "README"
+  rdoc.main     = "README.rdoc"
   rdoc.rdoc_dir = "doc/html"
   rdoc.title    = "HighLine Documentation"
 end

data/highline.gemspec

@@ -1,6 +1,6 @@
-DIR     = File.dirname(__FILE__)
-LIB     = File.join(DIR, *%w[lib highline.rb])
-VERSION = open(LIB) { |lib|
+DIR         = File.dirname(__FILE__)
+LIB         = File.join(DIR, *%w[lib highline.rb])
+GEM_VERSION = open(LIB) { |lib|
   lib.each { |line|
     if v = line[/^\s*VERSION\s*=\s*(['"])(\d+\.\d+\.\d+)\1/, 2]
       break v
@@ -10,14 +10,14 @@ VERSION = open(LIB) { |lib|
 
 SPEC = Gem::Specification.new do |spec|
   spec.name     = "highline"
-  spec.version  = VERSION
+  spec.version  = GEM_VERSION
   spec.platform = Gem::Platform::RUBY
   spec.summary  = "HighLine is a high-level command-line IO library."
   spec.files    = `git ls-files`.split("\n")
 
   spec.test_files       =  `git ls-files -- test/*.rb`.split("\n")
   spec.has_rdoc         =  true
-  spec.extra_rdoc_files =  %w{README INSTALL TODO CHANGELOG LICENSE}
+  spec.extra_rdoc_files =  %w[README.rdoc INSTALL TODO CHANGELOG LICENSE]
   spec.rdoc_options     << '--title' << 'HighLine Documentation' <<
                            '--main'  << 'README'
 

data/lib/highline.rb

@@ -30,7 +30,7 @@ require "highline/style"
 #
 class HighLine
   # The version of the installed library.
-  VERSION = "1.6.11".freeze
+  VERSION = "1.6.12".freeze
   
   # An internal HighLine error.  User code does not need to trap this.
   class QuestionError < StandardError

data/lib/highline/question.rb

@@ -332,7 +332,7 @@ class HighLine
       end
     end
 
-    # Returns a english explination of the current range settings.
+    # Returns an English explanation of the current range settings.
     def expected_range(  )
       expected = [ ]
 

data/lib/highline/simulate.rb

@@ -0,0 +1,50 @@
+#!/usr/local/bin/ruby -w
+
+# simulate.rb
+#
+#  Created by Andy Rossmeissl on 2012-04-29.
+#  Copyright 2005 Gray Productions. All rights reserved.
+#
+#  This is Free Software.  See LICENSE and COPYING for details.
+#
+# adapted from https://gist.github.com/194554
+class HighLine
+
+  # Simulates Highline input for use in tests.
+  class Simulate
+
+    # Creates a simulator with an array of Strings as a script
+    def initialize(strings)
+      @strings = strings
+    end
+    
+    # Simulate StringIO#gets by shifting a string off of the script
+    def gets
+      @strings.shift
+    end
+
+    # Simulate StringIO#getbyte by shifting a single character off of the next line of the script
+    def getbyte
+      line = gets
+      if line.length > 0
+        char = line.slice! 0
+        @strings.unshift line
+        char
+      end
+    end
+
+    # The simulator handles its own EOF
+    def eof?
+      false
+    end
+
+    # A wrapper method that temporarily replaces the Highline instance in $terminal with an instance of this object for the duration of the block
+    def self.with(*strings)
+      @input = $terminal.instance_variable_get :@input
+      $terminal.instance_variable_set :@input, new(strings)
+      yield
+    ensure
+      $terminal.instance_variable_set :@input, @input
+    end
+  end
+end

data/lib/highline/string_extensions.rb

@@ -32,17 +32,29 @@ class HighLine
     def self.included(base)
       HighLine::COLORS.each do |color|
         base.class_eval <<-END
+          if public_instance_methods.map { |m| m.to_s }.
+                                     include? "#{color.downcase}"
+            undef :#{color.downcase}
+          end
           def #{color.downcase}
             color(:#{color.downcase})
           end
         END
         base.class_eval <<-END
+          if public_instance_methods.map { |m| m.to_s }.
+                                     include? "on_#{color.downcase}"
+            undef :on_#{color.downcase}
+          end
           def on_#{color.downcase}
             on(:#{color.downcase})
           end
         END
         HighLine::STYLES.each do |style|
           base.class_eval <<-END
+            if public_instance_methods.map { |m| m.to_s }.
+                                       include? "#{style.downcase}"
+              undef :#{style.downcase}
+            end
             def #{style.downcase}
               color(:#{style.downcase})
             end
@@ -51,31 +63,52 @@ class HighLine
       end
       
       base.class_eval do
+        if public_instance_methods.map { |m| m.to_s }.include? "color"
+          undef :color
+        end
+        if public_instance_methods.map { |m| m.to_s }.include? "foreground"
+          undef :foreground
+        end
         def color(*args)
           self.class.new(HighLine.color(self, *args))
         end
         alias_method :foreground, :color
         
+        if public_instance_methods.map { |m| m.to_s }.include? "on"
+          undef :on
+        end
         def on(arg)
           color(('on_' + arg.to_s).to_sym)
         end
 
+        if public_instance_methods.map { |m| m.to_s }.include? "uncolor"
+          undef :uncolor
+        end
         def uncolor
           self.class.new(HighLine.uncolor(self))
         end
         
+        if public_instance_methods.map { |m| m.to_s }.include? "rgb"
+          undef :rgb
+        end
         def rgb(*colors)
           color_code = colors.map{|color| color.is_a?(Numeric) ? '%02x'%color : color.to_s}.join
           raise "Bad RGB color #{colors.inspect}" unless color_code =~ /^[a-fA-F0-9]{6}/
           color("rgb_#{color_code}".to_sym)
         end
         
+        if public_instance_methods.map { |m| m.to_s }.include? "on_rgb"
+          undef :on_rgb
+        end
         def on_rgb(*colors)
           color_code = colors.map{|color| color.is_a?(Numeric) ? '%02x'%color : color.to_s}.join
           raise "Bad RGB color #{colors.inspect}" unless color_code =~ /^[a-fA-F0-9]{6}/
           color("on_rgb_#{color_code}".to_sym)
         end
         
+        if public_instance_methods.map { |m| m.to_s }.include? "method_missing"
+          undef :method_missing
+        end
         # TODO Chain existing method_missing
         def method_missing(method, *args, &blk)
           if method.to_s =~ /^(on_)?rgb_([0-9a-fA-F]{6})$/

data/lib/highline/style.rb

@@ -100,7 +100,7 @@ class HighLine
       string.gsub(/\e\[\d+(;\d+)*m/, '')
     end
     
-    attr_reader :name, :code, :list
+    attr_reader :name, :list
     attr_accessor :rgb, :builtin
     
     # Single color/styles have :name, :code, :rgb (possibly), :builtin
@@ -114,7 +114,6 @@ class HighLine
       @builtin = defn[:builtin]
       if @rgb
         hex = self.class.rgb_hex(@rgb)
-        rgb = self.class.rgb_parts(hex)
         @name ||= 'rgb_' + hex
       elsif @list
         @name ||= @list
@@ -162,7 +161,7 @@ class HighLine
         new_code = $1 + ($2.to_i + options[:increment]).to_s + $3
       end
       new_rgb = options[:rgb] || @rgb
-      new_style = self.class.new(self.to_hash.merge(:name=>new_name, :code=>new_code, :rgb=>new_rgb))
+      self.class.new(self.to_hash.merge(:name=>new_name, :code=>new_code, :rgb=>new_rgb))
     end
     
     def on

data/lib/highline/system_extensions.rb

@@ -14,7 +14,7 @@ class HighLine
     module_function
 
     JRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-    
+
     #
     # This section builds character reading and terminal size functions
     # to suit the proper platform we're running on.  Be warned:  Here be
@@ -30,10 +30,10 @@ class HighLine
 
       #
       # Windows savvy getc().
-      # 
+      #
       # *WARNING*:  This method ignores <tt>input</tt> and reads one
       # character from +STDIN+!
-      # 
+      #
       def get_character( input = STDIN )
         Win32API.new("msvcrt", "_getch", [ ], "L").Call
       rescue Exception
@@ -53,10 +53,10 @@ class HighLine
         format        = 'SSSSSssssSS'
         buf           = ([0] * format.size).pack(format)
         stdout_handle = m_GetStdHandle.call(0xFFFFFFF5)
-        
+
         m_GetConsoleScreenBufferInfo.call(stdout_handle, buf)
-        bufx, bufy, curx, cury, wattr,
-        left, top, right, bottom, maxx, maxy = buf.unpack(format)
+        _, _, _, _, _,
+        left, top, right, bottom, _, _ = buf.unpack(format)
         return right - left + 1, bottom - top + 1
       end
     rescue LoadError                  # If we're not on Windows try...
@@ -72,7 +72,7 @@ class HighLine
         #
         def get_character( input = STDIN )
           return input.getbyte if input.is_a? StringIO
-          
+
           old_settings = Termios.getattr(input)
 
           new_settings                     =  old_settings.dup
@@ -111,7 +111,7 @@ class HighLine
             end
           end
 
-        rescue LoadError => e            # If the ffi-ncurses choice fails, try using stty
+        rescue LoadError                # If the ffi-ncurses choice fails, try using stty
           CHARACTER_MODE = "stty"    # For Debugging purposes only.
 
           #
@@ -163,6 +163,14 @@ class HighLine
           end
           size
         end
+      elsif JRUBY
+        # JRuby running on Unix can fetch the number of columns and rows from the builtin Jline library
+        require 'java'
+        java_import 'jline.Terminal'
+        def terminal_size
+          java_terminal = @java_terminal || Terminal.getTerminal
+          [ java_terminal.getTerminalWidth, java_terminal.getTerminalHeight ]
+        end
       else
         # A Unix savvy method using stty that to fetch the console columns, and rows.
         # ... stty does not work in JRuby

data/test/tc_style.rb

@@ -134,7 +134,7 @@ class TestStyle < Test::Unit::TestCase
     HighLine::COLORS.each do |color|
       style = HighLine.const_get('ON_' + color+'_STYLE')
       assert_instance_of HighLine::Style, style
-      assert_equal ('ON_'+color).downcase.to_sym, style.name
+      assert_equal "ON_#{color}".downcase.to_sym, style.name
       assert style.builtin
       code = HighLine.const_get('ON_' + color)
       assert_instance_of String, code, "Bad code for ON_#{color}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highline
 version: !ruby/object:Gem::Version
-  version: 1.6.11
+  version: 1.6.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies: []
 description: ! 'A high-level IO library that provides validation, type conversion,
   and more for
@@ -25,7 +25,7 @@ email: james@graysoftinc.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README
+- README.rdoc
 - INSTALL
 - TODO
 - CHANGELOG
@@ -37,7 +37,7 @@ files:
 - COPYING
 - INSTALL
 - LICENSE
-- README
+- README.rdoc
 - Rakefile
 - TODO
 - doc/.cvsignore
@@ -59,6 +59,7 @@ files:
 - lib/highline/import.rb
 - lib/highline/menu.rb
 - lib/highline/question.rb
+- lib/highline/simulate.rb
 - lib/highline/string_extensions.rb
 - lib/highline/style.rb
 - lib/highline/system_extensions.rb
@@ -100,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: highline
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: HighLine is a high-level command-line IO library.