term-ansicolor 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d6c71cb6e8330316827c42a78c14ff0be92b8bba
-  data.tar.gz: 65305bffc1b48e42d974bd3e629e5a99c910ee7b
+SHA256:
+  metadata.gz: 304878391ec13c534365a4a694d13b65d171f94062397af82fd34d1bbaa8bf3b
+  data.tar.gz: 6992e038df00f0d887afa1c0ff373f6d8b1d9a55d24620c427e4b9912808bb94
 SHA512:
-  metadata.gz: 58373fab1285b42dfb4a5a9e56fa65077d7c63660518ecbab867241295d132fe02f64304f6c72a4e85e476b8364d1c69196f8bdebe45a557d0aa6efb6c30489c
-  data.tar.gz: b206537a735980413b6648c3aa0ed822935c978aefbad1ee13be7710e193a479cffc6c6f1bc37b528a88530eb3e21a363f92058ee268f66cc52401aaf11e99cb
+  metadata.gz: 257d2e9c85eae190c42c82d88355fb93bad21d7ccd397069b1e41ce1a482284a65e357b4d38f3657be492a219a91b34658f353e0566a0eb608e2dc55200fcea9
+  data.tar.gz: 4dd918c597658bf3f8b5a7930f03fcf8eb61d21d9aa9357f24c25b53815587203d6449b53d9688b0ce8a54d872ffc9573fa6911dad62577f4f0ef0c880dc4fe7

data/.travis.yml

@@ -2,8 +2,9 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
-  - 2.3.1
-  - 2.4.1
+  - 2.3
+  - 2.4
+  - 2.5
   - ruby-head
   - jruby
 matrix:

data/CHANGES

@@ -1,3 +1,6 @@
+2018-11-02 - 1.7.0 * Add movement commands and term_snow executable
+2017-03-24 - 1.6.0 * Implement HSL colors and methods based on that code
+2017-04-13 - 1.5.0 * Change to Apache 2.0 license
 2017-03-24 - 1.4.1 * Correct triple html color support
 2016-09-27 - 1.4.0 * Extend colorized strings with Term::ANSIColor
 2015-06-23 - 1.3.2 * Fix release 1.3.1

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/bin/term_colortab

@@ -24,6 +24,7 @@ for c in 4..7
   print_color c
 end
 puts
+puts
 
 for c in 8..11
   print_color c
@@ -33,16 +34,16 @@ puts
 for c in 12..15
   print_color c
 end
-puts
 
 for c in 16..231
   (c - 16) % 6 == 0 and puts
+  (c - 16) % 36 == 0 and puts
   print_color c
 end
-puts
 
 for c in 232..255
   (c - 16) % 6 == 0 and puts
+  (c - 16) % 12 == 0 and puts
   print_color c
 end
 puts

data/bin/term_snow

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+require 'term/ansicolor'
+require 'tins/go'
+include Tins::GO
+
+class SnowFlake
+  include Term::ANSIColor
+  extend Term::ANSIColor
+
+  def initialize(x, y, shape: %w[ ❄ ❅ ❆ • • · · . . ])
+     @x, @y, @shape = x, y, Array(shape).sample
+     @shape.size != 1 and raise ArgumentError, "#@shape needs to be a character"
+   end
+
+   attr_accessor :x
+
+   attr_accessor :y
+
+   attr_accessor :shape
+
+   def to_s
+     move_to(y, x) { white on_black @shape }
+   end
+end
+
+opts = go 'n:s:'
+new_snowflakes  = (opts[?n] || 3).to_i
+sleep_duration = (opts[?s] || 0.2).to_f
+
+flakes = []
+cycles = 0
+wind   = 0.5
+
+loop do
+  print SnowFlake.hide_cursor, SnowFlake.on_black, SnowFlake.clear_screen
+
+  at_exit do
+    print SnowFlake.reset, SnowFlake.clear_screen, SnowFlake.move_home, SnowFlake.show_cursor
+  end
+
+  if cycles % (SnowFlake.terminal_lines / 3) == 0
+    wind, cycles = rand, 0
+  end
+  cycles += 1
+
+  flakes.reject! do |sf|
+    if rand > wind
+      sf.x -= 1
+      if sf.x <= 0
+        sf.x = SnowFlake.terminal_columns
+      end
+    else
+      sf.x == 1
+      if sf.x > SnowFlake.terminal_columns
+        sf.x = 1
+      end
+    end
+    sf.y += 1
+    sf.y > SnowFlake.terminal_lines
+  end
+
+  new_snowflakes.times do
+    flakes << SnowFlake.new(rand(1..SnowFlake.terminal_columns), 1)
+  end
+
+  print *flakes
+
+  sleep sleep_duration
+rescue Interrupt
+  exit
+end

