paint 0.8.7 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced283d5b465e7b6542cfd6753100e230498dbe9
-  data.tar.gz: e816d3cf009e99ef5e2f9797bd7c0605c5790f77
+  metadata.gz: bfb6c0865f627879375ff54af807216e5e0f736d
+  data.tar.gz: fa3d2cf817aa88e67cca7a8bceab448321da4c59
 SHA512:
-  metadata.gz: f6706e6a54863b5504137291bdb1e300bcdc8a5950f8525fdf9b1bc6828bd45c0cada92f4211735dc766f28c2c102b1eb02fc62b0afe635834ba324aea5a97f4
-  data.tar.gz: 5af21b99c6074ec374766b8e2aa0995240bb2e22f84d1873c134722008223fd3db6d9e8b1f892098105d997831f07bd75d77f8a961d25f96246647b58b235a74
+  metadata.gz: 5880654739c1fb793f43bff78d85c2ef07c9c8e83dba9011e94b59bde884596735107774fa20e0614aba53543c53356af41daef99a443311825b819c449ca18e
+  data.tar.gz: 71097ce6065c42c999a33ce7bfe190397c8f26e287cc720bad6a41fc94fbd6750b138f805238fc565a828551c6b6132def89e78f7f1718258a35ddbea703f8bf

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 0.9.0
+* Don't colorize strings via shortcuts when Paint.mode == 0
+* Freeze bundled ascii color data
+
 === 0.8.7
 * Fix caching bug for random ansi color
 

data/README.rdoc

@@ -1,4 +1,4 @@
-{<img src="https://travis-ci.org/janlelis/paint.png" />}[https://travis-ci.org/janlelis/paint]
+= Ruby 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.
 
@@ -21,6 +21,12 @@ Install with:
 
   gem install paint
 
+Or add to Gemfile:
+
+  gem 'paint'
+
+and run `bundle install`
+
 In Ruby do:
 
   require 'paint'
@@ -165,11 +171,10 @@ Another helper method is <tt>Paint.unpaint</tt>, which removes any ansi colors:
 
 == J-_-L
 
-Copyright (c) 2011-2013 Jan Lelis, http://rbjl.net, released under the MIT license.
+Copyright (c) 2011-2014 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].
-
-Contributions[https://github.com/janlelis/paint/contributors] by and thanks to:
-* {murphy}[https://github.com/rubychan]
+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]
-
+* {korun}[https://github.com/korun]
+* {mhaylock}[https://github.com/mhaylock]
+* {korny}[https://github.com/rubychan]

data/Rakefile

@@ -42,15 +42,6 @@ task :gemspec do
   gemspec.validate
 end
 
-#Rake::RDocTask.new do |rdoc|
-#  require File.expand_path( File.join( 'lib',  'paint') )
-#
-#  rdoc.rdoc_dir = 'doc'
-#  rdoc.title = "paint #{Paint::VERSION}"
-#  rdoc.rdoc_files.include('README*')
-#  rdoc.rdoc_files.include('lib/**/*.rb')
-#end
-
 desc "Run a Benchmark"
 task :benchmark do
   require 'benchmark'
@@ -58,11 +49,11 @@ task :benchmark do
   class String
     include Term::ANSIColor
   end
-  
+
   require 'rainbow'
   $:.unshift '../lib'
   require 'paint'
-  
+
   n = 100_000
   colors = [:black, :red, :green, :yellow, :blue, :magenta, :cyan]
   def colors.next
@@ -71,7 +62,7 @@ task :benchmark do
   end
   Benchmark.bmbm 30 do |results|
     string = 'Ruby is awesome!'
-    
+
     results.report 'cycle' do
       n.times do
         colors.next
@@ -83,16 +74,16 @@ task :benchmark do
         Paint[string, colors.next]
       end
     end
-    
+
     results.report 'term-ansicolor' do
       n.times do
         string.send(colors.next)
       end
     end
-    
+
     results.report 'rainbow' do
       n.times do
-        string.color(colors.next)
+        Rainbow(string).color(colors.next)
       end
     end
 
@@ -107,10 +98,10 @@ task :benchmark do
         string.send(colors.next).send("on_#{colors.next}")
       end
     end
-    
+
     results.report 'rainbow with background' do
       n.times do
-        string.color(colors.next).background(colors.next)
+        Rainbow(string).color(colors.next).background(colors.next)
       end
     end
   end

data/lib/paint.rb

@@ -7,7 +7,7 @@ module Paint
   autoload :RGB_COLORS_ANSI, 'paint/rgb_colors_ansi'
 
   # Important purpose
-  NOTHING = "\033[0m"
+  NOTHING = "\033[0m".freeze
 
   # Basic colors (often, the color differs when using the bright effect)
   # Final color will be 30 + value for foreground and 40 + value for background
@@ -21,7 +21,7 @@ module Paint
     :cyan    => 6,
     :white   => 7,
     :default => 9,
-  }
+  }.freeze
 
   # Terminal effects - most of them are not supported ;)
   # See http://en.wikipedia.org/wiki/ANSI_escape_code
@@ -52,33 +52,33 @@ module Paint
     :overline      => 53,
     :frame_off     => 54, :encircle_off    => 54,
     :overline_off  => 55,
-  }
+  }.freeze
 
   # cache
   ANSI_COLORS_FOREGROUND = {
-    :black   => '30',
-    :red     => '31',
-    :green   => '32',
-    :yellow  => '33',
-    :blue    => '34',
-    :magenta => '35',
-    :cyan    => '36',
-    :white   => '37',
-    :default => '39',
-  }
+    :black   => 30,
+    :red     => 31,
+    :green   => 32,
+    :yellow  => 33,
+    :blue    => 34,
+    :magenta => 35,
+    :cyan    => 36,
+    :white   => 37,
+    :default => 39,
+  }.freeze
 
   # cache
   ANSI_COLORS_BACKGROUND = {
-    :black   => '40',
-    :red     => '41',
-    :green   => '42',
-    :yellow  => '43',
-    :blue    => '44',
-    :magenta => '45',
-    :cyan    => '46',
-    :white   => '47',
-    :default => '49',
-  }
+    :black   => 40,
+    :red     => 41,
+    :green   => 42,
+    :yellow  => 43,
+    :blue    => 44,
+    :magenta => 45,
+    :cyan    => 46,
+    :white   => 47,
+    :default => 49,
+  }.freeze
 
   class << self
     # Takes a string and color options and colorizes the string

