colsole 0.8.2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277f45ee7c12e0c6090bd41752a275feef3357c38a1d3cbca522f9089ce68d49
-  data.tar.gz: f21a9866ce164222627f314c4ffe0c16046d705f5d544783b1d5f3598a54cf18
+  metadata.gz: c0eb4d2ccfbad964021e0ca4fbc960c9dad7b94656ad9219df64b466923f20f8
+  data.tar.gz: 3f7f6cfeaf1ae7a1a3d32e0d079acbd538406947587e33f7af28e8e9bb0fda27
 SHA512:
-  metadata.gz: c74ab05a5fea57685109cbcf2bdc033e0b0ba7f191a5ea491e4d31a1bcee335718d7e74481a031b19e99203e14dd34646542985199a001d15c2dbfc0dd52a8da
-  data.tar.gz: af3bcd3c64f66cc5dd5a89c96f4e92946160082ea08e017e68c3eda311525c6de5688759bdfe858d084231dae835d4c091ed9ca6af225f640ef2803a61b0e4d9
+  metadata.gz: d8da75c93b2ec90c5371026a0ab5b592150806e460197b7a61fb2e65f89027238343d55a3bbe1a4be5daff3564f895829cf8377dbbd7edb036bba6f82b3dc267
+  data.tar.gz: 8e209b414153ccb313bf10f375dcc95fde7db4d53e8adc57af1f79b1c03a12b415e82e626cb8d37f570b0c731ee372f6a536d14fe0195af3afde248c97ce1222

data/README.md

@@ -1,19 +1,15 @@
 # Colsole
 
-[![Gem Version](https://badge.fury.io/rb/colsole.svg)](https://badge.fury.io/rb/colsole)
-[![Build Status](https://github.com/DannyBen/colsole/workflows/Test/badge.svg)](https://github.com/DannyBen/colsole/actions?query=workflow%3ATest)
-[![Maintainability](https://api.codeclimate.com/v1/badges/0556015f7cd2080531a1/maintainability)](https://codeclimate.com/github/DannyBen/colsole/maintainability)
-
----
+![repocard](https://repocard.dannyben.com/svg/colsole.svg)
 
 Utility functions for colorful console applications.
 
 > **Upgrade Note**
 > 
-> This README is for the latest version of colsole (0.8.x), which is compatible
-> with older versions. Version 1.x will NOT be compatible.
+> - Version 1.0.x is not compatible with older versions
+> - Version 0.8.x is compatible with both the old syntax and new syntax
 > 
-> See [Uprading](#upgrading) below.
+> See [Upgrading](#upgrading) below.
 
 ## Install
 

data/lib/colsole/version.rb

@@ -1,3 +1,3 @@
 module Colsole
-  VERSION = '0.8.2'
+  VERSION = '1.0.1'
 end

data/lib/colsole.rb

@@ -1,5 +1,4 @@
 require 'io/console'
-require 'colsole/compat'
 
 # Utility functions for colorful console applications.
 module Colsole
@@ -105,24 +104,20 @@ module_function
 
   # Convert color markers to ansi colors.
   def colorize(string)
-    # compatibility later
-    compat_string = old_colorize string
-
-    process_color_markers compat_string do |color, styles, text|
+    process_color_markers string do |color, styles, text|
       "#{styles}#{color}#{text}#{ANSI_STYLES['z']}"
     end
   end
 
   # Remove color markers.
   def strip_colors(string)
-    # compatibility layer
-    compat_string = old_strip_colors string
-
-    process_color_markers(compat_string) { |_color, _styles, text| text }
+    process_color_markers(string) { |_color, _styles, text| text }
   end
 
   def process_color_markers(string)
-    string.gsub(/([rgybmcn])([ubi]{0,3})`([^`]*)`/) do
+    color_codes = Regexp.union(ANSI_COLORS.keys)
+
+    string.gsub(/(#{color_codes})([ubi]{0,3})`([^`]*)`/) do
       color = ANSI_COLORS[$1]
       styles = $2.chars.map { |a| ANSI_STYLES[a] }.join
       text = $3

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: colsole
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 1.0.1
 platform: ruby
 authors:
 - Danny Ben Shitrit
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Utility functions for making colorful console applications
 email: db@dannyben.com
@@ -18,14 +17,15 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/colsole.rb
-- lib/colsole/compat.rb
 - lib/colsole/version.rb
 homepage: https://github.com/DannyBen/colsole
 licenses:
 - MIT
 metadata:
+  bug_tracker_uri: https://github.com/DannyBen/colsole/issues
+  changelog_uri: https://github.com/DannyBen/colsole/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/DannyBen/colsole
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -33,15 +33,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Colorful Console Applications
 test_files: []

data/lib/colsole/compat.rb

@@ -1,61 +0,0 @@
-# This file contains methods that are called by the main Colsole module
-# for compatibility with older versions of colsole.
-# Do not use these methods directly.
-module Colsole
-module_function
-
-  def detect_terminal_size(*args)
-    terminal_size(*args)
-  end
-
-  def old_colorize(text)
-    reset = colors['txtrst']
-    reset_called_last = true
-
-    out = text.gsub(/!([a-z]{6})!/) do
-      reset_called_last = $1 == 'txtrst'
-      colors[$1]
-    end
-
-    reset_called_last or out = "#{out}#{reset}"
-    out
-  end
-
-  def old_strip_colors(text)
-    text.gsub(/!([a-z]{6})!/, '')
-  end
-
-  def resay(text)
-    say text, replace: true
-  end
-
-  def say_status(status, message = nil, color = nil)
-    color ||= (message ? :txtgrn : :txtblu)
-    say "!#{color}!#{status.to_s.rjust 12} !txtrst! #{message}".strip
-  end
-
-  def colors
-    @colors ||= begin
-      esc = 27.chr
-      pattern = "#{esc}[%{decor};%{fg}m"
-
-      decors = { txt: 0, bld: 1, und: 4, rev: 7 }
-      color_codes = { blk: 0, red: 1, grn: 2, ylw: 3, blu: 4, pur: 5, cyn: 6, wht: 7 }
-      colors = {}
-
-      decors.each do |dk, dv|
-        color_codes.each do |ck, cv|
-          key = "#{dk}#{ck}"
-          val = pattern % { decor: dv, fg: "3#{cv}" }
-          colors[key] = val
-        end
-      end
-
-      colors['txtbld'] = "#{esc}[1m"
-      colors['txtund'] = "#{esc}[4m"
-      colors['txtrev'] = "#{esc}[7m"
-      colors['txtrst'] = "#{esc}[0m"
-      colors
-    end
-  end
-end