colored2 3.1.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 924031901113f03f0694ea75208745920d7f38ab
-  data.tar.gz: 835ee416fa88d5d903546a021da1e0792d6529fc
+SHA256:
+  metadata.gz: 931fcb1dc0aebdc4cee8c0b71849879b22878076547172885d4a15fc6bd19e80
+  data.tar.gz: 07263f510c64006915085ba83c1c4ca84e16208c93ebe9696a4802eb6f4afb59
 SHA512:
-  metadata.gz: '008631053e811a6694c199ddc6c0c5b2636c7c863a5a794835766effb93cb9afea9af5a51802f8b9943a206138b9555002b33e68eeb148b9f05ded8fc6fe2f5f'
-  data.tar.gz: a3d40c57634d3753a2dcd9073f6841ef2f40d1b21b1a141a34ade7eff762a934e878f2e8b91051c0f072e8b392cff5abd77456b6415d2d0cb4f28fbcb4c473f8
+  metadata.gz: 7434349bb14787804acb8cf8692e522f0accf8d751ef45672bce10171ad4bce61318df04676af58dbf64a5fbe399e89f1b741e7ba6b0c5c8b608db7a42085874
+  data.tar.gz: 3a8a6bf7fe16badb197728f645c8e16c5c48f7f933e3c2e5d68a2b1dbdc24c6706638a8d39ae1fc38dec68a4f1348c2db673c6d21a80b5f314355b95a6601ff5

data/README.md

