monocle-print 1.0.5 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmQwZjE5MDc2Nzg1MWIxNWY3YmUwMTc1M2Y1NWU2Yjg5N2NlZGY1Ng==
+    ODM2ZmVhODYxMDhhYTc1NjdlNWJkNGI1ZDVkYjY4NDI3M2E0ZTRmYg==
   data.tar.gz: !binary |-
-    ODM3ODlmMGNjYjc0MzVhYmU4M2Y1MjBmOWJhMjZlZjQ2YzZjOWM5OQ==
+    NzJhODM3MTczZmI4NzJkMTQxNmZkNDI3YWE2NjBhNTEzM2U0OTI1MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzU1NzczZWY0YmIyMWNkYWViMDIxNGVmNjA0MTViYWNiODY5NjlkMTI1ZTUz
-    NTRmNWE4NDcxMTU1ZGU5NjM1NTg2NDUwMjljZWRmN2U0YjFiZDllY2UzZjIz
-    YjkwYTdmOGQyMDM0ZmNmOGExYjFmYmUxM2JiNWQ4MWQwODU4MTg=
+    MDMxZjA0NjU1ODIzMWViMGU5YTVjZGVkNzczOTU1NGEwNjk4OTg0M2E3YjU1
+    MWFhMjk1OGQ0MzgyN2JkMTY2ZTRlN2NkODlkZjc1MjdhYmNkOWY2Mzk3NTM1
+    ODA3NmIzODlhNWJjZmRlZDY5NjgwYjI1NWVjZDUwYjFlMGEyMzA=
   data.tar.gz: !binary |-
-    YzhjNTE3YjRlMTkwMjE5MWY4NzEwNTgyY2U2NjliZWNhOWM4MzUyMjU1MDE1
-    MjFkYjEwYWNmZjgxODc1M2RkZjYwN2JmMjZkYzE1ODE1ZjBkZGI2ODNiNTA3
-    MmQ0MjQ3MWNjNmU4ZmJlNGJkNmUwNWIyZmQ2M2FmOGVmYmFkZGE=
+    ODczNmI5YmYwNTYwNzdlMGVmNTAzYjkxZDJmMTUwMzE5NjllNzBjM2ZhYWFj
+    ZDg0MTEwZTM1YWVmM2ZlZDQwMjNhOTYwNmJiNmFlZjllNGQ1MDUxMjU5NDBm
+    OTcxNTI4MjI3MTUzZTZmNjg5NDcyYjYzMjk1OGYyOTgyMTBlNTE=

data/lib/monocle-print.rb

@@ -11,7 +11,7 @@ require 'delegate'
 autoload :StringIO, 'stringio' unless defined?( StringIO )
 
 module MonoclePrint
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 
   def self.version
     VERSION

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

@@ -70,7 +70,9 @@ class OutputDevice < DelegateClass( IO )
 
     @background_stack = []
     @foreground_stack = []
-    @background       = @foreground = nil
+    @modifier_stack   = []
+
+    @background       = @foreground = @modifier = nil
     @use_color        = options.fetch( :use_color, tty? )
 
     @cursor           = Pair.new( 0, 0 )
@@ -120,7 +122,17 @@ class OutputDevice < DelegateClass( IO )
 
   alias on background
 
