monocle-print 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWI2NjhiNjNlODdkN2NlMjcxZGNjNGVlNDI2OWViNTc3NmJjODBjZg==
+    ZTJhOTg2ZGRkZTUzMDYxOTAxMmNhMWI2ZTJjM2ViM2E0NTk4YzBmMQ==
   data.tar.gz: !binary |-
-    ZDFkMWM1YTIyMTY2N2RhMmRlYjRkM2MzYjYzZjBlYzFkNjE3NWVjZA==
+    NmMyYWJmNzEyZDc1ZWZlODE5NDgwY2RiNjI1NDAzYjdjYzdhNWY1OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTRjOTJhMWE2N2FlNWRkMDZmNzI5MjcyYTI2ZDMxZWVjYTJhZmUxYzU1MjZm
-    MTExMjk5OTllYjkyYWVkYTc3YTRjZGZlZGFiYjJmNTczMzNiNjFhNmNkMTg3
-    ZGNiOWJiYWJjODUwZGRjNzVlMzk0ZTQ0OWZkYjJmOTdlYzQ3NmU=
+    NDE0ZDQwOTk5MTk1ZDVkYjM5NjJjZjg3OGFmZWVlMmRhMTFkOTcxMWNkNDgz
+    ODExMTQ5ODFmMzkxZTgxMTNlYmExODUzY2M1MWZlODE4MTlmNWY2NTViYzY5
+    ZmM3ZjZjNGZiZTU3YzI4ZmYwNTQzNDc0ODEwNGQ2ZDE5OTkyZjE=
   data.tar.gz: !binary |-
-    MDhkN2ZmYTQxNTUxY2E2NmQ1ZmQ5ODYxNTUyODRkNmU4ZTZhY2Q1ZjY3ZWEz
-    MjMwNTI0NGU0ZGQwMGQ2Yzk3MjdjZGE1YmNkOTdjYWYzMzkyMDRhNjUyMmFh
-    MmIxOWZmZTg4YTU0YTk3YzdlZjA0ZjAxMTMwYThkODY3MDE3ZGY=
+    MGUyN2Q0NzkyN2I5ZWY0NjUzNzE2NWRlNDc3MTg4NGE2NDRiMDZjMjAzZDlm
+    YWZjM2Q2YzkyNWMzNWJiZDcyZmNjYzUyNTliMmJlY2U0ZmFiNzRjNDUwNjNk
+    YzRlNmJmMWQ0MGE5MjQ0NjM0ODk3MjRjODg0MzQ2ZWNkNzFmOGI=

data/lib/monocle-print/output-device.rb

@@ -40,6 +40,11 @@ class OutputDevice < DelegateClass( IO )
     block_given? ? yield( device ) : device
   end
 
+  def self.stderr( options = {} )
+    device = new( $stderr, options )
+    block_given? ? yield( device ) : device
+  end
+
   DEFAULT_SIZE     = Pair.new( 80, 22 ).freeze
   IO_PRINT_METHODS = %w( puts print printf putc )
   SIZE_IOCTL       = 0x5413
@@ -62,18 +67,20 @@ class OutputDevice < DelegateClass( IO )
           raise( ArgumentError, msg )
         end
       end
+
     super( @device )
 
-    @cursor = Pair.new( 0, 0 )
     @background_stack = []
     @foreground_stack = []
-    @background = @foreground = nil
-    @tab_width = options.fetch( :tab_width, 8 )
+    @background       = @foreground = nil
+    @use_color        = options.fetch( :use_color, tty? )
 
-    @newline = options.fetch( :newline, $/ )
-    @use_color = options.fetch( :use_color, tty? )
+    @cursor           = Pair.new( 0, 0 )
+    @tab_width        = options.fetch( :tab_width, 8 )
+    @margin           = Pair.new( 0, 0 )
+
+    @newline          = options.fetch( :newline, $/ )
 
-    @margin = Pair.new( 0, 0 )
     case margin = options.fetch( :margin, 0 )
     when Numeric then @margin.left = @margin.right = margin.to_i
     else
@@ -81,12 +88,12 @@ class OutputDevice < DelegateClass( IO )
       @margin.right = margin[ :right ].to_i
     end
 
