barf 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b69cda1ca1cc3d0f08ffeb1d9ab4062a13153b0e6cc5cce7c4454eb50dcee4b7
-  data.tar.gz: 1d42daddf65bfd08c96d92cda98942e5b0d06125486bd59e00d138efc19d9205
+  metadata.gz: a54ef7a9bc1c444deb287dcb2e251c5b3d1f6b2faabb98193e213381e7260832
+  data.tar.gz: 4ddbc68c83504e5e024cb3099924bf91c1f019338d5e3cb93a865b621b1abe0b
 SHA512:
-  metadata.gz: e0f8480fdf41a9b5656ec8c813e8d38c8dc1aeb54704e19a9ce08be72300a9c53c83510ca48d20997213a37e6ee11efe2cb2fc450548852b0df72ab15ad86dc5
-  data.tar.gz: d7b2b6c359a2c0dd26f539c7f9bce459565c8113c5d361206b185dadfec1c5fe6bb41bd34ad116335174e760d0dc987bb893a5a9ddcc3f06df78f0578c8eba19
+  metadata.gz: 5af52fd5dc2498c4828ec123ab6a4d8c578788ab4e09485dbc9405fd47c7b0b7ce29aaaad5189a35dd6031ea74e20b91abb89f84b6305b383b4f12b2163168dd
+  data.tar.gz: 778b824ebc858733f9dadfbb433236fd47c62800dd1e0af99b13a0f20c33d90228ddc1981bdd238aefa5d30305a875f78422b0223816551dbdf4f02c64bf7f80

data/README.md

