jamescook-pow 0.1.1 → 0.1.2

data/README

@@ -12,9 +12,13 @@ Examples:
   puts.yellow "Hello world in yellow"
   puts.red    "Hello world in red" 
   puts.red!   "Hello world in red, but with boldness"
-  puts.red_   "Hello world in red, but with strikethrough"
+  puts.red_   "Hello world in red, but with underscore"
   puts.rainbow "Hellow world, but more silly."
 
+  p.red "Hello world, but less typing .. also red."
+  p! "Hello world, in bold"
+  p! "Mix and match", :color => :purple, :background => :black
+
 
 TODO:
  - Figure out if you can bold a 'dark' color

data/jamescook-pow.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jamescook-pow}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Cook"]
-  s.date = %q{2009-11-19}
-  s.description = %q{'puts' with shell colors.}
+  s.date = %q{2009-11-20}
+  s.description = %q{Ruby 'puts' with shell colors.}
   s.email = %q{jamecook@gmail.com}
   s.extra_rdoc_files = [
     "README"

data/lib/pow.rb

@@ -2,6 +2,10 @@ module Pow
   # Override puts on include to allow coloring (but also retain existing function)
   def self.included(base)
     base.send(:define_method, :puts){ |*args| Puts.new(*args) }
+    base.send(:define_method, :puts!){ |*args| opts=(args.detect{|a| a.is_a?(Hash)} || {}).merge(:misc => {:bold => true}); args.reject!{|a| a.is_a?(Hash)}; args = [args.push(opts)].flatten; Puts.new(*args) } # Now that's just self-explanatory ..
+
+    base.send(:alias_method, :p, :puts)
+    base.send(:alias_method, :p!, :puts!)
   end
   CODES = {
           :clear           => 0,
@@ -49,14 +53,14 @@ module Pow
   class Puts  
     attr_accessor :writer
     def initialize(*args)
-      options = args[0].is_a?(String) ? {:text => args[0] } : (args[0] || {})
+      options = args[0].is_a?(String) ? {:text => args[0]}.merge(args[1] || {}) : (args[0] || {})
       CODES.keys.each do |key|
         # Color
         self.class.send(:define_method, key.to_sym)       { |*args| Puts.new({:color => key.to_sym, :text => args[0], :misc => args[1]}).out! }
         # Bold
         self.class.send(:define_method, "#{key}!".to_sym) { |*args| Puts.new({:color => key.to_sym, :text => args[0], :bold => true, :misc => args[1]}).out! }
-        # Strikethrough
-        self.class.send(:define_method, "#{key}_".to_sym) { |*args| Puts.new({:color => key.to_sym, :text => args[0], :strikethrough => true, :misc => args[1]}).out! }
+        # Underline
+        self.class.send(:define_method, "#{key}_".to_sym) { |*args| Puts.new({:color => key.to_sym, :text => args[0], :underline => true, :misc => args[1]}).out! }
       end     
       # FIXME make this part a method or less fug
       if options[:misc] && options[:misc].is_a?(Hash)
@@ -113,6 +117,7 @@ module Pow
       background     = options.fetch(:background){ false }
       concealed      = options.fetch(:concealed){ false }
       strikethrough  = options.fetch(:strikethrough){ false }
+      underscore     = options.fetch(:underscore){ false }
 
       if text != ""
         result = [escape_sequence(color), text, escape_sequence(:reset), newline].join
@@ -142,6 +147,10 @@ module Pow
         result.insert(0, escape_sequence(:strikethrough))
       end
 
+      if underscore
+        result.insert(0, escape_sequence(:underscore))
+      end
+
       return result
     end
 

data/rakefile.rb

@@ -1,10 +1,11 @@
+require "rake"
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "jamescook-pow"
-    gemspec.version = "0.1.1"
+    gemspec.version = "0.1.2"
     gemspec.summary = "puts with colors"
-    gemspec.description = "'puts' with shell colors."
+    gemspec.description = "Ruby 'puts' with shell colors."
     gemspec.email = "jamecook@gmail.com"
     gemspec.homepage = "http://github.com/jamescook/pow"
     gemspec.authors = ["James Cook"]
@@ -12,3 +13,12 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
+
+task :default => [:test]
+
+desc "Run tests"
+task :test do |t|
+  ruby "test/pow_test.rb"
+end
+
+

data/test/pow_test.rb

@@ -39,6 +39,12 @@ class PowTest < Test::Unit::TestCase
     assert_equal "\e[1mTEST\e[0m\n", @writer.gets
   end
 
+  def test_puts_with_underscore
+    @puts.new(:text => "TEST", :underscore => :true, :writer => @writer).out!
+    @writer.rewind
+    assert_equal "\e[4m\e[37mTEST\e[0m\n", @writer.gets
+  end
+
   def test_puts_with_strikethrough
     @puts.new(:text => "TEST", :strikethrough => :true, :writer => @writer).out!
     @writer.rewind

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jamescook-pow
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - James Cook
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 -06:00
+date: 2009-11-20 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
-description: "'puts' with shell colors."
+description: Ruby 'puts' with shell colors.
 email: jamecook@gmail.com
 executables: []