rainbow 1.99.0 → 2.0.0

data/spec/unit/wrapper_spec.rb

@@ -4,144 +4,23 @@ require 'rainbow/wrapper'
 module Rainbow
   describe Wrapper do
 
-    let(:wrapper) { described_class.new('hello') }
+    let(:wrapper) { described_class.new(enabled) }
 
-    shared_examples_for "wrapper method" do
-      it "wraps the text with a sgr sequence" do
-        expect(subject).to eq('[hello]')
-      end
-
-      it "returns an instance of Rainbow::Wrapper" do
-        expect(subject).to be_kind_of(Rainbow::Wrapper)
-      end
-
-      context "when Rainbow is disabled" do
-        before do
-          allow(Rainbow).to receive(:enabled) { false }
-        end
-
-        it "doesn't wrap the text" do
-          expect(subject).to eq('hello')
-        end
-
-        it "returns an instance of Rainbow::Wrapper" do
-          expect(subject).to be_kind_of(Rainbow::Wrapper)
-        end
-      end
-    end
-
-    before do
-      allow(StringUtils).to receive(:wrap_with_sgr) { '[hello]' }
-    end
-
-    describe '#foreground' do
-      subject { wrapper.foreground(:arg1, 'arg2') }
-
-      let(:color) { double('color', :codes => [1, 2]) }
-
-      before do
-        allow(Color).to receive(:build).with(:foreground, [:arg1, 'arg2']) { color }
-      end
-
-      it_behaves_like "wrapper method"
-
-      it 'wraps with color codes' do
-        subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [1, 2])
-      end
-    end
-
-    describe '#background' do
-      subject { wrapper.background(:arg1, 'arg2') }
-
-      let(:color) { double('color', :codes => [1, 2]) }
-
-      before do
-        allow(Color).to receive(:build).with(:background, [:arg1, 'arg2']) { color }
-      end
-
-      it_behaves_like "wrapper method"
-
-      it 'wraps with color codes' do
-        subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [1, 2])
-      end
-    end
-
-    describe '#reset' do
-      subject { wrapper.reset }
+    describe '#wrap' do
+      subject { wrapper.wrap('hello') }
 
-      it_behaves_like "wrapper method"
+      context "when wrapping is enabled" do
+        let(:enabled) { true }
 
-      it 'wraps with 0 code' do
-        subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [0])
+        it { should eq('hello') }
+        it { should be_kind_of(Rainbow::Presenter) }
       end
-    end
-
-    describe '#bright' do
-      subject { wrapper.bright }
-
-      it_behaves_like "wrapper method"
-
-      it 'wraps with 1 code' do
-        subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [1])
-      end
-    end
-
-    describe '#italic' do
-      subject { wrapper.italic }
-
-      it_behaves_like "wrapper method"
-
-      it 'wraps with 3 code' do
-        subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [3])
-      end
-    end
-
-    describe '#underline' do
-      subject { wrapper.underline }
-
-      it_behaves_like "wrapper method"
-
-      it 'wraps with 4 code' do
-        subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [4])
-      end
-    end
-
-    describe '#blink' do
-      subject { wrapper.blink }
-
-      it_behaves_like "wrapper method"
-
-      it 'wraps with 5 code' do
-        subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [5])
-      end
-    end
-
-    describe '#inverse' do
-      subject { wrapper.inverse }
-
-      it_behaves_like "wrapper method"
-
-      it 'wraps with 7 code' do
-        subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [7])
-      end
-    end
-
-    describe '#hide' do
-      subject { wrapper.hide }
 
-      it_behaves_like "wrapper method"
+      context "when wrapping is disabled" do
+        let(:enabled) { false }
 
-      it 'wraps with 8 code' do
-        subject
-        expect(StringUtils).to have_received(:wrap_with_sgr).with('hello', [8])
+        it { should eq('hello') }
+        it { should be_kind_of(Rainbow::NullPresenter) }
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rainbow
 version: !ruby/object:Gem::Version
-  version: 1.99.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Marcin Kulik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,8 +60,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .travis.yml
-- Changelog
+- Changelog.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -69,18 +70,24 @@ files:
 - Rakefile
 - lib/rainbow.rb
 - lib/rainbow/color.rb
-- lib/rainbow/core.rb
+- lib/rainbow/ext/string.rb
+- lib/rainbow/global.rb
 - lib/rainbow/legacy.rb
-- lib/rainbow/string.rb
+- lib/rainbow/null_presenter.rb
+- lib/rainbow/presenter.rb
 - lib/rainbow/string_utils.rb
 - lib/rainbow/version.rb
 - lib/rainbow/wrapper.rb
 - rainbow.gemspec
+- spec/integration/instance_spec.rb
 - spec/integration/rainbow_spec.rb
 - spec/integration/string_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
 - spec/unit/wrapper_spec.rb
 homepage: https://github.com/sickill/rainbow
@@ -95,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -108,10 +115,14 @@ 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/string_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
 - spec/unit/wrapper_spec.rb

data/Changelog

@@ -1,3 +0,0 @@
-1.0.1
-- added Windows support
-

data/lib/rainbow/core.rb

@@ -1,16 +0,0 @@
-module Rainbow
-
-  class << self; attr_accessor :enabled; end
-  @enabled = true
-
-  TERM_EFFECTS = {
-    :reset     => 0,
-    :bright    => 1,
-    :italic    => 3,
-    :underline => 4,
-    :blink     => 5,
-    :inverse   => 7,
-    :hide      => 8,
-  }
-
-end

data/lib/rainbow/string.rb

@@ -1,50 +0,0 @@
-require 'rainbow'
-
-module Rainbow
-  module String
-    module InstanceMethods
-
-      def foreground(*color)
-        Rainbow(self).foreground(*color)
-      end
-
-      alias_method :color, :foreground
-      alias_method :colour, :foreground
-
-      def background(*color)
-        Rainbow(self).background(*color)
-      end
-
-      def reset
-        Rainbow(self).reset
-      end
-
-      def bright
-        Rainbow(self).bright
-      end
-
-      def italic
-        Rainbow(self).italic
-      end
-
-      def underline
-        Rainbow(self).underline
-      end
-
-      def blink
-        Rainbow(self).blink
-      end
-
-      def inverse
-        Rainbow(self).inverse
-      end
-
-      def hide
-        Rainbow(self).hide
-      end
-
-    end
-  end
-end
-
-::String.send(:include, Rainbow::String::InstanceMethods)