@@ -1,3 +1,5 @@
+[![security](https://hakiri.io/github/duffyjp/barf/master.svg)](https://hakiri.io/github/duffyjp/barf/master)
+
 # Barf
 
 Displays images in your terminal.  There are many existing utilities to 
@@ -17,7 +19,7 @@ accomplish this, but they're all way too complex.
 ## Details
 * Can display anything supported by imagemagick including web resources.
 * Applies the 256 color extended Ansi color palette with dithering.
-* Multithreading is used to speed up the `tco` color operations.
+* Multithreading is used to speed things up.
 
 ```bash
 $ barf https://avatars2.githubusercontent.com/u/382216

data/barf.gemspec

@@ -26,10 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mini_magick", '>= 3.6.0'
   spec.add_dependency "parallel"
 
-  # Easier terminal color setting
-  spec.add_dependency "tco"
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/lib/barf/rgb_to_ansi.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+##
+# A helper module to detect terminal capabilities.
+module Terminal
+  # Checks if the terminal likely supports 24-bit "true color" by checking
+  # the standard COLORTERM environment variable.  Works in iTerm, MacOS Terminal does not as of 2025.
+  def self.truecolor?
+    ENV['COLORTERM'] =~ /^(truecolor|24bit)$/
+  end
+end
+
+##
+# Converts an RGB color to the nearest matching 8-bit ANSI terminal color code.
+# This is now only used as a fallback for terminals without true color support.
+class AnsiColorConverter
+  # Pre-calculated lookup table of the 256 ANSI colors and their RGB values.
+  ANSI_PALETTE = begin
+                   cube_levels = [0, 95, 135, 175, 215, 255]
+                   palette = [
+                     [0, 0, 0], [128, 0, 0], [0, 128, 0], [128, 128, 0],
+                     [0, 0, 128], [128, 0, 128], [0, 128, 128], [192, 192, 192],
+                     [128, 128, 128], [255, 0, 0], [0, 255, 0], [255, 255, 0],
+                     [0, 0, 255], [255, 0, 255], [0, 255, 255], [255, 255, 255]
+                   ]
+                   (0..5).each { |r| (0..5).each { |g| (0..5).each { |b| palette << [cube_levels[r], cube_levels[g], cube_levels[b]] } } }
+                   (0..23).each { |step| level = 8 + (step * 10); palette << [level, level, level] }
+                   palette.freeze
+                 end.freeze
+
+  # Convenience class method for direct conversion.
+  def self.convert(r, g, b)
+    min_dist_sq = Float::INFINITY
+    alternate_code = -1
+    nearest_code = -1
+    ANSI_PALETTE.each_with_index do |(ar, ag, ab), code|
+      dist_sq = (r - ar)**2 + (g - ag)**2 + (b - ab)**2
+      alternate_code ||= code
+      nearest_code   ||= code
+      next unless dist_sq < min_dist_sq
+      alternate_code = nearest_code
+      min_dist_sq = dist_sq
+      nearest_code = code
+    end
+    # Alternate color is chosen randomly to simulate dithering.
+    rand(2) == 0 ? nearest_code : alternate_code
+  end
+end
+
+##
+# Extend Ruby's String class to add terminal color methods.
+class String
+  # Matches an ANSI-wrapped string to allow for code chaining.
+  ANSI_COLOR_REGEX = /\A(\e\[[\d;]*m)(.*?)(\e\[0m)\z/m
+
+  # Sets the foreground color of the string using an RGB array.
+  # @param rgb_array [Array<Integer>] An array of [r, g, b] values (0-255).
+  # @return [String] The colorized string.
+  def fg(rgb_array)
+    apply_color('38', rgb_array)
+  end
+
+  # Sets the background color of the string using an RGB array.
+  # @param rgb_array [Array<Integer>] An array of [r, g, b] values (0-255).
+  # @return [String] The colorized string.
+  def bg(rgb_array)
+    apply_color('48', rgb_array)
+  end
+
+  private
+
+  # Helper method to apply an ANSI color code to the string.
+  # It intelligently handles chained calls by combining ANSI codes.
+  def apply_color(type_code, rgb_array)
+    color_segment =
+      if Terminal.truecolor?
+        # Use 24-bit "true color" for perfect quality.
+        "#{type_code};2;#{rgb_array.join(';')}"
+      else
+        # Fallback to the 256-color palette for older terminals.
+    ansi_code = AnsiColorConverter.convert(*rgb_array)
+        "#{type_code};5;#{ansi_code}"
+      end
+
+    if (match = match(ANSI_COLOR_REGEX))
+      # String is already colorized, so we combine new and existing codes.
+      start_seq, content, end_seq = match.captures
+      existing_codes = start_seq[2..-2]
+      updated_codes = existing_codes.empty? ? color_segment : "#{existing_codes};#{color_segment}"
+      "\e[#{updated_codes}m#{content}#{end_seq}"
+    else
+      # String is not colorized, so we wrap it in new codes.
+      "\e[#{color_segment}m#{self}\e[0m"
+    end
+  end
+end

data/lib/barf/version.rb

@@ -1,3 +1,8 @@
 module Barf
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end
+
+
+
+# VERSION HISTORY
+# 1.1.0 - Removed tco dependency which was abandoned.  Replaced with mostly GEMINI written "rgb_to_ansi" file.

data/lib/barf.rb

@@ -1,7 +1,7 @@
 require_relative "./barf/version"
 
 require "mini_magick"
-require "tco"
+require_relative "./barf/rgb_to_ansi"
 require "parallel"
 
 module Barf
@@ -18,7 +18,6 @@ module Barf
       tmp.alpha 'remove'
       tmp.flatten
       tmp.resize "#{terminal_width}x#{new_height}!"
-      tmp.dither 'FloydSteinberg'
       tmp.remap __dir__ + '/palette.png'
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barf
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Jacob Duffy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2025-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -39,62 +39,48 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tco
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   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.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: 
+        version: '0'
+description:
 email:
 - duffy.jp@gmail.com
 executables:
@@ -115,6 +101,7 @@ files:
 - bin/setup
 - exe/barf
 - lib/barf.rb
+- lib/barf/rgb_to_ansi.rb
 - lib/barf/version.rb
 - lib/palette.png
 - lib/palette.txt
@@ -122,7 +109,7 @@ homepage: https://github.com/duffyjp/barf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Output images in terminal
 test_files: []