win32console 1.2.0-x86-mswin32-60 → 1.3.0.beta1-x86-mswin32-60

data/History.txt

@@ -0,0 +1,119 @@
+=== 1.3.0.beta
+
+* Enhancements
+  * Usage of Hoe and rake-compiler to ease releasing and extension
+  compilation.
+
+* Bugfixes:
+  * Works with Ruby 1.9
+
+* Known issues:
+  * win32console no longer automatically translate encoding to the console
+    output enconding. Please use Iconv to convert from your encoding (eg. UTF8)
+    to current console output:
+
+      current_cp = Win32::Console::OutputCP()
+      Iconv.iconv("cp#{current_cp}", "utf-8", utf_string)
+
+    A working example can be seen here: http://gist.github.com/265593
+
+=== 1.2.0 / 2008-11-22
+
+* Enhancements
+  * Better code organization and clenaup
+
+* Bugfixes:
+  * Removed license conflicting ANSI Term code and functionality.
+
+=== 1.1.0 / 2008-03-17
+
+* Enhancements:
+  * Added Kernel#putc
+    Redefined Kernel#putc to wrap Win32::Console::ANSI::IO#putc
+
+  * Added #putc to Win32::Console::ANSI::IO 
+    This putc buffers escape sequences so that they will be handled properly
+
+  * Added #redirected? to Win32::Console::ANSI::IO
+    Checks the mode of the console to see if IO is being redirected or not
+
+  * Added Win32::Console::API#WriteFile
+    to both the Ruby and compiled versions
+
+  * Added Win32::Console#WriteFile
+    This is a wrapper around Win32::Console::API#WriteFile
+
+  * Split Win32::Console::Constants and Win32::Console::API out into 
+    seperate files. These two classes were in 'Win32/Console.rb'
+    I moved them into 'Win32/Console/constants.rb' and 'Win32/Console/api.rb'
+    respectively.
+
+  * Cleaned up indentation
+    indentations was a mixture of tabs and spaces. I made everything indented
+    with 2 spaces.
+
+* Bugfixes:
+  * Fixed "Invalid Handle" error in compiled version of GetConsoleMode
+    I'm actually not sure of the source of this error.
+    It may be expected behavior when output is being redirected.
+    I worked around it by rescuing the exception in Win32::Console#Mode and
+    returning 9999. I picked that arbitrary value, because it is
+    higher than 31, which is what I think is the highest value Mode would
+    return if output isn't being redirected.
+    [Gordon Thiesfeld]
+
+  * Modified Win32::Console::ANSI::IO#write to check for redirection.
+    If output is redirected, it uses WriteFile instead of WriteConosle.
+    It also skips the parsing step, and passes the escape sequences through.
+    [Gordon Thiesfeld]
+
+  * Modified Win32::Console::ANSI::IO#_PrintString
+    Didn't change behavior, just tried to make it more idiomatic ruby.
+    I didn't make all of the changes I wanted to, because I wasn't sure 
+    how to test them all.
+    [Gordon Thiesfeld]
+
+  * Modified all Win32::Console::API methods
+    [Gordon Thiesfeld]
+
+    It was assigning Win32API functions to class variables.  I switched them to instance variables. I also changed the idiom it was using to instantiate the objects.
+    For instance, instead of:
+
+      if @@m_AllocConsole == nil
+      @@m_AllocConsole = Win32API.new( "kernel32", "AllocConsole", 
+              [], 'l' )
+
+    It is now:
+
+      @AllocConsole ||= Win32API.new( "kernel32", "AllocConsole", [], 'l' )
+
+  * Non-string arguments passed to Win32::Console::ANSI#write caused error
+    fix by Ivan Evtuhovich (evtuhovich at gmail dot com).
+
+=== 1.0.8 / 2006-06-05
+
+* New features:
+  * First public release of win32console gem by Justin Bailey.
+
+=== 1.0
+
+* New features:
+  * Added .dup to _printString function to avoid mangling outside
+    string references. Removed the other (later) .dup call.
+
+* Bugfixes:
+  * Turned of some exceptions that were conflicting with using the module
+    with pipes or redirections.
+
+=== 0.8
+
+* Enhancements:
+  * Added ruby docs, and sample test suite.
+
+* Bugfixes:
+  * Fixed bugs in reading routines, 
+
+=== 0.5
+
+New features:
+  * First public release.

data/Manifest.txt

@@ -0,0 +1,22 @@
+History.txt
+Manifest.txt
+Rakefile
+README.txt
+ext/Console_ext/Console.c
+ext/Console_ext/extconf.rb
+extra/Console.rdoc
+extra/Console_ANSI.rdoc
+lib/win32console.rb
+lib/Win32/Console.rb
+lib/Win32/Console/ANSI.rb
+lib/Win32/Console/api.rb
+lib/Win32/Console/constants.rb
+tasks/gem.rake
+tasks/native.rake
+test/test_cursor.rb
+test/test_mouse.rb
+test/test_readinput.rb
+test/test_readoutput.rb
+test/test_sendevent.rb
+test/test_title.rb
+test/test_write.rb

