colorato 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a04ec628455d986e1a98d0046ee1b63b1f046c1bc6d7018ef5cf2524998e18e
-  data.tar.gz: 947d85416c2d2f2a2d28645f97858788886a58b5c4088ac4b4bb55917ca781aa
+  metadata.gz: b28fd8267ee3efc81eeff84c4d0cb31904898b0c97f52277966e720f2e739ffd
+  data.tar.gz: 2d096f6c8970cebea52a1e30fba7bd4fab9d5d85741c1968caed17cc0941d060
 SHA512:
-  metadata.gz: 261f7abe0f7bebe479efae920db1ccc976c547ea2e312e1406b7efa637d0273e1eb77483b6945e63b6c3204c61389c40ef7172db1f4ca6e1bc0d64be8889add1
-  data.tar.gz: 968df424e0014f91f5cbe5fce37b51576790ecfd04453e6a88d168e2b096b8de9cbd617b765eef0cf76c0c96c5adf8c765794cad3364daa7c9db4f9b20f85764
+  metadata.gz: '08c68f4329d2d36927ccfe3d02805ef8f21bde89f0ddb70a71b935454f8b2fcbe6557098d3ded29b2e38664a9307849f5fd9978fe2227867fafa2792ff1c6d75'
+  data.tar.gz: 8cc6529dd0968df22087e816cc6a78b8b6ca4a6a109455b2401e7bf85273072b820b6979af0497aabb8c927b4298dd757a2bc2d4f3f5bb2f3c5f71535bbf210e

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # colorato
 
 
+## 1.1.0 released 2025-01-16
+
+* colorato.blue { 'blo' + 'ck' }
+* Show the colours when `ruby lib/colorato.rb`
+
+
 ## 1.0.0 released 2023-01-03
 
 * Introduce `make colo.rb`

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2015-2023, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2015-2025, John Mettraux, jmettraux+flor@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -14,8 +14,10 @@ NC = Colorato.nocolours
 
 C.blue # => "\e[34m"
 C.blue('car') # => "\e[34mcar\e[0;0m"
+C.blue { 'car' } # => "\e[34mcar\e[0;0m"
 
 NC.blue('car') # => "car"
+NC.blue { 'car' } # => "car"
 ```
 
 ### .decolour(string)

data/colorato.gemspec

@@ -26,6 +26,7 @@ terminal colors extracted from flor
     'homepage_uri' =>  s.homepage,
     'source_code_uri' => s.homepage,
     #'wiki_uri' => s.homepage + '/wiki',
+    'rubygems_mfa_required' => 'true',
   }
 
   #s.files = `git ls-files`.split("\n")
@@ -40,7 +41,8 @@ terminal colors extracted from flor
   #s.add_runtime_dependency 'raabro', '~> 1.4'
   #s.add_runtime_dependency 'et-orbi', '~> 1', '>= 1.2.7'
 
-  s.add_development_dependency 'rspec', '~> 3.12'
+  #s.add_development_dependency 'rspec', '~> 3.12'
+  s.add_development_dependency 'probatio', '~> 1'
 
   s.require_path = 'lib'
 end

data/lib/colorato/core.rb

@@ -12,6 +12,7 @@ module Colorato
     black 30 red 31 green 32 yellow 33 blue 34 magenta 35 cyan 36
     light_gray 37 dark_gray 90 light_red 91 light_green 92 light_yellow 93
     light_blue 94 light_magenta 95 light_cyan 96 white 97
+
     bg_default 49 bg_black 40 bg_red 41 bg_green 42 bg_yellow 43 bg_blue 44
     bg_magenta 45 bg_cyan 46 bg_light_gray 47 bg_dark_gray 100
     bg_light_red 101 bg_light_green 102 bg_light_yellow 103
@@ -35,16 +36,14 @@ module Colorato
     if v.match(/\A\d/) # Ruby 2.3 doesn't have String#match?
 
       ::Colorato::Colours.class_eval(%{
-        def #{k}(s=nil)
-          s ?
-            "\e[#{v}m\#{s}\e[0;0m" :
+        def #{k}(s=nil, &block)
+          (x = (block && block.call) || s) ?
+            "\e[#{v}m\#{x}\e[0;0m" :
             "\e[#{v}m"
         end })
       ::Colorato::NoColours.class_eval(%{
-        def #{k}(s=nil)
-          s ?
-            s :
-            ''
+        def #{k}(s=nil, &block)
+          (x = (block && block.call) || s) ? x : ''
         end })
 
     else
@@ -70,6 +69,38 @@ module Colorato
     alias colors colours
     alias nocolors no_colours
     alias no_colors no_colours
+
+    def show_colours
+
+      cs = Colorato.colours.public_methods
+        .inject([]) { |a, n|
+          m = n.to_s.match(/^bg_(.+)$/)
+          a << m[1] if m
+          a }
+
+      #%w[ (default) bright dim ].each do |filter|
+
+      puts
+
+      fs = %w[ (def) bright dim ]
+
+      puts "%14s  %-9s  %-9s  %-9s" % ([ '' ] + fs)
+      puts
+
+      cs.each do |n|
+        a = [ n ]
+        fs.each do |f|
+          f = Colorato.colours.send(f) rescue ''
+          fgc = f + Colorato.colours.send(n)
+          bgc = f + Colorato.colours.send("bg_#{n}")
+          a << (fgc + 'Text' + Colorato.colours.reset)
+          a << (bgc + '    ' + Colorato.colours.reset)
+        end
+        puts "%14s: %s %s  %s %s  %s %s" % a
+      end
+
+      puts
+    end
   end
 end
 

data/lib/colorato.rb

@@ -3,9 +3,12 @@
 
 module Colorato
 
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end
 
 require 'colorato/core'
 require 'colorato/more'
 
+
+Colorato.show_colours if __FILE__ == $0
+

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: colorato
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2025-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: probatio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '1'
 description: terminal colors extracted from flor
 email:
 - jmettraux+flor@gmail.com
@@ -48,6 +48,7 @@ metadata:
   bug_tracker_uri: https://github.com/floraison/colorato/issues
   homepage_uri: https://github.com/floraison/colorato
   source_code_uri: https://github.com/floraison/colorato
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: terminal colors for flor