cloudhead-mutter 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/mutter.rb

@@ -12,24 +12,30 @@ require 'ext'
 
 module Mutter
   #
-  # ANSI color & style codes
+  # ANSI color & transform codes
   #
-  #   if the value's an array, it 
-  #   represents [0] is the start code
+  #   If the value's an array, 
+  #   [0] is the start code
   #   and [1] is the end code.
   #
-  #   if the value is an int, it represents
-  #   the start code, and the end code will be 0
+  #   Colors all have the same
+  #   reset code (39).
   #
   ANSI = {
-    :bold      => [1, 22],
-    :underline => [4, 24],
-    :inverse   => [7, 27],
-    
-    :black  => 30, :red    => 31,
-    :green  => 32, :yellow => 33,
-    :blue   => 34, :purple => 35,
-    :cyan   => 36, :white  => 37
+    :reset => 0,
+    :transforms => {
+      :bold      => [1, 22],
+      :underline => [4, 24],
+      :blink     => [5, 25],
+      :inverse   => [7, 27]
+    },
+    :colors => {
+      :black  => 30, :red    => 31,
+      :green  => 32, :yellow => 33,
+      :blue   => 34, :purple => 35,
+      :cyan   => 36, :white  => 37,
+      :reset  => 39
+    }
   }
   
   def self.indenter tab

data/lib/mutter/mutterer.rb

@@ -1,8 +1,10 @@
 module Mutter
   class Mutterer
+    attr_accessor :styles
+
     @stream = STDOUT
 
-    # Initialize the styles, and load the defaults from +defaults.yml+
+    # Initialize the styles, and load the defaults from +styles.yml+
     #
     # @active: currently active styles, which apply to the whole string
     # @styles: contains all the user + default styles
@@ -26,7 +28,7 @@ module Mutter
           load obj
         else raise ArgumentError
       end
-      
+
       #
       # Create an instance method for each style
       #
@@ -89,12 +91,24 @@ module Mutter
     alias :oo watch
 
     #
-    # Add a style to the active styles
+    # Add and remove styles from the active styles
     #
     def << style
       @active << style
     end
 
+    def >> style
+      @active.delete style
+    end
+
+    def + style
+      dup.tap {|m| m << style }
+    end
+
+    def - style
+      dup.tap {|m| m >> style }
+    end
+
     #
     # Parse a string to ANSI codes
     #
@@ -123,12 +137,15 @@ module Mutter
     #   if the style is a custom style, we recurse, sending
     #   the list of ANSI styles contained in the custom style.
     #
+    #   TODO: use ';' delimited codes instead of multiple \e sequences
+    #
     def stylize string, styles = []
       [styles].flatten.inject(string) do |str, style|
         style = style.to_sym
-        if ANSI.include? style
-          open, close = ANSI[style]
-          "#{esc(open)}#{str}#{esc(close || 0)}"
+        if ANSI[:transforms].include? style
+          esc str, *ANSI[:transforms][style]
+        elsif ANSI[:colors].include? style
+          esc str, ANSI[:colors][style], ANSI[:colors][:reset]
         else
           stylize(str, @styles[style][:style])
         end
@@ -138,8 +155,8 @@ module Mutter
     #
     # Escape a string, for later replacement
     #
-    def esc style
-      "\e#{style}\e"
+    def esc str, open, close
+      "\e#{open}\e" + str + "\e#{close}\e"
     end
 
     #

data/mutter.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mutter}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-07-31}
+  s.date = %q{2009-08-01}
   s.email = %q{self@cloudhead.net}
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/mutter_spec.rb

@@ -33,6 +33,11 @@ describe Mutter do
     out.should == "\e[7mhello mutter!\e[27m\n"
   end
   
+  it "should blink" do
+    Mutter.say "hello mutter!", :blink
+    out.should == "\e[5mhello mutter!\e[25m\n"
+  end
+  
   it "should escape glyphs" do
     Mutter.say "**hello * world**"
     out.should == "\e[1mhello * world\e[22m\n"