@@ -1,18 +1,21 @@
+
+[![RSpecs](https://github.com/kigster/colored2/actions/workflows/ruby-ci.yml/badge.svg)](https://github.com/kigster/colored2/actions/workflows/ruby-ci.yml)
+[![Rubocop](https://github.com/kigster/colored2/actions/workflows/rubocop-ci.yml/badge.svg)](https://github.com/kigster/colored2/actions/workflows/rubocop-ci.yml)
+
 [![Gem Version](https://badge.fury.io/rb/colored2.svg)](https://badge.fury.io/rb/colored2)
-[![Downloads](http://ruby-gem-downloads-badge.herokuapp.com/colored2?type=total)](https://rubygems.org/gems/colored2)
 [![Gitter](https://img.shields.io/gitter/room/gitterHQ/gitter.svg)](https://gitter.im/colored2)
 
-[![Build Status](https://travis-ci.org/kigster/colored2.svg?branch=master)](https://travis-ci.org/kigster/colored2)
-[![Test Coverage](https://codeclimate.com/github/kigster/colored2/badges/coverage.svg)](https://codeclimate.com/github/kigster/colored2/coverage)
-[![Code Climate](https://codeclimate.com/github/kigster/colored2/badges/gpa.svg)](https://codeclimate.com/github/kigster/colored2)
-[![Issue Count](https://codeclimate.com/github/kigster/colored2/badges/issue_count.svg)](https://codeclimate.com/github/kigster/colored2)
-
 ## Colored2
 
 This is an actively maintained fork of Chris (defunkt) Wanstrath's gem [colored](https://github.com/defunkt/colored), which appears to be no longer supported.
 
 This fork comes with a slightly spruced up syntax, some additional features, and a test suite written in [RSpec](http://rspec.info/).
 
+## Please Consider Donating
+
+<a href="https://liberapay.com/kigster/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg" height="30"></a>
+<a href="https://liberapay.com/kigster/donate"><img alt="Donate using Liberapay" src="https://img.shields.io/liberapay/goal/kigster.svg" height="30"></a>
+
 ## Usage
 
 In addition to the simple syntax of the original gem, which affected only the string to the left of the method call, the new "bang" syntax affects a string to the right. If the block or a method argument is provided, the contents is wrapped in the color, and the color is then reset back. 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'bundler'
 require 'bundler/gem_tasks'
 require 'rake/clean'
@@ -7,7 +9,9 @@ CLEAN.include %w(pkg coverage *.gem)
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
+rescue LoadError => e
+  warn "Error loading task: #{e.message}"
+  exit 1
 end
 
-task :default => [:spec]
+task default: [:spec]

data/lib/colored2/ascii_decorator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'colored2/codes'
 require 'forwardable'
 
@@ -5,15 +7,19 @@ module Colored2
   def self.enable!
     Colored2::AsciiDecorator.enable!
   end
+
   def self.disable!
     Colored2::AsciiDecorator.disable!
   end
+
   def self.background_next!
     Colored2::AsciiDecorator.background_next!
   end
+
   def self.foreground_next!
     Colored2::AsciiDecorator.foreground_next!
   end
+
   def self.background_next?
     Colored2::AsciiDecorator.background_next?
   end
@@ -23,23 +29,29 @@ module Colored2
     @__colors_disabled = false
     class << self
       attr_accessor :__background_next, :__colors_disabled
+
       def enable!
         self.__colors_disabled = false
       end
+
       def enabled?
-        !self.__colors_disabled
+        !__colors_disabled
       end
+
       def disable!
         self.__colors_disabled = true
       end
+
       def background_next!
         self.__background_next = true
       end
+
       def foreground_next!
         self.__background_next = false
       end
+
       def background_next?
-        self.__background_next
+        __background_next
       end
     end
 
@@ -56,7 +68,8 @@ module Colored2
     # options[:start] = :color
     # options[:end]   = :color | :no_color
     def decorate(options = {})
-      return string if !self.class.enabled? || string.length == 0
+      return string if !self.class.enabled? || string.empty?
+
       escape_sequence = [
         Colored2::TextColor.new(options[:foreground]),
         Colored2::BackgroundColor.new(options[:background]),
@@ -74,7 +87,7 @@ module Colored2
     end
 
     def un_decorate
-      string.gsub(%r{\e\[\d+(;\d+)*m}, '')
+      string.gsub(/\e\[\d+(;\d+)*m/, '')
     end
 
     private

data/lib/colored2/codes.rb

@@ -1,34 +1,37 @@
-module Colored2
+# frozen_string_literal: false
 
-  COLORS  = {
-    black:     30,
-    red:       31,
-    green:     32,
-    yellow:    33,
-    blue:      34,
-    magenta:   35,
-    cyan:      36,
-    white:     37
-  }
+module Colored2
+  COLORS = {
+    black: 30,
+    red: 31,
+    green: 32,
+    yellow: 33,
+    blue: 34,
+    magenta: 35,
+    cyan: 36,
+    white: 37
+  }.freeze
 
   EFFECTS = {
-    no_color:   0,
-    bold:       1,
-    dark:       2,
-    italic:     3,
+    no_color: 0,
+    bold: 1,
+    dark: 2,
+    italic: 3,
     underlined: 4,
-    reversed:   7,
-    plain:      21, # non-bold
-    normal:     22
-  }
+    reversed: 7,
+    plain: 21, # non-bold
+    normal: 22
+  }.freeze
 
   class Code
     attr_accessor :name, :escape
+
     def initialize(name)
       @name = name
       return if name.nil?
+
       @escape = codes[name.to_sym]
-      raise ArgumentError.new("No color or effect named #{name} exists for #{self.class}.") if @escape.nil?
+      raise ArgumentError, "No color or effect named #{name} exists for #{self.class}." if @escape.nil?
     end
 
     def value(shift = nil)
@@ -59,5 +62,4 @@ module Colored2
       super 10
     end
   end
-
 end

data/lib/colored2/numbers.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: false
+
 require 'colored2' unless defined?(Colored2) && Colored2.respond_to?(:decorate)
 
 module Colored2
   def self.integer_class
-    major, minor = RUBY_VERSION.split(/\./).map(&:to_i)
-    major >= 2 && minor >= 4 ? Integer : Kernel.const_get(:Fixnum)
+    major, minor = RUBY_VERSION.split(".").map(&:to_i)
+    major >= 2 && minor >= 4 ? Integer : Numeric
   end
 end
 

data/lib/colored2/object.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: false
+
 require 'colored2' unless defined?(Colored2) && Colored2.respond_to?(:decorate)
 Colored2.decorate(Object)

data/lib/colored2/strings.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: false
+
 require 'colored2' unless defined?(Colored2) && Colored2.respond_to?(:decorate)
 Colored2.decorate(String)

data/lib/colored2/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Colored2
-  VERSION = '3.1.2'
+  VERSION = '4.0.0'
 end

data/lib/colored2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: false
+
 require 'colored2/codes'
 require 'colored2/ascii_decorator'
 
@@ -8,7 +10,6 @@ module Colored2
 
   def self.included(from_class)
     from_class.class_eval do
-
       def surround_with_color(color: nil, effect: nil, color_self: nil, string: nil, &block)
         color_type = if Colored2.background_next? && effect.nil?
                        Colored2.foreground_next!
@@ -17,23 +18,23 @@ module Colored2
                        :foreground
                      end
 
-       opts = {}
-       opts.merge!(color_type => color) if color
-       opts.merge!(effect: effect) if effect
+        opts = {}
+        opts.merge!(color_type => color) if color
+        opts.merge!(effect:) if effect
 
-        if color_self then
+        if color_self
           opts.merge!( beginning: :on, end: :off)
           colored = Colored2::AsciiDecorator.new(self).decorate(opts)
           if string || block
-            arg = "#{string}#{block.call if block}"
-            colored << Colored2::AsciiDecorator.new(arg).decorate(opts) if arg.length > 0
+            arg = "#{string}#{block&.call}"
+            colored << Colored2::AsciiDecorator.new(arg).decorate(opts) if !arg.empty?
           end
         else
           opts.merge!( end: :on )
           colored = Colored2::AsciiDecorator.new(self).decorate(opts)
           if string || block
-            arg = "#{string}#{block.call if block}"
-            colored << Colored2::AsciiDecorator.new(arg).decorate(opts.merge(end: :off)) if arg.length > 0
+            arg = "#{string}#{block&.call}"
+            colored << Colored2::AsciiDecorator.new(arg).decorate(opts.merge(end: :off)) if !arg.empty?
           end
         end
         colored
@@ -46,24 +47,25 @@ module Colored2
     end
 
     from_class.instance_eval do
-      COLORS.keys.each do |color|
+      COLORS.each_key do |color|
         define_method(color) do |string = nil, &block|
-          surround_with_color(color: color, color_self: true, string: string, &block)
+          surround_with_color(color:, color_self: true, string:, &block)
         end
 
         define_method("#{color}!".to_sym) do |string = nil, &block|
-          surround_with_color(color: color, color_self: false, string: string, &block)
+          surround_with_color(color:, color_self: false, string:, &block)
         end
       end
 
-      EFFECTS.keys.each do |effect|
+      EFFECTS.each_key do |effect|
         next if effect == 'no_color'
+
         define_method(effect) do |string = nil, &block|
-          surround_with_color(effect: effect, color_self: true, string: string, &block)
+          surround_with_color(effect:, color_self: true, string:, &block)
         end
 
         define_method("#{effect}!".to_sym) do |string = nil, &block|
-          surround_with_color(effect: effect, color_self: false, string: string, &block)
+          surround_with_color(effect:, color_self: false, string:, &block)
         end
       end
 
@@ -72,6 +74,7 @@ module Colored2
         if tmp == self
           return "\e[2K" << self
         end
+
         tmp
       end
 

metadata

@@ -1,58 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: colored2
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Chris Wanstrath
 - Konstantin Gredeskoul
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  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'
+date: 2023-08-24 00:00:00.000000000 Z
+dependencies: []
 description: |+
   This is a heavily modified fork of http://github.com/defunkt/colored gem, with many
   sensible pull requests combined. Since the authors of the original gem no longer support it,
@@ -89,16 +47,12 @@ files:
 - lib/colored2/object.rb
 - lib/colored2/strings.rb
 - lib/colored2/version.rb
-- spec/colored2/numbers_spec.rb
-- spec/colored2/object_spec.rb
-- spec/colored2/strings_spec.rb
-- spec/colored2_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/kigster/colored2
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,21 +60,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.4.13
+signing_key:
 specification_version: 4
 summary: Add even more color to your life.
-test_files:
-- spec/colored2/numbers_spec.rb
-- spec/colored2/object_spec.rb
-- spec/colored2/strings_spec.rb
-- spec/colored2_spec.rb
-- spec/spec_helper.rb
+test_files: []
+...

data/spec/colored2/numbers_spec.rb

@@ -1,26 +0,0 @@
-require File.expand_path('spec/spec_helper')
-require 'colored2/numbers'
-require 'colored2/strings'
-
-RSpec.describe Colored2.integer_class do
-  describe 'with foreground and background colors' do
-    it 'should work with one color' do
-      expect(32.red).to eql('32'.red)
-    end
-    it 'should insert escape sequences' do
-      expect(32.red).to eql("\e[31m32\e[0m")
-    end
-  end
-end
-
-RSpec.describe Float do
-  describe 'with foreground and background colors' do
-    it 'should add two colors chained' do
-      expect((32.5).blue.on.red).to eql('32.5'.blue.on.red)
-    end
-
-    it 'should insert escape sequences' do
-      expect((32.5).blue.on.red).to eql("\e[41m\e[34m32.5\e[0m")
-    end
-  end
-end

data/spec/colored2/object_spec.rb

@@ -1,24 +0,0 @@
-require File.expand_path('spec/spec_helper')
-require 'colored2/object'
-
-subject1 = red('hello')
-subject2 = red('blue').on.blue
-subject3 = on.yellow('on yellow')
-
-RSpec.describe Object do
-
-  describe 'with foreground and background colors' do
-    it 'should work with one color' do
-      expect(subject1).to eql('hello'.red)
-    end
-
-    it 'should work with color on color' do
-      expect(subject2).to eql('blue'.red.on.blue)
-    end
-
-    it 'should add background color using on_<color>' do
-      expect(subject3).to eql('on yellow'.on.yellow)
-    end
-
-  end
-end

data/spec/colored2/strings_spec.rb

@@ -1,77 +0,0 @@
-require File.expand_path('spec/spec_helper')
-require 'colored2/strings'
-
-RSpec.describe String do
-  before do
-    Colored2.decorate(String)
-  end
-
-  describe 'with foreground and background colors' do
-    it 'should work with one color' do
-      expect('red'.red).to eql("\e[31mred\e[0m")
-    end
-
-    it 'should add two colors chained' do
-      expect('blue'.red.blue).to eql("\e[34m\e[31mblue\e[0m")
-    end
-
-    it 'should add background color using on_<color>' do
-      expect('on yellow'.on.yellow).to eql("\e[43mon yellow\e[0m")
-    end
-
-    it 'should work with <color>_on_<color> syntax' do
-      expect('red on blue'.red.on.blue).to eql("\e[44m\e[31mred on blue\e[0m")
-    end
-  end
-
-  describe 'with effects' do
-    it 'should add a bold modifier' do
-      expect('way bold'.bold).to eql("\e[1mway bold\e[0m")
-    end
-
-    it 'should let modifiers stack' do
-      expect('underlinedd bold'.bold.underlined).to eql("\e[4m\e[1munderlinedd bold\e[0m")
-    end
-
-    it 'should let modifiers stack with colors' do
-      expect('cyan underlinedd bold'.bold.underlined.cyan).to eql("\e[36m\e[4m\e[1mcyan underlinedd bold\e[0m")
-    end
-  end
-
-  describe 'new block syntax' do
-    it 'should defined block syntax nested colors' do
-      expect('No Color, then'.blue!('blue inside')).to eql('No Color, then' + 'blue inside'.blue)
-    end
-
-    it 'should defined block syntax nested colors two levels deep' do
-      expect('regular here'.blue! + 'blue here'.no_color!).to eql('regular here' << 'blue here'.blue)
-    end
-
-    it 'should defined block syntax nested colors two levels deep' do
-      expect('regular here'.blue! { 'something else'.red!('red riding hood') }).to eql('regular here'.blue! << 'something else'.red! << 'red riding hood'.no_color!)
-    end
-
-    it 'should defined block syntax nested colors two levels deep' do
-      expectation = 'this is regular, but '.red! do
-        'this is red '.yellow! do
-          ' and yellow'.no_color!
-        end
-      end
-      expect(expectation).to eql('this is regular, but '.red! << 'this is red '.yellow! << ' and yellow'.no_color!)
-    end
-  end
-
-  describe 'end of line' do
-    it 'should work with eol' do
-      expect('nothing to see here really.'.to_eol).to eql("\e[2Knothing to see here really.")
-    end
-
-    it 'should work with eol_with_with_two_colors' do
-      expect('blue'.red.blue.to_eol).to eql("\e[34m\e[31m\e[2Kblue\e[0m")
-    end
-
-    it 'should work with eol_with_modifiers_stack_with_colors' do
-      expect('cyan underlinedd bold'.bold.underlined.cyan.to_eol).to eql("\e[36m\e[4m\e[1m\e[2Kcyan underlinedd bold\e[0m")
-    end
-  end
-end

data/spec/colored2_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-require 'colored2/strings'
-
-RSpec.describe Colored2 do
-  describe 'global enable and disable' do
-    before do
-      Colored2.disable!
-    end
-    after do
-      Colored2.enable!
-    end
-    let(:sample) { 'sample string' }
-
-    describe 'colors' do
-      subject { sample.red.on.blue }
-      it { should eql(sample) }
-    end
-    describe 'effects' do
-      subject { sample.bold.on.red }
-      it { should eql(sample) }
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,5 +0,0 @@
-require 'simplecov'
-SimpleCov.start
-
-require 'rspec/core'
-