data/lib/paint/rgb_colors_ansi.rb

@@ -10,7 +10,7 @@ module Paint
     :magenta => [205,0,205],
     :cyan    => [0,205,205],
     :white   => [229,229,229],
-  }
+  }.each { |k, v| v.freeze }.freeze
 
   # A list of color names for standard bright ansi colors, needed for 16 color fallback mode
   # See http://en.wikipedia.org/wiki/ANSI_escape_code#Colors
@@ -23,5 +23,5 @@ module Paint
     :magenta => [255,0,255],
     :cyan    => [0,255,255],
     :white   => [255,255,255],
-  }
+  }.each { |k, v| v.freeze }.freeze
 end

data/lib/paint/shortcuts.rb

@@ -23,7 +23,14 @@ module Paint
       # 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]
-          if args.empty? then color_code else color_code + Array(args).join + NOTHING end
+          string = Array(args).join
+          return string if Paint.mode.zero?
+
+          if args.empty?
+            color_code
+          else
+            color_code + string + NOTHING
+          end
         else
           nil
         end
@@ -37,7 +44,14 @@ module Paint
       eigen_mod.send:define_method, :included do |_|
         shortcuts.each{ |color_name, color_code|
           define_method color_name do |*args|
-            if args.empty? then color_code else color_code + Array(args).join + NOTHING end
+            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?
@@ -50,7 +64,11 @@ module Paint
       eigen_string.send:define_method, :included do |_|
         shortcuts.each{ |color_name, color_code|
           define_method color_name do
-            color_code + to_s + NOTHING
+            if Paint.mode.zero?
+              to_s
+            else
+              color_code + to_s + NOTHING
+            end
           end
         }
       end
@@ -66,7 +84,13 @@ module Paint
 
         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|
-            shortcuts[color_name] && shortcuts[color_name] + to_s + NOTHING
+            if color_code = shortcuts[color_name]
+              return to_s if Paint.mode.zero?
+
+              color_code + to_s + NOTHING
+            else
+              nil
+            end
           end
         end
 

data/lib/paint/version.rb

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

data/paint.gemspec

@@ -12,20 +12,11 @@ Gem::Specification.new do |s|
   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", "LICENSE.txt"]
+  s.extra_rdoc_files = ["README.rdoc", "MIT-LICENSE.txt"]
   s.license = 'MIT'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rspec-core'
+
+  s.add_development_dependency 'rspec', '>= 3'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rainbow', '1.1.4'
   s.add_development_dependency 'term-ansicolor'
-
-  len = s.homepage.size
-  s.post_install_message = \
-   ("       ┌── " + "info ".ljust(len-2,'%')            + "─┐\n" +
-    " J-_-L │ "   + s.homepage                          + " │\n" +
-    "       ├── " + "usage ".ljust(len-2,'%')           + "─┤\n" +
-    "       │ "   + "require 'paint'".ljust(len,' ')    + " │\n" +
-    "       │ "   + "puts Paint['J-_-L', :red] # \e[31mJ-_-L\e[0m".ljust(len,' ')         + " │\n" +
-    "       └─"   + '─'*len                             + "─┘").gsub('%', '─') # 1.8 workaround
 end

data/spec/paint_shortcuts_spec.rb

@@ -1,7 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-# TODO fix include specs, probably failing because of some rspec voodoo
-
 describe 'Paint::SHORTCUTS' do
   before do
     Paint::SHORTCUTS[:example] = {
@@ -9,32 +7,37 @@ describe 'Paint::SHORTCUTS' do
       :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 == "\e[31m"
+      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' == "\e[31;1mJ-_-L\e[0m"
+      Paint::Example.red('J-_-L').should == "\e[31;1mJ-_-L\e[0m"
     end
-  end
 
-  context 'include Paint::Example' do
-    include Paint::Example
-    #red.should == "\e[31;1m"
-    #white( 'Ruby' ).should "\e[30m"
-  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 # could also have used original String
+      class MyString < String
         include Paint::Example::String
       end
 
-      # MyString.new("J-_-L").red.should == "\e[31;1mJ-_-L\e[0m"
+      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
@@ -42,7 +45,8 @@ describe 'Paint::SHORTCUTS' do
       class Integer
         include Paint::Example::String
       end
-      #123.red.should == "\e[38;5;226m123\e[0m"
+
+      123.red.should == "\e[31;1m123\e[0m"
     end
   end
 
@@ -51,7 +55,8 @@ describe 'Paint::SHORTCUTS' do
       class Object
         include Paint::Example::Prefix::ExampleName
       end
-      #"Ruby".example_name(:red).should == "\e[31;1mRuby\e[0m"
+
+      "Ruby".example_name(:red).should == "\e[31;1mRuby\e[0m"
     end
   end
 end

data/spec/spec_helper.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paint
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.0
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,10 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
-- LICENSE.txt
+- MIT-LICENSE.txt
 files:
 - CHANGELOG.rdoc
-- LICENSE.txt
+- MIT-LICENSE.txt
 - README.rdoc
 - Rakefile
 - lib/paint.rb
@@ -110,9 +96,7 @@ homepage: https://github.com/janlelis/paint
 licenses:
 - MIT
 metadata: {}
-post_install_message: "       ┌── info ───────────────────────────┐\n J-_-L │ https://github.com/janlelis/paint
-  │\n       ├── usage ──────────────────────────┤\n       │ require 'paint'                   │\n
-  \      │ puts Paint['J-_-L', :red] # \e[31mJ-_-L\e[0m │\n       └───────────────────────────────────┘"
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -128,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Terminal painter!