-    @tabs = {}
-    @screen_size = nil
+    @tabs          = {}
+    @screen_size   = nil
     @forced_width  = options[ :width ]
     @forced_height = options[ :height ]
-    @alignment = options.fetch( :alignment, :left )
-    @style = Style( options[ :style ] )
+    @alignment     = options.fetch( :alignment, :left )
+    @style         = Style( options[ :style ] )
   end
 
   def foreground( color = nil )
@@ -137,22 +144,22 @@ class OutputDevice < DelegateClass( IO )
   end
 
   def use_color= v
-    @use_color = ! ! v # 'not not x' casts x to either `true' or 'false'
+    @use_color = !!v
   end
 
   def margin= n
-    left_margin = right_margin = Utils.at_least( n.to_i, 0 )
+    self.left_margin = self.right_margin = Utils.at_least( n.to_i, 0 )
   end
 
   def indent( n = 0, m = 0 )
     n, m = n.to_i, m.to_i
-    self.left_margin += n
+    self.left_margin  += n
     self.right_margin += m
     if block_given?
       begin
         yield
       ensure
-        self.left_margin -= n
+        self.left_margin  -= n
         self.right_margin -= m
       end
     else
@@ -297,7 +304,7 @@ class OutputDevice < DelegateClass( IO )
     @device.print( str )
     @cursor + str.width
     @device.print( clear_attr )
-    fill( @screen_size.width - @cursor.column )
+    fill( screen_size.width - @cursor.column )
     self
   end
 
@@ -406,34 +413,35 @@ private
   end
 
   def screen_size
-    @screen_size ||= begin
-      data = SIZE_STRUCT.dup
-      if @device.ioctl( SIZE_IOCTL, data ) >= 0
-        height, width = data.unpack( "SS" )
-        @forced_width and width = @forced_width
-        @forced_height and height = @forced_height
+    @screen_size ||=
+      begin
+        if device.respond_to?( :winsize )
+          detected_height, detected_width = device.winsize
+        elsif data = SIZE_STRUCT.dup and device.ioctl( SIZE_IOCTL, data ) >= 0
+          detected_height, detected_width = data.unpack( "SS" )
+        else
+          size = default_size
+          detected_height, detected_width = size.height, size.width
+        end
         Pair.new(
-          width  > 0 ? width  : default_width,
-          height > 0 ? height : default_height
+          @forced_height || detected_height,
+          @forced_width  || detected_width
         )
-      else
+      rescue Exception
         default_size
       end
-    rescue Exception
-      default_size
-    end
   end
 
   def default_size
-    Pair.new( @forced_width || default_width, @forced_height || default_height )
+    Pair.new( default_width, default_height )
   end
 
   def default_height
-    ( ENV[ 'LINES' ] || DEFAULT_SIZE.height ).to_i
+    ( @forced_height || ENV[ 'LINES' ] || DEFAULT_SIZE.height ).to_i
   end
 
   def default_width
-    ( ENV[ 'COLUMNS' ] || DEFAULT_SIZE.width ).to_i
+    ( @forced_width || ENV[ 'COLUMNS' ] || DEFAULT_SIZE.width ).to_i
   end
 end
 
@@ -471,20 +479,23 @@ class Pager < OutputDevice
 private
 
   def screen_size
-    @screen_size ||= begin
-      data = SIZE_STRUCT.dup
-      if STDOUT.ioctl( SIZE_IOCTL, data ) >= 0
-        height, width = data.unpack( "SS" )
+    @screen_size ||=
+      begin
+        if STDOUT.respond_to?( :winsize )
+          detected_height, detected_width = STDOUT.winsize
+        elsif data = SIZE_STRUCT.dup and STDOUT.ioctl( SIZE_IOCTL, data ) >= 0
+          detected_height, detected_width = data.unpack( "SS" )
+        else
+          size = default_size
+          detected_height, detected_width = size.height, size.width
+        end
         Pair.new(
-          width  > 0 ? width  : default_width,
-          height > 0 ? height : default_height
+          @forced_height || detected_height,
+          @forced_width  || detected_width
         )
-      else
+      rescue Exception
         default_size
       end