data/README.txt

@@ -1,25 +1,63 @@
-
-This file implements a port of Perl's Win32::Console
-and Win32::Console::ANSI modules.
-
-Win32::Console allows controling the windows command line terminal
-thru an OO-interface.  This allows you to query the terminal (find
-its size, characters, attributes, etc).  The interface and functionality
-should be identical to Perl's.
-
-Win32::Console consists of a Ruby .rb interface.
-For best performance, this library has been also ported to C.  
-If you lack a C compiler, you can still use the class thru the ruby
-interface.  If you can compile it, then the ruby interface is not
-used and the C functions are called instead.
-
-Win32::Console::ANSI is a class derived from IO that seamlessly
-translates ANSI Esc control character codes into Windows' command.exe 
-or cmd.exe equivalents.
-
-These modules allow you to develop command-line tools that can take 
-advantage of the unix terminal functions while still being portable.
-One of the most common uses for this is to allow to color your
-output.
-The modules are disted with Term/ansicolor.rb, too, as it is a nice
-thing to verify it is working properly.
+= Win32::Console
+
+* http://rubyforge.org/projects/winconsole
+* http://github.com/luislavena/win32console
+* http://rdoc.info/projects/luislavena/win32console
+
+== DESCRIPTION
+
+Win32::Console allows controling the windows command line terminal
+thru an OO-interface. This allows you to query the terminal (find
+its size, characters, attributes, etc). The interface and functionality
+should be identical to Perl's counterpart.
+
+A port of Perl's Win32::Console and Win32::Console::ANSI modules.
+
+This gem packages Gonzalo Garramuno's Win32::Console project, and includes
+a compiled binary for speed. The Win32::Console project's home can be
+found at:
+
+  http://rubyforge.org/projects/win32console
+
+== FEATURES
+
+Win32::Console::ANSI is a class derived from IO that seamlessly
+translates ANSI Esc control character codes into Windows' command.exe
+or cmd.exe equivalents.
+
+To ease usage, you can use in combination with term-ansicolor gem and avoid
+writing ANSI codes manually.
+
+== EXAMPLES
+
+To output a simple bolded string, try this script:
+
+  require 'rubygems'
+  require 'win32console'
+  include Win32::Console::ANSI
+  include Term::ANSIColor
+
+  puts bold << "bolded text" << clear << " and no longer bold."
+
+== INSTALL
+
+  gem install win32console
+
+== DEVELOPERS:
+
+After checking out the source, run:
+
+  $ rake newb
+
+This task will install any missing dependencies, run the tests/specs,
+and generate the RDoc.
+
+== LICENSE
+
+This program is FREE; you can redistribute, modify, disassemble, or even
+reverse engineer this software at your will. Keep in mind, however, that
+NOTHING IS GUARANTEED to work and everything you do is AT YOUR OWN RISK - I
+will not take responsibility for any damage, loss of money and/or health
+that may arise from the use of this program!
+
+This is distributed under the terms of Larry Wall's Artistic License.

data/Rakefile

@@ -1,12 +1,17 @@
+#
+# NOTE: Keep this file clean.
+# Add your customizations inside tasks directory.
+# Thank You.
+#
+
+# load rakefile extensions (tasks)
+Dir['tasks/*.rake'].sort.each { |f| load f }
+
+=begin
 require 'rubygems'
 require 'rake/clean'
 require 'rake/gempackagetask'
-require './tasks/ext_helper'
-
-# House-keeping
-CLEAN.include '**/*.o', '**/*.so', '**/*.bundle', '**/*.a',
-  '**/*.log', '{ext,lib}/*.{bundle,so,obj,pdb,lib,def,exp}',
-  'ext/Makefile', '**/*.db'
+require 'rake/extensiontask'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'win32console'
@@ -31,7 +36,7 @@ The gem project can be found at
 EOS
 
   s.require_path      = 'lib'
-  s.extensions        = %w[ ext/extconf.rb ]
+  s.extensions        = %w[ ext/Console/extconf.rb ]
   s.files             = FileList[ '{doc,ext,lib,test}/**/*.{rdoc,c,cpp,rb}', 'Rakefile', *s.extra_rdoc_files ]
 
   s.rdoc_options << '--title' << 'Win32Console Gem -- Gem for Win32::Console Project' <<
@@ -44,6 +49,6 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 
-# Use of ext_helper to properly setup compile tasks and native gem generation
-# add 'native', 'compile' and some tweaks to gem specifications.
-setup_extension 'Console', spec
+Rake::ExtensionTask.new('Console', spec) do |ext|
+end
+=end

