wgif 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d808e6c96d0dfe1070dbcdc750412e5b4f84c862
-  data.tar.gz: 242b7baf97aa7968e7e082af1de2ea6c933a24d7
+  metadata.gz: 4c2b920dfa55567f79e781514cdbec115e06c044
+  data.tar.gz: 9e8dea99fdfd3f316538be45f6f5508e77470aed
 SHA512:
-  metadata.gz: b0e44313b6eb58f5c8adae849d3466eed79131707d9a107494e6ec3cf425bc9cd774ea5fdd7f34c5c2101d836e537cc8bcafe85349afef2b12f0bff5788c0455
-  data.tar.gz: 8241d6bb255012480ffb84b79f6bea5adf6b4182eb8d0d680f7c971859bd5fd03a4b28500c9ec51fe310240c5c73d10a8a17c013bc01a6761aa02346db968505
+  metadata.gz: 2eeab9f6ee176bf8b412f72a722dfd9dcc8156107f760591602465a63bbee4f86dc8ae0ad7ba3d7c9c1ddbd0d282b763015eb5ba060ed61d8116be542811b9a5
+  data.tar.gz: e5c3125c238f0b92b25531371287170b87084ee7e80392521c32134f4c4e8082f03fd6a9bcee811f6bae6115b423310be3fd46fce64aacca6975d3b52310634a

data/README.md

@@ -1,5 +1,5 @@
 # WGif