@@ -50,7 +55,7 @@ describe Mutter do
   
   it "should set defaults at both levels" do
     Mutter.new(:bold).say "hello mutter!", :underline, :yellow
-    out.should == "\e[33m\e[4m\e[1mhello mutter!\e[22m\e[24m\e[0m\n"
+    out.should == "\e[33m\e[4m\e[1mhello mutter!\e[22m\e[24m\e[39m\n"
   end
   
   describe "with custom styles" do
@@ -62,7 +67,7 @@ describe Mutter do
         }
       }
       Mutter.new(style).say "alert!", :alert
-      out.should == "\e[31m\e[1malert!\e[22m\e[0m\n"
+      out.should == "\e[31m\e[1malert!\e[22m\e[39m\n"
     end
   
     it "should work with shorthand custom styles" do
@@ -72,38 +77,53 @@ describe Mutter do
   
     it "should color" do
       Mutter.new({:cyan => ['<', '>']}).say "<hello mutter!>"
-      out.should == "\e[36mhello mutter!\e[0m\n"
+      out.should == "\e[36mhello mutter!\e[39m\n"
     end
   
     it "should mix styles" do
       Mutter.new({:cyan => '~'}).say "_*hello* ~world~_"
-      out.should == "\e[4m\e[1mhello\e[22m \e[36mworld\e[0m\e[24m\n"
+      out.should == "\e[4m\e[1mhello\e[22m \e[36mworld\e[39m\e[24m\n"
     end
   
     it "should color backgrounds" do
       Mutter.new({:cyan => '~'}).say "~[hello mutter!]~"
-      out.should == "\e[36m\e[7mhello mutter!\e[27m\e[0m\n"
+      out.should == "\e[36m\e[7mhello mutter!\e[27m\e[39m\n"
     end
   
     it "should work with multiple shorthand styles" do
       Mutter.new({[:cyan, :underline] => '~'}).say "~hello mutter!~"
-      out.should == "\e[4m\e[36mhello mutter!\e[0m\e[24m\n"
+      out.should == "\e[4m\e[36mhello mutter!\e[39m\e[24m\n"
     end
     
     it "should load styles from a yaml" do
       Mutter.new("spec/style").say "{important message!}"
-      out.should == "\e[33m\e[4m\e[1mimportant message!\e[22m\e[24m\e[0m\n"
+      out.should == "\e[33m\e[4m\e[1mimportant message!\e[22m\e[24m\e[39m\n"
     end
     
     it "should be able to call styles as methods" do
       Mutter.new("spec/style").important "important message!"
-      out.should == "\e[33m\e[4m\e[1mimportant message!\e[22m\e[24m\e[0m\n"
+      out.should == "\e[33m\e[4m\e[1mimportant message!\e[22m\e[24m\e[39m\n"
+    end
+    
+    it "should add and remove active styles" do
+      mut = Mutter.new
+      mut << :bold << :underline << :inverse
+      mut >> :inverse
+      mut.say "hello mutter!"
+      out.should == "\e[4m\e[1mhello mutter!\e[22m\e[24m\n"
+    end
+    
+    it "should return instances of itself, +- active styles" do
+      mut = Mutter.new
+      mut << :bold << :underline
+      (mut - :bold).say "hello mutter!"
+      out.should == "\e[4mhello mutter!\e[24m\n"
     end
   end
   
   it "should parse a complex string" do
     m = Mutter.new({:cyan => ['<','>']})
     m.say "hello *mutter*, would you _<please be quiet>_ for this <[test]>?"
-    out.should == "hello \e[1mmutter\e[22m, would you \e[4m\e[36mplease be quiet\e[0m\e[24m for this \e[36m\e[7mtest\e[27m\e[0m?\n"
+    out.should == "hello \e[1mmutter\e[22m, would you \e[4m\e[36mplease be quiet\e[39m\e[24m for this \e[36m\e[7mtest\e[27m\e[39m?\n"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-mutter
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-31 00:00:00 -07:00
+date: 2009-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: []