data/ext/{Console.cpp → Console_ext/Console.c}

@@ -1,11 +1,12 @@
-
-#include "windows.h"
+#include <windows.h>
 #include "ruby.h"
 
-#ifdef WIN32
-#define CONSOLE_EXPORT __declspec(dllexport)
-#else
-#error Not compiling on Windows
+/* Workaround deprecated RString accessors */
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
 #endif
 
 VALUE rb_mWin32;
@@ -32,7 +33,6 @@ VALUE rb_mConstants;
 VALUE
 rb_getWin32Error()
 {
-   DWORD e = GetLastError();
    LPVOID lpMsgBuf;
    if (!FormatMessage( 
 		      FORMAT_MESSAGE_ALLOCATE_BUFFER | 
@@ -55,15 +55,12 @@ rb_getWin32Error()
    LocalFree( lpMsgBuf );
 
    // Raise exception
-   rb_raise(rb_eRuntimeError, RSTRING(t)->ptr);
+   rb_raise(rb_eRuntimeError, RSTRING_PTR(t));
    return Qnil;
 
 }
 
 
-extern "C"
-{
-
 static VALUE rb_GetStdHandle(VALUE self, VALUE handle)
 {
    unsigned long x;
@@ -205,11 +202,11 @@ static VALUE rb_WriteConsole( VALUE self, VALUE hConsoleOutput,
 			      VALUE lpBuffer )
 {
    HANDLE handle = ULongToPtr( NUM2ULONG( hConsoleOutput ) );
-   DWORD nNumberOfCharsToWrite = RSTRING(lpBuffer)->len;
+   DWORD nNumberOfCharsToWrite = RSTRING_LEN(lpBuffer);
    
    DWORD lpNumberOfCharsWritten;
 
-   WriteConsole( handle, RSTRING(lpBuffer)->ptr,
+   WriteConsole( handle, RSTRING_PTR(lpBuffer),
 		 nNumberOfCharsToWrite,
 		 &lpNumberOfCharsWritten, NULL );
    return UINT2NUM( lpNumberOfCharsWritten );
@@ -219,11 +216,11 @@ static VALUE rb_WriteFile( VALUE self, VALUE hConsoleOutput,
                VALUE lpBuffer )
 {
    HANDLE handle = ULongToPtr( NUM2ULONG( hConsoleOutput ) );
-   DWORD nNumberOfBytesToWrite = RSTRING(lpBuffer)->len;
+   DWORD nNumberOfBytesToWrite = RSTRING_LEN(lpBuffer);
 
    DWORD lpNumberOfBytesWritten;
 
-   WriteFile( handle, RSTRING(lpBuffer)->ptr,
+   WriteFile( handle, RSTRING_PTR(lpBuffer),
        nNumberOfBytesToWrite,
        &lpNumberOfBytesWritten, NULL );
    return UINT2NUM( lpNumberOfBytesWritten );
@@ -255,12 +252,12 @@ static VALUE rb_GetConsoleCursorInfo( VALUE self, VALUE hConsoleOutput )
    return ret;
 }
 
-void rb_ParseEvent(VALUE ret, INPUT_RECORD& event )
+void rb_ParseEvent(VALUE ret, INPUT_RECORD *event )
 {
-   switch(event.EventType) {
+   switch(event->EventType) {
       case KEY_EVENT:
 	 {
-	    KEY_EVENT_RECORD* kevent=(KEY_EVENT_RECORD *)&(event.Event);
+	    KEY_EVENT_RECORD* kevent=(KEY_EVENT_RECORD *)&(event->Event);
 	    rb_ary_push(ret, UINT2NUM(KEY_EVENT));
 	    rb_ary_push(ret, UINT2NUM(kevent->bKeyDown));
 	    rb_ary_push(ret, UINT2NUM(kevent->wRepeatCount));
@@ -276,7 +273,7 @@ void rb_ParseEvent(VALUE ret, INPUT_RECORD& event )
 	 }
       case MOUSE_EVENT:
 	 {
-	    MOUSE_EVENT_RECORD * mevent=(MOUSE_EVENT_RECORD *)&(event.Event);
+	    MOUSE_EVENT_RECORD * mevent=(MOUSE_EVENT_RECORD *)&(event->Event);
 	    rb_ary_push(ret, UINT2NUM(MOUSE_EVENT) );
 	    rb_ary_push(ret, UINT2NUM(mevent->dwMousePosition.X) );
 	    rb_ary_push(ret, UINT2NUM(mevent->dwMousePosition.Y) );
@@ -288,7 +285,7 @@ void rb_ParseEvent(VALUE ret, INPUT_RECORD& event )
       case WINDOW_BUFFER_SIZE_EVENT:
 	 {
 	    WINDOW_BUFFER_SIZE_RECORD* wevent=
-	    (WINDOW_BUFFER_SIZE_RECORD *)&(event.Event);
+	    (WINDOW_BUFFER_SIZE_RECORD *)&(event->Event);
 	    rb_ary_push(ret, UINT2NUM(WINDOW_BUFFER_SIZE_EVENT) );
 	    rb_ary_push(ret, UINT2NUM(wevent->dwSize.X) );
 	    rb_ary_push(ret, UINT2NUM(wevent->dwSize.Y) );
@@ -296,14 +293,14 @@ void rb_ParseEvent(VALUE ret, INPUT_RECORD& event )
 	 break;
       case MENU_EVENT:
 	 {
-	    MENU_EVENT_RECORD* mevent= (MENU_EVENT_RECORD *)&(event.Event);
+	    MENU_EVENT_RECORD* mevent= (MENU_EVENT_RECORD *)&(event->Event);
 	    rb_ary_push(ret, UINT2NUM(MENU_EVENT) );
 	    rb_ary_push(ret, UINT2NUM(mevent->dwCommandId) );
 	 }
 	 break;
       case FOCUS_EVENT:
 	 {
-	    FOCUS_EVENT_RECORD* mevent= (FOCUS_EVENT_RECORD *)&(event.Event);
+	    FOCUS_EVENT_RECORD* mevent= (FOCUS_EVENT_RECORD *)&(event->Event);
 	    rb_ary_push(ret, UINT2NUM(FOCUS_EVENT) );
 	    rb_ary_push(ret, UINT2NUM(mevent->bSetFocus) );
 	 }
@@ -321,7 +318,7 @@ static VALUE rb_PeekConsoleInput( VALUE self, VALUE hConsoleOutput )
       return rb_getWin32Error();
    
    VALUE ret = rb_ary_new();
-   rb_ParseEvent( ret, event );
+   rb_ParseEvent( ret, &event );
    return ret;
 }
 
@@ -332,9 +329,9 @@ static VALUE rb_ReadConsole( VALUE self, VALUE hConsoleOutput,
    DWORD nofread;
    Check_Type( buffer, T_STRING );
    int to_read = NUM2INT(numread);
-   if ( RSTRING(buffer)->len > to_read )
+   if ( RSTRING_LEN(buffer) > to_read )
       rb_raise(rb_eArgError, "String is too small to read that many characters.");
-   if (ReadConsole(handle,(void *)RSTRING(buffer)->ptr, to_read,
+   if (ReadConsole(handle,(void *)RSTRING_PTR(buffer), to_read,
 		   &nofread,NULL))
       return UINT2NUM(nofread);
    return rb_getWin32Error();
@@ -349,7 +346,7 @@ static VALUE rb_ReadConsoleInput( VALUE self, VALUE hConsoleOutput )
       return rb_getWin32Error();
    
    VALUE ret = rb_ary_new();
-   rb_ParseEvent( ret, event );
+   rb_ParseEvent( ret, &event );
    return ret;
 }
 
@@ -365,9 +362,9 @@ static VALUE rb_ReadConsoleOutputCharacter( VALUE self, VALUE hConsoleOutput,
    coords.X= NUM2UINT( x );
    coords.Y= NUM2UINT( y );
    int l = NUM2INT(len);
-   if ( RSTRING(charbuf)->len < l*sizeof(TCHAR) )
+   if ( (unsigned long)RSTRING_LEN(charbuf) < l*sizeof(TCHAR) )
       rb_raise(rb_eArgError, "String is too small to read that many characters.");
-   if (ReadConsoleOutputCharacter(handle,RSTRING(charbuf)->ptr,l,
+   if (ReadConsoleOutputCharacter(handle,RSTRING_PTR(charbuf),l,
 				  coords,&nofread))
       return UINT2NUM( nofread );
    return rb_getWin32Error();
@@ -382,12 +379,14 @@ static VALUE rb_ReadConsoleOutputAttribute( VALUE self, VALUE hConsoleOutput,
    DWORD nofread;
    unsigned short abuffer[80*999*sizeof(unsigned short)];
    char cbuffer[80*999];
+   unsigned i = 0;
+
    coords.X= NUM2UINT( x );
    coords.Y= NUM2UINT( y );
    if (ReadConsoleOutputAttribute(handle, abuffer, NUM2UINT(len),
 				  coords,&nofread))
    {
-      for(unsigned i=0;i<nofread;++i) {
+      for(i=0;i<nofread;++i) {
 	 cbuffer[i]=(char)abuffer[i];
       }
       return rb_str_new( cbuffer, nofread );
@@ -413,10 +412,10 @@ static VALUE rb_ReadConsoleOutput( VALUE self, VALUE hConsoleOutput,
    from.Right  = NUM2INT( r );
    from.Bottom = NUM2INT( b );
    Check_Type( buffer, T_STRING );
-   if ( RSTRING(buffer)->len < (sizeof(CHAR_INFO)*size.X*size.Y) )
+   if ( (unsigned long)RSTRING_LEN(buffer) < (sizeof(CHAR_INFO)*size.X*size.Y) )
       rb_raise(rb_eArgError, "string buffer is too small for reading that many characters.");
    HANDLE handle = ULongToPtr( NUM2ULONG( hConsoleOutput ) );
-   if (!ReadConsoleOutput(handle,(CHAR_INFO *)RSTRING(buffer)->ptr,size,coords,&from))
+   if (!ReadConsoleOutput(handle,(CHAR_INFO *)RSTRING_PTR(buffer),size,coords,&from))
       return rb_getWin32Error();
 
    VALUE ret = rb_ary_new();
@@ -739,7 +738,7 @@ not_there:
 VALUE rb_constant( VALUE self, VALUE name )
 {
    Check_Type( name, T_STRING );
-   return ULONG2NUM( c_constant( RSTRING(name)->ptr ) );
+   return ULONG2NUM( c_constant( RSTRING_PTR(name) ) );
 }
 
 
@@ -844,7 +843,7 @@ VALUE
 rb_SetConsoleTitle( VALUE self, VALUE title )
 {
    Check_Type( title, T_STRING );
-   if (SetConsoleTitle(RSTRING( title )->ptr))
+   if (SetConsoleTitle(RSTRING_PTR( title )))
       return NUM2UINT(1);
    return rb_getWin32Error();
 }
@@ -1081,7 +1080,7 @@ rb_WriteConsoleOutput(VALUE self, VALUE h, VALUE buffer,
     to.Top    = NUM2INT( t );
     to.Right  = NUM2INT( r );
     to.Bottom = NUM2INT( b );
-    if (WriteConsoleOutput(handle,(CHAR_INFO *)RSTRING(buffer)->ptr,
+    if (WriteConsoleOutput(handle,(CHAR_INFO *)RSTRING_PTR(buffer),
 			   size,coords,&to)) {
        VALUE ret = rb_ary_new();
        rb_ary_push( ret, INT2FIX( to.Left   ) );
@@ -1104,9 +1103,11 @@ rb_WriteConsoleOutputAttribute(VALUE self, VALUE h, VALUE s,
     
     unsigned short buffer[80*999*sizeof(unsigned short)];
     DWORD written;
-    DWORD towrite = RSTRING(s)->len;
-    for(unsigned i=0; i<towrite; i++) {
-        buffer[i] = (unsigned short)(RSTRING(s)->ptr[i]);
+    DWORD towrite = RSTRING_LEN(s);
+    unsigned i = 0;
+
+    for(i=0; i<towrite; i++) {
+        buffer[i] = (unsigned short)(RSTRING_PTR(s)[i]);
     }
     COORD coords;
     coords.X=NUM2INT( x );
@@ -1131,16 +1132,15 @@ rb_WriteConsoleOutputCharacter(VALUE self, VALUE h, VALUE s,
     COORD coords;
     coords.X=NUM2INT( x );
     coords.Y=NUM2INT( y );
-    if (WriteConsoleOutputCharacter(handle,(LPCTSTR)RSTRING(s)->ptr,
-				    RSTRING(s)->len,coords,&written)) {
+    if (WriteConsoleOutputCharacter(handle,(LPCTSTR)RSTRING_PTR(s),
+				    RSTRING_LEN(s),coords,&written)) {
        return UINT2NUM( written );
     }
     return rb_getWin32Error();
 }
 
 
-CONSOLE_EXPORT  void
-Init_Console(void)
+void Init_Console_ext(void)
 {
    rb_mWin32 = rb_define_module("Win32");
    rb_define_const(rb_mKernel, "Win32", rb_mWin32);
@@ -1214,5 +1214,3 @@ Init_Console(void)
    RB_DEF_API_METHOD(WriteConsoleOutputCharacter, 4);
  
 }
-
-}

data/ext/{extconf.rb → Console_ext/extconf.rb}

@@ -15,4 +15,4 @@
 #
 ##################################################################
 require 'mkmf'
-create_makefile('Console')
+create_makefile('Console_ext')

data/lib/Win32/Console.rb

@@ -4,23 +4,13 @@
 # Original Win32API_Console was:
 # Copyright (C) 2001 Michael L. Semon (mlsemon@sega.net)
 
+# support multiple ruby version (fat binaries under windows)
 begin
-  # If Console.so is available, use that.  Otherwise, we define
-  # equivalent functions in ruby (a tad slower)
-  # That dll should define everything in an identical interface
-  # to all the ruby code that the rescue below defines.
-
-  require "Console.so"
-  STDERR.print "Using faster, DLL Console.so\n" if $DEBUG
-
-rescue Exception
-
-  STDERR.print "Using slower, non-DLL Console.rb\n" if $DEBUG
-
-  require 'Win32/Console/constants.rb'
-  require 'Win32/Console/api.rb'
-
-end  # rescue
+  require 'Console_ext'
+rescue LoadError
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/Console_ext"
+end
 
 module Win32
   class Console

data/lib/Win32/Console/ANSI.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 #
 # Win32::Console::ANSI
 #
@@ -137,7 +139,7 @@ module Win32
         def _PrintString(t)
           s = t.dup.to_s
           while s != ''
-            if s.sub!( /([^\e]*)?\e([\[\(])([0-9\;\=]*)([a-zA-Z@])(.*)/s,'\5')
+            if s.sub!( /([^\e]*)?\e([\[\(])([0-9\;\=]*)([a-zA-Z@])(.*)/, '\5')
               @Out.Write((_conv("#$1")))
               if $2 == '['
                 case $4
@@ -318,20 +320,6 @@ module Win32
         def _conv(s)
           if @concealed
             s.gsub!( /\S/,' ')
-          elsif @conv
-            if EncodeOk
-              from_to(s, cpANSI, cpOEM)
-            elsif @@cp == 'cp1252cp850'      # WinLatin1 --> DOSLatin1
-              s.tr!("���������������������������������������������������������������������������������������������������ÁāŁƁǁȁɁʁˁ́́΁ρЁсҁӁԁՁցׁ؁فځہ܁݁ށ߁��������������������������������������������","???�??????????????????????????��������ρ��݁�����������������������������������������󁨁������ǎ����Ԑ�ҁӁށցׁ؁с������噞����ꚁ��ᅁ���Ƅ�������������Ё������䔁����������")
-            elsif @@cp == 'cp1252cp437'      # WinLatin1 --> DOSLatinUS
-              s.tr!("���������������������������������������������������������������������������������������������������ÁāŁƁǁȁɁʁˁ́́΁ρЁсҁӁԁՁցׁ؁فځہ܁݁ށ߁��������������������������������������������", "??????????????????????????????������?�????������???�����??��?��??��������?��????����?�???????��????�?????�??�ᅁ��?�������������?������?���?�����??�")
-            elsif @@cp == 'cp1250cp852'      # WinLatin2 --> DOSLatin2
-              s.tr!("���������������������������������������������������������������������������������������������������ÁāŁƁǁȁɁʁˁ́́΁ρЁсҁӁԁՁցׁ؁فځہ܁݁ށ߁��������������������������������������������",
-              "??????????��?��??????????��?������������ρ�?����?��������?����?���???����������񖁾�聵���Ǝ���������Ӂ��ցׁҁс�Ձ��⊙����ށ�뚁�݁�ꁠ��DŽ���������؁���ԁЁ�偢�����������������" )
-            elsif @@cp == 'cp1251cp855'      # WinCyrillic --> DOSCyrillic
-              s.tr!("���������������������������������������������������������������������������������������������������ÁāŁƁǁȁɁʁˁ́́΁ρЁсҁӁԁՁցׁ؁فځہ܁݁ށ߁��������������������������������������������",
-              "��?�??????�?����?????????�?����������??���?���?��?�??��????������������쁭������􁸁��ǁсӁՁׁ݁���聫�����������������������끬������󁷁��ƁЁҁԁց؁���灪������������������")
-            end
           end
           return s
         end

data/tasks/gem.rake

@@ -0,0 +1,31 @@
+require 'hoe'
+
+HOE = Hoe.spec 'win32console' do
+  self.version = '1.3.0.beta1'
+
+  developer 'Gonzalo Garramuno',  'ggarra@advancedsl.com.ar'
+  developer 'Justin Bailey',      'jgbailey@gmail.com'
+  developer 'Luis Lavena',        'luislavena@gmail.com'
+
+  self.rubyforge_name = 'winconsole'
+
+  spec_extras[:required_ruby_version] = Gem::Requirement.new('>= 1.8.6')
+
+  spec_extras[:extensions] = ["ext/Console_ext/extconf.rb"]
+
+  extra_rdoc_files.push *FileList['extra/*.rdoc']
+
+  spec_extras[:rdoc_options] = proc do |rdoc_options|
+    rdoc_options << "--exclude" << "ext"
+  end
+
+  extra_dev_deps << ['rake-compiler', "~> 0.7.0"]
+end
+
+file "#{HOE.spec.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|
+  puts "Generating #{t.name}"
+  File.open(t.name, 'w') { |f| f.puts HOE.spec.to_yaml }
+end
+
+desc "Generate or update the standalone gemspec file for the project"
+task :gemspec => ["#{HOE.spec.name}.gemspec"]

data/tasks/native.rake

@@ -0,0 +1,14 @@
+# use rake-compiler for building the extension
+require 'rake/extensiontask'
+
+Rake::ExtensionTask.new('Console_ext', HOE.spec) do |ext|
+  # FIXME: enable cross compilation to build fat binaries
+  ext.cross_compile = true
+  ext.cross_platform = ['i386-mingw32', 'i386-mswin32-60']
+
+  # place extension binaries inside lib/X.Y
+  if RUBY_PLATFORM =~ /mingw|mswin/
+    RUBY_VERSION =~ /(\d+.\d+)/
+    ext.lib_dir = "lib/#{$1}"
+  end
+end

metadata

@@ -1,40 +1,82 @@
 --- !ruby/object:Gem::Specification 
 name: win32console
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.3.0.beta1
 platform: x86-mswin32-60
 authors: 
-- Original Library by Gonzalo Garramuno, Gem by Justin Bailey
+- Gonzalo Garramuno
+- Justin Bailey
+- Luis Lavena
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-11-22 00:00:00 -02:00
+date: 2009-12-29 00:00:00 -03:00
 default_executable: 
-dependencies: []
-
-description: "This gem packages Gonzalo Garramuno's Win32::Console project, and includes a compiled binary for speed. The Win32::Console project's home can be found at:  http://rubyforge.org/projects/win32console  The gem project can be found at  http://rubyforge.org/projects/winconsole"
-email: ggarra @nospam@ advancedsl.com.ar, jgbailey @nospan@ gmail.com
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.4.0
+    version: 
+description: |-
+  Win32::Console allows controling the windows command line terminal
+  thru an OO-interface. This allows you to query the terminal (find
+  its size, characters, attributes, etc). The interface and functionality
+  should be identical to Perl's counterpart.
+  
+  A port of Perl's Win32::Console and Win32::Console::ANSI modules.
+  
+  This gem packages Gonzalo Garramuno's Win32::Console project, and includes
+  a compiled binary for speed. The Win32::Console project's home can be
+  found at:
+  
+    http://rubyforge.org/projects/win32console
+email: 
+- ggarra@advancedsl.com.ar
+- jgbailey@gmail.com
+- luislavena@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
+- History.txt
+- Manifest.txt
 - README.txt
-- README_GEM.txt
-- INSTALL.txt
-- HISTORY.txt
-- HISTORY_GEM.txt
+- extra/Console.rdoc
+- extra/Console_ANSI.rdoc
 files: 
-- doc/Console.rdoc
-- doc/Console_ANSI.rdoc
-- ext/Console.cpp
-- ext/extconf.rb
+- History.txt
+- Manifest.txt
+- Rakefile
+- README.txt
+- ext/Console_ext/Console.c
+- ext/Console_ext/extconf.rb
+- extra/Console.rdoc
+- extra/Console_ANSI.rdoc
+- lib/win32console.rb
+- lib/Win32/Console.rb
 - lib/Win32/Console/ANSI.rb
 - lib/Win32/Console/api.rb
 - lib/Win32/Console/constants.rb
-- lib/Win32/Console.rb
-- lib/win32console.rb
+- tasks/gem.rake
+- tasks/native.rake
 - test/test_cursor.rb
 - test/test_mouse.rb
 - test/test_readinput.rb
@@ -42,42 +84,45 @@ files:
 - test/test_sendevent.rb
 - test/test_title.rb
 - test/test_write.rb
-- Rakefile
-- README.txt
-- README_GEM.txt
-- INSTALL.txt
-- HISTORY.txt
-- HISTORY_GEM.txt
-- lib/Console.so
+- lib/1.8/Console_ext.so
+- lib/1.9/Console_ext.so
 has_rdoc: true
 homepage: http://rubyforge.org/projects/winconsole
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --title
-- Win32Console Gem -- Gem for Win32::Console Project
 - --main
-- README_GEM.txt
-- --line-numbers
+- README.txt
+- --exclude
+- ext
 require_paths: 
 - lib
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.8.6
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: http://rubyforge.org/projects/winconsole
-rubygems_version: 1.3.1
+rubyforge_project: winconsole
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: A library giving the Win32 console ANSI escape sequence support.
-test_files: []
-
+specification_version: 3
+summary: Win32::Console allows controling the windows command line terminal thru an OO-interface
+test_files: 
+- test/test_mouse.rb
+- test/test_readoutput.rb
+- test/test_write.rb
+- test/test_readinput.rb
+- test/test_sendevent.rb
+- test/test_title.rb
+- test/test_cursor.rb

data/HISTORY.txt

@@ -1,7 +0,0 @@
-v1.0 - Added .dup to _printString function to avoid mangling outside
-       string references.  Removed the other (later) .dup call.
-       Turned of some exceptions that were conflicting with using
-       the module with pipes or redirections.
-v0.8 - Fixed bugs in reading routines, added ruby docs, and 
-       sample test suite.
-v0.5 - First public release.

data/HISTORY_GEM.txt

@@ -1,38 +0,0 @@
-1.2.0 - Code corrections integrated from GitHub
-  * Removed license conflicting ANSI Term code and functionality.
-  * Better code organization and clenaup
-
-1.1.0 - Bug fixes provided by Gordon Thiesfeld (gthiesfeld at gmail dot com).
-  * added #putc to Win32::Console::ANSI::IO 
-    This putc buffers escape sequences so that they will be handled properly
-  *added Kernel#putc
-    Redefined Kernel#putc to wrap Win32::Console::ANSI::IO#putc
-  *added #redirected? to Win32::Console::ANSI::IO
-    Checks the mode of the console to see if IO is being redirected or not
-  * fixed "Invalid Handle" error in compiled version of GetConsoleMode
-    I'm actually not sure of the source of this error.  It may be expected behavior when output is being redirected.  I worked around it by rescuing the exception in Win32::Console#Mode and returning 9999.  I picked that arbitrary value, because it is higher than 31, which is what I think is the highest value Mode would return if output isn't being redirected.
-  * modified Win32::Console::ANSI::IO#write
-  to check for redirection.  If output is redirected, it uses WriteFile instead of  WriteConosle.  It also skips the parsing step, and passes the escape sequences through.
-  * added Win32::Console::API#WriteFile
-    to both the Ruby and compiled versions
-  * added Win32::Console*WriteFile
-  This is a wrapper around Win32::Console::API#WriteFile
-  * modified Win32::Console::ANSI::IO#_PrintString
-  Didn't change behavior, just tried to make it more idiomatic ruby.  I didn't make all of the changes I wanted to, because I wasn't sure how to test them all.
-  * split Win32::Console::Constants and Win32::Console::API out into seperate files.
-  These two classes were in 'Win32/Console.rb'  I moved them into 'Win32/Console/constants.rb' and 'Win32/Console/api.rb' respectively.
-  * cleaned up indentation
-  indentations was a mixture of tabs and spaces.  I made everything indented with 2 spaces.
-  * modified all Win32::Console::API methods
-  It was assigning Win32API functions to class variables.  I switched them to instance variables. I also changed the idiom it was using to instantiate the objects.
-  For instance, instead of:
-  
-    if @@m_AllocConsole == nil
-    @@m_AllocConsole = Win32API.new( "kernel32", "AllocConsole", 
-            [], 'l' )
-            
-  It is now:
-  
-    @AllocConsole ||= Win32API.new( "kernel32", "AllocConsole", [], 'l' )
-  * Non-string arguments passed to Win32::Console::ANSI#write caused error - fix by Ivan Evtuhovich (evtuhovich at gmail dot com).
-1.0.8 - First public release of win32console gem by Justin Bailey (jgbailey at gmail dot com).

data/INSTALL.txt

@@ -1,18 +0,0 @@
-
-To compile and install:
-
-
-Open a windows console.
-> vcvars32.bat    # to set up microsoft's compiling environment
-                  # this is located in the bin/ directory of the MSVC compiler
-> ruby extconf.rb # to create a Makefile
-> nmake           # to compile
-> nmake install   # to install
-
-
-To test:
-
-> cd test
-> dir              # to see available samples
-> ruby [anysample]
-

data/README_GEM.txt

@@ -1,64 +0,0 @@
-= Introduction
-
-This gem packages Gonzalo Garramuno's Win32::Console project, and includes a compiled binary for speed. The Win32::Console project's home can be found at:
-
-http://rubyforge.org/projects/win32console
-  
-To use the gem, just put
-
-  require 'win32console'
-  
-At the top of your file.
-
-= Example
-
-To output a simple bolded string, try this script:
-
-  require 'rubygems'
-  require 'win32console'
-  include Win32::Console::ANSI
-  include Term::ANSIColor
-  
-  puts bold << "bolded text" << clear << " and no longer bold."
-
-= Formatting Methods Available
-
-The full list of methods available is found in lib/Term/ansicolor.rb (generated from the @@attributes array):
-
-  clear
-  reset # synonym for clear
-  bold
-  dark
-  italic # not widely implemented
-  underline
-  underscore # synonym for underline
-  blink
-  rapid_blink # not widely implemented
-  negative # no reverse because of String#reverse
-  concealed
-  strikethrough # not widely implemented
-
-  # The following will set the foreground color
-  
-  black
-  red
-  green
-  yellow
-  blue
-  magenta
-  cyan
-  white
-
-  # The following will set the background color
-  
-  on_black
-  on_red
-  on_green
-  on_yellow
-  on_blue
-  on_magenta
-  on_cyan
-  on_white
-
-The methods are fairly sophisticated. If you don't pass an argument, the appropriate escape sequence is returned. If a string is given, it will be outputted with an escape sequence wrapping it to apply the formatting to just that portion. If a block is given, the escape sequence will wrap the output of the block. Finally, if the Term::ANSIColor module is mixed into an object, and that instance supports to_str, tnen the result of to_str will be wrapped in the escape sequence.
-