simplecolor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e29e32da09d330fd55cc5a21481c4b2cd697f15f
-  data.tar.gz: adb0f95981bb5a0d8508303199c99d09313712ec
+  metadata.gz: 7bfa2f004182adc7590fe70ab6a17c4234dbdfe9
+  data.tar.gz: 2a0ae6533b7ccf85397d9dd0cf4722403eb8c4d9
 SHA512:
-  metadata.gz: e2280f08ed62a8abcba4241bc4119aab09ffc386abc98e5dbf154097ec9402bd8f268af2806ac5e226275a2457665a25a67f7b20bb4dd440e00287bdda91caba
-  data.tar.gz: 5065a32ee415dfc0e9dbba91cf1cc5a6de425bd8bb956ffc9ae81b4e0b8693981beaa31169a3f18182bbee5c088c70ad38b3710b69a0b2d60cf09abdc070b049
+  metadata.gz: 7d1fc1b1e74ef5eeea41bab02e75399a551a709230752e6d5816a8b9e518933033040ec58a034afa14fb20c014c2948653d1ca3302512bba68b51d53a9777458
+  data.tar.gz: 9252b19aa9917848bcef1291a1f35c5af8cc80a816e27691eae258816fe85b208a7657ef977940c1c412c9d06e2578cfa194d413c82d1573ae0ae2648ac9fb9b

data/.gitignore

@@ -1,3 +1,6 @@
-.yardoc/
-doc/
-pkg/
+/.bundle
+/.yardoc/
+/Gemfile.lock
+/doc/
+/pkg/
+/vendor/cache/*.gem

data/.travis.yml

@@ -0,0 +1,10 @@
+---
+language: ruby
+rvm:
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+  - 2.1.10
+  #- ruby-head
+  #- ruby-head-clang
+script: rake test

data/.yardopts

@@ -1 +1,6 @@
---markup markdown --title "simplecolor Documentation" --protected
+--markup markdown
+--title "simplecolor Documentation"
+--protected
+-
+ChangeLog.md
+LICENSE.txt

data/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :development do
+  gem 'kramdown'
+end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Damien Robert
+Copyright © 2013–2016 Damien Robert
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,9 +1,12 @@
 # simplecolor
 
-* [Homepage](https://rubygems.org/gems/simplecolor)
-* [Documentation](http://rubydoc.info/gems/simplecolor/frames)
+* [Homepage](https://github.com/DamienRobert/simplecolor)
+* [Documentation](http://rubydoc.info/gems/simplecolor)
 * [Email](mailto:Damien.Olivier.Robert+gems@gmail.com)
 
+[![Gem Version](https://img.shields.io/gem/v/simplecolor.svg)](https://rubygems.org/gems/simplecolor)
+[![Build Status](https://travis-ci.org/DamienRobert/simplecolor.svg?branch=master)](https://travis-ci.org/DamienRobert/simplecolor)
+
 ## Description
 
 [rainbow]: https://github.com/sickill/rainbow
@@ -35,15 +38,32 @@ definitions.
 
 ## Examples
 
-    require 'simplecolor'
+~~~ ruby
+require 'simplecolor'
+
+SimpleColor.color("blue", :blue, :bold)
+SimpleColor.color(:blue,:bold) { "blue" }
+SimpleColor.color(:blue,:bold) << "blue" << SimpleColor.color(:clear)
+
+SimpleColor.mix_in_string
+"blue".color(:blue,:bold)
+"\e[34m\e[1mblue\e[0m".uncolor
+~~~
+
+## Usage
 
-    SimpleColor.color("blue", :blue, :bold)
-    SimpleColor.color(:blue,:bold) { "blue" }
-    SimpleColor.color(:blue,:bold) << "blue" << SimpleColor.color(:clear)
+There is a global switch `SimpleColor.enabled` to select the color mode.
+The possible values are
 
-    SimpleColor.mix_in_string
-    "blue".color(:blue,:bold)
-    "\e[34m\e[1mblue\e[0m".uncolor
+- `true`: activate color output
+- `false`: desactivate all color output
+- `:shell`: activate color output for use in zsh prompt
+
+When using a color escape sequence in a prompt in zsh, zsh will count the
+escape sequences as part of the length of a prompt. To mark them as non
+printable, one has to wrap them around `%{` and `%}`.
+With `SimpleColor.enabled=:shell` this is done automatically by
+`SimpleColor`.
 
 ## Requirements
 
@@ -51,16 +71,19 @@ None.
 
 ## Install
 
-    $ gem install simplecolor
+~~~ sh
+$ gem install simplecolor
+~~~
+
+This installs `v0.1.0`, the current `master` version may not work.
 
 ## Todo
 
 - Support 256 colors
 - Tests
 
-
 ## Copyright
 
-Copyright (c) 2013 Damien Robert
+Copyright © 2013–2016 Damien Robert
 
-MIT License. See {file:LICENSE.txt} for details.
+MIT License. See [LICENSE.txt](./LICENSE.txt) for details.

data/Rakefile

@@ -1,36 +1,29 @@
-# encoding: utf-8
-
-require 'rubygems'
 require 'rake'
 
 begin
-  gem 'yard', '~> 0.8'
-  require 'yard'
-
-  YARD::Rake::YardocTask.new  
-rescue LoadError => e
-  task :yard do
-    abort "Please run `gem install yard` to install YARD."
-  end
-end
-task :doc => :yard
-
-begin
-  gem 'rubygems-tasks', '~> 0.2'
   require 'rubygems/tasks'
-
-  Gem::Tasks.new(sign: {checksum: true, pgp: true},
-                 build: {tar: true}, scm: {status: true}) do |tasks|
-    tasks.console.command = 'pry'
-  end
+  Gem::Tasks.new(sign: {checksum: true, pgp: true}, 
+    scm: {status: true}) do |tasks|
+  tasks.console.command = 'pry'
+end
 rescue LoadError => e
   warn e.message
-  warn "Run `gem install rubygems-tasks` to install Gem::Tasks."
 end
 
 require 'rake/testtask'
+Rake::TestTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
 
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/**/test_*.rb']
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new
+rescue LoadError => e
+  task :yard do
+    warn e.message
+  end
 end
