gif 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fba3f0b2273c689eaff3d6af71bb01ef4ac9616
-  data.tar.gz: c9163c1bb0d9895d607a002032e65c25618b208a
+  metadata.gz: 8869c437022a0d8199476ad435f1200563d1a16a
+  data.tar.gz: 81469f59ee98dc1525f3e026b2006fb85c3bb877
 SHA512:
-  metadata.gz: 56ddf09a34630832f7e2162b07ba88503466c9007fbe58d65be7a9a742c9381f156db2bb6c033620c146c75cdfe1dd7f9e12e457bfdc2d05c0295d86e1cfd0b9
-  data.tar.gz: d844b4ebceac64e82fc179406c22bfd0275cfaf4b8c5d7e339650eb32d83daed979163fd6f836cdcb069e550a64a7cf17136643033d27bfc4b82a82be7432598
+  metadata.gz: 1c87ebb3a86b7d7e900d0a777cf899faeeab0b34e18638067b6c3952e5f84f0d601009548c43ef4cc7158ad2b9dcb47e6019379a856842147eb384e722021a01
+  data.tar.gz: c9fe378ceaef64ad9439c5c974bbb054235706eece9531a23127849acd1c9cc387d1eb9dc1921ae0efef43d23d9cdb0b63dd40ba749b0abce4b79e4d070db74f

data/bin/gif

@@ -2,6 +2,6 @@
 
 require 'gif'
 
-gif = Gif::CLI.new
-tags = ARGV.join("+")
-gif.search(tags)
+tags = ARGV.join "+"
+gif = Gif::CLI.new tags
+gif.fetch

data/lib/gif.rb

@@ -3,27 +3,78 @@ require 'digest/sha1'
 
 module Gif
   class CLI
-    def search(tags)
-      fetch_url = "https://api.giphy.com/v1/gifs/random?api_key=dc6zaTOxFJmzC&tag=#{tags}"
-      raw = `curl '#{fetch_url}'`
-      gif_json = JSON.parse(raw)
-      gif_url = gif_json["data"]["image_original_url"]
-      gif_sha = Digest::SHA1.hexdigest(gif_url)
-
-      `curl -o #{gif_sha}.gif #{gif_url}`
-      `convert #{gif_sha}.gif frames.jpg`
-
-      width = `tput cols`.to_i / 3
-      frames = `ls -1 *.jpg | wc -l`.to_i
+    def initialize tags
+      @tags = tags
+    end
+
+    def fetch
+      generate_url
+      create_images
+      rename_files
+      gif_to_terminal
+      `rm #{@gif_sha}.gif`
+      `rm #{@resized_sha}`
+    end
+
+    private
+
+    def generate_url
+      fetch_url     = "https://api.giphy.com/v1/gifs/random?api_key=dc6zaTOxFJmzC&tag=#{@tags}"
+      gif_json      = JSON.parse `curl -s '#{fetch_url}'`
+      @gif_url      = gif_json["data"]["fixed_height_small_url"]
+      @gif_sha      = Digest::SHA1.hexdigest @gif_url
+      @resized_sha  = Digest::SHA1.hexdigest @gif_sha
+    end
+
+    def create_images
+      system "curl -s -o #{@gif_sha}.gif #{@gif_url}"
+      width  = `tput cols`
+      height = `tput lines`
+      wh     = [width, "x", height].join.gsub /\n/,""
+      fix_colors
+      system "gifsicle --resize-fit #{wh} --unoptimize #{@gif_sha}.gif -o #{@resized_sha}"
+      system "gifsicle --explode #{@resized_sha} -o frames.jpg"
+    end
+
+    def rename_files
+      filenames = Dir.glob "*.jpg.*"
+      filenames.each_with_index do |filename, i|
+          File.rename filename, "frames-" + i.to_s
+      end
+    end
+
+    def gif_to_terminal
+      frames = `ls -1 frames-* | wc -l`.to_i
       frames.times do |n|
-        system "imgcat --width #{width} frames-#{n}.jpg"
-        `rm frames-#{n}.jpg`
+        system "imgcat -R frames-#{n}"
+        sleep 1.0/24
+        `rm frames-#{n}`
         system "⌘ k"
       end
+    end
+
+    def fix_colors
+      suppress_output do
+        `gifsicle --colors=256 #{@gif_sha}.gif -o #{@gif_sha}.gif")`
+      end
+    end
 
-      `rm #{gif_sha}.gif`
-      puts fetch_url
-      puts gif_json["data"]["url"]
+    def suppress_output
+      begin
+        original_stderr = $stderr.clone
+        original_stdout = $stdout.clone
+        $stderr.reopen(File.new('/dev/null', 'w'))
+        $stdout.reopen(File.new('/dev/null', 'w'))
+        retval = yield
+      rescue Exception => e
+        $stdout.reopen(original_stdout)
+        $stderr.reopen(original_stderr)
+        raise e
+      ensure
+        $stdout.reopen(original_stdout)
+        $stderr.reopen(original_stderr)
+      end
+      retval
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gif
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Lev Kravinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies: []
 description: running `gif` returns a random gif and `gif [search_term]` filters by
   tags