delicious-cli 0.3.2 → 0.4.0

data/lib/delicious-cli/colored.rb

@@ -0,0 +1,224 @@
+require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
+require 'set'
+
+##
+# cute.
+# 
+#   >> "this is red".red
+#  
+#   >> "this is red with a blue background (read: ugly)".red_on_blue
+#
+#   >> "this is red with an underline".red.underline
+#
+#   >> "this is really bold and really blue".bold.blue
+#
+#   >> Colored.red "This is red" # but this part is mostly untested
+module Colored
+  extend self
+
+  ###########################################################################
+  
+  @@is_tty = STDOUT.isatty
+
+  COLORS = { 
+    'black'   => 30,
+    'red'     => 31, 
+    'green'   => 32, 
+    'yellow'  => 33,
+    'blue'    => 34,
+    'magenta' => 35,
+    'cyan'    => 36,
+    'white'   => 37
+  }
+
+  EXTRAS = {
+    'clear'     => 0, 
+    'bold'      => 1,
+    'light'     => 1,
+    'underline' => 4,
+    'reversed'  => 7
+  }
+  
+  #
+  # BBS-style numeric color codes.
+  #
+  BBS_COLOR_TABLE = {
+    0   => :black,
+    1   => :blue,
+    2   => :green,
+    3   => :cyan,
+    4   => :red,
+    5   => :magenta,
+    6   => :yellow,
+    7   => :white,
+    8   => :light_black,
+    9   => :light_blue,
+    10  => :light_green,
+    11  => :light_cyan,
+    12  => :light_red,
+    13  => :light_magenta,
+    14  => :light_yellow,
+    15  => :light_white,
+  }
+
+  VALID_COLORS = Set.new(
+    COLORS.keys +
+    COLORS.map { |k,v| "light_#{k}" } +
+    COLORS.map { |k,v| "bold_#{k}"  }
+  )
+  
+  ###########################################################################
+
+  COLORS.each do |color, value|
+    define_method(color) do 
+      colorize(self, :foreground => color)
+    end
+
+    define_method("on_#{color}") do
+      colorize(self, :background => color)
+    end
+
+    define_method("light_#{color}") do
+      colorize(self, :foreground => color, :extra => 'bold')
+    end
+
+    COLORS.each do |highlight, value|
+      next if color == highlight
+      define_method("#{color}_on_#{highlight}") do
+        colorize(self, :foreground => color, :background => highlight)
+      end
+    end
+  end
+
+  EXTRAS.each do |extra, value|
+    next if extra == 'clear'
+    define_method(extra) do 
+      colorize(self, :extra => extra)
+    end
+  end
+
+  define_method(:to_eol) do
+    tmp = sub(/^(\e\[[\[\e0-9;m]+m)/, "\\1\e[2K")
+    if tmp == self
+      return "\e[2K" << self
+    end
+    tmp
+  end
+
+  ###########################################################################
+
+  def colorize(string=nil, options = {})
+    if string == nil
+      return tagged_colors(self)
+    end
+    
+    if @@is_tty
+      colored = [color(options[:foreground]), color("on_#{options[:background]}"), extra(options[:extra])].compact * ''
+      colored << string
+      colored << extra(:clear)
+    else
+      string
+    end
+  end
+
+  def colors
+    @@colors ||= COLORS.keys.sort
+  end
+
+  def extra(extra_name)
+    extra_name = extra_name.to_s
+    "\e[#{EXTRAS[extra_name]}m" if EXTRAS[extra_name]
+  end
+
+  def color(color_name)
+    background = color_name.to_s =~ /on_/
+    color_name = color_name.to_s.sub('on_', '')
+    return unless color_name && COLORS[color_name]
+    "\e[#{COLORS[color_name] + (background ? 10 : 0)}m" 
+  end
+
+  ###########################################################################
+
+  def enable!
+    @@is_tty = true
+  end
+  
+  alias_method :force!, :enable!
+  
+  def disable!
+    @@is_tty = false
+  end
+
+  def is_tty?
+    @@is_tty
+  end
+  
+  #
+  # Is this string legal?
+  #     
+  def valid_tag?(tag)
+    VALID_COLORS.include?(tag) or
+    (
+      string =~ /^\d+$/ and
+      BBS_COLOR_TABLE.include?(tag.to_i)
+    )
+  end
+    
+  #
+  # Colorize a string that has "color tags".
+  #
+  # Examples:
+  #
+  # Colors as words:
+  #    puts "<light_yellow><light_white>*</light_white> Hey mom! I am <light_green>SO</light_green> colourized right now.</light_yellow>".colorize
+  #
+  # Numeric ANSI colors (from the BBS days):
+  #    puts "<10><5>*</5> Hey mom! I am <9>SO</9> colourized right now.</10>".colorize
+  #
+  def tagged_colors(string)
+    stack = []
+
+    # split the string into tags and literal strings
+    tokens          = string.split(/(<\/?[\w\d_]+>)/)
+    tokens.delete_if { |token| token.size == 0 }
+    
+    result        = ""
+
+    tokens.each do |token|
+
+      # token is an opening tag!
+      
+      if /<([\w\d_]+)>/ =~ token and valid_tag?($1)
+        stack.push $1
+
+      # token is a closing tag!      
+      
+      elsif /<\/([\w\d_]+)>/ =~ token and valid_tag?($1)
+
+        # if this color is on the stack somwehere...
+        if pos = stack.rindex($1)
+          # close the tag by removing it from the stack
+          stack.delete_at pos
+        else
+          raise "Error: tried to close an unopened color tag -- #{token}"
+        end
+
+      # token is a literal string!
+      
+      else
+
+        color = (stack.last || "white")
+        color = BBS_COLOR_TABLE[color.to_i] if color =~ /^\d+$/
+        result << token.send(color)
+        
+      end
+      
+    end
+    
+    result
+  end  
+
+
+end unless Object.const_defined? :Colored
+
+String.send(:include, Colored)

data/lib/delicious-cli/display.rb

@@ -5,7 +5,7 @@ require 'open3'
 ## Load the colorize gem, and define the "hilite" function
 begin
   
-  require 'delicious-cli/colorize'
+  require 'delicious-cli/colored'
   
   # Colourized hilite...
   class String
@@ -28,14 +28,6 @@ begin
     
   end
   
-rescue LoadError
-  
-  STDERR.puts "Note: You should install the 'colorize' gem for extra prettiness.\n"
-  # Monochrome hilite does nothing...
-  class String
-    def hilite(words); self; end
-  end
-  
 end
 
 
@@ -108,10 +100,10 @@ def display(post, query=nil, indent_size=11)
   url          = post["href"].hilite(query, :light_blue)
   tag_lines    = post["tag"].wrap(wrap_size-2).map { |line| line.hilite(query, :light_cyan) }
 
-  if post["extended"].any?
-    ext_lines = post["extended"].wrap(wrap_size).map { |line| line.hilite(query, :white) }
-  else
+  if post["extended"].blank?
     ext_lines = []
+  else
+    ext_lines = post["extended"].wrap(wrap_size).map { |line| line.hilite(query, :white) }
   end
   
   # date / description

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: delicious-cli
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - epitron
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -04:00
+date: 2010-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,7 +43,7 @@ extra_rdoc_files:
 files: 
 - lib/delicious-cli.rb
 - lib/delicious-cli/api.rb
-- lib/delicious-cli/colorize.rb
+- lib/delicious-cli/colored.rb
 - lib/delicious-cli/db.rb
 - lib/delicious-cli/display.rb
 - lib/delicious-cli/log.rb
@@ -61,8 +59,8 @@ homepage: http://github.com/epitron/delicious-cli
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -70,7 +68,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -79,7 +76,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/delicious-cli/colorize.rb

@@ -1,275 +0,0 @@
-#
-# Colorize String class extension.
-#
-class String
-  
-  #
-  # Colors Hash
-  #
-  COLORS = {
-    :black          => 0,
-    :red            => 1,
-    :green          => 2,
-    :yellow         => 3,
-    :blue           => 4,
-    :magenta        => 5,
-    :cyan           => 6,
-    :white          => 7,
-    :default        => 9,
-    
-    :light_black    => 10,
-    :light_red      => 11,
-    :light_green    => 12,
-    :light_yellow   => 13,
-    :light_blue     => 14,
-    :light_magenta  => 15,
-    :light_cyan     => 16,
-    :light_white    => 17
-  }
-
-  #
-  # Modes Hash
-  #
-  MODES = {
-    :default        => 0, # Turn off all attributes
-    #:bright        => 1, # Set bright mode
-    :underline      => 4, # Set underline mode
-    :blink          => 5, # Set blink mode
-    :swap           => 7, # Exchange foreground and background colors
-    :hide           => 8  # Hide text (foreground color would be the same as background)
-  }
-  
-  protected
-  
-  #
-  # Set color values in new string intance
-  #
-  def set_color_parameters( params )
-    if (params.instance_of?(Hash))
-      @color = params[:color]
-      @background = params[:background]
-      @mode = params[:mode]
-      @uncolorized = params[:uncolorized]
-      self
-    else
-      nil
-    end
-  end
-
-  public
-
-  #
-  # Change color of string
-  #
-  # Examples:
-  #
-  #   puts "This is blue".colorize( :blue )
-  #   puts "This is light blue".colorize( :light_blue )
-  #   puts "This is also blue".colorize( :color => :blue )
-  #   puts "This is blue with red background".colorize( :color => :light_blue, :background => :red )
-  #   puts "This is blue with red background".colorize( :light_blue ).colorize( :background => :red )
-  #   puts "This is blue text on red".blue.on_red
-  #   puts "This is red on blue".colorize( :red ).on_blue
-  #   puts "This is red on blue and underline".colorize( :red ).on_blue.underline
-  #   puts "This is blue text on red".blue.on_red.blink
-  #
-  def colorize( params=nil )
-    
-    return self.tagged_colors unless params
-    return self unless STDOUT.isatty
-
-    begin
-        require 'Win32/Console/ANSI' if PLATFORM =~ /win32/
-    rescue LoadError
-        raise 'You must gem install win32console to use color on Windows'
-    end
-    
-    
-    color_parameters = {}
-
-    if (params.instance_of?(Hash))
-      color_parameters[:color] = COLORS[params[:color]]
-      color_parameters[:background] = COLORS[params[:background]]
-      color_parameters[:mode] = MODES[params[:mode]]
-    elsif (params.instance_of?(Symbol))
-      color_parameters[:color] = COLORS[params]
-    end
-    
-    color_parameters[:color] ||= @color || 9
-    color_parameters[:background] ||= @background || 9
-    color_parameters[:mode] ||= @mode || 0
-
-    color_parameters[:uncolorized] ||= @uncolorized || self.dup
-   
-    # calculate bright mode
-    color_parameters[:color] += 50 if color_parameters[:color] > 10
-
-    color_parameters[:background] += 50 if color_parameters[:background] > 10
-
-    return "\033[#{color_parameters[:mode]};#{color_parameters[:color]+30};#{color_parameters[:background]+40}m#{color_parameters[:uncolorized]}\033[0m".set_color_parameters( color_parameters )
-  end
-
-  
-  #
-  # Return uncolorized string
-  #
-  def uncolorize
-    return @uncolorized || self
-  end
-  
-  #
-  # Return true if sting is colorized
-  #
-  def colorized?
-    return !@uncolorized.nil?
-  end
-
-  #
-  # Make some color and on_color methods
-  #
-  COLORS.each_key do | key |
-    eval <<-"end_eval"
-      def #{key.to_s}
-        return self.colorize( :color => :#{key.to_s} )
-      end
-      def on_#{key.to_s}
-        return self.colorize( :background => :#{key.to_s} )
-      end
-    end_eval
-  end
-
-  #
-  # Methods for modes
-  #
-  MODES.each_key do | key |
-    eval <<-"end_eval"
-      def #{key.to_s}
-        return self.colorize( :mode => :#{key.to_s} )
-      end
-    end_eval
-  end
-
-  class << self
-    
-    #
-    # Return array of available modes used by colorize method
-    #
-    def modes
-      keys = []
-      MODES.each_key do | key |
-        keys << key
-      end
-      keys
-    end
-
-    #
-    # Return array of available colors used by colorize method
-    #
-    def colors
-      keys = []
-      COLORS.each_key do | key |
-        keys << key
-      end
-      keys
-    end 
-
-    #
-    # Display color matrix with color names.
-    #
-    def color_matrix( txt = "[X]" )
-      size = String.colors.length
-      String.colors.each do | color |
-        String.colors.each do | back |
-         print txt.colorize( :color => color, :background => back )
-        end
-        puts " < #{color}"
-      end
-      String.colors.reverse.each_with_index do | back, index |
-        puts "#{"|".rjust(txt.length)*(size-index)} < #{back}"
-      end 
-    end
-  end
-  puts
-
-  #
-  # BBS-style numeric color codes.
-  #
-  BBS_COLOR_TABLE = {
-    0   => :black,
-    1   => :blue,
-    2   => :green,
-    3   => :cyan,
-    4   => :red,
-    5   => :magenta,
-    6   => :yellow,
-    7   => :white,
-    8   => :light_black,
-    9   => :light_blue,
-    10  => :light_green,
-    11  => :light_cyan,
-    12  => :light_red,
-    13  => :light_magenta,
-    14  => :light_yellow,
-    15  => :light_white,
-  }
-
-  #        
-  def valid_color?(string)
-    COLORS.include?(string.to_sym) or (string =~ /^\d+$/ and BBS_COLOR_TABLE.include?(string.to_i))
-  end
-  
-  #
-  # Colorize a string that has "color tags".
-  #
-  # Examples:
-  #
-  # Colors as words:
-  #    puts "<light_yellow><light_white>*</light_white> Hey mom! I am <light_green>SO</light_green> colourized right now.</light_yellow>".colorize
-  #
-  # Numeric ANSI colors (from the BBS days):
-  #    puts "<10><5>*</5> Hey mom! I am <9>SO</9> colourized right now.</10>".colorize
-  #
-  def tagged_colors
-    stack = []
-
-    # matchers for just the color part of the tag
-    open_tag_re     = /<([\w\d_]+)>/
-    close_tag_re    = /<\/([\w\d_]+)>/
-
-    # split the string into tags and texts
-    tokens          = self.split(/(<\/?[\w\d_]+>)/)
-    tokens.delete_if { |token| token.size == 0 }
-    
-    result        = ""
-
-    tokens.each do |token|
-      
-      if open_tag_re =~ token and valid_color?($1)
-
-        stack.push $1
-
-      elsif close_tag_re =~ token and valid_color?($1)
-
-	# if this color is on the stack somwehere...
-        if pos = stack.rindex($1)
-          # close the tag by removing it from the stack
-          stack.delete_at pos
-        else
-          raise "Error: tried to close an unopened color tag -- #{token}"
-        end
-
-      else
-
-        color = (stack.last || "white")
-        color = BBS_COLOR_TABLE[color.to_i] if color =~ /^\d+$/
-        result << token.colorize(color.to_sym)
-        
-      end
-      
-    end
-    
-    result
-  end  
-
-end
-