gif 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 165b9964e1297f48e888c41703bc60873fb1d086
-  data.tar.gz: c7cf4a57be53de182cda1ae76c1acef346c67d77
+  metadata.gz: 381700aba7daa8d7cd18428d36e073f820b23583
+  data.tar.gz: 67d826f4163430fe37697f78060f98dd36695e17
 SHA512:
-  metadata.gz: 7d4d4b184d02fe81e089f28a0d98c07d817c4198afc7569f6fd53e491149c167eedd8aa410d147062e185e475b0becf7f6aceb3f64c3748ade4bf9f4cda0b13c
-  data.tar.gz: b3c58679dc01f363bbb7bb05895254ff94023cf97c9e91971e47c8ccb997571a371e0321c4aa72a3f37bb98ca4a5d8be25618d6a2e9b29a39c9e45970adbf528
+  metadata.gz: 484dcefa73eda1fbc2e576d5a06740c2d0cd61dcffa241ba459990dfbecb45360823c710c11a377c402721a6cca191e285a3beff232dc75449dfb206fc57c2c0
+  data.tar.gz: bffad4f975e90f20309d1e1db4171e466010492f3e502cf35fe620df3c44e6e040256590d8d712d2cc6748fa101a83c0ea7f15b9c818064df6cb6fac08a26fab

data/bin/gif

@@ -7,16 +7,21 @@ loops = 1
 
 options = {}
 OptionParser.new do |parser|
-  parser.on("--l", "--loops") do |times|
+  parser.on("--l", "--loops") do |_|
     loops = ARGV.find { |arg| /\A\d+\z/.match(arg).to_s.to_i > 0 }
   end
 
+  parser.on("--m", "--modern") do |_|
+    options[:modern] = true
+  end
+
   parser.on("--setup", "--s") do |_|
     options[:setup] = true
     puts "Installing dependencies (gifsicle, imgcat) now..."
     `brew install gifsicle`
     `brew tap eddieantonio/eddieantonio`
     `brew install imgcat`
+    `npm install -g imgcat-cli`
     puts "Finished installing dependencies!"
   end
 
@@ -25,7 +30,9 @@ OptionParser.new do |parser|
     puts [
       "`gif` will play a random gif in your terminal",
       "`gif [search_terms]` will filter by search terms. for example, `gif cute pikachu` will cause you to immediately feel 100% happier.",
-      "`--loops` or `--l` will let you loop the gif. for example, `gif cute pikachu --loops 10` will cause you to immediately feel 1000% happier.",
+      "`--modern will output much higher quality gifs but only works on iTerm 2.9 and later`",
+      "if you want your gifs to be higher quality by default, set $MODERN_TERMINAL to be 'true' - add `export MODERN_TERMINAL='true'` to your bash_profile/fish_config",
+      "`--loops` or `--l` will let you loop the gif on older versions of iTerm. for example, `gif cute pikachu --loops 10` will cause you to immediately feel 1000% happier.",
       "`--help`, `--h`, or `man` will print this paragraph."
     ]
   end
@@ -33,6 +40,6 @@ end.parse!
 
 if options[:setup].nil? && options[:help].nil?
   tags = ARGV.join "+"
-  gif = Gif::CLI.new tags, loops
+  gif = Gif::CLI.new tags, loops, options[:modern]
   gif.fetch
 end

data/lib/gif.rb

@@ -4,20 +4,18 @@ require 'digest/sha1'
 
 module Gif
   class CLI
-    def initialize tags, loops
+    def initialize tags, loops, modern
       @tags = tags
       @loops = loops.to_i
+      ENV["MODERN_TERMINAL"] = "true" if modern
+      @modern = ENV["MODERN_TERMINAL"] if ENV["MODERN_TERMINAL"] == "true"
     end
 
     def fetch
       Dir.mktmpdir do |tmp|
         Dir.chdir(tmp)
         generate_url
-        create_images
-        rename_files
-        @loops.times { gif_to_terminal }
-        `rm #{@gif_sha}.gif`
-        `rm #{@resized_sha}`
+        generate_gifs
       end
     end
 
@@ -26,17 +24,20 @@ module Gif
     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"]
+      original_url = gif_json["data"]["image_original_url"]
+      fixed_height_url = gif_json["data"]["fixed_height_small_url"]
+      @modern ? @gif_url = original_url : @gif_url = fixed_height_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
+      suppress_output do
+        `gifsicle --colors=256 #{@gif_sha}.gif -o #{@gif_sha}.gif")`
+      end
       system "gifsicle --resize-fit #{wh} --unoptimize #{@gif_sha}.gif -o #{@resized_sha}"
       system "gifsicle --explode #{@resized_sha} -o frames.jpg"
     end
@@ -44,24 +45,34 @@ module Gif
     def rename_files
       filenames = Dir.glob "*.jpg.*"
       filenames.each_with_index do |filename, i|
-          File.rename filename, "frames-" + i.to_s
+        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 -R frames-#{n}"
+        system "/usr/local/Cellar/imgcat/1.1.0/bin/imgcat -R frames-#{n}"
         sleep 1.0/24
-        `rm frames-#{n}` if @loops < 1
         system "⌘ k"
       end
       @loops -= 1
     end
 
-    def fix_colors
-      suppress_output do
-        `gifsicle --colors=256 #{@gif_sha}.gif -o #{@gif_sha}.gif")`
+    def gif_to_modern_terminal
+      width  = `tput cols`.to_i
+      height = `tput lines`.to_i
+      system "imgcat -w #{width} -h #{height} #{@gif_sha}.gif"
+    end
+
+    def generate_gifs
+      system "curl -s -o #{@gif_sha}.gif #{@gif_url}"
+      if @modern
+        gif_to_modern_terminal
+      else
+        create_images
+        rename_files
+        @loops.times { gif_to_terminal }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gif
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Lev Kravinsky