rainbow 2.2.2 → 3.0.0

data/spec/integration/refinement_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+require 'rainbow'
+
+RSpec.describe 'Rainbow refinement' do
+  before do
+    require 'rainbow/refinement'
+    
+    class ScopeNotIncluded
+      def self.red_hello
+        'hello'.red
+      end
+    end
+
+    class ScopeIncluded
+      using Rainbow
+      def self.red_hello
+        'hello'.red
+      end
+    end
+  end
+
+  it 'is not active by default' do
+    expect do
+      ScopeNotIncluded.red_hello
+    end.to raise_error(NoMethodError)
+  end
+
+  it 'is available when used' do
+    expect(ScopeIncluded.red_hello).to eq(Rainbow('hello').red)
+  end
+
+  it 'respects disabled state' do
+    Rainbow.enabled = false
+    expect(ScopeIncluded.red_hello).to eq('hello')
+  end
+end

data/spec/integration/string_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 require 'rainbow/ext/string'
 
-describe 'String mixin' do
-
+RSpec.describe 'String mixin' do
   before do
     Rainbow.enabled = true
   end
@@ -60,25 +59,23 @@ describe 'String mixin' do
   end
 
   context "when Rainbow is disabled" do
-
     before do
       Rainbow.enabled = false
     end
 
     it "allows chaining but doesn't wrap with escape codes" do
-      result = 'hello'.
-        foreground(:red).
-        bright.
-        italic.
-        background('#ff8040').
-        underline.
-        color(:blue).
-        blink.
-        inverse.
-        hide
+      result = 'hello'
+               .foreground(:red)
+               .bright
+               .italic
+               .background('#ff8040')
+               .underline
+               .color(:blue)
+               .blink
+               .inverse
+               .hide
 
       expect(result).to eq('hello')
     end
   end
-
 end

data/spec/integration/uncolor_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'rainbow'
+
+RSpec.describe 'uncolor method' do
+
+  it 'strips ansi color escape code' do
+    expect(Rainbow.uncolor("\e[35mhello\e[0mm")).to eq 'hellom'
+  end
+
+  it 'does not strip scroll down escape code' do
+    expect(Rainbow.uncolor("\e[1Thello")).to eq "\e[1Thello"
+  end
+
+end

data/spec/spec_helper.rb

@@ -4,3 +4,7 @@ if ENV["CI"] && (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby")
 end
 
 Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |file| require file }
+
+RSpec.configure do |config|
+  config.disable_monkey_patching!
+end

data/spec/support/presenter_shared_examples.rb

@@ -1,5 +1,5 @@
-shared_examples_for "presenter with shortcut color methods" do
-  [:black, :red, :green, :yellow, :blue, :magenta, :cyan, :white, :aqua].each do |name|
+RSpec.shared_examples_for "presenter with shortcut color methods" do
+  %i[black red green yellow blue magenta cyan white aqua].each do |name|
     describe "##{name}" do
       subject { presenter.public_send(name) }
 

data/spec/unit/color_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 require 'rainbow/color'
 
 module Rainbow
-  describe Color do
+  RSpec.describe Color do
     describe '.build' do
-
       subject { described_class.build(ground, values) }
 
       let(:ground) { :foreground }
@@ -75,11 +74,10 @@ module Rainbow
           expect { subject }.to raise_error(ArgumentError)
         end
       end
-
     end
   end
 
-  describe Color::Indexed do
+  RSpec.describe Color::Indexed do
     let(:color) { described_class.new(ground, 5) }
 
     describe '#codes' do
@@ -99,7 +97,7 @@ module Rainbow
     end
   end
 
-  describe Color::Named do
+  RSpec.describe Color::Named do
     let(:color) { described_class.new(ground, name) }
 
     describe '#codes' do
@@ -227,7 +225,7 @@ module Rainbow
     end
   end
 
-  describe Color::RGB do
+  RSpec.describe Color::RGB do
     let(:color) { described_class.new(ground, r, g, b) }
 
     describe '#codes' do
@@ -265,11 +263,10 @@ module Rainbow
           expect { subject }.to raise_error(ArgumentError)
         end
       end
-
     end
   end
 
-  describe Color::X11Named do
+  RSpec.describe Color::X11Named do
     let(:color) { described_class.new(ground, name) }
 
     describe '#codes' do
@@ -294,8 +291,6 @@ module Rainbow
           expect { subject }.to raise_error(ArgumentError)
         end
       end
-
     end
   end
-
 end

data/spec/unit/null_presenter_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 require 'rainbow/null_presenter'
 
 module Rainbow
-  describe NullPresenter do
-
+  RSpec.describe NullPresenter do
     let(:presenter) { described_class.new('hello') }
 
     shared_examples_for "rainbow null string method" do

data/spec/unit/presenter_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 require 'rainbow/presenter'
 
 module Rainbow
-  describe Presenter do
-
+  RSpec.describe Presenter do
     let(:presenter) { described_class.new('hello') }
 
     shared_examples_for "rainbow string method" do
@@ -20,16 +19,16 @@ module Rainbow
       let(:color) { double('color', codes: [1, 2]) }
 
       before do
