lolcat 99.9.10 → 99.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a313766343e4d204f03d600659987b0c910dc8afd3fbc420987a01ed3f829fc6
-  data.tar.gz: b01cf6ef9c92806257e88ee14416e428330531a128cd7c7ec8c6e47970c5e5b9
+  metadata.gz: 7e107b8b9bebc7bb055b3290eda6c35d1120dcec828c94400b8b440b5f3dce77
+  data.tar.gz: d6a015bcfa6f6dfc82dad2a273ea39def69372a14908c24f3607396b90db2b1a
 SHA512:
-  metadata.gz: 51c84d710091c29b29611c089090515cc5c26c69e33517ca894eb9f28363f794edeb324a5aa5687addca1ea9d1f94dd553b08b55cef9d9270cf269cd46abf041
-  data.tar.gz: 383ba55cf86ab59a187a2085df85e29d7b70cbb4c6e302680bb4e9fb17b975f214c5de6bc78882871fabc4f7df4047f5965e112539d6f7833b49055ebee656e2
+  metadata.gz: 9b4a2c26b6ed06a1660a420705c1395ea422336634f1d22e7aca0b9621383360a60447f49139bf3a6ecfb6dc04fba4d9104dcc2706c26860f1b0990324f5502c
+  data.tar.gz: 4b52e98963743154d90382a13211a09f76b33bd678ef0cc7fb354bc81b2126d89f09bec5cbce4f884f09883e44c02626383b46e128539fe7fd0669dff67ee500

data/lib/lolcat/cat.rb

@@ -27,11 +27,11 @@ require "lolcat/version"
 require "lolcat/lol"
 
 require 'stringio'
-require 'trollop'
+require 'optimist'
 
 module Lol
   def self.cat!
-    p = Trollop::Parser.new do
+    p = Optimist::Parser.new do
       version "lolcat #{Lolcat::VERSION} (c)2011 moe@busyloop.net"
       banner <<HEADER
 
@@ -67,10 +67,10 @@ Report lolcat translation bugs to <http://speaklolcat.com/>
 FOOTER
     end
 
-    opts = Trollop::with_standard_exception_handling p do
+    opts = Optimist::with_standard_exception_handling p do
       begin
         o = p.parse ARGV
-      rescue Trollop::HelpNeeded
+      rescue Optimist::HelpNeeded
         buf = StringIO.new
         p.educate buf
         buf.rewind

data/lib/lolcat/lol.rb

@@ -29,7 +29,6 @@ require 'paint'
 module Lol
   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
 
@@ -47,7 +46,8 @@ module Lol
       begin
         begin
           buf += fd.sysread(4096)
-        end while buf.match(INCOMPLETE_ESCAPE) or (fd.external_encoding == 'UTF-8' and buf.match(INCOMPLETE_UTF8))
+          invalid_encoding = !buf.dup.force_encoding(fd.external_encoding).valid_encoding?
+        end while invalid_encoding or buf.match(INCOMPLETE_ESCAPE)
       rescue EOFError
         break
       end

data/lib/lolcat/version.rb

@@ -1,3 +1,3 @@
 module Lolcat
-  VERSION = "99.9.10"
+  VERSION = "99.9.20"
 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 "optimist", "~> 3.0.0"
   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.10
+  version: 99.9.20
 platform: ruby
 authors:
 - Moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 3.0.0
 - !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!!