Skip to content

Did Some Stuff #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Did Some Stuff #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ea3d41
Added Italic and Dark
Dec 9, 2013
8aa554c
Sent the module to Fixnum and Float
Dec 9, 2013
c5e89a0
Added tests for Fixnum and Float
Dec 14, 2013
2186f38
Tested Fixnum and Float but not :to_eol
Dec 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/colored.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ module Colored
EXTRAS = {
'clear' => 0,
'bold' => 1,
'dark' => 2,
'italic' => 3,
'underline' => 4,
'reversed' => 7
}
Expand Down Expand Up @@ -67,7 +69,7 @@ module Colored

def colorize(string, options = {})
colored = [color(options[:foreground]), color("on_#{options[:background]}"), extra(options[:extra])].compact * ''
colored << string
colored << String(string)
colored << extra(:clear)
end

Expand All @@ -89,3 +91,6 @@ def color(color_name)
end unless Object.const_defined? :Colored

String.send(:include, Colored)
Fixnum.send(:include, Colored)
Float.send(:include, Colored)

17 changes: 17 additions & 0 deletions test/colored_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,51 @@
class TestColor < Test::Unit::TestCase
def test_one_color
assert_equal "\e[31mred\e[0m", "red".red
assert_equal "\e[31m100\e[0m", 100.red
assert_equal "\e[31m100.001\e[0m", 100.001.red
end

def test_two_colors
assert_equal "\e[34m\e[31mblue\e[0m\e[0m", "blue".red.blue
assert_equal "\e[34m\e[31m505\e[0m\e[0m", 505.red.blue
assert_equal "\e[34m\e[31m505.223\e[0m\e[0m", 505.223.red.blue
end

def test_background_color
assert_equal "\e[43mon yellow\e[0m", "on yellow".on_yellow
assert_equal "\e[43m1920\e[0m", 1920.on_yellow
assert_equal "\e[43m19.2\e[0m", 19.2.on_yellow
end

def test_hot_color_on_color_action
assert_equal "\e[31m\e[44mred on blue\e[0m", "red on blue".red_on_blue
assert_equal "\e[31m\e[44m38\e[0m", 38.red_on_blue
assert_equal "\e[31m\e[44m38.38\e[0m", 38.38.red_on_blue

end

def test_modifier
assert_equal "\e[1mway bold\e[0m", "way bold".bold
assert_equal "\e[1m35\e[0m", 35.bold
assert_equal "\e[1m35.467\e[0m", 35.467.bold
end

def test_modifiers_stack
assert_equal "\e[4m\e[1munderlined bold\e[0m\e[0m", "underlined bold".bold.underline
assert_equal "\e[4m\e[1m129\e[0m\e[0m", 129.bold.underline
assert_equal "\e[4m\e[1m129.29\e[0m\e[0m", 129.29.bold.underline
end

def test_modifiers_stack_with_colors
assert_equal "\e[36m\e[4m\e[1mcyan underlined bold\e[0m\e[0m\e[0m", "cyan underlined bold".bold.underline.cyan
assert_equal "\e[36m\e[4m\e[1m954\e[0m\e[0m\e[0m", 954.bold.underline.cyan
assert_equal "\e[36m\e[4m\e[1m954.55\e[0m\e[0m\e[0m", 954.55.bold.underline.cyan
end

def test_eol
assert_equal "\e[2Knothing to see here really.", "nothing to see here really.".to_eol
#assert_equal "\e[2K456", 456.to_eol
#assert_equal "\e[2K456.82", 456.82.to_eol
end

def test_eol_with_with_two_colors
Expand Down