cloudhead-mutter 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/mutter.rb

@@ -39,14 +39,15 @@ module Mutter
     def load styles
       styles += '.yml' unless styles =~ /\.ya?ml/
       styles = YAML.load_file(styles).inject({}) do |h, (key, value)|
-        value = { match: value['match'], style: value['style'] }
+        value = { :match => value['match'], :style => value['style'] }
         h.merge key.to_sym => value
       end
       @styles.merge! styles
     end
     
     def say str, *styles
-      self.class.stream.write stylize(parse(str), @active + styles).gsub(/\e(\d+)/, "\e[\\1m") + "\n"
+      out = stylize(parse(str), @active + styles)
+      self.class.stream.write out.gsub(/\e(\d+)\e/, "\e[\\1m") + "\n"
       self.class.stream.flush
     end
     alias :print say
@@ -72,15 +73,20 @@ module Mutter
   		end
     end
     
-    def stylize string, styles = []      
+    def stylize string, styles = []
       [styles].flatten.inject(string) do |str, style|
-        open, close = ANSI[style.to_sym]
-        "#{esc(open)}#{str}#{esc(close || 0)}"
+        style = style.to_sym
+        if ANSI.include? style
+          open, close = ANSI[style]
+          "#{esc(open)}#{str}#{esc(close || 0)}"
+        else
+          stylize(str, @styles[style][:style])
+        end
       end
     end
     
     def esc style
-      "\e#{style}"
+      "\e#{style}\e"
     end
     
     def self.stream

data/mutter.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mutter}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]

data/spec/mutter_spec.rb

@@ -57,11 +57,12 @@ describe Mutter do
     it "should work with custom styles" do
       style = {
         :alert => {
-          :match => '!', 
-          :styles => ['bold', 'red']
+          :match => '!!', 
+          :style => ['bold', 'red']
         }
       }
       Mutter.new(style).say "alert!", :alert
+      out.should == "\e[31m\e[1malert!\e[22m\e[0m\n"
     end
   
     it "should work with shorthand custom styles" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-mutter
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - cloudhead