+task :doc => :yard
+

data/gemspec.yml

@@ -9,8 +9,10 @@ description: "A simple library for coloring text output. Heavily inspired
 license: MIT
 authors: Damien Robert
 email: Damien.Olivier.Robert+gems@gmail.com
-homepage: https://rubygems.org/gems/simplecolor
+homepage: https://github.com/DamienRobert/simplecolor
 
 development_dependencies:
-  rubygems-tasks: ~> 0.2
-  yard: ~> 0.8
+  minitest: "~> 5.0"
+  rake: "~> 10"
+  rubygems-tasks: "~> 0.2"
+  yard: "~> 0.8"

data/lib/simplecolor/colors.rb

@@ -1,17 +1,15 @@
 module SimpleColor
 
-  # Regular expression to scan if there is a clear ANSI effect at end of string
-  CLEAR_REGEXP = /\e\[0m$/
-  # Regular expression to find the end of the current ANSI sequence at
-  # beginning of string, to wrap around in the correct order.
-  COLOR_REGEXP = /^(\e\[([\d;]+)m)*/
-  # Regular expression that is used to scan for ANSI-sequences while
-  # uncoloring strings.
-  COLORED_REGEXP = /\e\[(?:(?:[349]|10)[0-7]|[0-9])?m/
-  
-  #Stolen from paint gem
-  #http://en.wikipedia.org/wiki/ANSI_escape_code
-  
+  # Regular expression to scan if there is a clear ANSI effect
+  CLEAR_REGEXP = /\e\[0m/
+  # Regular expression that is used to scan for ANSI-sequences
+  ANSICOLOR_REGEXP = /\e\[(?:[\d;]*)m/
+  COLOR_REGEXP = /#{ANSICOLOR_REGEXP}+/
+  COLORMATCH_REGEXP = /#{ANSICOLOR_REGEXP}*/
+
+  #Stolen from the paint gem.
+  #See alosa http://en.wikipedia.org/wiki/ANSI_escape_code
+
   # Basic colors (often, the color differs when using the bright effect)
   # Final color will be 30 + value for foreground and 40 + value for background
   # 90+value for intense foreground, 100+value for intense background
@@ -94,19 +92,18 @@ module SimpleColor
   }
 
   ANSI_COLORS_INTENSE_BACKGROUND = {
-    :on_instance_black   => 100,
-    :on_instance_red     => 101,
-    :on_instance_green   => 102,
-    :on_instance_yellow  => 103,
-    :on_instance_blue    => 104,
-    :on_instance_magenta => 105,
-    :on_instance_cyan    => 106,
-    :on_instance_white   => 107,
-    :on_instance_default => 109,
+    :on_intense_black   => 100,
+    :on_intense_red     => 101,
+    :on_intense_green   => 102,
+    :on_intense_yellow  => 103,
+    :on_intense_blue    => 104,
+    :on_intense_magenta => 105,
+    :on_intense_cyan    => 106,
+    :on_intense_white   => 107,
+    :on_intense_default => 109,
   }
 
   #attributes that can be specified to the color method
   COLORS = [ANSI_EFFECTS,ANSI_COLORS_FOREGROUND, ANSI_COLORS_BACKGROUND, ANSI_COLORS_INTENSE_FOREGROUND, ANSI_COLORS_INTENSE_BACKGROUND].inject({}){ |a,b| a.merge(b) }
 
-
 end

data/lib/simplecolor/version.rb

@@ -1,4 +1,4 @@
 module SimpleColor
   # simplecolor version
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/simplecolor.rb

@@ -1,3 +1,181 @@
 require 'simplecolor/version'
 require 'simplecolor/colors'
-require 'simplecolor/simplecolor'
+
+#Usage:
+#
+#@example
+#  class Foo
+#		 include SimpleColor::Mixin
+#		 def to_str
+#			 ...
+#		 end
+#  end
+#  foo=Foo.new()
+#  foo.color(:red)
+
+#after SimpleColor.mix_in_string, one can do
+#`"blue".color(:blue,:bold)`
+module SimpleColor
+	# The Colorer module handle all color outputs
+	module Colorer
+		extend self
+		WrongColor=Class.new(StandardError)
+		def color_attributes(*args, mode: :text)
+			accu=[]
+			buffer=""
+			flush=lambda {r=accu.join(";"); accu=[]; r.empty? || r="\e["+r+"m"; buffer<<r}
+			args.each do |col|
+				case col
+				when Symbol
+					raise WrongColor.new(col) unless COLORS.key?(col)
+					accu<<COLORS[col]
+				when COLOR_REGEXP
+					flush.call
+					buffer<<col
+				else
+					raise WrongColor.new(col)
+				end
+			end
+			flush.call
+			case mode
+			when :shell
+				"%{"+buffer+"%}"
+			when :disabled
+				""
+			else
+				buffer
+			end
+		end
+
+		def colorer(s,*attributes,**kwds)
+			if s.nil?
+				color_attributes(*attributes,**kwds)
+			elsif s.empty?
+				s
+			else
+				matched = s.match(COLORMATCH_REGEXP)
+				attributes=color_attributes(*attributes,**kwds)
+				s.insert(matched.end(0), attributes)
+				s.concat(color_attributes(:clear,**kwds)) unless s =~ /#{CLEAR_REGEXP}$/ or attributes.empty?
+				s
+			end
+		end
+
+		def uncolorer(s)
+			s.to_str.gsub!(COLOR_REGEXP, '') || s.to_str
+		rescue ArgumentError #rescue from "invalid byte sequence in UTF-8"
+			s.to_str
+		end
+
+		def colored?(s)
+			!! (s =~ COLOR_REGEXP)
+		end
+	end
+
+	# Wraps around Colorer to provide useful instance methods
+	module ColorWrapper
+		extend self
+
+		# Returns an uncolored version of the string, that is all
+		# ANSI-sequences are stripped from the string.
+		# @see: color
+		def uncolor!(string = nil)
+			arg=if block_given?
+				yield.to_s
+			elsif string.respond_to?(:to_str)
+				string.to_str
+			elsif respond_to?(:to_str)
+				self.to_str
+			else
+				''
+			end
+			Colorer.uncolorer(arg)
+		end
+
+		# wrap self or the first argument with colors
+		# @example ploum
+		#		SimpleColor.color("blue", :blue, :bold)
+		#		SimpleColor.color(:blue,:bold) { "blue" }
+		#		SimpleColor.color(:blue,:bold) << "blue" << SimpleColor.color(:clear)
+		def color!(*args)
+			arg=if block_given?
+				yield.to_s
+			elsif respond_to?(:to_str)
+				self.to_str
+			elsif args.first.respond_to?(:to_str)
+				args.shift.to_str
+			else
+				nil
+			end
+			Colorer.colorer(arg,*args)
+		end
+
+		[:color,:uncolor].each do |m|
+			define_method m do |*args,&b|
+				self.dup.send :"#{m}!",*args,&b
+			end
+		end
+
+		def color?(*args)
+			arg=if block_given?
+				yield.to_s
+			elsif respond_to?(:to_str)
+				self.to_str
+			elsif args.first.respond_to?(:to_str)
+				args.shift.to_str
+			else
+				nil
+			end
+			Colorer.colored?(arg)
+		end
+	end
+
+	include ColorWrapper
+	extend self
+
+	# enabled can be set to true, false, or :shell
+	# :shell means that the color escape sequence will be quoted.
+	# This is meant to be used in the shell prompt, so that the escape
+	# sequence will not count in the length of the prompt.
+	attr_accessor :enabled
+	self.enabled=true
+
+	[:color,:color!].each do |m|
+		define_method m do |*args, mode: (SimpleColor.enabled || :disabled), &b|
+			super(*args, mode: mode, &b)
+		end
+	end
+
+	module Helpers
+		def mix_in(klass)
+			klass.send :include, SimpleColor
+		end
+		def mix_in_string
+			mix_in(String)
+		end
+
+		def attributes_from_colors(s)
+			s.scan(/#{ANSICOLOR_REGEXP}/).flat_map do |a|
+				next :reset if a=="\e[m"
+				a[/\e\[(.*)m/,1].split(';').map {|c| COLORS.key(c.to_i)}
+			end
+		end
+		#get the ansi sequences on s (assume the whole line is colored)
+		def current_colors(s)
+			m=s.match(/^(#{COLORMATCH_REGEXP})(.*?)(#{COLORMATCH_REGEXP})$/)
+			[m[1],m[3],m[2]]
+		rescue ArgumentError #rescue from "invalid byte sequence in UTF-8"
+			["","",s]
+		end
+		#copy the colors from s to t
+		def copy_colors(s,t)
+			b,e=current_colors(s)
+			b+t+e
+		end
+		#split the line into characters and ANSII color sequences
+		def color_entities(l)
+			l.split(/(#{COLOR_REGEXP})/).flat_map {|c| color?(c) ? [c] : c.split('') }
+		end
+	end
+	extend Helpers
+end

data/simplecolor.gemspec

@@ -24,6 +24,16 @@ Gem::Specification.new do |gem|
   glob = lambda { |patterns| gem.files & Dir[*patterns] }
 
   gem.files = `git ls-files`.split($/)
+
+  `git submodule --quiet foreach --recursive pwd`.split($/).each do |submodule|
+    submodule.sub!("#{Dir.pwd}/",'')
+
+    Dir.chdir(submodule) do
+      `git ls-files`.split($/).map do |subpath|
+        gem.files << File.join(submodule,subpath)
+      end
+    end
+  end
   gem.files = glob[gemspec['files']] if gemspec['files']
 
   gem.executables = gemspec.fetch('executables') do
@@ -38,7 +48,7 @@ Gem::Specification.new do |gem|
     %w[ext lib].select { |dir| File.directory?(dir) }
   })
 
-  gem.requirements              = gemspec['requirements']
+  gem.requirements              = Array(gemspec['requirements'])
   gem.required_ruby_version     = gemspec['required_ruby_version']
   gem.required_rubygems_version = gemspec['required_rubygems_version']
   gem.post_install_message      = gemspec['post_install_message']
@@ -56,4 +66,6 @@ Gem::Specification.new do |gem|
       gem.add_development_dependency(name,split[versions])
     end
   end
+
+  gem.metadata['yard.run']='yri'
 end

data/test/helper.rb

@@ -1,7 +1,13 @@
-require 'rubygems'
 require 'minitest/autorun'
 
-class MiniTest::Test
-end
+## Uncomment to launch pry on a failure
+#require 'pry-rescue/minitest'
 
-MiniTest.autorun
+begin
+  require 'minitest/reporters'
+  Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new
+  #Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+  #Minitest::Reporters.use! Minitest::Reporters::ProgressReporter.new
+rescue LoadError => error
+  warn "minitest/reporters not found, not changing minitest reporter: #{error}"
+end

data/test/test_simplecolor.rb

@@ -3,10 +3,152 @@ require 'simplecolor'
 
 class TestSimpleColor < MiniTest::Test
 
-  def test_version
-    version = SimpleColor.const_get('VERSION')
+	def test_version
+		version = SimpleColor.const_get('VERSION')
 
-    assert(!version.empty?, 'should have a VERSION constant')
-  end
+		assert(!version.empty?, 'should have a VERSION constant')
+	end
+
+end
+
+describe SimpleColor do
+	before do
+		SimpleColor.enabled=true
+	end
+
+	it "Can be used directly" do
+		SimpleColor.color("red",:red).must_equal "\e[31mred\e[0m"
+	end
+
+	it "Can specify several colors" do
+		SimpleColor.color("red",:red,:bold).must_equal "\e[31;1mred\e[0m"
+	end
+
+	it "Accepts ANSI sequences" do
+		SimpleColor.color("red","\e[31;1m").must_equal "\e[31;1mred\e[0m"
+	end
+
+	it "Can mix ANSI sequences and attributes" do
+		SimpleColor.color("red",:inverse,"\e[31m",:blue,:bold).must_equal "\e[7m\e[31m\e[34;1mred\e[0m"
+	end
+
+	it "Can take a block" do
+		SimpleColor.color(:red) { "red" }.must_equal "\e[31mred\e[0m"
+	end
+
+	it "Can provide only color values" do
+		SimpleColor.color(:red).must_equal "\e[31m"
+	end
+
+	it "Does not change the string when there is no color attributes" do
+		SimpleColor.color("foo").must_equal "foo"
+	end
+
+	it "can uncolor" do
+		SimpleColor.uncolor(SimpleColor.color("red",:red)).must_equal "red"
+	end
+
+	it "uncolor does not change uncolored strings" do
+		SimpleColor.uncolor("red").must_equal "red"
+	end
+
+	it "Can detect colored strings" do
+		SimpleColor.color?("red").must_equal false
+		SimpleColor.color?(SimpleColor.color("red",:red)).must_equal true
+	end
+
+
+	describe "Shell mode" do
+		before do
+			SimpleColor.enabled=:shell
+		end
+
+		it "Wraps color into shell escapes" do
+			SimpleColor.color("red",:red).must_equal "%{\e[31m%}red%{\e[0m%}"
+		end
+	end
+
+	describe "It can be mixed in strings" do
+		before do
+			SimpleColor.mix_in_string
+		end
+
+		it "Works on strings" do
+			"red".color(:red).must_equal "\e[31mred\e[0m"
+		end
+
+		it "Uncolor works on strings" do
+			"red".color(:red).uncolor.must_equal "red"
+		end
+
+		it "color does not affects the string" do
+			s="red"
+			s.color(:red)
+			s.must_equal "red"
+		end
+
+		it "color! does affects the string" do
+			s="red"
+			s.color!(:red)
+			s.must_equal "\e[31mred\e[0m"
+		end
+
+		it "uncolor does not affects the string" do
+			s="\e[31mred\e[0m"
+			s.uncolor
+			s.must_equal "\e[31mred\e[0m"
+		end
+
+		it "uncolor! does not affects the string" do
+			s="\e[31mred\e[0m"
+			s.uncolor!
+			s.must_equal "red"
+		end
+
+	end
+
+
+	describe "It can be disabled" do
+		before do
+			SimpleColor.enabled=false
+		end
+
+		it "When disabled color should be a noop" do
+			word="red"
+			SimpleColor.color(word,:red).must_equal word
+		end
+
+		it "When disabled uncolor should still work" do
+			word="\e[31mred\e[0m"
+			SimpleColor.uncolor(word).must_equal "red"
+		end
+	end
+
+	describe "It has colors helpers utilities" do
+		it "It can copy one color" do
+			SimpleColor.copy_colors(SimpleColor.color("red",:red),"blue").must_equal "\e[31mblue\e[0m"
+		end
+
+		it "Copy several colors" do
+			SimpleColor.copy_colors(SimpleColor.color("red",:red,:bold),"blue").must_equal "\e[31;1mblue\e[0m"
+		end
+
+		it "Can recover colors" do
+			b,e,l=SimpleColor.current_colors(SimpleColor.color("red",:red,:bold))
+			b.must_equal "\e[31;1m"
+			e.must_equal "\e[0m"
+			l.must_equal "red"
+		end
+
+		it "Can get colors attributes" do
+			b,e=SimpleColor.current_colors(SimpleColor.color("red",:red,:bold))
+			SimpleColor.attributes_from_colors("\e[m"+b+e).must_equal([:reset,:red,:bright,:reset])
+		end
+
+		it "Can split a string into color entities" do
+			SimpleColor.color_entities(SimpleColor.color("red",:red,:bold)+SimpleColor.color("blue",:blue)).must_equal(["\e[31;1m", "r", "e", "d", "\e[0m\e[34m", "b", "l", "u", "e", "\e[0m"])
+			SimpleColor.color_entities("blue "+SimpleColor.color("red",:red,:bold)+" green").must_equal(["b", "l", "u", "e", " ", "\e[31;1m", "r", "e", "d", "\e[0m", " ", "g", "r", "e", "e", "n"])
+		end
+	end
 
 end

metadata

@@ -1,41 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: simplecolor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Damien Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 description: 'A simple library for coloring text output. Heavily inspired from term-ansicolor
@@ -51,42 +79,43 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .gitignore
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - ChangeLog.md
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemspec.yml
 - lib/simplecolor.rb
 - lib/simplecolor/colors.rb
-- lib/simplecolor/simplecolor.rb
 - lib/simplecolor/version.rb
 - simplecolor.gemspec
 - test/helper.rb
 - test/test_simplecolor.rb
-homepage: https://rubygems.org/gems/simplecolor
+homepage: https://github.com/DamienRobert/simplecolor
 licenses:
 - MIT
-metadata: {}
+metadata:
+  yard.run: yri
 post_install_message: 
 rdoc_options: []
 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.0.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Simple color library

data/.document

@@ -1,3 +0,0 @@
-- 
-ChangeLog.md
-LICENSE.txt

data/lib/simplecolor/simplecolor.rb

@@ -1,82 +0,0 @@
-module SimpleColor
-  class << self; attr_accessor :enabled; end
-  self.enabled=true
-
-  def colorattributes(*args)
-    if SimpleColor.enabled
-      result=args.map {|col| "\e[#{COLORS[col]}m" }.inject(:+)
-      if SimpleColor.enabled == :shell
-        return "%{"+result+"%}"
-      else
-        return result
-      end
-    else
-      return ''
-    end
-  end
-
-  #Usage:
-  #class Foo
-  #  include SimpleColor::Mixin
-  #  def to_str
-  #    ...
-  #  end
-  #end
-  #foo=Foo.new()
-  #foo.color(:red)
-  module Mixin
-
-    # Returns an uncolored version of the string, that is all
-    # ANSI-sequences are stripped from the string.
-    def uncolor(string = nil)
-      if block_given?
-        yield.to_str.gsub(COLORED_REGEXP, '')
-      elsif string.respond_to?(:to_str)
-        string.to_str.gsub(COLORED_REGEXP, '')
-      elsif respond_to?(:to_str)
-        to_str.gsub(COLORED_REGEXP, '')
-      else
-        ''
-      end
-    end
-
-    #wrap self or the first argument with colors
-    #Examples:
-    #    SimpleColor.color("blue", :blue, :bold)
-    #    SimpleColor.color(:blue,:bold) { "blue" }
-    #    SimpleColor.color(:blue,:bold) << "blue" << SimpleColor.color(:clear)
-    #pareil pour uncolored
-    def color(*args)
-      if respond_to?(:to_str)
-        arg=self.dup
-      elsif block_given?
-        arg = yield
-      elsif args.first.respond_to?(:to_str)
-        arg=args.shift
-      else
-        arg=nil
-      end
-      return arg unless SimpleColor.enabled
-
-      if arg.nil?
-        return SimpleColor.colorattributes(*args)
-      elsif arg.empty?
-        return arg
-      else
-        matched = arg.match(SimpleColor::COLOR_REGEXP)
-        arg.insert(matched.end(0), SimpleColor.colorattributes(*args))
-        arg.concat(SimpleColor.colorattributes(:clear)) unless arg =~ SimpleColor::CLEAR_REGEXP
-        return arg
-      end
-    end
-  end
-
-  #after SimpleColor.mix_in_string, one can do
-  #"blue".color(:blue,:bold)
-  include SimpleColor::Mixin
-  def mix_in_string
-    String.class_eval {include SimpleColor::Mixin}
-  end
-
-  extend self
-end