win32console 1.3.1 → 1.3.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3.2 / 2012-05-11
+
+* Bugfixes:
+  * Fix background color issue associated with redirected outputs. Closes GH-14
+    [kbarber]
+
 === 1.3.1 / 2012-04-15
 
 * Enhancements:

data/lib/Win32/Console.rb

@@ -31,7 +31,7 @@ module Win32
       end
 
       # Preserve original attribute setting, so Cls can use it
-      if t == STD_OUTPUT_HANDLE or t == STD_ERROR_HANDLE
+      if (t == STD_OUTPUT_HANDLE or t == STD_ERROR_HANDLE) and not redirected?
         @attr_default = self.Attr
       end
     end
@@ -285,6 +285,15 @@ module Win32
       Window(1,0,0,vx,vy)
     end
 
+    # Return true if console is redirected or piped and no longer is outputing
+    # to the normal console.
+    #
+    # This can be used to determine if normal console operations will be
+    # available.
+    def redirected?
+      self.Mode > 31
+    end
+
     def Console.Free()
       API.FreeConsole()
     end

data/lib/Win32/Console/ANSI.rb

@@ -87,10 +87,15 @@ module Win32
           super(fd, 'w')
           @Out = Win32::Console.new(handle)
           @x = @y = 0           # to save cursor position
-          @default_foreground = @Out.DefaultForeground
-          @default_background = @Out.DefaultBackground
-          @default_bold       = @Out.DefaultBold
-          @default_underline  = @Out.DefaultUnderline
+
+          # None of these calls will work, when we are redirected
+          unless redirected?
+            @default_foreground = @Out.DefaultForeground
+            @default_background = @Out.DefaultBackground
+            @default_bold       = @Out.DefaultBold
+            @default_underline  = @Out.DefaultUnderline
+          end
+
           @foreground = @default_foreground
           @background = @default_background
           @bold       = @default_bold
@@ -109,7 +114,7 @@ module Win32
           if @buffer.empty?
             # match \e
             unless int == 27
-               write(int.chr)
+              write(int.chr)
             else
               @buffer << int
             end
@@ -142,9 +147,12 @@ module Win32
           end
         end
 
-        # returns true if outputs is being redirected.
+        # Returns true if output is being redirected to something other then a
+        # terminal.
+        #
+        # For now just checks the status of Win32::Console#redirected?
         def redirected?
-          @Out.Mode > 31
+          @Out.redirected?
         end
 
         private

data/tasks/gem.rake

@@ -1,7 +1,7 @@
 require 'hoe'
 
 HOE = Hoe.spec 'win32console' do
-  self.version = '1.3.1'
+  self.version = '1.3.2'
 
   developer 'Gonzalo Garramuno',  'ggarra@advancedsl.com.ar'
   developer 'Justin Bailey',      'jgbailey@gmail.com'
@@ -19,7 +19,12 @@ HOE = Hoe.spec 'win32console' do
     rdoc_options << "--exclude" << "ext"
   end
 
-  extra_dev_deps << ['rake-compiler', "~> 0.7.0"]
+  extra_dev_deps.push(
+    ['rake-compiler', "~> 0.7.0"],
+    ['mocha', '>= 0.10.5'],
+    ['rspec', '>= 2.9.0'],
+    ['rspec-core', '>= 2.9.0']
+  )
 end
 
 file "#{HOE.spec.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32console
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -45,6 +45,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.5
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: winconsole
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Win32::Console allows controling the windows command line terminal thru an