-    rescue Exception
-      default_size
-    end
   end
 end
 

data/lib/monocle-print/presentation.rb

@@ -5,7 +5,7 @@ module MonoclePrint
 module Presentation
   include MonoclePrint
   ALIGNMENTS = [ :left, :right, :center ]
-  
+
   def self.included( klass )
     super
     klass.extend( ClassMethods )
@@ -13,7 +13,7 @@ module Presentation
   
   attr_accessor :owner
   protected :owner=
-  
+
   for attr in %w( margin padding border )
     class_eval( <<-END, __FILE__, __LINE__ + 1 )
       def #{ attr }( value = nil )
@@ -21,33 +21,33 @@ module Presentation
         @#{ attr } ||= default_#{ attr }
         block_given? ? yield( @#{ attr } ) : @#{ attr }
       end
-      
+
       def #{ attr }= value
         @#{ attr } = Rectangle( value )
       end
     END
   end
-  
+
   def alignment( value = nil )
     value and self.alignment = value
     @alignment or @owner ? @owner.alignment : :left
   end
-  
+
   def alignment= value
     ALIGNMENTS.member?( value = value.to_sym ) or
       raise( ArgumentError, "unkown alignment: %p" % value )
     @alignment = value
   end
-  
+
   def style( value = nil )
     value and self.style = value
     @style or @owner ? @owner.style : Graphics::NAMED_STYLES[ 'ascii' ]
   end
-  
+
   def style= value
     @style = Style( value )
   end
-  
+
   def render( output = @output )
     if output
       render_content( output )
@@ -58,66 +58,66 @@ module Presentation
       end
     end
   end
-  
+
   def to_s
     OutputDevice.buffer do | out |
       render_content( out )
     end
   end
-  
+
   def height
     @height or calculate_height
   end
-  
+
   def width
     @width or calculate_width
   end
-  
+
   attr_writer :max_width
-  
+
   def max_width
     @max_width or @owner && @owner.max_width or output.width
   end
-  
+
   def output
     @output ||= ( @owner and @owner.output or OutputDevice.stdout )
   end
-  
+
   def output=( io )
     @output = io.nil? ? io : Output( io )
   end
-  
+
 private
-  
+
   def initialize_view( options = nil, owner = nil )
     @max_width = @width = @height = nil
     @margin = @padding = @alignment = @style = nil
     @output = @foreground = @background = nil
-    
+
     if options
-      val = options[ :width ]   and self.width = val
+      val = options[ :width ]   and self.width     = val
       val = options[ :align ]   and self.alignment = val
-      val = options[ :style ]   and self.style = val
-      val = options[ :padding ] and self.padding = val
-      val = options[ :margin ]  and self.margin = val
-      val = options[ :output ]  and self.output = val
+      val = options[ :style ]   and self.style     = val
+      val = options[ :padding ] and self.padding   = val
+      val = options[ :margin ]  and self.margin    = val
+      val = options[ :output ]  and self.output    = val
     end
-    
+
     @owner = owner
   end
-  
+
   def default_margin
     Rectangle.new( 0, 0, 0, 0 )
   end
-  
+
   def default_padding
     Rectangle.new( 0, 0, 0, 0 )
   end
-  
+
   def default_border
     Rectangle.new( false, false, false, false )
   end
-  
+
 end
 
 module Presentation::ClassMethods

data/lib/monocle-print.rb

@@ -1,8 +1,14 @@
 #!/usr/bin/ruby
 # encoding: utf-8
 
+begin
+  require 'io/console'
+rescue LoadError
+  # ignore
+end
+
 module MonoclePrint
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
   def self.version
     VERSION
@@ -17,8 +23,16 @@ module MonoclePrint
     File.join( File.dirname( __FILE__ ), *args )
   end
 
-  def self.stdout
-    Output( $stdout )
+  def self.stdout( options = {}, &block )
+    OutputDevice.stdout( options, &block )
+  end
+
+  def self.stderr( options = {}, &block )
+    OutputDevice.stderr( options, &block )
+  end
+
+  def self.buffer( options = {}, &block )
+    OutputDevice.buffer( options, &block )
   end
 
 module_function

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monocle-print
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - monocle-print
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc