ansi 1.4.2 → 1.4.3

data/.ruby

@@ -8,8 +8,6 @@ authors:
 copyrights:
 - holder: Rubyworks
   year: '2009'
-replacements: []
-alternatives: []
 requirements:
 - name: detroit
   groups:
@@ -24,25 +22,34 @@ requirements:
   - test
   development: true
 dependencies: []
+alternatives: []
 conflicts: []
 repositories:
 - uri: git://github.com/rubyworks/ansi.git
   scm: git
   name: upstream
 resources:
-  home: http://rubyworks.github.com/ansi
-  code: http://github.com/rubyworks/ansi
-  docs: http://rubydoc.info/gems/ansi/frames
-  mail: http://groups.google.com/group/rubyworks-mailinglist
+- uri: http://rubyworks.github.com/ansi
+  label: Website
+  type: home
+- uri: http://github.com/rubyworks/ansi
+  label: Source Code
+  type: code
+- uri: http://rubydoc.info/gems/ansi/frames
+  label: Documentation
+  type: docs
+- uri: http://groups.google.com/group/rubyworks-mailinglist
+  label: Mailing List
+  type: mail
+categories: []
 extra: {}
 load_path:
 - lib
 revision: 0
+name: ansi
+title: ANSI
 created: '2009-08-01'
 summary: ANSI at your fingertips!
-title: ANSI
-version: 1.4.2
-name: ansi
 description: ! 'The ANSI project is a superlative collection of ANSI escape code related
   libraries
 
@@ -52,4 +59,5 @@ description: ! 'The ANSI project is a superlative collection of ANSI escape code
 
   language.'
 organization: Rubyworks
-date: '2012-01-29'
+version: 1.4.3
+date: '2012-06-28'

data/Config.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+#
+# Setup QED.
+#
+config :qed, :profile=>:cov do
+  require 'simplecov'
+  SimpleCov.start do
+    coverage_dir 'log/coverage'
+    #add_group "RSpec", "lib/assay/rspec.rb"
+  end
+end
+

data/HISTORY.rdoc

@@ -1,5 +1,18 @@
 = RELEASE HISTORY
 
