lolcat 42.24.1 → 99.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ab93abe8e7d53af236ec646e4c198e4e3e56cb1c
-  data.tar.gz: bd145e7a94e6c8c2cb0b59757b775a6502950d66
+SHA256:
+  metadata.gz: a313766343e4d204f03d600659987b0c910dc8afd3fbc420987a01ed3f829fc6
+  data.tar.gz: b01cf6ef9c92806257e88ee14416e428330531a128cd7c7ec8c6e47970c5e5b9
 SHA512:
-  metadata.gz: 80b3e97e2d833edb96751457f9760e539b98997b6d75ffc307551c5ddea297d758cbfb31666deffa14520ae8057f8bd926490f43682568991b3fcbc9e2e4bf3f
-  data.tar.gz: e7c7af8efa52c2bd73df211c603dfeebea72c0ab7aa3224d335ad6559d6000d340330a3693c6f20436a35867e998149ffa53e7e8b228d19cb5e50f72f6e0168e
+  metadata.gz: 51c84d710091c29b29611c089090515cc5c26c69e33517ca894eb9f28363f794edeb324a5aa5687addca1ea9d1f94dd553b08b55cef9d9270cf269cd46abf041
+  data.tar.gz: 383ba55cf86ab59a187a2085df85e29d7b70cbb4c6e302680bb4e9fb17b975f214c5de6bc78882871fabc4f7df4047f5965e112539d6f7833b49055ebee656e2

data/lib/lolcat/cat.rb

@@ -82,7 +82,7 @@ FOOTER
           :spread => 8.0,
           :freq => 0.3
         }
-        Lol.cat buf.read.split("\n"), opts
+        Lol.cat buf, opts
         puts
         buf.close
         exit 1
@@ -112,9 +112,7 @@ FOOTER
                 $stdout.write(line)
               end
             else
-              until fd.eof? do
-                $stdout.write(fd.read(8192))
-              end
+              IO.copy_stream(fd, $stdout)
             end
           end
         rescue Errno::ENOENT

data/lib/lolcat/lol.rb

@@ -27,7 +27,10 @@ require "lolcat/version"
 require 'paint'
 
 module Lol
-  STRIP_ANSI = Regexp.compile '\e\[[\d;]*[m|K]', nil
+  ANSI_ESCAPE = /((?:\e(?:[ -\/]+.|[\]PX^_][^\a\e]*|\[[0-?]*.|.))*)(.?)/m
+  INCOMPLETE_ESCAPE = /\e(?:[ -\/]*|[\]PX^_][^\a\e]*|\[[0-?]*)$/
+  INCOMPLETE_UTF8 = /[\xc0-\xdf]$|[\xe0-\xef].?$|[\xf0-\xf7].?.?$/n
+
   @paint_detected_mode = Paint.detect_mode
 
   def self.rainbow(freq, i)
@@ -39,21 +42,34 @@ module Lol
 
   def self.cat(fd, opts={})
     print "\e[?25l" if opts[:animate]
-    fd.each do |line|
-      opts[:os] += 1
-      println(line, opts)
+    while true do
+      buf = ''
+      begin
+        begin
+          buf += fd.sysread(4096)
+        end while buf.match(INCOMPLETE_ESCAPE) or (fd.external_encoding == 'UTF-8' and buf.match(INCOMPLETE_UTF8))
+      rescue EOFError
+        break
+      end
+      buf.force_encoding(fd.external_encoding)
+      buf.lines.each do |line|
+        opts[:os] += 1
+        println(line, opts)
+      end
     end
     ensure
-    print "\e[?25h" if opts[:animate]
+    if STDOUT.tty? then
+        print "\e[m\e[?25h\e[?1;5;2004l"
+        system("stty sane -istrip <&1");
+    end
   end
 
   def self.println(str, defaults={}, opts={})
     opts.merge!(defaults)
-    str.chomp!
-    str.gsub! STRIP_ANSI, '' if !str.nil? and ($stdout.tty? or opts[:force])
+    chomped = str.sub!(/\n$/, "")
     str.gsub! "\t", "        "
     opts[:animate] ? println_ani(str, opts) : println_plain(str, opts)
-    puts
+    puts if chomped
   end
 
   private
@@ -61,18 +77,24 @@ module Lol
   def self.println_plain(str, defaults={}, opts={})
     opts.merge!(defaults)
     set_mode(opts[:truecolor])
-    str.chomp.chars.each_with_index do |c,i|
-      code = rainbow(opts[:freq], opts[:os]+i/opts[:spread])
-      print Paint[c, *[ (:black if opts[:invert]), code ].compact ]
+    str.scan(ANSI_ESCAPE).each_with_index do |c,i|
+      color = rainbow(opts[:freq], opts[:os]+i/opts[:spread])
+      if opts[:invert] then
+        print c[0], Paint.color(nil, color), c[1], "\e[49m"
+      else
+        print c[0], Paint.color(color), c[1], "\e[39m"
+      end
     end
   end
 
   def self.println_ani(str, opts={})
     return if str.empty?