-![Travis Build](https://travis-ci.org/ecmendenhall/wgif.png?branch=master)
+[![Build Status](https://travis-ci.org/ecmendenhall/wgif.svg?branch=master)](https://travis-ci.org/ecmendenhall/wgif)
 
 WGif is a command line tool for creating animated GIFs from YouTube videos.
 
@@ -10,11 +10,12 @@ Usage: wgif [YouTube URL] [output file] [options]
     -f, --frames N            Number of frames in the final gif. (Default 20)
     -s, --start HH:MM:SS      Start creating gif from input video at this timestamp. (Default 00:00:00)
     -d, --duration seconds    Number of seconds of input video to capture. (Default 1)
+    -u, --upload              Upload finished GIF to Imgur
     -w, --width pixels        Width of the gif in pixels. (Default 480px)
 
 Example:
 
-    $ wgif https://www.youtube.com/watch?v=1A78yTvIY1k bjork.gif -s 00:03:30 -d 2 -w 400
+    $ wgif https://www.youtube.com/watch?v=1A78yTvIY1k bjork.gif -s 00:03:30 -d 2 -w 400 --upload
 ```
 
 ## Installation (Mac OS X)
@@ -33,7 +34,7 @@ $ gem build wgif.gemspec
 and
 
 ```sh
-$ gem install wgif-0.0.1.pre.gem
+$ gem install wgif-0.2.0.gem
 ```
 
 to install the executable.
@@ -78,11 +79,21 @@ with the `-w` or `--width` flag:
 $ wgif https://www.youtube.com/watch?v=1A78yTvIY1k bjork.gif --start 00:03:30 -d 2 -f 18 --width 350
 ```
 
+And finally, now that everything's completed add the `--upload` flag to automatically post it to Imgur:
+
+```sh
+$ wgif https://www.youtube.com/watch?v=1A78yTvIY1k bjork.gif --start 00:03:30 -d 2 -f 18 --width 350 --upload
+Finished. GIF uploaded to Imgur at http://i.imgur.com/iA28DuR.gif
+```
+
 And here it is:
 
-![Bjork](http://i.imgur.com/NZXWwey.gif)
+![Bjork](http://i.imgur.com/iA28DUR.gif)
 ### "You shouldn't let poets lie to you."
 
+## Changes
+- v0.2.0, 2014/4/11: Add automatic upload to Imgur with `--upload` flag.
+
 ## Contributions
 Are welcome via pull request.
 

data/lib/wgif.rb

@@ -4,6 +4,7 @@ require "wgif/downloader"
 require "wgif/exceptions"
 require "wgif/gif_maker"
 require "wgif/installer"
+require "wgif/uploader"
 require "wgif/version"
 require "wgif/video"
 require "wgif/video_cache"

data/lib/wgif/cli.rb

@@ -35,6 +35,11 @@ module WGif
                 'Width of the gif in pixels. (Default 500px)') {
                   |gs| @options[:dimensions] = gs
                 }
+        opts.on('-u',
+                '--upload',
+                'Upload finished GIF to Imgur') {
+                  |u| @options[:upload] = !!u
+                }
 
         opts.on_tail('-h',
                      '--help',
@@ -65,6 +70,7 @@ module WGif
       WGif::Installer.new.run if cli_args[0] == 'install'
       require 'wgif/downloader'
       require 'wgif/gif_maker'
+      require 'wgif/uploader'
       rescue_errors do
         args = parse_args cli_args
         validate_args(args)
@@ -72,6 +78,10 @@ module WGif
         clip = video.trim(args[:trim_from], args[:duration])
         frames = clip.to_frames(frames: args[:frames])
         GifMaker.new.make_gif(frames, args[:output], args[:dimensions])
+        if args[:upload]
+          url = Uploader.new('d2321b02db7ba15').upload(args[:output])
+          puts "Finished. GIF uploaded to Imgur at #{url}"
+        end
       end
     end
 
@@ -90,6 +100,12 @@ module WGif
         print_error "WGif can't find a valid YouTube video at that URL."
       rescue WGif::ClipEncodingException
         print_error "WGif encountered an error transcoding the video."
+      rescue WGif::ImgurException => e
+        print_error <<-error
+WGif couldn't upload your GIF to Imgur. The Imgur error was:
+
+#{e}
+error
       rescue SystemExit => e
         raise e
       rescue Exception => e

data/lib/wgif/exceptions.rb

@@ -21,4 +21,7 @@ module WGif
   class ClipEncodingException < Exception
   end
 
+  class ImgurException < Exception
+  end
+
 end

data/lib/wgif/uploader.rb

@@ -0,0 +1,38 @@
+require 'json'
+require 'typhoeus'
+require 'wgif/exceptions'
+
+module WGif
+  class Uploader
+
+    UPLOAD_ENDPOINT = 'https://api.imgur.com/3/image'
+
+    def initialize(client_id)
+      @client_id = client_id
+    end
+
+    def upload(filename)
+      File.open(filename, 'r') do |file|
+        response = Typhoeus.post(UPLOAD_ENDPOINT,
+                                 body: {image: file},
+                                 headers: auth_header)
+        raise WGif::ImgurException, error_message(response) unless response.success?
+        image_url(response)
+      end
+    end
+
+    private
+
+    def image_url(response)
+      JSON.parse(response.body)['data']['link']
+    end
+
+    def error_message(response)
+      JSON.parse(response.body)['data']['error']
+    end
+
+    def auth_header
+      {Authorization: "Client-ID #{@client_id}"}
+    end
+  end
+end

data/lib/wgif/version.rb

@@ -1,3 +1,3 @@
 module WGif
-  VERSION = "0.0.1"
+  VERSION = "0.2.0"
 end

data/spec/wgif/cli_spec.rb

@@ -59,6 +59,16 @@ describe WGif::CLI do
     expect(options[:dimensions]).to eq("300")
   end
 
+  it 'parses the short upload option' do
+    options = cli.parse_options ["-u"]
+    expect(options[:upload]).to eq(true)
+  end
+
+  it 'parses the long upload option' do
+    options = cli.parse_options ["--upload"]
+    expect(options[:upload]).to eq(true)
+  end
+
   it 'handles args in wacky order' do
     args = cli.parse_args([
       "-d",
@@ -164,6 +174,12 @@ describe WGif::CLI do
       expect_help_with_message(@mock_stdout.string, "WGif encountered an error transcoding the video.")
     end
 
+    it 'catches upload errors' do
+      OptionParser.any_instance.stub(:parse!).and_raise(WGif::ImgurException, "Imgur error")
+      expect{ cli.make_gif([]) }.to raise_error(SystemExit)
+      expect_help_with_message(@mock_stdout.string, "Imgur error")
+    end
+
     it 'raises SystemExit when thrown' do
       OptionParser.any_instance.stub(:parse!).and_raise(SystemExit)
       expect{ cli.make_gif([]) }.to raise_error(SystemExit)

data/spec/wgif/uploader_spec.rb

@@ -0,0 +1,44 @@
+require 'json'
+require 'spec_helper'
+require 'typhoeus'
+require 'wgif/uploader'
+
+describe WGif::Uploader do
+  let(:api_key) { 'api-key' }
+  let(:uploader) { WGif::Uploader.new(api_key) }
+  let(:success) { Typhoeus::Response.new(
+    response_code: 200,
+    return_code: :ok,
+    body: {data: {link: 'foo'}}.to_json)
+  }
+
+  let(:failure) { Typhoeus::Response.new(
+    response_code: 400,
+    return_code: :error,
+    body: {data: {error: 'You should be ashamed of yourself.'}}.to_json )
+  }
+  let(:tempfile) { Tempfile.new('whatever') }
+  let(:request_params) { {body: {image: tempfile},
+                          headers: {Authorization: "Client-ID #{api_key}"}} }
+
+  it 'sends an authorized POST request to Imgur with image file data' do
+    File.stub(:open).and_yield(tempfile)
+    expect(Typhoeus).to receive(:post).
+      with('https://api.imgur.com/3/image', request_params).and_return(success)
+    uploader.upload(tempfile.path)
+  end
+
+  it 'raises an exception if request is not successful' do
+    Typhoeus.stub(/http/).and_return(failure)
+    expect{ uploader.upload(tempfile.path) }.
+      to raise_error(WGif::ImgurException, 'You should be ashamed of yourself.')
+  end
+
+  it 'returns the url when successful' do
+    File.stub(:open).and_yield(tempfile)
+    expect(Typhoeus).to receive(:post).
+      with('https://api.imgur.com/3/image', request_params).and_return(success)
+    expect(uploader.upload(tempfile.path)).to eq("foo")
+  end
+
+end

data/wgif.gemspec

@@ -13,9 +13,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ecmendenhall/wgif"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($/) << 'lib/wgif/uploader.rb'
   spec.executables   = ["wgif"]
-    #spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wgif
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Connor Mendenhall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -174,6 +174,7 @@ files:
 - lib/wgif/exceptions.rb
 - lib/wgif/gif_maker.rb
 - lib/wgif/installer.rb
+- lib/wgif/uploader.rb
 - lib/wgif/version.rb
 - lib/wgif/video.rb
 - lib/wgif/video_cache.rb
@@ -183,6 +184,7 @@ files:
 - spec/wgif/downloader_spec.rb
 - spec/wgif/gif_maker_spec.rb
 - spec/wgif/installer_spec.rb
+- spec/wgif/uploader_spec.rb
 - spec/wgif/video_cache_spec.rb
 - spec/wgif/video_spec.rb
 - wgif.gemspec
@@ -218,5 +220,6 @@ test_files:
 - spec/wgif/downloader_spec.rb
 - spec/wgif/gif_maker_spec.rb
 - spec/wgif/installer_spec.rb
+- spec/wgif/uploader_spec.rb
 - spec/wgif/video_cache_spec.rb
 - spec/wgif/video_spec.rb