+== 1.4.3 | 2012-06-26
+
+This release bring two small changes. The first improves support
+for Windows by only rescuing LoadError when 'win32console' fails
+to load. The second improves the heuritstics used for determining
+the current terminal screen width.
+
+Changes:
+
+* Only rescue LoadError on windows require. (#9) [bug]
+* Improvements for getting proper screen width.
+
+
 == 1.4.2 | 2012-01-29
 
 ANSI chains are a new feature inspired by Kazuyoshi Tlacaelel's Isna project.

data/lib/ansi.yml

@@ -8,8 +8,6 @@ authors:
 copyrights:
 - holder: Rubyworks
   year: '2009'
-replacements: []
-alternatives: []
 requirements:
 - name: detroit
   groups:
@@ -24,25 +22,34 @@ requirements:
   - test
   development: true
 dependencies: []
+alternatives: []
 conflicts: []
 repositories:
 - uri: git://github.com/rubyworks/ansi.git
   scm: git
   name: upstream
 resources:
-  home: http://rubyworks.github.com/ansi
-  code: http://github.com/rubyworks/ansi
-  docs: http://rubydoc.info/gems/ansi/frames
-  mail: http://groups.google.com/group/rubyworks-mailinglist
+- uri: http://rubyworks.github.com/ansi
+  label: Website
+  type: home
+- uri: http://github.com/rubyworks/ansi
+  label: Source Code
+  type: code
+- uri: http://rubydoc.info/gems/ansi/frames
+  label: Documentation
+  type: docs
+- uri: http://groups.google.com/group/rubyworks-mailinglist
+  label: Mailing List
+  type: mail
+categories: []
 extra: {}
 load_path:
 - lib
 revision: 0
+name: ansi
+title: ANSI
 created: '2009-08-01'
 summary: ANSI at your fingertips!
-title: ANSI
-version: 1.4.2
-name: ansi
 description: ! 'The ANSI project is a superlative collection of ANSI escape code related
   libraries
 
@@ -52,4 +59,5 @@ description: ! 'The ANSI project is a superlative collection of ANSI escape code
 
   language.'
 organization: Rubyworks
-date: '2012-01-29'
+version: 1.4.3
+date: '2012-06-28'

data/lib/ansi/code.rb

@@ -3,7 +3,7 @@ module ANSI
   if RUBY_PLATFORM =~ /(win32|w32)/
     begin
       require 'Win32/Console/ANSI'
-    rescue
+    rescue LoadError
       warn "ansi: 'gem install win32console' to use color on Windows"
       $ansi = false
     end
@@ -242,7 +242,7 @@ module ANSI
 
     # Remove ANSI codes from string or block value.
     #
-    # @param [String]
+    # @param [String] string
     #   String from which to remove ANSI codes.
     #
     # @return [String]

data/lib/ansi/columns.rb

@@ -84,7 +84,10 @@ module ANSI
 
     # Set alignment ensuring value is a symbol.
     #
-    # @param [Symbol] Either `:right`, `:left` or `:center`.
+    # @param [#to_sym] symbol
+    #   Either `:right`, `:left` or `:center`.
+    #
+    # @return [Symbol] The given symbol.
     def align=(symbol)
       symbol = symbol.to_sym
       raise ArgumentError, "invalid alignment -- #{symbol.inspect}" \

data/lib/ansi/diff.rb

@@ -110,10 +110,10 @@ module ANSI
     # Take two plain strings and produce colorized
     # versions of each highlighting their differences.
     #
-    # @param [String] string1
+    # @param [String] x
     #   First string to compare.
     #
-    # @param [String] string2
+    # @param [String] y
     #   Second string to compare.
     #
     # @return [Array<String>] The two difference strings.

data/lib/ansi/progressbar.rb

@@ -61,6 +61,9 @@ module ANSI
       @total_overflow = boolv ? true : false
     end
 
+    # Get rid of warning about Kenrel method being redefined.
+    remove_method :format
+
     # Set format and format arguments.
     def format(format, *arguments)
       @format = format
@@ -220,7 +223,8 @@ module ANSI
     def title
       @title[0,13] + ":"
     end
-    #
+
+    # TODO: Use Terminal.terminal_width instead.
     def get_width
       # FIXME: I don't know how portable it is.
       default_width = 80
@@ -228,7 +232,8 @@ module ANSI
         tiocgwinsz = 0x5413
         data = [0, 0, 0, 0].pack("SSSS")
         if @out.ioctl(tiocgwinsz, data) >= 0 then
-          rows, cols, xpixels, ypixels = data.unpack("SSSS")
+          #rows, cols, xpixels, ypixels = data.unpack("SSSS")
+          cols = data.unpack("SSSS")[1]
           if cols >= 0 then cols else default_width end
         else
           default_width

data/lib/ansi/string.rb

@@ -117,8 +117,9 @@ class ANSI::String
         end
         self.class.new(new_text, new_marks)
       else
-        nm = marks.select do |(i,c)|
-          marks[0] == rng or ( marks[0] == rng + 1 && [:clear, :reset].include?(marks[1]) )
+        nm = marks.select do |(i, v)|
+          #marks[0] == rng or ( marks[0] == rng + 1 && [:clear, :reset].include?(marks[1]) )
+          i == rng or ( i == rng + 1 && [:clear, :reset].include?(v) )
         end
         self.class.new(text[rng,1], nm)
       end

data/lib/ansi/table.rb

@@ -56,8 +56,8 @@ module ANSI
 
     #
     def to_s #(fit=false)
-      row_count = table.size
-      col_count = table[0].size
+      #row_count = table.size
+      #col_count = table[0].size
 
       max = max_columns(fit)
 
@@ -134,6 +134,7 @@ module ANSI
       tmp = max_columns(fit).map{ |m| "%#{m}s" }.join(" | ")
       tmp = "| #{tmp} |"
       lin = (tmp % (['-'] * column_size)).gsub(/[^\|]/, '-').gsub('|', '+')
+      lin
     end
 
     #def dividing_line_top

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ansi
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-29 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: detroit
-  requirement: &31273700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *31273700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: qed
-  requirement: &31273100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *31273100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: lemon
-  requirement: &31272580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *31272580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'The ANSI project is a superlative collection of ANSI escape code related
   libraries
 
@@ -59,9 +74,9 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - HISTORY.rdoc
-- README.rdoc
-- QED.rdoc
+- DEMO.rdoc
 - COPYING.rdoc
+- README.rdoc
 files:
 - .ruby
 - .yardopts
@@ -87,28 +102,29 @@ files:
 - lib/ansi/version.rb
 - lib/ansi.rb
 - lib/ansi.yml
-- qed/01_ansicode.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.rdoc
-- qed/10_bbcode.rdoc
-- qed/11_terminal.rdoc
-- qed/applique/ae.rb
-- qed/applique/output.rb
+- demo/01_ansicode.rdoc
+- demo/02_core.rdoc
+- demo/03_logger.rdoc
+- demo/04_progressbar.rdoc
+- demo/05_mixin.rdoc
+- demo/06_string.rdoc
+- demo/07_columns.rdoc
+- demo/08_table.rdoc
+- demo/09_diff.rdoc
+- demo/10_bbcode.rdoc
+- demo/11_terminal.rdoc
+- demo/applique/ae.rb
+- demo/applique/output.rb
 - test/case_ansicode.rb
 - test/case_bbcode.rb
 - test/case_mixin.rb
 - test/case_progressbar.rb
 - test/test_helper.rb
 - HISTORY.rdoc
-- README.rdoc
-- QED.rdoc
+- DEMO.rdoc
 - COPYING.rdoc
+- Config.rb
+- README.rdoc
 homepage: http://rubyworks.github.com/ansi
 licenses: []
 post_install_message: 
@@ -129,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ANSI at your fingertips!