ansi 1.4.1 → 1.4.2

data/lib/ansi/mixin.rb

@@ -7,9 +7,8 @@ module ANSI
   # Generally speaking the String#ansi method is the more
   # elegant approach to modifying a string with codes
   # via a method call. But in some cases this Mixin's design
-  # might be preferable. In particular it was primarily
-  # designed to provide a compatability layer for the
-  # +colored+ gem.
+  # might be preferable. Indeed, it original intent was
+  # as a compatability layer for the +colored+ gem.
 
   module Mixin
 
@@ -120,4 +119,3 @@ module ANSI
   end
 
 end
-

data/lib/ansi/progressbar.rb

@@ -25,7 +25,7 @@ module ANSI
       @out   = out
 
       @bar_length = 80
-      @bar_mark = "o"
+      @bar_mark = "|"
       @total_overflow = true
       @current = 0
       @previous = 0
@@ -54,6 +54,8 @@ module ANSI
     def bar_mark=(mark)
       @bar_mark = String(mark)[0..0]
     end
+    alias_method :barmark=, :bar_mark=
+    alias_method :mark=,    :bar_mark=
 
     def total_overflow=(boolv)
       @total_overflow = boolv ? true : false
@@ -272,7 +274,8 @@ module ANSI
     #
     def colorize(part, style)
       return part unless style
-      [style].flatten.inject(part){ |pt, st| ANSI::Code.send(st){pt} }
+      #[style].flatten.inject(part){ |pt, st| ANSI::Code.ansi(pt, *st) }
+      ANSI::Code.ansi(part, *style)
     end
 
   end

data/lib/ansi/terminal.rb

@@ -30,12 +30,12 @@ module ANSI
 
     # Get the width of the terminal window.
     def terminal_width
-      terminal_size[0]
+      terminal_size.first
     end
 
     # Get the height of the terminal window.
     def terminal_height
-      terminal_size[1]
+      terminal_size.last
     end
 
   end

data/lib/ansi/terminal/curses.rb

@@ -19,9 +19,9 @@ module ANSI
       Curses.init_screen
       w, r = Curses.cols, Curses.rows
       Curses.close_screen
-      return r, w
+      return w, r
     end
 
   end
 
-end
+end

data/lib/ansi/terminal/stty.rb

@@ -1,9 +1,11 @@
 module ANSI
 
   module Terminal
-
     module_function
 
+    #COLS_FALLBACK = 80
+    #ROWS_FALLBACK = 25
+
     #CHARACTER_MODE = "stty"    # For Debugging purposes only.
 
     #
@@ -42,12 +44,17 @@ module ANSI
 
     # A Unix savvy method to fetch the console columns, and rows.
     def terminal_size
-      if /solaris/ =~ RUBY_PLATFORM and
-          `stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/
-        [$2, $1].map { |c| x.to_i }
+      if /solaris/ =~ RUBY_PLATFORM && (`stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/)
+        w, r = [$2, $1]
       else
-        `stty size`.split.map { |x| x.to_i }.reverse
+        w, r = `stty size`.split.reverse
       end
+      w = `tput cols` unless w  # last ditch effort to at least get width
+
+      w = w.to_i if w
+      r = r.to_i if r
+
+      return w, r
     end
 
   end

data/lib/ansi/terminal/termios.rb

@@ -29,18 +29,23 @@ module ANSI
 
     # A Unix savvy method to fetch the console columns, and rows.
     def terminal_size
-      if /solaris/ =~ RUBY_PLATFORM and
-          `stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/
-        [$2, $1].map { |c| x.to_i }
+      if /solaris/ =~ RUBY_PLATFORM && (`stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/)
+        w, r = [$2, $1]
       else
-        `stty size`.split.map { |x| x.to_i }.reverse
+        w, r = `stty size`.split.reverse
       end
+      w = `tput cols` unless w  # last ditch effort to at least get width
+
+      w = w.to_i if w
+      r = r.to_i if r
+
+      return w, r
     end
 
     # Console screen width (taken from progress bar)
     #
     # NOTE: Don't know how portable #screen_width is.
-    # TODO: How to fit in to system?
+    # TODO: How to fit into system?
     #
     def screen_width(out=STDERR)
       default_width = ENV['COLUMNS'] || 76
@@ -60,4 +65,4 @@ module ANSI
 
   end
 
-end
+end

data/lib/ansi/version.rb

@@ -1,7 +1,6 @@
-# ANSI module contains all the ANSI related classes.
 module ANSI
   # Returns Hash table of project metadata.