data/lib/term/ansicolor.rb

@@ -14,6 +14,9 @@ module Term
     require 'term/ansicolor/attribute/color8'
     require 'term/ansicolor/attribute/intense_color8'
     require 'term/ansicolor/attribute/color256'
+    require 'term/ansicolor/movement'
+
+    include Term::ANSIColor::Movement
 
     # :stopdoc:
     ATTRIBUTE_NAMES = Attribute.named_attributes.map(&:name)

data/lib/term/ansicolor/attribute/text.rb

@@ -2,7 +2,7 @@ module Term
   module ANSIColor
     class Attribute
       class Text
-        Attribute.set :clear,         0 # String#clear is already used to empty string in Ruby 1.9
+        Attribute.set :clear,         0 # String#clear already used in String
         Attribute.set :reset,         0 # synonym for :clear
         Attribute.set :bold,          1
         Attribute.set :dark,          2
@@ -12,8 +12,10 @@ module Term
         Attribute.set :underscore,    4 # synonym for :underline
         Attribute.set :blink,         5
         Attribute.set :rapid_blink,   6 # not widely implemented
-        Attribute.set :negative,      7 # no reverse because of String#reverse
+        Attribute.set :reverse,       7 # String#reverse already used in String
+        Attribute.set :negative,      7 # synonym for :reverse
         Attribute.set :concealed,     8
+        Attribute.set :conceal,       8 # synonym for :concealed
         Attribute.set :strikethrough, 9 # not widely implemented
       end
     end

data/lib/term/ansicolor/movement.rb

@@ -0,0 +1,108 @@
+require 'tins/terminal'
+
+module Term
+  module ANSIColor
+    module Movement
+      def terminal_lines
+        Tins::Terminal.lines
+      end
+
+      def terminal_columns
+        Tins::Terminal.columns
+      end
+
+      def move_to(line = 1, column = 1, string = nil, &block)
+        move_command("\e[#{line.to_i};#{column.to_i}H", string, &block)
+      end
+
+      def move_to_column(column = 1, string = nil, &block)
+        move_command("\e[#{column.to_i}G", string, &block)
+      end
+
+      def move_to_line(line = 1, string = nil, &block)
+        move_command("\e[#{line.to_i}f", string, &block)
+      end
+
+      def move_up(lines = 1, string = nil, &block)
+        move_command("\e[#{lines.to_i}A", string, &block)
+      end
+
+      def move_down(lines = 1, string = nil, &block)
+        move_command("\e[#{lines.to_i}B", string, &block)
+      end
+
+      def move_forward(columns = 1, string = nil, &block)
+        move_command("\e[#{columns.to_i}C", string, &block)
+      end
+
+      def move_backward(columns = 1, string = nil, &block)
+        move_command("\e[#{columns.to_i}D", string, &block)
+      end
+
+      def move_to_next_line(lines = 1, string = nil, &block)
+        move_command("\e[#{lines}E", string, &block)
+      end
+
+      def move_to_previous_line(lines = 1, string = nil, &block)
+        move_command("\e[#{lines}F", string, &block)
+      end
+
+      def move_home(string = nil, &block)
+        move_to(1, 1, string, &block)
+      end
+
+      def clear_screen(string = nil, &block)
+        erase_in_display(2, string, &block)
+      end
+
+      def erase_in_display(n = 0, string = nil, &block)
+        move_command("\e[#{n}J", string, &block)
+      end
+
+      def erase_in_line(n = 0, string = nil, &block)
+        move_command("\e[#{n}K", string, &block)
+      end
+
+      def scroll_up(pages = 1, string = nil, &block)
+        move_command("\e[#{pages}S", string, &block)
+      end
+
+      def scroll_down(pages = 1, string = nil, &block)
+        move_command("\e[#{pages}T", string, &block)
+      end
+
+      def save_position(string = nil, &block)
+        move_command("\e[s", string, &block)
+      end
+
+      def restore_position(string = nil, &block)
+        move_command("\e[u", string, &block)
+      end
+
+      def return_to_position(string = nil, &block)
+        save_position("") << move_command("", string, &block) << restore_position("")
+      end
+
+      def show_cursor(string = nil, &block)
+        move_command("\e[?25h", string, &block)
+      end
+
+      def hide_cursor(string = nil, &block)
+        move_command("\e[?25l", string, &block)
+      end
+
+      private
+
+      def move_command(move, string = nil)
+        if block_given?
+          move << yield.to_s
+        elsif string.respond_to?(:to_str)
+          move << string.to_str
+        elsif respond_to?(:to_str)
+          move << to_str
+        end
+        move
+      end
+    end
+  end
+end