-        allow(Color).to receive(:build).
-          with(:foreground, [:arg1, 'arg2']) { color }
+        allow(Color).to receive(:build)
+          .with(:foreground, [:arg1, 'arg2']) { color }
       end
 
       it_behaves_like "rainbow string method"
 
       it 'wraps with color codes' do
         subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).
-          with('hello', [1, 2])
+        expect(StringUtils).to have_received(:wrap_with_sgr)
+          .with('hello', [1, 2])
       end
     end
 
@@ -37,16 +36,16 @@ module Rainbow
       let(:color) { double('color', codes: [1, 2]) }
 
       before do
-        allow(Color).to receive(:build).
-          with(:background, [:arg1, 'arg2']) { color }
+        allow(Color).to receive(:build)
+          .with(:background, [:arg1, 'arg2']) { color }
       end
 
       it_behaves_like "rainbow string method"
 
       it 'wraps with color codes' do
         subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).
-          with('hello', [1, 2])
+        expect(StringUtils).to have_received(:wrap_with_sgr)
+          .with('hello', [1, 2])
       end
     end
 
@@ -146,8 +145,8 @@ module Rainbow
 
       it 'wraps with 3 code' do
         subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).
-          with('hello', [3])
+        expect(StringUtils).to have_received(:wrap_with_sgr)
+          .with('hello', [3])
       end
     end
 
@@ -196,6 +195,5 @@ module Rainbow
     end
 
     it_behaves_like "presenter with shortcut color methods"
-
   end
 end

data/spec/unit/string_utils_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 require 'rainbow/string_utils'
 
 module Rainbow
-  describe StringUtils do
+  RSpec.describe StringUtils do
     describe '.wrap_with_sgr' do
-
       subject { described_class.wrap_with_sgr(string, codes) }
 
       let(:string) { 'hello' }
@@ -56,7 +55,40 @@ module Rainbow
           expect(subject).to eq("\e[1;2m\e[3;4mhello\e[0m")
         end
       end
+    end
+
+    describe '.uncolor' do
+      subject { described_class.uncolor(string) }
+
+      context "when string with ansi color escape is passed" do
+        let(:string) do
+          rainbow = Rainbow.new
+          rainbow.enabled = true
+          rainbow.wrap('hello').
+            foreground(:red).
+            bright.
+            bold.
+            italic.
+            background('#ff8040').
+            underline.
+            color(:blue).
+            blink.
+            inverse.
+            hide
+        end
+
+        it "removes ansi color codes" do
+          expect(subject).to eq 'hello'
+        end
+      end
+
+      context "when string with scroll down ansi escape is passed" do
+        let(:string) { "\e[1Thello" }
 
+        it "does not remove ansi scroll down escape" do
+          expect(subject).to eq "\e[1Thello"
+        end
+      end
     end
   end
 end

data/spec/unit/wrapper_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 require 'rainbow/wrapper'
 
 module Rainbow
-  describe Wrapper do
-
+  RSpec.describe Wrapper do
     let(:wrapper) { described_class.new(enabled) }
 
     it "is enabled by default" do
@@ -29,6 +28,5 @@ module Rainbow
         it { should be_kind_of(Rainbow::NullPresenter) }
       end
     end
-
   end
 end

metadata

@@ -1,68 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: rainbow
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Marcin Kulik
+- Olle Jonsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 description: Colorize printed text on ANSI terminals
 email:
 - m@ku1ik.com
 executables: []
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - Changelog.md
 - Gemfile
 - Guardfile
 - LICENSE
 - README.markdown
 - Rakefile
-- ext/mkrf_conf.rb
+- appveyor.yml
 - lib/rainbow.rb
 - lib/rainbow/color.rb
 - lib/rainbow/ext/string.rb
 - lib/rainbow/global.rb
-- lib/rainbow/legacy.rb
 - lib/rainbow/null_presenter.rb
 - lib/rainbow/presenter.rb
+- lib/rainbow/refinement.rb
 - lib/rainbow/string_utils.rb
 - lib/rainbow/version.rb
 - lib/rainbow/wrapper.rb
@@ -70,11 +57,12 @@ files:
 - rainbow.gemspec
 - spec/integration/instance_spec.rb
 - spec/integration/rainbow_spec.rb
+- spec/integration/refinement_spec.rb
 - spec/integration/string_spec.rb
+- spec/integration/uncolor_spec.rb
 - spec/spec_helper.rb
 - spec/support/presenter_shared_examples.rb
 - spec/unit/color_spec.rb
-- spec/unit/namespace_spec.rb
 - spec/unit/null_presenter_spec.rb
 - spec/unit/presenter_spec.rb
 - spec/unit/string_utils_spec.rb
@@ -89,28 +77,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Colorize printed text on ANSI terminals
 test_files:
 - spec/integration/instance_spec.rb
 - spec/integration/rainbow_spec.rb
+- spec/integration/refinement_spec.rb
 - spec/integration/string_spec.rb
+- spec/integration/uncolor_spec.rb
 - spec/spec_helper.rb
 - spec/support/presenter_shared_examples.rb
 - spec/unit/color_spec.rb
-- spec/unit/namespace_spec.rb
 - spec/unit/null_presenter_spec.rb
 - spec/unit/presenter_spec.rb
 - spec/unit/string_utils_spec.rb