-  def self.meta
+  def self.metadata
     @spec ||= (
       require 'yaml'
       YAML.load(File.new(File.dirname(__FILE__) + '/../ansi.yml'))
@@ -10,7 +9,7 @@ module ANSI
 
   # Check metadata for missing constants.
   def self.const_missing(name)
-    meta[name.to_s.downcase] || super(name)
+    metadata[name.to_s.downcase] || super(name)
   end
 end
 

data/qed/11_terminal.rdoc

@@ -0,0 +1,8 @@
+= ANSI::Terminal
+
+We should be ables to get the terminal width via the `terminal_width` method.
+
+  width = ANSI::Terminal.terminal_width
+
+  Fixnum.assert === width
+

data/qed/applique/ae.rb

@@ -0,0 +1 @@
+require 'ae'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansi
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2012-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &29129100 !ruby/object:Gem::Requirement
+  requirement: &31273700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *29129100
+  version_requirements: *31273700
 - !ruby/object:Gem::Dependency
   name: qed
-  requirement: &29128360 !ruby/object:Gem::Requirement
+  requirement: &31273100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *29128360
+  version_requirements: *31273100
 - !ruby/object:Gem::Dependency
   name: lemon
-  requirement: &29127740 !ruby/object:Gem::Requirement
+  requirement: &31272580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,13 +44,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *29127740
-description: ! 'The ANSI project is a collection of ANSI escape code related libraries
-  enabling
+  version_requirements: *31272580
+description: ! 'The ANSI project is a superlative collection of ANSI escape code related
+  libraries
 
-  ANSI code based colorization and stylization of output. It is very nice for
+  enabling ANSI colorization and stylization of console output. Byte for byte
 
-  beautifying shell output.'
+  ANSI is the best ANSI code library available for the Ruby programming
+
+  language.'
 email:
 - transfire@gmail.com
 executables: []
@@ -59,12 +61,12 @@ extra_rdoc_files:
 - HISTORY.rdoc
 - README.rdoc
 - QED.rdoc
-- NOTICE.rdoc
-- LICENSE.rdoc
+- COPYING.rdoc
 files:
 - .ruby
 - .yardopts
 - lib/ansi/bbcode.rb
+- lib/ansi/chain.rb
 - lib/ansi/chart.rb
 - lib/ansi/code.rb
 - lib/ansi/columns.rb
@@ -84,18 +86,19 @@ files:
 - lib/ansi/terminal.rb
 - lib/ansi/version.rb
 - lib/ansi.rb
-- lib/ansi.rbz
 - lib/ansi.yml
 - qed/01_ansicode.rdoc
-- qed/02_bbcode.rdoc
+- qed/02_core.rdoc
 - qed/03_logger.rdoc
 - qed/04_progressbar.rdoc
 - qed/05_mixin.rdoc
 - qed/06_string.rdoc
 - qed/07_columns.rdoc
 - qed/08_table.rdoc
-- qed/09_diff.rb
-- qed/10_core.rdoc
+- qed/09_diff.rdoc
+- qed/10_bbcode.rdoc
+- qed/11_terminal.rdoc
+- qed/applique/ae.rb
 - qed/applique/output.rb
 - test/case_ansicode.rb
 - test/case_bbcode.rb
@@ -105,8 +108,7 @@ files:
 - HISTORY.rdoc
 - README.rdoc
 - QED.rdoc
-- NOTICE.rdoc
-- LICENSE.rdoc
+- COPYING.rdoc
 homepage: http://rubyworks.github.com/ansi
 licenses: []
 post_install_message: 

data/NOTICE.rdoc

@@ -1,156 +0,0 @@
-= COPYRIGHT NOTICES
-
-== ANSI
-
-Copyright:: (c) 2009 Rubyworks
-License:: BSD-2-Clause
-Website:: http://rubyworks.github.com/ansi
-
-    Copyright 2009 Rubyworks. All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without modification, are
-    permitted provided that the following conditions are met:
-
-       1. Redistributions of source code must retain the above copyright notice, this list of
-          conditions and the following disclaimer.
-
-       2. Redistributions in binary form must reproduce the above copyright notice, this list
-          of conditions and the following disclaimer in the documentation and/or other materials
-          provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESS OR IMPLIED
-    WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
-    OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-    ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    (http://spdx.org/licenses/BSD-2-Clause)
-
-
-== ProgressBar
-
-Copyright:: (C) 2001 Satoru Takabayashi
-License:: Ruby License
-Website:: http://0xcc.net/ruby-progressbar/
-
-ProgressBar class is based on the original ProgressBar by Satoru Takabayashi.
-
-    Ruby/ProgressBar - a text progress bar library
-
-    Copyright (C) 2001-2005 Satoru Takabayashi <satoru@namazu.org>
-        All rights reserved.
-        This is free software with ABSOLUTELY NO WARRANTY.
-
-    You can redistribute it and/or modify it under the terms
-    of Ruby's license.
-
-
-== HighLine (Terminal Extensions)
-
-Copyright:: (c) 2006 Gray Productions
-License:: Ruby License
-Website:: http://highline.rubyforge.org/
-
-The terminal extensions are based on HighLine's SystemExtensions
-by James Edward Gray II.
-
-    Copyright 2006 Gray Productions
-
-    Distributed under the user's choice of the {GPL Version 2}[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html]
-    (see GPL-2.0.txt for details) or the {Ruby software license}[http://www.ruby-lang.org/en/LICENSE.txt]
-    by James Edward Gray II and Greg Brown.
-
-    Please email James[mailto:james@grayproductions.net] with any questions.
-
-
-== BBCode
-
-Copyright:: (c) 2002 Thomas-Ivo Heinen
-License:: Ruby License
-
-BBCode module is a derivative of BBCode by Thomas-Ivo Heinen.
-
-    Copyright (c) 2002 Thomas-Ivo Heinen
-
-    This module is free software. You may use, modify, and/or redistribute this
-    software under the same terms as Ruby.
-
-    This program is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.
-
-
-== Rainbow (XTerm Color Support)
-
-Copyright:: (c) Marcin Kulik
-License:: MIT
-Website:: http://github.com/sickill/rainbow
-
-Rainbox provided the bases for building the XTerm 256 color code
-support into the ANSI::Code module.
-
-    Copyright (c) Marcin Kulik
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-== Paint
-
-Copyright:: (c) 2011 Jan Lelis
-Website:: https://github.com/janlelis/paint
-
-Some of the latest ANSI code names, and inspiration to check out Rainbow
-and include XTerm 256 color codes, came from Paint.
-
-    Copyright (c) 2011 Jan Lelis
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-== ANSIColor
-
-Copyright:: (c) 2002 Florian Frank
-Website:: http://flori.github.com/term-ansicolor
-
-Albeit the code no long bares much if any resemblance to it, the ANSI Code
-module (and subsequently the Constants module) originated with the
-ANSIColor library by Florian Frank.
-