win32console 1.3.0-x86-mswin32-60 → 1.3.1-x86-mswin32-60

data/History.txt

@@ -1,4 +1,9 @@
-=== 1.3.0 / 2007-03-14
+=== 1.3.1 / 2012-04-15
+
+* Enhancements:
+  * Maintain Fore and background colors [kbarber & vertigious]
+
+=== 1.3.0 / 2010-03-14
 
 * Enhancements
   * Works with Ruby 1.9

data/README.txt

@@ -4,6 +4,15 @@
 * http://github.com/luislavena/win32console
 * http://rdoc.info/projects/luislavena/win32console
 
+== DEPRECATION NOTICE
+
+Win32::Console has been deprecated in favor of an external tool named ANSICON:
+
+* https://github.com/adoxa/ansicon
+* http://blog.mmediasys.com/2010/11/24/we-all-love-colors/
+
+This project is left here for history purposes but no further development will be done.
+
 == DESCRIPTION
 
 Win32::Console allows controling the windows command line terminal
@@ -41,8 +50,22 @@ To output a simple bolded string, try this script:
 
 == INSTALL
 
+To install from rubygems, simple run:
+
   gem install win32console
 
+To install from source, make sure you have the Ruby development kit from
+RubyInstaller on your Windows host, install the following gems:
+
+  * rake
+  * hoe
+  * rake-compiler
+
+Then run the following:
+
+  rake gem
+  gem install pkg\win32console-1.3.0.gem
+
 == DEVELOPERS:
 
 After checking out the source, run:

data/lib/Win32/Console.rb

@@ -29,6 +29,11 @@ module Win32
         @handle = API.CreateConsoleScreenBuffer( param1, param2,
                                                  CONSOLE_TEXTMODE_BUFFER )
       end
+
+      # Preserve original attribute setting, so Cls can use it
+      if t == STD_OUTPUT_HANDLE or t == STD_ERROR_HANDLE
+        @attr_default = self.Attr
+      end
     end
 
     def Display
@@ -207,6 +212,24 @@ module Win32
       end
     end
 
+    def DefaultBold # Foreground Intensity
+      self.Attr[3] == 1
+    end
+
+    def DefaultUnderline # Background Intensity
+      self.Attr[7] == 1
+    end
+
+    def DefaultForeground
+      a = self.Attr
+      (0..2).map{|i| a[i] }.inject(0){|num, bit| (num << 1) + bit }
+    end
+
+    def DefaultBackground
+      a = self.Attr
+      (4..6).map{|i| a[i] }.inject(0){|num, bit| (num << 1) + bit }
+    end
+
     def Size(*t)
       if t.size == 0
         col, row = API.GetConsoleScreenBufferInfo(@handle )
@@ -251,7 +274,7 @@ module Win32
     end
 
     def Cls()
-      attr = ATTR_NORMAL
+      attr = @attr_default || ATTR_NORMAL
       x, y = Size()
       left, top, right , bottom = Window()
       vx = right  - left

data/lib/Win32/Console/ANSI.rb

@@ -87,10 +87,14 @@ module Win32
           super(fd, 'w')
           @Out = Win32::Console.new(handle)
           @x = @y = 0           # to save cursor position
-          @foreground = 7
-          @background = 0
-          @bold =
-          @underline =
+          @default_foreground = @Out.DefaultForeground
+          @default_background = @Out.DefaultBackground
+          @default_bold       = @Out.DefaultBold
+          @default_underline  = @Out.DefaultUnderline
+          @foreground = @default_foreground
+          @background = @default_background
+          @bold       = @default_bold
+          @underline  = @default_underline
           @revideo =
           @concealed = nil
           @conv = 1        # char conversion by default
@@ -159,10 +163,10 @@ module Win32
                     atv = attr.to_i
                     case atv
                     when 0  # ESC[0m reset
-                      @foreground = 7
-                      @background = 0
-                      @bold =
-                      @underline =
+                      @foreground = @default_foreground
+                      @background = @default_background
+                      @bold       = @default_bold
+                      @underline  = @default_underline
                       @revideo =
                       @concealed = nil
                     when 1

data/tasks/gem.rake

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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: win32console
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  hash: 25
+  prerelease: 
+  segments: 
+  - 1
+  - 3
+  - 1
+  version: 1.3.1
 platform: x86-mswin32-60
 authors: 
 - Gonzalo Garramuno
@@ -11,49 +17,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 -03:00
-default_executable: 
+date: 2012-04-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rdoc
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id003
 description: |-
   Win32::Console allows controling the windows command line terminal
   thru an OO-interface. This allows you to query the terminal (find
@@ -105,9 +116,9 @@ files:
 - test/test_title.rb
 - test/test_write.rb
 - test/test_std.rb
+- .gemtest
 - lib/1.8/Console_ext.so
 - lib/1.9/Console_ext.so
-has_rdoc: true
 homepage: http://rubyforge.org/projects/winconsole
 licenses: []
 
@@ -119,32 +130,39 @@ rdoc_options:
 - ext
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: winconsole
-rubygems_version: 1.3.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Win32::Console allows controling the windows command line terminal thru an OO-interface
 test_files: 
+- test/test_cursor.rb
 - test/test_mouse.rb
-- test/test_std.rb
-- test/test_readoutput.rb
-- test/test_write.rb
 - test/test_readinput.rb
+- test/test_readoutput.rb
 - test/test_sendevent.rb
+- test/test_std.rb
 - test/test_title.rb
-- test/test_cursor.rb
+- test/test_write.rb