data/lib/term/ansicolor/version.rb

@@ -1,6 +1,6 @@
 module Term::ANSIColor
   # Term::ANSIColor version
-  VERSION         = '1.6.0'
+  VERSION         = '1.7.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/term-ansicolor.gemspec

@@ -1,24 +1,24 @@
 # -*- encoding: utf-8 -*-
-# stub: term-ansicolor 1.6.0 ruby lib
+# stub: term-ansicolor 1.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "term-ansicolor".freeze
-  s.version = "1.6.0"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2017-04-13"
+  s.date = "2018-11-02"
   s.description = "This library uses ANSI escape sequences to control the attributes of terminal output".freeze
   s.email = "flori@ping.de".freeze
-  s.executables = ["term_cdiff".freeze, "term_colortab".freeze, "term_decolor".freeze, "term_display".freeze, "term_mandel".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/term/ansicolor.rb".freeze, "lib/term/ansicolor/attribute.rb".freeze, "lib/term/ansicolor/attribute/color256.rb".freeze, "lib/term/ansicolor/attribute/color8.rb".freeze, "lib/term/ansicolor/attribute/intense_color8.rb".freeze, "lib/term/ansicolor/attribute/text.rb".freeze, "lib/term/ansicolor/hsl_triple.rb".freeze, "lib/term/ansicolor/ppm_reader.rb".freeze, "lib/term/ansicolor/rgb_color_metrics.rb".freeze, "lib/term/ansicolor/rgb_triple.rb".freeze, "lib/term/ansicolor/version.rb".freeze]
-  s.files = [".gitignore".freeze, ".travis.yml".freeze, "CHANGES".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/term_cdiff".freeze, "bin/term_colortab".freeze, "bin/term_decolor".freeze, "bin/term_display".freeze, "bin/term_mandel".freeze, "examples/example.rb".freeze, "examples/lambda-red-plain.ppm".freeze, "examples/lambda-red.png".freeze, "examples/lambda-red.ppm".freeze, "lib/term/ansicolor.rb".freeze, "lib/term/ansicolor/.keep".freeze, "lib/term/ansicolor/attribute.rb".freeze, "lib/term/ansicolor/attribute/color256.rb".freeze, "lib/term/ansicolor/attribute/color8.rb".freeze, "lib/term/ansicolor/attribute/intense_color8.rb".freeze, "lib/term/ansicolor/attribute/text.rb".freeze, "lib/term/ansicolor/hsl_triple.rb".freeze, "lib/term/ansicolor/ppm_reader.rb".freeze, "lib/term/ansicolor/rgb_color_metrics.rb".freeze, "lib/term/ansicolor/rgb_triple.rb".freeze, "lib/term/ansicolor/version.rb".freeze, "term-ansicolor.gemspec".freeze, "tests/ansicolor_test.rb".freeze, "tests/attribute_test.rb".freeze, "tests/hsl_triple_test.rb".freeze, "tests/ppm_reader_test.rb".freeze, "tests/rgb_color_metrics_test.rb".freeze, "tests/rgb_triple_test.rb".freeze, "tests/test_helper.rb".freeze]
+  s.executables = ["term_snow".freeze, "term_display".freeze, "term_decolor".freeze, "term_cdiff".freeze, "term_mandel".freeze, "term_colortab".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/term/ansicolor.rb".freeze, "lib/term/ansicolor/attribute.rb".freeze, "lib/term/ansicolor/attribute/color256.rb".freeze, "lib/term/ansicolor/attribute/color8.rb".freeze, "lib/term/ansicolor/attribute/intense_color8.rb".freeze, "lib/term/ansicolor/attribute/text.rb".freeze, "lib/term/ansicolor/hsl_triple.rb".freeze, "lib/term/ansicolor/movement.rb".freeze, "lib/term/ansicolor/ppm_reader.rb".freeze, "lib/term/ansicolor/rgb_color_metrics.rb".freeze, "lib/term/ansicolor/rgb_triple.rb".freeze, "lib/term/ansicolor/version.rb".freeze]
+  s.files = [".gitignore".freeze, ".travis.yml".freeze, "CHANGES".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/term_cdiff".freeze, "bin/term_colortab".freeze, "bin/term_decolor".freeze, "bin/term_display".freeze, "bin/term_mandel".freeze, "bin/term_snow".freeze, "examples/example.rb".freeze, "examples/lambda-red-plain.ppm".freeze, "examples/lambda-red.png".freeze, "examples/lambda-red.ppm".freeze, "lib/term/ansicolor.rb".freeze, "lib/term/ansicolor/.keep".freeze, "lib/term/ansicolor/attribute.rb".freeze, "lib/term/ansicolor/attribute/color256.rb".freeze, "lib/term/ansicolor/attribute/color8.rb".freeze, "lib/term/ansicolor/attribute/intense_color8.rb".freeze, "lib/term/ansicolor/attribute/text.rb".freeze, "lib/term/ansicolor/hsl_triple.rb".freeze, "lib/term/ansicolor/movement.rb".freeze, "lib/term/ansicolor/ppm_reader.rb".freeze, "lib/term/ansicolor/rgb_color_metrics.rb".freeze, "lib/term/ansicolor/rgb_triple.rb".freeze, "lib/term/ansicolor/version.rb".freeze, "term-ansicolor.gemspec".freeze, "tests/ansicolor_test.rb".freeze, "tests/attribute_test.rb".freeze, "tests/hsl_triple_test.rb".freeze, "tests/ppm_reader_test.rb".freeze, "tests/rgb_color_metrics_test.rb".freeze, "tests/rgb_triple_test.rb".freeze, "tests/test_helper.rb".freeze]
   s.homepage = "http://flori.github.com/term-ansicolor".freeze
   s.licenses = ["Apache-2.0".freeze]
   s.rdoc_options = ["--title".freeze, "Term-ansicolor - Ruby library that colors strings using ANSI escape sequences".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze)
-  s.rubygems_version = "2.6.11".freeze
+  s.rubygems_version = "2.7.7".freeze
   s.summary = "Ruby library that colors strings using ANSI escape sequences".freeze
   s.test_files = ["tests/ansicolor_test.rb".freeze, "tests/attribute_test.rb".freeze, "tests/hsl_triple_test.rb".freeze, "tests/ppm_reader_test.rb".freeze, "tests/rgb_color_metrics_test.rb".freeze, "tests/rgb_triple_test.rb".freeze, "tests/test_helper.rb".freeze]
 

data/tests/ansicolor_test.rb

@@ -104,8 +104,8 @@ class ANSIColorTest < Test::Unit::TestCase
   def test_attributes
     foo = 'foo'
     for a in Term::ANSIColor.attributes
-      # skip clear for Ruby 1.9 which implements String#clear to empty the string
-      if a != :clear || Term::ANSIColor.support?(:clear)
+      # skip :clear and :reverse b/c Ruby implements them on string
+      if a != :clear && a != :reverse || Term::ANSIColor.support?(:clear)
         refute_equal foo, foo_colored = foo.__send__(a)
         assert_equal foo, foo_colored.uncolor
       end
@@ -121,6 +121,24 @@ class ANSIColorTest < Test::Unit::TestCase
     assert_equal Term::ANSIColor.attributes, 'foo'.attributes
   end
 
+  def test_move_to
+    string_23_23 = "\e[23;23Hred"
+    assert_equal string_23_23, string.move_to(23, 23)
+    assert_equal string_23_23, Color.move_to(23, 23, string)
+    assert_equal string_23_23, Color.move_to(23, 23) { string }
+    assert_equal string_23_23, Term::ANSIColor.move_to(23, 23) { string }
+    assert_equal string_23_23, move_to(23, 23) { string }
+  end
+
+  def test_return_to_position
+    string_return = "\e[sred\e[u"
+    assert_equal string_return, string.return_to_position
+    assert_equal string_return, Color.return_to_position(string)
+    assert_equal string_return, Color.return_to_position { string }
+    assert_equal string_return, Term::ANSIColor.return_to_position { string }
+    assert_equal string_return, return_to_position { string }
+  end
+
   def test_coloring_string_like
     assert_equal "\e[31mred\e[0m", red(string_like)
   end

data/tests/hsl_triple_test.rb

@@ -27,8 +27,8 @@ class HSLTripleTest < Test::Unit::TestCase
     assert_in_delta @pastel_green_hsl.hue, hsl.hue, 1e-1
     assert_in_delta @pastel_green_hsl.saturation, hsl.saturation, 1e-1
     assert_in_delta @pastel_green_hsl.lightness, hsl.lightness, 1e-1
-    assert_match /hsl\(0\.0,0\.0%,53.3333.*?%\)/, @gray_rgb.to_hsl_triple.css
-    assert_match /hsl\(120\.0.*?,58\.82.*?%,20.0%\)/, RGBTriple[ '#155115' ].to_hsl_triple.css
+    assert_match(/hsl\(0\.0,0\.0%,53.3333.*?%\)/, @gray_rgb.to_hsl_triple.css)
+    assert_match(/hsl\(120\.0.*?,58\.82.*?%,20.0%\)/, RGBTriple[ '#155115' ].to_hsl_triple.css)
   end
 
   def test_conversion_to_rgb

data/tests/rgb_triple_test.rb

@@ -87,7 +87,7 @@ class RgbTripleTest < Test::Unit::TestCase
     rgb = RGBTriple.new(128, 0, 255)
     assert_equal 'rgb(128,0,255)', rgb.css
     assert_equal '#8000ff', RGBTriple.from_css('rgb(128,0,255)').html
-    assert_match /rgb\(50\.19.*?%,0\.0%,100.0%\)/, rgb.css(percentage: true)
+    assert_match(/rgb\(50\.19.*?%,0\.0%,100.0%\)/, rgb.css(percentage: true))
     assert_equal '#8000ff', RGBTriple.from_css('rgb(50.19607843137255%,0.0%,100.0%)').html
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: term-ansicolor
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -70,11 +70,12 @@ description: This library uses ANSI escape sequences to control the attributes o
   terminal output
 email: flori@ping.de
 executables:
-- term_cdiff
-- term_colortab
-- term_decolor
+- term_snow
 - term_display
+- term_decolor
+- term_cdiff
 - term_mandel
+- term_colortab
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -85,6 +86,7 @@ extra_rdoc_files:
 - lib/term/ansicolor/attribute/intense_color8.rb
 - lib/term/ansicolor/attribute/text.rb
 - lib/term/ansicolor/hsl_triple.rb
+- lib/term/ansicolor/movement.rb
 - lib/term/ansicolor/ppm_reader.rb
 - lib/term/ansicolor/rgb_color_metrics.rb
 - lib/term/ansicolor/rgb_triple.rb
@@ -103,6 +105,7 @@ files:
 - bin/term_decolor
 - bin/term_display
 - bin/term_mandel
+- bin/term_snow
 - examples/example.rb
 - examples/lambda-red-plain.ppm
 - examples/lambda-red.png
@@ -115,6 +118,7 @@ files:
 - lib/term/ansicolor/attribute/intense_color8.rb
 - lib/term/ansicolor/attribute/text.rb
 - lib/term/ansicolor/hsl_triple.rb
+- lib/term/ansicolor/movement.rb
 - lib/term/ansicolor/ppm_reader.rb
 - lib/term/ansicolor/rgb_color_metrics.rb
 - lib/term/ansicolor/rgb_triple.rb
@@ -151,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby library that colors strings using ANSI escape sequences