mutter 0.3.3 → 0.3.6

data/Rakefile

@@ -13,36 +13,11 @@ begin
     gem.authors = ["cloudhead"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-
+  Jeweler::RubyforgeTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-# rubyforge
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
-        local_dir = 'rdoc'
-
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.6

data/lib/mutter/mutterer.rb

@@ -1,7 +1,5 @@
 module Mutter
   class Mutterer
-    attr_accessor :styles
-
     @stream = STDOUT
 
     # Initialize the styles, and load the defaults from +styles.yml+
@@ -11,28 +9,27 @@ module Mutter
     #
     def initialize obj = {}
       self.reset
-      load File.dirname(__FILE__) + "/styles"
+      @defaults = load File.dirname(__FILE__) + "/styles"
 
       case obj
         when Hash       # A style definition: expand quick-styles and merge with @styles
-          obj = obj.inject({}) do |h, (k, v)|
+          @styles = obj.inject({}) do |h, (k, v)|
             h.merge k =>
               (v.is_a?(Hash) ? v : { :match => v, :style => [k].flatten })
           end
-          @styles.merge! obj
         when Array      # An array of styles to be activated
           @active = obj
         when Symbol     # A single style to be activated
-          self.<< obj
+          self << obj
         when String     # The path of a yaml style-sheet
-          load obj
+          @styles = load obj
         else raise ArgumentError
       end
 
       #
       # Create an instance method for each style
       #
-      @styles.keys.each do |style|
+      self.styles.keys.each do |style|
         (class << self; self end).class_eval do
           define_method style do |msg|
             say msg, style
@@ -41,8 +38,19 @@ module Mutter
       end
     end
     
-    def clear
-      @active, @styles = [], {}
+    def styles
+      @defaults.merge @styles
+    end
+
+    def clear opt = :all
+      case opt
+        when :user    then @styles = {}
+        when :default then @defaults = {}
+        when :styles  then @styles, @defaults = {}, {}
+        when :active  then @active = []
+        when :all     then @active, @styles, @defaults = [], {}, {}
+        else          raise ArgumentError, "[:user, :default, :active, :all] only"
+      end
       self
     end
     alias :reset clear
@@ -53,11 +61,10 @@ module Mutter
     #
     def load styles
       styles += '.yml' unless styles =~ /\.ya?ml/
-      @defaults = YAML.load_file(styles).inject({}) do |h, (key, value)|
+      YAML.load_file(styles).inject({}) do |h, (key, value)|
         value = { :match => value['match'], :style => value['style'] }
         h.merge key.to_sym => value
       end
-      @styles.merge! @defaults
     end
 
     #
@@ -128,13 +135,13 @@ module Mutter
     #   the matches are sent to +stylize+
     #
     def parse string
-      @styles.inject(string) do |str, (name, options)|
-        glyph, styles = options[:match], options[:style]
+      self.styles.inject(string) do |str, (name, options)|
+        glyph, style = options[:match], options[:style]
         if glyph.is_a? Array
-          str.gsub(/#{Regexp.escape(glyph.first)}(.+?)
-                    #{Regexp.escape(glyph.last)}/x) { stylize $1, styles }
+          str.gsub(/#{Regexp.escape(glyph.first)}(.*?)
+                    #{Regexp.escape(glyph.last)}/x) { stylize $1, style }
         else
-          str.gsub(/(#{Regexp.escape(glyph)}+)(.+?)\1/) { stylize $2, styles }
+          str.gsub(/(#{Regexp.escape(glyph)}+)(.*?)\1/) { stylize $2, style }
         end
       end
     end

data/mutter.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{mutter}
-  s.version = "0.3.3"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-09-02}
+  s.date = %q{2009-10-06}
   s.description = %q{the tiny CLI library}
   s.email = %q{self@cloudhead.net}
   s.extra_rdoc_files = [

data/spec/mutter_spec.rb

@@ -43,17 +43,17 @@ describe Mutter do
     out.should == "\e[1mhello * world\e[22m\n"
   end
   
-  it "should set defaults at the instance level" do
+  it "should set actives at the instance level" do
     Mutter.new([:bold, :underline]).say "hello mutter!"
     out.should == "\e[4m\e[1mhello mutter!\e[22m\e[24m\n"
   end
   
-  it "should set defaults at the method level" do
+  it "should set actives at the method level" do
     Mutter.say "hello mutter!", :bold, :underline
     out.should == "\e[4m\e[1mhello mutter!\e[22m\e[24m\n"
   end
   
-  it "should set defaults at both levels" do
+  it "should set actives 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[39m\n"
   end
@@ -69,17 +69,24 @@ describe Mutter do
       Mutter.new(style).say "alert!", :alert
       out.should == "\e[31m\e[1malert!\e[22m\e[39m\n"
     end
-  
-    it "should work with shorthand custom styles" do
-      Mutter.new({:bold => '~'}).say "~hello mutter!~"
-      out.should == "\e[1mhello mutter!\e[22m\n"
-    end
-  
-    it "should color" do
-      Mutter.new({:cyan => ['<', '>']}).say "<hello mutter!>"
-      out.should == "\e[36mhello mutter!\e[39m\n"
+    
+    describe "in shorthand form" do
+      it "should work with simple shorthand styles" do
+        Mutter.new({:bold => '~'}).say "~hello mutter!~"
+        out.should == "\e[1mhello mutter!\e[22m\n"
+      end
+  
+      it "should work with complex shorthand styles" do
+        Mutter.new({:cyan => ['<', '>']}).say "<hello mutter!>"
+        out.should == "\e[36mhello mutter!\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[39m\e[24m\n"
+      end
     end
-  
+    
     it "should mix styles" do
       Mutter.new({:cyan => '~'}).say "_*hello* ~world~_"
       out.should == "\e[4m\e[1mhello\e[22m \e[36mworld\e[39m\e[24m\n"
@@ -89,11 +96,6 @@ describe Mutter do
       Mutter.new({:cyan => '~'}).say "~[hello mutter!]~"
       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[39m\e[24m\n"
-    end
     
     it "should load styles from a yaml" do
       Mutter.new("spec/style").say "{important message!}"
@@ -105,6 +107,17 @@ describe Mutter do
       out.should == "\e[33m\e[4m\e[1mimportant message!\e[22m\e[24m\e[39m\n"
     end
     
+    it "should clear all styles" do
+      Mutter.new.clear(:all).say "[hello] *world*"
+      out.should == "[hello] *world*\n"
+    end
+    
+    it "should clear active styles" do
+      mut = Mutter.new(:bold)
+      mut.clear(:active).say "hello"
+      out.should == "hello\n"
+    end
+    
     it "should add and remove active styles" do
       mut = Mutter.new
       mut << :bold << :underline << :inverse

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mutter
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.6
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -04:00
+date: 2009-10-06 00:00:00 -04:00
 default_executable: 
 dependencies: []