paint 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfb6c0865f627879375ff54af807216e5e0f736d
-  data.tar.gz: fa3d2cf817aa88e67cca7a8bceab448321da4c59
+  metadata.gz: 676c869edf2a0dd0a45112ae34b5efe40253383b
+  data.tar.gz: 36c67ac1e7d1a6251203b426bacd00d5827f2d64
 SHA512:
-  metadata.gz: 5880654739c1fb793f43bff78d85c2ef07c9c8e83dba9011e94b59bde884596735107774fa20e0614aba53543c53356af41daef99a443311825b819c449ca18e
-  data.tar.gz: 71097ce6065c42c999a33ce7bfe190397c8f26e287cc720bad6a41fc94fbd6750b138f805238fc565a828551c6b6132def89e78f7f1718258a35ddbea703f8bf
+  metadata.gz: 7020dd7dec634ef466ac98c1366e413b5d1c0a728c0bc954f2c57ae47e5c69c2e365bebc13a80ed916e90e74fceb6f502c1b5d5d9bd8f1cd4508273ae9542e70
+  data.tar.gz: 3575d22aa3cc18df1a1877a2472f43ccdd43f87f99c0d996de0e67f2ba94f819733758206748028b63810ce0aa8c4181346960c9df48661176b3be30b6d89d7f

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format documentation

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+
+rvm:
+- ruby-head
+- 2.2
+- 2.1
+- 2.0
+- rbx-2
+- jruby-head
+- jruby-9000

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 1.0.0
+* Improved performance
+* Option for :random colors removed (see readme)
+* Seperate Paint::SHORTCUTS into extra gem
+* Drop support for Ruby 1 (inoffically still support 1.9.3)
+
 === 0.9.0
 * Don't colorize strings via shortcuts when Paint.mode == 0
 * Freeze bundled ascii color data

data/MIT-LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT LICENSE
 
