win32console 1.3.0.beta1 → 1.3.0.beta2

data/History.txt

@@ -1,4 +1,10 @@
-=== 1.3.0.beta
+=== 1.3.0.beta2 / 2010-03-07
+
+* Enhancements
+  * Redirect STDERR to be processed also for ANSI codes. Closes GH-4
+  * Allow ECHO to be displayed [jloveces]
+
+=== 1.3.0.beta1
 
 * Enhancements
   * Usage of Hoe and rake-compiler to ease releasing and extension

data/Rakefile

@@ -6,49 +6,3 @@
 
 # load rakefile extensions (tasks)
 Dir['tasks/*.rake'].sort.each { |f| load f }
-
-=begin
-require 'rubygems'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/extensiontask'
-
-spec = Gem::Specification.new do |s|
-  s.name              = 'win32console'
-  s.version           = '1.2.0'
-  s.platform          = Gem::Platform::RUBY
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = %w[ README.txt README_GEM.txt INSTALL.txt HISTORY.txt HISTORY_GEM.txt ]
-  s.summary           = 'A library giving the Win32 console ANSI escape sequence support.'
-  s.description       = s.summary
-  s.author            = 'Original Library by Gonzalo Garramuno, Gem by Justin Bailey'
-  s.email             = 'ggarra @nospam@ advancedsl.com.ar, jgbailey @nospan@ gmail.com'
-  s.homepage          = 'http://rubyforge.org/projects/winconsole'
-  s.rubyforge_project = 'http://rubyforge.org/projects/winconsole'
-  s.description = <<EOS
-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
-EOS
-
-  s.require_path      = 'lib'
-  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' <<
-                   '--main' << 'README_GEM.txt' <<
-                   '--line-numbers'
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-  pkg.gem_spec = spec
-end
-
-Rake::ExtensionTask.new('Console', spec) do |ext|
-end
-=end

data/lib/Win32/Console.rb

@@ -184,6 +184,16 @@ module Win32
       end
     end
 
+    def Echo(flag = nil)
+      if flag.nil?
+        (self.Mode & ENABLE_ECHO_INPUT) == ENABLE_ECHO_INPUT
+      elsif flag
+        self.Mode(self.Mode |  ENABLE_ECHO_INPUT)
+      else
+        self.Mode(self.Mode & ~ENABLE_ECHO_INPUT)
+      end
+    end
+
     def WriteInput(*t)
       API.WriteConsoleInput(@handle, *t)
     end

data/lib/Win32/Console/ANSI.rb

@@ -39,6 +39,11 @@ module Win32
 
         include Win32::Console::Constants
 
+        FD_STD_MAP = {
+          :stdout => [1, STD_OUTPUT_HANDLE],
+          :stderr => [2, STD_ERROR_HANDLE]
+        }
+
         # @todo: encode is another perl module
         EncodeOk = false
 
@@ -77,9 +82,10 @@ module Win32
               47 => BACKGROUND_RED|BACKGROUND_GREEN|BACKGROUND_BLUE, # white background
         }
 
-        def initialize
-          super(1,'w')
-          @Out = Win32::Console.new(STD_OUTPUT_HANDLE)
+        def initialize(fd_std = :stdout)
+          fd, handle = FD_STD_MAP[fd_std]
+          super(fd, 'w')
+          @Out = Win32::Console.new(handle)
           @x = @y = 0           # to save cursor position
           @foreground = 7
           @background = 0
@@ -332,5 +338,5 @@ module Win32
   end
 end
 
-$stdout = Win32::Console::ANSI::IO.new()
-
+$stdout = Win32::Console::ANSI::IO.new(:stdout)
+$stderr = Win32::Console::ANSI::IO.new(:stderr)

data/tasks/gem.rake

@@ -1,7 +1,7 @@
 require 'hoe'
 
 HOE = Hoe.spec 'win32console' do
-  self.version = '1.3.0.beta1'
+  self.version = '1.3.0.beta2'
 
   developer 'Gonzalo Garramuno',  'ggarra@advancedsl.com.ar'
   developer 'Justin Bailey',      'jgbailey@gmail.com'

data/tasks/native.rake

@@ -3,8 +3,10 @@ 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']
+  unless RUBY_PLATFORM =~ /mingw|mswin/ then
+    ext.cross_compile = true
+    ext.cross_platform = ['i386-mingw32', 'i386-mswin32-60']
+  end
 
   # place extension binaries inside lib/X.Y
   if RUBY_PLATFORM =~ /mingw|mswin/

data/test/test_readinput.rb

@@ -10,7 +10,9 @@ puts "InputChar: Type a phrase then ENTER, please:"
 x1 = a.InputChar(1)
 puts "Your phrase starts with the character #{x1}"
 
+gets #clear regular input buffer
 
+oldMode = a.Mode
 fdwMode = ENABLE_WINDOW_INPUT | ENABLE_MOUSE_INPUT
 
 a.Mode(fdwMode)
@@ -60,3 +62,17 @@ else
   end
 end
 
+
+
+a.Mode(oldMode)
+
+a.Echo(false)
+puts
+puts "Echo is #{a.Echo}: Type something, which you SHOULD NOT see"
+gets
+
+a.Echo(true)
+puts
+puts "Echo is #{a.Echo}: Type something, which you SHOULD see"
+gets
+

data/test/test_std.rb

@@ -0,0 +1,4 @@
+require "Win32/Console/ANSI"
+
+puts "this goes to \e[32mSTDOUT\e[0m"
+warn "this goes to \e[31mSTDERR\e[0m"

data/test/test_write.rb

@@ -6,6 +6,7 @@ begin
 rescue LoadError
   puts "You need term-ansicolor gem installed to run this test"
   puts "Please 'gem install term-ansicolor' and try again."
+  exit(1)
 end
 
 require "benchmark"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32console
 version: !ruby/object:Gem::Version 
-  version: 1.3.0.beta1
+  version: 1.3.0.beta2
 platform: ruby
 authors: 
 - Gonzalo Garramuno
@@ -11,9 +11,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -03:00
+date: 2010-03-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
   type: :development
@@ -32,7 +52,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.5.0
     version: 
 description: |-
   Win32::Console allows controling the windows command line terminal
@@ -118,6 +138,7 @@ 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_std.rb
 - test/test_readoutput.rb
 - test/test_write.rb
 - test/test_readinput.rb