[DRE-commits] [ruby-colorize] 01/02: Imported Upstream version 0.7.3
Jonas Genannt
jonas at brachium-system.net
Tue Sep 23 19:40:14 UTC 2014
This is an automated email from the git hooks/post-receive script.
hggh-guest pushed a commit to branch master
in repository ruby-colorize.
commit e2e80fb612a3402fdf60d8287fbb81266f58360e
Author: Jonas Genannt <jonas at brachium-system.net>
Date: Tue Sep 23 21:39:53 2014 +0200
Imported Upstream version 0.7.3
---
CHANGELOG.rdoc => CHANGELOG | 15 ++
LICENSE | 339 ++++++++++++++++++++++++++++++++++++++++++++
README.md | 65 +++++++++
README.rdoc | 53 -------
Rakefile | 4 +-
checksums.yaml.gz | Bin 422 -> 268 bytes
colorize.gemspec | 40 +++---
lib/colorize.rb | 134 ++++++++---------
metadata.yml | 23 ++-
test/test_colorize.rb | 79 ++++++++---
test/test_helper.rb | 2 -
11 files changed, 572 insertions(+), 182 deletions(-)
diff --git a/CHANGELOG.rdoc b/CHANGELOG
similarity index 62%
rename from CHANGELOG.rdoc
rename to CHANGELOG
index 0ec5470..177c212 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+== 0.7.23 / 2014-05-19
+ * fix new line maching
+
+== 0.7.2 / 2014-04-08
+ * tests cleanups
+ * gem release date fixed
+
+== 0.7.1 / 2014-04-02
+ * handling wrong color values
+
+== 0.7.0 / 2014-03-12
+ * refactored to use regexp pattern matching
+ * works with frozen strings
+ * works with concatenated string
+
== 0.6.0 / 2013-09-25
* code cleanups
* bold mode fixed
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d7f1051
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,339 @@
+GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ {description}
+ Copyright (C) {year} {fullname}
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ {signature of Ty Coon}, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..2a5dbfb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,65 @@
+colorize [](http://badge.fury.io/rb/colorize)
+========
+
+Ruby String class extension. Adds methods to set text color, background color and, text effects on ruby console and command line output, using ANSI escape sequences.
+
+features
+--------
+
+* change string color
+* change string background
+* change string effect
+
+usage
+-----
+
+Some usage samples:
+
+ puts "This is blue".colorize(:blue)
+ puts "This is light blue".colorize(:light_blue)
+ puts "This is also blue".colorize(:color => :blue)
+ puts "This is light blue with red background".colorize(:color => :light_blue, :background => :red)
+ puts "This is light blue with red background".colorize(:light_blue ).colorize( :background => :red)
+ puts "This is blue text on red".blue.on_red
+ puts "This is red on blue".colorize(:red).on_blue
+ puts "This is red on blue and underline".colorize(:red).on_blue.underline
+ puts "This is blue text on red".blue.on_red.blink
+ puts "This is uncolorized".blue.on_red.uncolorize
+
+Class methods:
+
+ String.colors - return array of all possible colors names
+ String.modes - return array of all possible modes
+ String.color_matrix - displays color matrix with color names
+ String.color_matrix("FOO") - display color matrix with "FOO" text
+
+requirements
+------------
+
+* Win32/Console/ANSI (for Windows)
+
+install
+-------
+
+* gem install colorize
+
+*Note:* You may need to use sudo to install gems
+
+license
+-------
+
+Copyright (C) 2007 Michal Kalbarczyk
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
diff --git a/README.rdoc b/README.rdoc
deleted file mode 100644
index 5a892da..0000000
--- a/README.rdoc
+++ /dev/null
@@ -1,53 +0,0 @@
-== DESCRIPTION:
-
-Ruby String class extension. Adds methods to set text color, background color and, text effects on ruby console and command line output, using ANSI escape sequences.
-
-== FEATURES/PROBLEMS:
-
-* change string color
-* change string background
-* change string effect
-
-== SYNOPSIS:
-
- Some usage samples:
-
- puts "This is blue".colorize( :blue )
- puts "This is light blue".colorize( :light_blue )
- puts "This is also blue".colorize( :color => :blue )
- puts "This is light blue with red background".colorize( :color => :light_blue, :background => :red )
- puts "This is light blue with red background".colorize( :light_blue ).colorize( :background => :red )
- puts "This is blue text on red".blue.on_red
- puts "This is red on blue".colorize( :red ).on_blue
- puts "This is red on blue and underline".colorize( :red ).on_blue.underline
- puts "This is blue text on red".blue.on_red.blink
- puts "This is uncolorized".blue.on_red.uncolorize
-
- Class methods:
-
- String.colors - return array of all possible colors names
- String.modes - return array of all possible modes
- String.color_matrix - displays color matrix with color names
- String.color_matrix( "FOO" ) - display color matrix with "FOO" text
-
-== REQUIREMENTS:
-
-* Win32/Console/ANSI (for Windows)
-
-== INSTALL:
-
-* gem install colorize
-
-*Note:* You may need to use sudo to install gems
-
-== LICENSE:
-
-colorize - Ruby String class extension. Adds methods to set text color, background color and, text effects on ruby console and command line output, using ANSI escape sequences.
-
-Copyright (C) 2007 Michal Kalbarczyk
-
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335, USA
diff --git a/Rakefile b/Rakefile
index aa69c71..5814915 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,8 +1,8 @@
require 'rake/testtask'
Rake::TestTask.new do |t|
- t.libs << 'test'
+ t.libs << 'test'
end
-desc "Run tests"
+desc 'Run tests'
task :default => :test
diff --git a/checksums.yaml.gz b/checksums.yaml.gz
index ed76fe3..19e3b6a 100644
Binary files a/checksums.yaml.gz and b/checksums.yaml.gz differ
diff --git a/colorize.gemspec b/colorize.gemspec
index b5ea290..7379a8a 100644
--- a/colorize.gemspec
+++ b/colorize.gemspec
@@ -1,33 +1,29 @@
Gem::Specification.new do |s|
- s.name = "colorize"
- s.version = "0.6.0"
+ s.name = 'colorize'
+ s.version = '0.7.3'
- s.authors = ["fazibear"]
- s.email = "fazibear at gmail.com"
+ s.authors = ['fazibear']
+ s.email = 'fazibear at gmail.com'
- s.date = "2012-09-15"
+ s.date = Time.now.strftime("%Y-%m-%d")
- s.homepage = "http://github.com/fazibear/colorize"
- s.description = "Ruby String class extension. Adds methods to set text color, background color and, text effects on ruby console and command line output, using ANSI escape sequences."
- s.summary = "Add color methods to String class"
- s.license = 'GPL'
+ s.homepage = 'http://github.com/fazibear/colorize'
+ s.description = 'Ruby String class extension. Adds methods to set text color, background color and, text effects on ruby console and command line output, using ANSI escape sequences.'
+ s.summary = 'Add color methods to String class'
+ s.license = 'GPL-2'
- s.require_paths = ["lib"]
+ s.require_paths = ['lib']
s.files = [
- "CHANGELOG.rdoc",
- "README.rdoc",
- "Rakefile",
- "colorize.gemspec",
- "lib/colorize.rb",
- "test/test_colorize.rb",
- "test/test_helper.rb"
+ 'LICENSE',
+ 'CHANGELOG',
+ 'README.md',
+ 'Rakefile',
+ 'colorize.gemspec',
+ 'lib/colorize.rb',
+ 'test/test_colorize.rb',
]
s.test_files = [
- "test/test_helper.rb",
- "test/test_colorize.rb"
- ]
- s.extra_rdoc_files = [
- "README.rdoc"
+ 'test/test_colorize.rb'
]
end
diff --git a/lib/colorize.rb b/lib/colorize.rb
index 60ca91f..2418c61 100644
--- a/lib/colorize.rb
+++ b/lib/colorize.rb
@@ -16,15 +16,15 @@ class String
:cyan => 6,
:white => 7,
:default => 9,
-
- :light_black => 10,
- :light_red => 11,
- :light_green => 12,
- :light_yellow => 13,
- :light_blue => 14,
- :light_magenta => 15,
- :light_cyan => 16,
- :light_white => 17
+
+ :light_black => 60,
+ :light_red => 61,
+ :light_green => 62,
+ :light_yellow => 63,
+ :light_blue => 64,
+ :light_magenta => 65,
+ :light_cyan => 66,
+ :light_white => 67
}
#
@@ -38,23 +38,10 @@ class String
:swap => 7, # Exchange foreground and background colors
:hide => 8 # Hide text (foreground color would be the same as background)
}
-
- protected
-
- #
- # Set color values in new string instance
- #
- def set_color_parameters( params )
- if (params.instance_of?(Hash))
- @color = params[:color]
- @background = params[:background]
- @mode = params[:mode]
- @uncolorized = params[:uncolorized]
- self
- else
- nil
- end
- end
+
+ REGEXP_PATTERN = /\033\[([0-9]+);([0-9]+);([0-9]+)m(.+?)\033\[0m|([^\033]+)/m
+ COLOR_OFFSET = 30
+ BACKGROUND_OFFSET = 40
public
@@ -63,90 +50,88 @@ class String
#
# Examples:
#
- # puts "This is blue".colorize( :blue )
- # puts "This is light blue".colorize( :light_blue )
- # puts "This is also blue".colorize( :color => :blue )
- # puts "This is light blue with red background".colorize( :color => :light_blue, :background => :red )
- # puts "This is light blue with red background".colorize( :light_blue ).colorize( :background => :red )
+ # puts "This is blue".colorize(:blue)
+ # puts "This is light blue".colorize(:light_blue)
+ # puts "This is also blue".colorize(:color => :blue)
+ # puts "This is light blue with red background".colorize(:color => :light_blue, :background => :red)
+ # puts "This is light blue with red background".colorize(:light_blue ).colorize( :background => :red)
# puts "This is blue text on red".blue.on_red
- # puts "This is red on blue".colorize( :red ).on_blue
- # puts "This is red on blue and underline".colorize( :red ).on_blue.underline
+ # puts "This is red on blue".colorize(:red).on_blue
+ # puts "This is red on blue and underline".colorize(:red).on_blue.underline
# puts "This is blue text on red".blue.on_red.blink
# puts "This is uncolorized".blue.on_red.uncolorize
#
- def colorize( params )
+ def colorize(params)
begin
require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
rescue LoadError
raise 'You must gem install win32console to use colorize on Windows'
end
- color_parameters = {}
-
- if (params.instance_of?(Hash))
- color_parameters[:color] = COLORS[params[:color]]
- color_parameters[:background] = COLORS[params[:background]]
- color_parameters[:mode] = MODES[params[:mode]]
- elsif (params.instance_of?(Symbol))
- color_parameters[:color] = COLORS[params]
- end
-
- color_parameters[:color] ||= @color ||= COLORS[:default]
- color_parameters[:background] ||= @background ||= COLORS[:default]
- color_parameters[:mode] ||= @mode ||= MODES[:default]
+ self.scan(REGEXP_PATTERN).inject("") do |str, match|
+ match[0] ||= MODES[:default]
+ match[1] ||= COLORS[:default] + COLOR_OFFSET
+ match[2] ||= COLORS[:default] + BACKGROUND_OFFSET
+ match[3] ||= match[4]
- color_parameters[:uncolorized] ||= @uncolorized ||= self.dup
-
- # Calculate bright mode
- color_parameters[:color] += 50 if color_parameters[:color] > 10
-
- color_parameters[:background] += 50 if color_parameters[:background] > 10
+ if (params.instance_of?(Hash))
+ match[0] = MODES[params[:mode]] if params[:mode] && MODES[params[:mode]]
+ match[1] = COLORS[params[:color]] + COLOR_OFFSET if params[:color] && COLORS[params[:color]]
+ match[2] = COLORS[params[:background]] + BACKGROUND_OFFSET if params[:background] && COLORS[params[:background]]
+ elsif (params.instance_of?(Symbol))
+ match[1] = COLORS[params] + COLOR_OFFSET if params && COLORS[params]
+ end
- "\033[#{color_parameters[:mode]};#{color_parameters[:color]+30};#{color_parameters[:background]+40}m#{color_parameters[:uncolorized]}\033[0m".set_color_parameters( color_parameters )
+ str << "\033[#{match[0]};#{match[1]};#{match[2]}m#{match[3]}\033[0m"
+ end
end
#
# Return uncolorized string
#
def uncolorize
- @uncolorized || self
+ self.scan(REGEXP_PATTERN).inject("") do |str, match|
+ str << (match[3] || match[4])
+ end
end
-
+
#
- # Return true if sting is colorized
+ # Return true if string is colorized
#
def colorized?
- !defined?(@uncolorized).nil?
+ self.scan(REGEXP_PATTERN).reject do |match|
+ match.last
+ end.any?
end
#
# Make some color and on_color methods
#
- COLORS.each_key do | key |
+ COLORS.each_key do |key|
next if key == :default
define_method key do
- self.colorize( :color => key )
+ self.colorize(:color => key)
end
-
+
define_method "on_#{key}" do
- self.colorize( :background => key )
+ self.colorize(:background => key)
end
end
#
# Methods for modes
#
- MODES.each_key do | key |
+ MODES.each_key do |key|
next if key == :default
-
+
define_method key do
- self.colorize( :mode => key )
+ self.colorize(:mode => key)
end
end
class << self
-
+
#
# Return array of available modes used by colorize method
#
@@ -159,23 +144,24 @@ class String
#
def colors
COLORS.keys
- end
+ end
#
# Display color matrix with color names
#
- def color_matrix( txt = "[X]" )
+ def color_matrix(txt = '[X]')
size = String.colors.length
- String.colors.each do | color |
- String.colors.each do | back |
- print txt.colorize( :color => color, :background => back )
+ String.colors.each do |color|
+ String.colors.each do |back|
+ print txt.colorize(:color => color, :background => back)
end
puts " < #{color}"
end
- String.colors.reverse.each_with_index do | back, index |
+ String.colors.reverse.each_with_index do |back, index|
puts "#{"|".rjust(txt.length)*(size-index)} < #{back}"
- end
- ""
+ end
+ ''
end
+
end
end
diff --git a/metadata.yml b/metadata.yml
index f675049..eb46b44 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: colorize
version: !ruby/object:Gem::Version
- version: 0.6.0
+ version: 0.7.3
platform: ruby
authors:
- fazibear
autorequire:
bindir: bin
cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
dependencies: []
description: Ruby String class extension. Adds methods to set text color, background
color and, text effects on ruby console and command line output, using ANSI escape
@@ -16,19 +16,18 @@ description: Ruby String class extension. Adds methods to set text color, backgr
email: fazibear at gmail.com
executables: []
extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
files:
-- CHANGELOG.rdoc
-- README.rdoc
+- CHANGELOG
+- LICENSE
+- README.md
- Rakefile
- colorize.gemspec
- lib/colorize.rb
- test/test_colorize.rb
-- test/test_helper.rb
homepage: http://github.com/fazibear/colorize
licenses:
-- GPL
+- GPL-2
metadata: {}
post_install_message:
rdoc_options: []
@@ -36,21 +35,19 @@ require_paths:
- lib
required_ruby_version: !ruby/object:Gem::Requirement
requirements:
- - - ! '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
required_rubygems_version: !ruby/object:Gem::Requirement
requirements:
- - - ! '>='
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
requirements: []
rubyforge_project:
-rubygems_version: 2.1.4
+rubygems_version: 2.2.2
signing_key:
specification_version: 4
summary: Add color methods to String class
test_files:
-- test/test_helper.rb
- test/test_colorize.rb
-has_rdoc:
diff --git a/test/test_colorize.rb b/test/test_colorize.rb
index 36d577c..8573534 100644
--- a/test/test_colorize.rb
+++ b/test/test_colorize.rb
@@ -1,49 +1,96 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/colorize'
class TestColorize < Test::Unit::TestCase
def test_blue_symbol
- assert "This is blue".colorize(:blue) == "\e[0;34;49mThis is blue\e[0m"
+ assert_equal 'This is blue'.colorize(:blue),
+ "\e[0;34;49mThis is blue\e[0m"
+ end
+
+ def test_incorrect_symbol
+ assert_equal 'This is incorrect color'.colorize(:bold),
+ "\e[0;39;49mThis is incorrect color\e[0m"
+ end
+
+ def test_incorrect_hash
+ assert_equal 'This is incorrect color'.colorize(:color => :bold),
+ "\e[0;39;49mThis is incorrect color\e[0m"
+
+ assert_equal 'This is incorrect color'.colorize(:mode => :green),
+ "\e[0;39;49mThis is incorrect color\e[0m"
+
+ assert_equal 'This is incorrect color'.colorize(:background => :bold),
+ "\e[0;39;49mThis is incorrect color\e[0m"
end
def test_blue_hash
- assert "This is also blue".colorize( :color => :blue) == "\e[0;34;49mThis is also blue\e[0m"
+ assert_equal 'This is also blue'.colorize(:color => :blue),
+ "\e[0;34;49mThis is also blue\e[0m"
end
def test_light_blue_symbol
- assert "This is light blue".colorize(:light_blue) == "\e[0;94;49mThis is light blue\e[0m"
+ assert_equal 'This is light blue'.colorize(:light_blue),
+ "\e[0;94;49mThis is light blue\e[0m"
end
def test_light_blue_with_red_background_hash
- assert "This is light blue with red background".colorize( :color => :light_blue, :background => :red ) == "\e[0;94;41mThis is light blue with red background\e[0m"
+ assert_equal 'This is light blue with red background'.colorize(:color => :light_blue, :background => :red),
+ "\e[0;94;41mThis is light blue with red background\e[0m"
end
-
+
def test_light_blue_with_red_background_symbol_and_hash
- assert "This is light blue with red background".colorize( :light_blue ).colorize( :background => :red ) == "\e[0;144;41mThis is light blue with red background\e[0m"
+ assert_equal 'This is light blue with red background'.colorize(:light_blue).colorize(:background => :red),
+ "\e[0;94;41mThis is light blue with red background\e[0m"
end
-
+
def test_blue_with_red_background_method
- assert "This is blue text on red".blue.on_red == "\e[0;34;41mThis is blue text on red\e[0m"
+ assert_equal 'This is blue text on red'.blue.on_red,
+ "\e[0;34;41mThis is blue text on red\e[0m"
end
def test_red_with_blue_background_symbol_and_method
- assert "This is red on blue".colorize( :red ).on_blue == "\e[0;31;44mThis is red on blue\e[0m"
+ assert_equal 'This is red on blue'.colorize(:red).on_blue,
+ "\e[0;31;44mThis is red on blue\e[0m"
end
def test_red_with_blue_background_and_underline_sumbol_and_methods
- assert "This is red on blue and underline".colorize( :red ).on_blue.underline == "\e[4;31;44mThis is red on blue and underline\e[0m"
+ assert_equal 'This is red on blue and underline'.colorize(:red).on_blue.underline,
+ "\e[4;31;44mThis is red on blue and underline\e[0m"
end
def test_blue_with_red_background_and_blink_methods
- assert "This is blue text on red".blue.on_red.blink == "\e[5;34;41mThis is blue text on red\e[0m"
+ assert_equal 'This is blue text on red'.blue.on_red.blink,
+ "\e[5;34;41mThis is blue text on red\e[0m"
end
def test_uncolorize
- assert "This is uncolorized".blue.on_red.uncolorize == "This is uncolorized"
+ assert_equal 'This is uncolorized'.blue.on_red.uncolorize,
+ "This is uncolorized"
end
def test_colorized?
- assert "Red".red.colorized? == true
- assert "Blue".colorized? == false
- assert "Green".blue.green.uncolorize.colorized? == false
+ assert_equal 'Red'.red.colorized?, true
+ assert_equal 'Blue'.colorized?, false
+ assert_equal 'Green'.blue.green.uncolorize.colorized?, false
+ end
+
+ def test_concatenated_strings_on_green
+ assert_equal ('none' + 'red'.red + 'none' + 'blue'.blue + 'none').on_green,
+ "\e[0;39;42mnone\e[0m\e[0;31;42mred\e[0m\e[0;39;42mnone\e[0m\e[0;34;42mblue\e[0m\e[0;39;42mnone\e[0m"
+ end
+
+ def test_concatenated_strings_uncolorize
+ assert_equal ('none' + 'red'.red + 'none' + 'blue'.blue + 'none').uncolorize,
+ "nonerednonebluenone"
+ end
+
+ def test_frozen_strings
+ assert_equal 'This is blue text on red'.freeze.blue.on_red.blink,
+ "\e[5;34;41mThis is blue text on red\e[0m"
+ end
+
+ def test_new_line
+ assert_equal "This is blue\ntext on red".freeze.blue.on_red.blink,
+ "\e[5;34;41mThis is blue\ntext on red\e[0m"
end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
deleted file mode 100644
index d44b90b..0000000
--- a/test/test_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/colorize'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-colorize.git
More information about the Pkg-ruby-extras-commits
mailing list