-Copyright (c) 2011-2014 Jan Lelis
+Copyright (c) 2011-2015 Jan Lelis
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,14 +1,13 @@
-= Ruby Paint {<img src="https://travis-ci.org/janlelis/paint.png" />}[https://travis-ci.org/janlelis/paint]
+= Ruby Paint {<img src="https://badge.fury.io/rb/paint.svg" />}[http://badge.fury.io/rb/paint] {<img src="https://travis-ci.org/janlelis/paint.png" />}[https://travis-ci.org/janlelis/paint]
 
 Paint manages terminal colors and effects for you. It combines the strengths of *term-ansicolor*, *rainbow* and other similar projects into a simple to use, however still flexible terminal colorization gem with no core extensions by default.
 
 == Features
-
 * No string extensions (suitable for library development)
 * Supports setting 256 colors (for capable terminals)
 * Supports setting any effects (although most terminals won't support it)
 * Simple to use
-* Custom shortcuts can be defined and flexibly mixed in
+* Faster than most similar gems due to caching
 * Fall-back modes for non-256-color terminals (<tt>Paint.mode</tt>), supported modes:
   * 256 colors
   * 16 colors (only ansi colors, combined with bright effect)
@@ -16,12 +15,7 @@ Paint manages terminal colors and effects for you. It combines the strengths of
   * 0 colors (deactivate)
 
 == Setup
-
-Install with:
-
-  gem install paint
-
-Or add to Gemfile:
+Add to Gemfile:
 
   gem 'paint'
 
@@ -32,7 +26,6 @@ In Ruby do:
   require 'paint'
 
 == Usage
-
 The only method you need to know to get started is: <tt>Paint.[]</tt>
 
 The first argument given to <tt>Paint.[]</tt> is the string to colorize (if the object is not a string, <tt>to_s</tt> will be called on it). The other arguments describe how to modify/colorize the string. Let's learn by example:
@@ -47,7 +40,6 @@ The first argument given to <tt>Paint.[]</tt> is the string to colorize (if the
   Paint['Ruby', "gold", "snow"] # Paint supports rgb.txt color names, note that the arguments are strings (:yellow != "yellow")!
   Paint['Ruby', "#123456"]      # html like definitions are possible.
   Paint['Ruby', "fff"]          # another html hex definition
-  Paint['Ruby', :random]        # pass :random to get one of eight random ansi foreground colors
   Paint['Ruby', :inverse]       # swaps fore- and background
   Paint['Ruby', :italic, :encircle, :rapid_blink, :overline] # probably not supported effects
   Paint['Ruby']                 # don't pass any argument and the string will not be changed
@@ -57,11 +49,9 @@ When you pass multiple colors, the first one is taken as foreground color and th
 You can find more examples in the specs.
 
 == Windows Support
-
 For ANSI support in Windows OS, you can use {ansicon}[https://github.com/adoxa/ansicon] or {ConEmu}[http://code.google.com/p/conemu-maximus5/].
 
 == More details about terminal colors and effects
-
 Terminal colors/effects are set by {ansi escape sequences}[http://en.wikipedia.org/wiki/ANSI_escape_code]. These are strings that look like this: <tt>\e[X;X;X;X;X]m</tt> where X are integers with some meaning. For example, 0 means reset, 31 means red foreground and 41 red background. When you tell Paint to use one of the eight ansi base colors as foreground color, it just inserts a number between 30 and 37 in the sequence. The following colors are available:
 
   :black, :red, :green, :yellow, :blue, :magenta, :cyan, :white, (:default)
@@ -73,7 +63,6 @@ Through special sequences it's also possible to set 256-colors, instead of 8, wh
 When using the <tt>Paint.[]</tt> method, Paint wraps the given string between the calculated escape sequence and an reset sequence (<tt>"\e[0m"</tt>). You can get the raw escape sequence by using the <tt>Paint.color</tt> method.
 
 === Effects
-
 Also see {en.wikipedia.org/wiki/ANSI_escape_code}[http://en.wikipedia.org/wiki/ANSI_escape_code]:
 
 ==== Often supported
@@ -109,7 +98,6 @@ Also see {en.wikipedia.org/wiki/ANSI_escape_code}[http://en.wikipedia.org/wiki/A
   55) :overline_off
 
 == Paint.mode
-
 You can choose between four ways to use <tt>Paint.[]</tt> by setting <tt>Paint.mode</tt> to one of the following:
 * 256:   full support
 * 16:    don't use 256 colors, but the ansi eight ones (combined with bright effect)
@@ -118,48 +106,14 @@ You can choose between four ways to use <tt>Paint.[]</tt> by setting <tt>Paint.m
 
 Paint tries to automatically detect the proper value, please open an issue if <tt>Paint.detect_mode</tt> yields a wrong value for you.
 
-== Advanced Usage: Shortcuts
-
-Now for the fancy part: You can create color shortcuts for your gems and scripts! Note: You don't have to use this feature (and only stick to <tt>Paint.[]</tt> instead) ;)
-
-It's easy: Just setup a hash of symbol keys and escape string values at: <tt>Paint::SHORTCUTS[:your_namespace]</tt>. They are stored directly as escape sequences for performance reasons (this also means, you need different namespaces for different <tt>Paint.mode</tt>s). Example:
-
-  Paint::SHORTCUTS[:example] = {
-    :white => Paint.color(:black),
-    :red => Paint.color(:red, :bright),
-    :title => Paint.color(:underline),
-  }
+== Random ANSI colors
 
-The methods become "rubymagically" available in a <tt>Paint</tt> child model:
+With 1.0, the :random feature was removed, because it interfered with the caching mechanism. If you still need it, you will have to workaround by generating random colors yourself, before passing them into the Paint method:
 
-  Paint::Example.red 'Ruby' # => "\e[31;1mRuby\e[0m"
-  Paint::Example.white      # => "\e[37m"
-
-As you can see, the helper methods look useful and can take either one (wrap string) or none (only color) arguments ...but they aren't really <em>short</em> yet.
-
-Fortunately, you can include them:
-
-  include Paint::Example
-  red # => "\e[31;1m"
-  white 'Ruby' # => "\e[30m"
-
-All shortcuts, defined in your shortcut namespace at this time, are now (privately) available in your current namespace (without using a method_missing implementation).
-
-Furthermore, there are two variations of this approach:
-
-  include Paint::Example::String
-  "Ruby".title # => "\e[4mRuby\e[0m"
-  5.red # => "\e[31;1m5\e[0m"
-
-In this case, <tt>self</tt> will be converted to a string and wrapped with the specific color code. Note, that the helper methods doesn't take any arguments when using this inclusion method.
-
-The third way allows you to get a single color helper method to avoid cluttering namespaces:
-
-  include Paint::Example::Prefix::ExampleName
-  "Ruby".example_name(:red) # => "\e[31;1mRuby\e[0m"
-
-=== Utilities
+  Paint['Ruby', Paint.random]        # get one of eight random ansi foreground colors
+  Paint['Ruby', Paint.random(true)]  # get one of eight random ansi background colors
 
+== Utilities
 There are some supporting methods available. You can get a <tt>p</tt> like alternative for calling <tt>puts Paint.[]</tt>:
 
   require 'paint/pa'
@@ -169,9 +123,12 @@ Another helper method is <tt>Paint.unpaint</tt>, which removes any ansi colors:
 
   Paint.unpaint( Paint['Ruby', :red, :bright] ).should == 'Ruby'
 
+== Advanced Usage: Shortcuts
+There is an extension gem available that allows you to define custom color shortcuts. See {SHORTCUTS.rdoc}[https://github.com/janlelis/paint/blob/master/SHORTCUTS.rdoc] for more information.
+
 == J-_-L
 
-Copyright (c) 2011-2014 Jan Lelis <http://janlelis.com>, released under the MIT license.
+Copyright (c) 2011-2015 Jan Lelis <http://janlelis.com>, released under the MIT license.
 
 Mainly influenced by rainbow[https://github.com/sickill/rainbow] and {term-ansicolor}[https://github.com/flori/term-ansicolor]. Contributors[https://github.com/janlelis/paint/contributors]:
 * {CyberShadow}[https://github.com/CyberShadow]

data/Rakefile

@@ -1,12 +1,10 @@
-GEMSPEC = 'paint.gemspec'
-
-#require 'rake'
-#require 'rake/rdoctask'
 require 'fileutils'
 require 'rspec/core/rake_task'
 
-task :default => :spec
-task :test    => :spec
+gemspecs = %w[
+  paint.gemspec
+  paint-shortcuts.gemspec
+]
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = [
@@ -16,30 +14,29 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   ]
 end
 
-def gemspec
-  @gemspec ||= eval(File.read(GEMSPEC), binding, GEMSPEC)
+task :default => :spec
+task :test    => :spec
+
+def gemspec_spec_for(gemspec)
+  eval(File.read(gemspec), binding, gemspec)
 end
 
-desc "Build the gem"
-task :gem => :gemspec do
-  sh "gem build #{GEMSPEC}"
+desc "Build the gems"
+task :gems do
   FileUtils.mkdir_p 'pkg'
-  FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", 'pkg'
+  gemspecs.each{ |gemspec|
+    sh "gem build #{gemspec}"
+    spec = gemspec_spec_for(gemspec)
+    FileUtils.mv "#{spec.name}-#{spec.version}.gem", 'pkg'
+  }
 end
 
 desc "Install the gem locally"
-task :install => :gem do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}.gem --no-rdoc --no-ri}
-end
-
-desc "Generate the gemspec"
-task :generate do
-  puts gemspec.to_ruby
-end
-
-desc "Validate the gemspec"
-task :gemspec do
-  gemspec.validate
+task :install => :gems do
+  gemspecs.each{ |gemspec|
+    spec = gemspec_spec_for(gemspec)
+    sh %{gem install pkg/#{spec.name}-#{spec.version}.gem --no-rdoc --no-ri}
+  }
 end
 
 desc "Run a Benchmark"
@@ -51,8 +48,7 @@ task :benchmark do
   end
 
   require 'rainbow'
-  $:.unshift '../lib'
-  require 'paint'
+  require_relative 'lib/paint'
 
   n = 100_000
   colors = [:black, :red, :green, :yellow, :blue, :magenta, :cyan]

data/lib/paint.rb

@@ -1,12 +1,11 @@
-require 'paint/version'  unless defined? Paint::VERSION
-require 'paint/shortcuts'unless defined? Paint::SHORTCUTS
-require 'paint/util'
+require_relative 'paint/version'
+require_relative 'paint/util'
+
 
 module Paint
   autoload :RGB_COLORS, 'paint/rgb_colors'
   autoload :RGB_COLORS_ANSI, 'paint/rgb_colors_ansi'
 
-  # Important purpose
   NOTHING = "\033[0m".freeze
 
   # Basic colors (often, the color differs when using the bright effect)
@@ -54,7 +53,6 @@ module Paint
     :overline_off  => 55,
   }.freeze
 
-  # cache
   ANSI_COLORS_FOREGROUND = {
     :black   => 30,
     :red     => 31,
@@ -67,7 +65,6 @@ module Paint
     :default => 39,
   }.freeze
 
-  # cache
   ANSI_COLORS_BACKGROUND = {
     :black   => 40,
     :red     => 41,
@@ -84,19 +81,14 @@ module Paint
     # Takes a string and color options and colorizes the string
     # See README.rdoc for details
     def [](string, *options)
-      return string.to_s if mode.zero? || options.empty?
-
-      if options.size == 1 && !options.first.respond_to?(:to_ary)
-        options = options.first
-      end
-
-      cache[options] + string.to_s + NOTHING
+      return string.to_s if @mode.zero? || options.empty?
+      options = options.first if options.size == 1 && !options.first.respond_to?(:to_ary)
+      @cache[options] + string.to_s + NOTHING
     end
 
-    # Sometimes, you only need the color
-    # Used by []
+    # Transforms options into the desired color. Used by @cache
     def color(*options)
-      return '' if mode.zero? || options.empty?
+      return '' if @mode.zero? || options.empty?
       mix = []
       color_seen = false
       colors = ANSI_COLORS_FOREGROUND
@@ -109,16 +101,13 @@ module Paint
             color_seen = :set
           elsif ANSI_EFFECTS.key?(option)
             mix << effect(option)
-          elsif option == :random
-            mix << random(color_seen)
-            color_seen = :set
           else
             raise ArgumentError, "Unknown color or effect: #{ option }"
           end
 
         when Array
           if option.size == 3 && option.all?{ |n| n.is_a? Numeric }
-            mix << rgb(*(option + [color_seen])) # 1.8 workaround
+            mix << rgb(*[*option, color_seen])
             color_seen = :set
           else
             raise ArgumentError, "Array argument must contain 3 numerals"
@@ -161,8 +150,8 @@ module Paint
     # * 16     - only ansi colors and bright effect
     # * 8      - only ansi colors
     # * 0      - no colorization!
-    def mode() @mode ||= detect_mode end
-    def mode=(val) cache.clear; @mode = val end
+    attr_reader :mode
+    def mode=(val) @cache.clear; @mode = val end
 
     # Adds ansi sequence
     def wrap(*ansi_codes)
@@ -176,8 +165,8 @@ module Paint
 
     # Creates a 256-compatible color from rgb values
     def rgb(red, green, blue, background = false)
-      if mode == 8 || mode == 16
-        "#{background ? 4 : 3}#{rgb_like_value(red, green, blue, mode == 16)}"
+      if @mode == 8 || @mode == 16
+        "#{background ? 4 : 3}#{rgb_like_value(red, green, blue, @mode == 16)}"
       else
         "#{background ? 48 : 38}#{rgb_value(red, green, blue)}"
       end
@@ -186,20 +175,18 @@ module Paint
     # Creates 256-compatible color from a html-like color string
     def hex(string, background = false)
       string.tr! '#',''
-      rgb(
-       *(if string.size == 6
-          # string.chars.each_cons(2).map{ |hex_color| hex_color.join.to_i(16) }
-          [string[0,2].to_i(16), string[2,2].to_i(16), string[4,2].to_i(16)]
-        else
-          string.chars.map{ |hex_color_half| (hex_color_half*2).to_i(16) }
-        end + [background]) # 1.8 workaround
-      )
+      color_code = if string.size == 6
+        string.each_char.each_slice(2).map{ |hex_color| hex_color.join.to_i(16) }
+      else
+        string.each_char.map{ |hex_color_half| (hex_color_half*2).to_i(16) }
+      end
+      rgb(*[*color_code, background])
     end
 
     # Creates a 256-color from a name found in Paint::RGB_COLORS (based on rgb.txt)
     def rgb_name(color_name, background = false)
       if color_code = RGB_COLORS[color_name]
-        rgb(*(color_code + [background] )) # 1.8 workaround
+        rgb(*[*color_code, background])
       end
     end
 
@@ -213,15 +200,30 @@ module Paint
       ANSI_EFFECTS[effect_name]
     end
 
-    private
-
-    def cache
-      return @cache if @cache
-      @cache = Hash.new { |h, k| h[k] = color(*k) }
-      def @cache.[](*k) k.include?(:random) ? Paint.color(*k) : super end
-      @cache
+    # Determine supported colors
+    def detect_mode
+      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ # windows
+        if ENV['ANSICON']
+          16
+        elsif ENV['ConEmuANSI'] == 'ON'
+          256
+        else
+          0
+        end
+      else
+        case ENV['TERM']
+        when /-256color$/, 'xterm'
+          256
+        when /-color$/, 'rxvt'
+          16
+        else # optimistic default
+          256
+        end
+      end
     end
 
+    private
+
     # Returns nearest supported 256-color an rgb value, without fore-/background information
     # Inspired by the rainbow gem
     def rgb_value(red, green, blue)
@@ -267,6 +269,10 @@ module Paint
       }
     end
   end
+
+  # init instance vars
+  @mode  = detect_mode
+  @cache = Hash.new{ |h, k| h[k] = color(*k) }
 end
 
 # J-_-L

data/lib/paint/util.rb

@@ -10,7 +10,7 @@ module Paint
 
     # Tries to print all 256 colors
     def rainbow
-      (0...256).each{ |color| 
+      (0...256).each{ |color|
         print Paint[' ', 48, 5, color] # print empty bg color field
       }
       puts
@@ -32,34 +32,6 @@ module Paint
       end
     end
 
-    # Determine supported colors
-    # This is just a naive approach, based on some things I could test
-    # Please open issues if it does not work correctly for you
-    def detect_mode
-      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ # windows
-        if ENV['ANSICON']
-          16
-        elsif ENV['ConEmuANSI'] == 'ON'
-          256
-        else
-          0
-        end
-      else
-        # case ENV['COLORTERM']
-        # when 'gnome-terminal'
-        #   256
-        # else
-          case ENV['TERM']
-          when /-256color$/, 'xterm'
-            256
-          when /-color$/, 'rxvt'
-            16
-          else # optimistic default
-            256
-          end
-        # end
-      end
-    end
   end
 end
 

data/lib/paint/version.rb

@@ -1,3 +1,3 @@
 module Paint
-  VERSION = '0.9.0'
+  VERSION = '1.0.0'
 end

data/paint.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require 'rubygems' unless defined? Gem
+
 require File.dirname(__FILE__) + "/lib/paint/version"
 
 Gem::Specification.new do |s|
@@ -9,14 +9,31 @@ Gem::Specification.new do |s|
   s.email       = "mail@janlelis.de"
   s.homepage    = "https://github.com/janlelis/paint"
   s.summary     = "Terminal painter!"
-  s.description = "Terminal painter / no string extensions / 256 color support / effect support / define custom shortcuts / basic usage: Paint['string', :red, :bright]"
-  s.required_ruby_version     = '>= 1.8.7'
-  s.files = Dir.glob(%w[{lib,test,spec}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c}]) + %w{Rakefile paint.gemspec}
-  s.extra_rdoc_files = ["README.rdoc", "MIT-LICENSE.txt"]
+  s.description = "Terminal painter: No string extensions / 256 color support / effect support. Usage: Paint['string', :red, :bright]"
   s.license = 'MIT'
 
-  s.add_development_dependency 'rspec', '>= 3'
-  s.add_development_dependency 'rake'
+  s.files = %w[
+    paint.gemspec
+    Rakefile
+    .rspec
+    .travis.yml
+    lib/paint.rb
+    lib/paint/pa.rb
+    lib/paint/rgb_colors.rb
+    lib/paint/rgb_colors_ansi.rb
+    lib/paint/util.rb
+    lib/paint/version.rb
+  ]
+  s.extra_rdoc_files = %w[
+    README.rdoc
+    CHANGELOG.rdoc
+    MIT-LICENSE.txt
+  ]
+
+  s.required_ruby_version = '>= 1.9.3'
+  s.requirements = ['Windows: ansicon (https://github.com/adoxa/ansicon) or ConEmu (http://code.google.com/p/conemu-maximus5)']
+  s.add_development_dependency 'rspec', '~> 3.2'
+  s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'rainbow', '1.1.4'
   s.add_development_dependency 'term-ansicolor'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: paint
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -66,15 +66,18 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'Terminal painter / no string extensions / 256 color support / effect
-  support / define custom shortcuts / basic usage: Paint[''string'', :red, :bright]'
+description: 'Terminal painter: No string extensions / 256 color support / effect
+  support. Usage: Paint[''string'', :red, :bright]'
 email: mail@janlelis.de
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- CHANGELOG.rdoc
 - MIT-LICENSE.txt
 files:
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - MIT-LICENSE.txt
 - README.rdoc
@@ -83,15 +86,9 @@ files:
 - lib/paint/pa.rb
 - lib/paint/rgb_colors.rb
 - lib/paint/rgb_colors_ansi.rb
-- lib/paint/shortcuts.rb
 - lib/paint/util.rb
 - lib/paint/version.rb
 - paint.gemspec
-- spec/paint_methods_spec.rb
-- spec/paint_mode_spec.rb
-- spec/paint_shortcuts_spec.rb
-- spec/paint_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/janlelis/paint
 licenses:
 - MIT
@@ -104,15 +101,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- 'Windows: ansicon (https://github.com/adoxa/ansicon) or ConEmu (http://code.google.com/p/conemu-maximus5)'
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Terminal painter!

data/lib/paint/shortcuts.rb

@@ -1,106 +0,0 @@
-module Paint
-  # Hash for defining color/effect shortcuts
-  # See README for details
-  SHORTCUTS = {
-    # :example => {                    # would create a Paint::Example constant...
-    #   :light_red     => "\e[31;1m",  # with a method .light_red
-    # }
-  }
-  SHORTCUTS.default = {}
-
-  class << self
-    # Paint::SomeModule --> Paint::SHORTCUTS[:some_module]
-    def const_missing(mod_name)
-      # get shortcuts
-      shortcuts = SHORTCUTS[mod_name.to_s.gsub(/[A-Z]/,'_\0').downcase[1..-1].to_sym] || []
-
-      # create module
-      class_eval "module #{mod_name}; end"
-      mod = const_get(mod_name)
-      eigen_mod = class << mod; self; end # 1.8
-
-      # define direct behaviour, class methods
-      # mod.define_singleton_method :method_missing do |color_name, *args|
-      eigen_mod.send:define_method, :method_missing do |color_name, *args|
-        if color_code = shortcuts[color_name]
-          string = Array(args).join
-          return string if Paint.mode.zero?
-
-          if args.empty?
-            color_code
-          else
-            color_code + string + NOTHING
-          end
-        else
-          nil
-        end
-      end
-
-      eigen_mod.send:define_method, :respond_to? do |color_name, *args|
-        shortcuts.include?(color_name) || super(color_name, *args)
-      end
-
-      # define include behaviour, instance methods
-      eigen_mod.send:define_method, :included do |_|
-        shortcuts.each{ |color_name, color_code|
-          define_method color_name do |*args|
-            string = Array(args).join
-            return string if Paint.mode.zero?
-
-            if args.empty?
-              color_code
-            else
-              color_code + string + NOTHING
-            end
-          end
-        }
-        private(*shortcuts.keys) unless shortcuts.empty?
-      end
-
-      # include variations, defined in child modules
-      mod.class_eval "module String; end"
-      string = mod.const_get(:String)
-      eigen_string = class << string; self; end # 1.8
-      eigen_string.send:define_method, :included do |_|
-        shortcuts.each{ |color_name, color_code|
-          define_method color_name do
-            if Paint.mode.zero?
-              to_s
-            else
-              color_code + to_s + NOTHING
-            end
-          end
-        }
-      end
-
-      # OK, let's take it one level further ;)
-      mod.class_eval "module Prefix; end"
-      prefix_prefix = mod.const_get(:Prefix)
-      eigen_prefix_prefix = class << prefix_prefix; self; end # 1.8
-      eigen_prefix_prefix.send:define_method, :const_missing do |prefix_name|
-        class_eval "module #{prefix_name}; end"
-        prefix = const_get(prefix_name)
-        eigen_prefix = class << prefix; self; end # 1.8
-
-        eigen_prefix.send:define_method, :included do |_|
-          define_method prefix_name.to_s.gsub(/[A-Z]/,'_\0').downcase[1..-1].to_sym do |color_name|
-            if color_code = shortcuts[color_name]
-              return to_s if Paint.mode.zero?
-
-              color_code + to_s + NOTHING
-            else
-              nil
-            end
-          end
-        end
-
-        prefix
-      end
-
-      # :)
-      mod
-    end
-  end
-end
-
-# J-_-L

data/spec/paint_methods_spec.rb

@@ -1,91 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe 'Paint.color' do
-  it 'only returns a the color escape sequnce and is directly used by Paint.[] with all paramenters except the first; see there fore specs' do end
-end
-
-describe 'Paint.simple' do
-  it 'returns ansi code number for one of the eight ansi base colors' do
-    Paint.simple(:red).should == 31
-  end
-
-  it 'returns background ansi code number for one of the eight ansi base colors if second parameter is true' do
-    Paint.simple(:red, true).should == 41
-  end
-end
-
-describe 'Paint.rgb' do
-  before do
-    Paint.mode = 256
-  end
-
-  it 'returns ansi code sequence for one of 256 colors' do
-    Paint.rgb(1,2,3).should == '38;5;232'
-  end
-
-  it 'returns background ansi code sequence for one of 256 colors if last parameter is true' do
-    Paint.rgb(1, 2, 3, true).should == '48;5;232'
-  end
-end
-
-describe 'Paint.hex' do
-  before do
-    Paint.mode = 256
-  end
-
-  it 'returns ansi code sequence for one of 256 colors' do
-    Paint.hex("#fff").should == "38;5;255"
-  end
-
-  it 'returns background ansi code sequence for one of 256 colors if second parameter is true' do
-    Paint.hex("123456", true).should == "48;5;24"
-  end
-end
-
-describe 'Paint.rbb_name' do
-  before do
-    Paint.mode = 256
-  end
-
-  it 'returns ansi code sequence for one of 256 colors' do
-    Paint.rgb_name("gold").should == "38;5;226"
-  end
-
-  it 'returns background ansi code sequence for one of 256 colors if second parameter is true' do
-    Paint.rgb_name("gold", true).should == "48;5;226"
-  end
-end
-
-describe 'Paint.random' do
-  it 'returns ansi code for one of the eight ansi base colors' do
-    (30...38) === Paint.random.should
-  end
-end
-
-describe 'Paint.effect' do
-  it 'returns ansi code for effect using EFFECTS hash' do
-    Paint.effect(:bright).should == 1
-  end
-end
-
-describe 'Paint.wrap' do
-  it 'wraps an ansi color code (array of integers) into an ansi escape sequence' do
-    Paint.wrap(31, 1).should == "\e[31;1m"
-  end
-end
-
-# util.rb
-
-describe 'Paint.unpaint' do
-  it 'removes any ansi color escape sequences in the string' do
-    Paint.unpaint( Paint['J-_-L', :red, :bright] ).should == 'J-_-L'
-  end
-end
-
-describe 'Paint.rainbow' do
-  it 'prints all available 256 colors' do end
-end
-
-describe 'Paint.update_rgb_colors' do
-  it 'updates the Paint::RGB_COLORS hash using rgb.txt (takes path to it as argument)' do end
-end

data/spec/paint_mode_spec.rb

@@ -1,23 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe 'Paint.mode' do
-  it "works normally if mode is 256 or another unknown true value" do
-    Paint.mode = 256
-    Paint['J-_-L', 'gold'].should == "\e[38;5;226mJ-_-L\e[0m"
-  end
-
-  it "doesn't colorize anything if mode is 0" do
-    Paint.mode = 0
-    Paint['J-_-L', 'gold'].should == "J-_-L"
-  end
-
-  it "only uses the 8 ansi colors if mode is 8" do
-    Paint.mode = 8
-    Paint['J-_-L', 'gold'].should == "\e[33mJ-_-L\e[0m"
-  end
-
-  it "only uses the 8 ansi colors with bright effect if mode is 16" do
-    Paint.mode = 16
-    Paint['J-_-L', 'gold'].should == "\e[33;1mJ-_-L\e[0m"
-  end
-end

data/spec/paint_shortcuts_spec.rb

@@ -1,62 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe 'Paint::SHORTCUTS' do
-  before do
-    Paint::SHORTCUTS[:example] = {
-      :white => Paint.color(:black),
-      :red => Paint.color(:red, :bright),
-      :title => Paint.color(:underline),
-    }
-
-    Paint.mode = 256
-  end
-
-  context 'Paint::Example.method_missing' do
-    it 'returns a color defined in the SHORTCUTS hash under the :example key' do
-      Paint::Example.red.should == "\e[31;1m"
-    end
-
-    it 'returns a color defined in the SHORTCUTS hash under the :some_module key; method takes string to colorize' do
-      Paint::Example.red('J-_-L').should == "\e[31;1mJ-_-L\e[0m"
-    end
-
-    context 'Paint.mode is 0' do
-      before do
-        Paint.mode = 0
-      end
-
-      it "doesn't colorize a string passed into a color defined in the SHORTCUTS hash under the :some_module key" do
-        Paint::Example.red('J-_-L').should == 'J-_-L'
-      end
-    end
-  end
-
-  context 'include Paint::Example::String' do
-    it 'adds shortcuts methods that colorize self' do
-      class MyString < String
-        include Paint::Example::String
-      end
-
-      MyString.new("J-_-L").red.should == "\e[31;1mJ-_-L\e[0m"
-    end
-
-    it 'adds shortcuts methods that colorize self (also works for non-String classes by calling to_s)' do
-      Paint::SHORTCUTS[:example][:gold] = Paint.color "gold"
-      class Integer
-        include Paint::Example::String
-      end
-
-      123.red.should == "\e[31;1m123\e[0m"
-    end
-  end
-
-  context 'include Paint::Example::Prefix::ExampleName' do
-    it 'sets a single color helper method to avoid cluttering namespaces' do
-      class Object
-        include Paint::Example::Prefix::ExampleName
-      end
-
-      "Ruby".example_name(:red).should == "\e[31;1mRuby\e[0m"
-    end
-  end
-end

data/spec/paint_spec.rb

@@ -1,97 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe 'Paint.[]' do
-  before do
-    Paint.mode = 256
-  end
-
-  context '(with no options)' do
-    it "doesn't colorize at all" do
-      Paint['J-_-L'].should == "J-_-L"
-    end
-  end
-
-  context '(with one color)' do
-    it 'understands a simple symbol color and use it as foreground color' do
-      Paint['J-_-L', :yellow].should == "\e[33mJ-_-L\e[0m"
-    end
-
-    it 'understands an array as rgb color definition and use it as foreground color' do
-      Paint['J-_-L', [255, 200, 0]].should == "\e[38;5;220mJ-_-L\e[0m"
-    end
-
-    it 'understands a hex string (with #, 6 digits) as rgb color definition and use it as foreground color' do
-      Paint['J-_-L', "#123456"].should == "\e[38;5;24mJ-_-L\e[0m"
-    end
-
-    it 'understands a hex string (no #, 6 digits) as rgb color definition and use it as foreground color' do
-      Paint['J-_-L', "123456"].should == "\e[38;5;24mJ-_-L\e[0m"
-    end
-
-    it 'understands a hex string (with #, 3 digits) as rgb color definition and use it as foreground color' do
-      Paint['J-_-L', "#fff"].should == "\e[38;5;255mJ-_-L\e[0m"
-    end
-
-    it 'understands a hex string (no #, 3 digits) as rgb color definition and use it as foreground color' do
-      Paint['J-_-L', "fff"].should == "\e[38;5;255mJ-_-L\e[0m"
-    end
-
-    it 'understands a hex string (with uppercased letters) as rgb color definition and use it as foreground color' do
-      Paint['J-_-L', "#4183C4"].should == "\e[38;5;74mJ-_-L\e[0m"
-    end
-
-    it 'understands a non-hex string as rgb color name (rgb.txt) and use it as foreground color' do
-      Paint['J-_-L', "medium purple"].should == "\e[38;5;141mJ-_-L\e[0m"
-    end
-
-    it 'colorizes using a random ansi foreground color' do
-      Paint['J-_-L', :random].should =~ /\e\[3\dmJ-_-L\e\[0m/
-    end
-
-    it 'does not cache randomness' do
-      (0..99).map{ Paint['J-_-L', :random] }.uniq.size.should > 1
-    end
-  end
-
-  context '(with two colors)' do
-    it 'interprets the first color as foreground color and the second one as background color' do
-      Paint['J-_-L', :yellow, :red].should == "\e[33;41mJ-_-L\e[0m"
-    end
-
-    it 'interprets the first color as foreground color and the second one as background color (rgb)' do
-      Paint['J-_-L', '#424242', [42, 142, 242]].should == "\e[38;5;238;48;5;39mJ-_-L\e[0m"
-    end
-
-    it 'sets only a background color, if first color is nil' do
-      Paint['J-_-L', nil, [42, 142, 242]].should == "\e[48;5;39mJ-_-L\e[0m"
-    end
-  end
-
-  context '(with effects)' do
-    it 'passes effects' do
-      Paint['J-_-L', :bright].should == "\e[1mJ-_-L\e[0m"
-    end
-
-    it 'passes effects, mixed with colors' do
-      Paint['J-_-L', :yellow, :bright].should == "\e[33;1mJ-_-L\e[0m"
-    end
-
-    it 'passes effects, mixed with colors, order does not matter' do
-      Paint['J-_-L', :bright, :yellow].should == "\e[1;33mJ-_-L\e[0m"
-    end
-
-    it 'passes multiple effects' do
-      Paint['J-_-L', :yellow, :red, :bright, :underline, :inverse].should == "\e[33;41;1;4;7mJ-_-L\e[0m"
-    end
-  end
-
-  context '(with plain integers)' do
-    it 'passes integers to final escape sequence' do
-      Paint['J-_-L', 31, 1, 42].should == "\e[31;1;42mJ-_-L\e[0m"
-    end
-
-    it 'passes integers to final escape sequence (mixed with normal arguments)' do
-      Paint['J-_-L', :red, :bright, 42, :underline].should == "\e[31;1;42;4mJ-_-L\e[0m"
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,7 +0,0 @@
-require File.dirname(__FILE__) + '/../lib/paint'
-
-RSpec.configure do |config|
-  config.expect_with :rspec do |c|
-    c.syntax = :should
-  end
-end