-  for color in ANSI_COLORS.keys
+  def modifier( name = nil )
+    name or return( @modifier_stack.last )
+    begin
+      @modifier_stack.push( name )
+      yield
+    ensure
+      @modifier_stack.pop
+    end
+  end
+
+  for color in ANSI_COLOR_NAMES
     class_eval( <<-END, __FILE__, __LINE__ )
       def #{ color }
         foreground( :#{ color } ) { yield }
@@ -132,6 +144,14 @@ class OutputDevice < DelegateClass( IO )
     END
   end
 
+  for modifier in ANSI_MODIFIER_NAMES
+    class_eval( <<-END, __FILE__, __LINE__ )
+      def #{ modifier }
+        modifier( :#{ modifier } ) { yield }
+      end
+    END
+  end
+
   def use_color?
     @use_color
   end
@@ -374,7 +394,6 @@ class OutputDevice < DelegateClass( IO )
     return!
   end
 
-
   for m in %w( horizontal_line box_top box_bottom )
     class_eval( <<-END, __FILE__, __LINE__ + 1 )
       def #{ m }
@@ -387,14 +406,21 @@ class OutputDevice < DelegateClass( IO )
   def color_code
     @use_color or return ''
     code = ''
+
     case fg = @foreground_stack.last
     when Fixnum then code << xterm_color( ?f, fg )
     when String, Symbol then code << ansi_color( ?f, fg )
     end
+
     case bg = @background_stack.last
     when Fixnum then code << xterm_color( ?b, bg )
     when String, Symbol then code << ansi_color( ?b, bg )
     end
+
+    case mod = @modifier_stack.last
+    when String, Symbol then code << ansi_modifier( mod )
+    end
+
     code
   end
 

data/lib/monocle-print/terminal-escapes.rb

@@ -11,13 +11,24 @@ module TerminalEscapes
     :yellow => 3, :green => 2,  :black => 0,
     :red => 1,    :cyan => 6
   }
-  
+  ANSI_COLOR_NAMES = ANSI_COLORS.keys.freeze
+
+  ANSI_MODIFIERS =
+    {
+      :bold      => 1,
+      :underline => 4,
+      :blink     => 5,
+      :reverse   => 7,
+      :conceal   => 8
+    }
+  ANSI_MODIFIER_NAMES = ANSI_MODIFIERS.keys.freeze
+
   module_function
-  
+
   #def term_info
   #  @term_info ||= TermInfo.new
   #end
-  
+
   def ansi_color( type, color, bold = nil )
     offset =
       case type
@@ -29,7 +40,7 @@ module TerminalEscapes
     end
     "\e[#{ '1;' if bold }#{ code }m"
   end
-  
+
   def xterm_color( type, color_index, bold = nil )
     prefix =
       case type
@@ -38,7 +49,7 @@ module TerminalEscapes
       end
     "\e[#{ prefix };5;#{ color_index }m"
   end
-  
+
   def konsole_color( type, r, g, b, bold = nil)
     prefix =
       case type
@@ -47,115 +58,123 @@ module TerminalEscapes
       end
     "\e[#{ prefix };2;#{ r };#{ g };#{ b }m"
   end
-  
+
+  def ansi_modifier( name )
+    code =
+      ANSI_MODIFIERS.fetch( name.to_sym ) do
+        fail ArgumentError, "unknown modifier name `%s'" % name
+      end
+    "\e[#{ code }m"
+  end
+
   def clear_attr
     "\e[0m"
   end
-  
+
   def bold
     "\e[1m"
   end
-  
+
   def underline
     "\e[4m"
   end
-  
+
   def blink
     "\e[5m"
   end
-  
+
   def reverse
     "\e[7m"
   end
-  
+
   def conceal
     "\e[8m"
   end
-  
+
   def set_cursor( line = 0, column = 0 )
     "\e[%i;%iH" % [ line, column ]
   end
-  
+
   def cursor_up( lines = 1 )
     "\e[%iA" % lines
   end
-  
+
   def cursor_down( lines = 1 )
     "\e[%iB" % lines
   end
-  
+
   def cursor_forward( columns = 1 )
     "\e[%iC" % columns
   end
-  
+
   def cursor_backward( columns = 1 )
     "\e[%iD" % columns
   end
-  
+
   def save_cursor
     "\e[s"
   end
-  
+
   def restore_cursor
     "\e[u"
   end
-  
+
   #def clear_line
   #  "\e[K"
   #end
-  
+
   # VT100 escapes
   def double_height_top
     "\e#3"
   end
-  
+
   def dobule_height_bottom
     "\e#4"
   end
-  
+
   def single_width
     "\e#5"
   end
-  
+
   def double_width
     "\e#6"
   end
-  
+
   def clear_right
     "\e[0K"
   end
-  
+
   def clear_left
     "\e[1K"
   end
-  
+
   def clear_line
     "\e[2K"
   end
-  
+
   def clear_down
     "\e[0J"
   end
-  
+
   def clear_up
     "\e[1J"
   end
-  
+
   def clear_screen
     "\e[2J"
   end
-  
+
 end
 end
 
 if __FILE__ == $0
-  
+
   TE = MonoclePrint::TerminalEscapes
   for attr in %w[ bold underline blink reverse conceal ]
     print( "This should be #{ attr }:".ljust( 30 ) )
     printf( "%swhateva\e[0m\n", TE.send( attr ) )
   end
-  
+
   colors = TE::ANSI_COLORS.keys.map(&:to_s).sort!
   for color in colors
     print( "This should be #{ color }:".ljust( 30 ) )
@@ -163,7 +182,7 @@ if __FILE__ == $0
     printf( "%swhateva\e[0m\t", TE.ansi_color( ?b, color ) )
     printf( "%sbright_whateva\e[0m\n", TE.ansi_color( ?f, color, true ) )
   end
-  
+
   for dir in %w( left right line )
     name = "clear_#{ dir }"
     code = TE.send( name )
@@ -177,7 +196,7 @@ if __FILE__ == $0
     puts("at end")
     printf("%-14s =>%s\n", name, code, name)
   end
-  
+
   puts( "[ Tabs ]" )
   puts( "     \eHx              \eHx      \eHx ")
   puts( "one\ttwo\tthree\tfour" )

metadata

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