lolcat 99.9.9 → 99.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b2f2da553496da9167b641f9490b602b7c7ab20939855328e5b11ba576981ac
-  data.tar.gz: fb4269af6402efb41734d960e7dc5645d3407e2140a1adcaf9d2346a853d3064
+  metadata.gz: 68967db19ea067b1adf19027786e77376bcefd55c3164e071541f5a2dca4b345
+  data.tar.gz: 1d3abe0fd9094344dbd21a7f10b9c6acce18c96cb7280ecd9d6d1c15a2e05c22
 SHA512:
-  metadata.gz: 836bb75c723ea7c49f4ea1201ab2a301bedc9c61db9a4995d8e7191f15ae4792dc856144bb592dab0dcc167234a968afb997f6b1b3323384eb07f679f5c7189b
-  data.tar.gz: 5678cebdb25b01d6115d20fbf8cfdb67a4904d1dc715671d40359ddce1ad080d9cd99f45ca062fe92eab3ed6913621ed6c67506eb625ecff31787ade038c9d74
+  metadata.gz: 6d8f33ff147d45bc995b34df1f5d0918f84591533b15e99139310321c09e3a44d52b1f0599ffb359cd16335cd6f1d354f27a3ac804b7266d76ecc71b8ee30b49
+  data.tar.gz: 97f965672e09e470de3137b5d61df8fe944acbdb36c44aaeab10b9543861c20e83029f387e21a609941298dd1c15b0f2575c0fe59b01c82a508eee773c0fe625

data/lib/lolcat/lol.rb

@@ -27,6 +27,9 @@ require "lolcat/version"
 require 'paint'
 
 module Lol
+  ANSI_ESCAPE = /((?:\e(?:[ -\/]+.|[\]PX^_][^\a\e]*|\[[0-?]*.|.))*)(.?)/m
+  INCOMPLETE_ESCAPE = /\e(?:[ -\/]*|[\]PX^_][^\a\e]*|\[[0-?]*)$/
+
   @paint_detected_mode = Paint.detect_mode
 
   def self.rainbow(freq, i)
@@ -39,8 +42,12 @@ module Lol
   def self.cat(fd, opts={})
     print "\e[?25l" if opts[:animate]
     while true do
+      buf = ''
       begin
-        buf = fd.sysread(65536)
+        begin
+          buf += fd.sysread(4096)
+          invalid_encoding = !buf.dup.force_encoding(fd.external_encoding).valid_encoding?
+        end while invalid_encoding or buf.match(INCOMPLETE_ESCAPE)
       rescue EOFError
         break
       end
@@ -52,8 +59,8 @@ module Lol
     end
     ensure
     if STDOUT.tty? then
-        print "\e[m\e[?25h\e[?1;5;47;2004l"
-        system("stty cooked -nl <&1");
+        print "\e[m\e[?25h\e[?1;5;2004l"
+        system("stty sane -istrip <&1");
     end
   end
 
@@ -70,9 +77,13 @@ module Lol
   def self.println_plain(str, defaults={}, opts={})
     opts.merge!(defaults)
     set_mode(opts[:truecolor])
-    str.scan(/((?:\e(?:[ -\/]+.|[\]PX^_][^\a\e]*|\[[0-?]*.|.))*)(.?)/m).each_with_index do |c,i|
-      code = rainbow(opts[:freq], opts[:os]+i/opts[:spread])
-      print c[0], Paint[c[1], *[ (: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
 

data/lib/lolcat/version.rb

@@ -1,3 +1,3 @@
 module Lolcat
-  VERSION = "99.9.9"
+  VERSION = "99.9.19"
 end

data/lolcat.gemspec

@@ -13,7 +13,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 "trollop", "= 2.1.3"
   s.add_dependency "manpages", "~> 0.6.1"
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolcat
 version: !ruby/object:Gem::Version
-  version: 99.9.9
+  version: 99.9.19
 platform: ruby
 authors:
 - Moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,16 +42,16 @@ dependencies:
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.3
 - !ruby/object:Gem::Dependency
   name: manpages
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Okay, no unicorns. But rainbows!!