+    print "\e7"
     (1..opts[:duration]).each do |i|
-      print "\e[#{str.length}D"
+      print "\e8"
       opts[:os] += opts[:spread]
       println_plain(str, opts)
+      str.gsub!(/\e\[[0-?]*[@JKPX]/, "")
       sleep 1.0/opts[:speed]
     end
   end

data/lib/lolcat/version.rb

@@ -1,3 +1,3 @@
 module Lolcat
-  VERSION = "42.24.1"
+  VERSION = "99.9.10"
 end

data/lolcat.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_dependency "paint", "~> 2.0.0"
   s.add_dependency "trollop", "~> 2.1.2"
+  s.add_dependency "manpages", "~> 0.6.1"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/man/lolcat.6

@@ -0,0 +1,100 @@
+.TH LOLCAT 6 "June 11, 2017"
+.\" Please adjust this date whenever revising the manpage.
+.SH NAME
+lolcat \- rainbow coloring effect for text console display
+
+.SH SYNOPSIS
+.B lolcat
+.RI [ options ] " " [ files ] " " ...
+
+.SH DESCRIPTION
+This manual page documents briefly the
+.B lolcat
+command.
+.PP
+\fBlolcat\fP is a program that concatenates files, or standard input, to
+standard output (like the generic \fBcat\fP), and adds rainbow coloring to it.
+
+.SH OPTIONS
+
+.TP
+\fB\-p\fP \fIX\fP, \fB\-\-spread=\fIX\fP
+Inclination of the rainbow stripes
+.br
+(character widths per line hight; high values (>1000) give almost horizonal stripes, low values (0.1) almost vertical ones; default: 3.0).
+.TP
+\fB\-F\fP \fIX\fP, \fB\-\-freq=\fIX\fP
+Frequency of the rainbow effect.
+.br
+(low values around 0.0001 give almost monochromous screens; default: 0.1).
+.TP
+\fB\-S\fP \fIX\fP, \fB\-\-seed=\fIX\fP
+Initial value for the random number generator; 0 means automatic.
+.br
+(default: 0).
+.TP
+\fB\-a\fP, \fB\-\-animate\fP
+Fade every line through an animation before printing the next one.
+.TP
+\fB\-d\fP \fIX\fP, \fB\-\-duration=\fIX\fP
+Duration of the animation.
+.br
+(number of steps before showing next line; default: 12)
+.TP
+\fB\-s\fP \fIX\fP, \fB\-\-speed=\fIX\fP
+Speed of the animation.
+.br
+(frame rate, ie. number of steps per second; default: 20)
+.TP
+\fB\-i\fP, \fB\-\-invert\fP
+Inverts the background and foreground colors.
+.TP
+\fB\-t\fP, \fB\-\-truecolor\fP
+Enables 24-bit truecolor mode.
+.TP
+\fB\-f\fP, \fB\-\-force\fP
+Force color even when stdout is not a tty.
+.TP
+.B \-v, \-\-version
+Shows lolcat version.
+.TP
+.B \-h, \-\-help
+Shows options summary.
+
+.SH EXAMPLES
+
+Typical combinations of \fBlolcat\fP include other programs that generate text:
+.br
+.br
+Large colorful words can be written like this:
+
+.IP
+.EX
+echo "KTHXBAI" | toilet | lolcat
+.EE
+.
+.P
+
+Cows are popular, come in all colors, and tell random epigrams:
+
+.IP
+.EX
+fortune | cowsay | lolcat \-a
+.EE
+.
+.P
+
+.SH SEE ALSO
+.BR cat (1),
+.BR toilet (1),
+.BR fortune (6),
+.BR cowsay (6)
+.br
+.SH AUTHOR
+lolcat was written by Moe <moe@busyloop.net>.
+.PP
+This manual page was originally written by chrysn <chrysn@fsfe.org>,
+for the Debian project.
+.br
+Very quickly revamped by Mathieu Aubin <mathieu@zeroserieux.com> to
+include as part of official code repository.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolcat
 version: !ruby/object:Gem::Version
-  version: 42.24.1
+  version: 99.9.10
 platform: ruby
 authors:
 - Moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2018-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: manpages
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 description: Rainbows and unicorns!
 email:
 - moe@busyloop.net
@@ -72,6 +86,7 @@ files:
 - lib/lolcat/lol.rb
 - lib/lolcat/version.rb
 - lolcat.gemspec
+- man/lolcat.6
 homepage: https://github.com/busyloop/lolcat
 licenses: []
 metadata: {}
@@ -91,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Okay, no unicorns. But rainbows!!