wgif 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a6f0bf2c4be9fa392a29d9ce4288c56a364fdb9
-  data.tar.gz: 54fb5cf82fec17aaea7d81533109ea02c6c29c8f
+  metadata.gz: 1010f88fc3bcf4944869c254a9f6da6cba507522
+  data.tar.gz: 5814606e027cb5da0560379f0186bd9ac26a3623
 SHA512:
-  metadata.gz: ffbd2b1b20e9a716e82d1210baf8fed2abc58a554e0ad27ce653ae8d8a629ca461900b18c5910a1b4ab118778450a1ba68de0e50f426db1d088aa203ab6a91a8
-  data.tar.gz: e9868668f1d15ed8bc8c908bbc12f670f8d8b0395312d069dfa4f55a12f336241857e48d8a70b3c5f955e3b03d8c7a5d2b688d7ea52383498be04b442e73a797
+  metadata.gz: fb0ae4bebe73f9e239b31baa3d521e8c1d81c452edd3545d0cae3923ea147e3b35d6dbb3859d8c5da6229287308232982c5b5e5cb688a1ffb4dacc1a9cbbd509
+  data.tar.gz: 3169b600b24e5d12fa6609b4eb8d59b21e5ad06f31582aead56e9730859012121b50007f4bdfecc4aa41a2efdb6ef33764e9c1e0d684cea49eddb50c4c599878

data/README.md

@@ -114,6 +114,7 @@ And here it is:
 ### "You shouldn't let poets lie to you."
 
 ## Changes
+- v0.5.3, 2015/7/26: Fix sort order of globbed frames. ([Issue #19](https://github.com/ecmendenhall/wgif/issues/19)
 - v0.5.2, 2015/1/24: Use `/usr/bin/env ruby` in binary.
 - v0.5.1, 2014/8/15: Lock down dependency versions.
 - v0.5.0, 2014/8/15: Add support for sub-second timestamps in `--start` and `--duration` flags ([Issue #13](https://github.com/ecmendenhall/wgif/issues/13)).

data/lib/wgif/version.rb

@@ -1,3 +1,3 @@
 module WGif
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/wgif/video.rb

@@ -42,7 +42,7 @@ module WGif
     end
 
     def open_frame_dir
-      Dir.glob('/tmp/wgif/frames/*.png')
+      Dir.glob('/tmp/wgif/frames/*.png').sort
     end
 
     def transcode(clip, file, options)

data/spec/unit/wgif/downloader_spec.rb

@@ -23,7 +23,10 @@ describe WGif::Downloader do
 
   it 'throws an error if the video is not found' do
     expect(ViddlRb).to receive(:get_urls).with(clip_url)
-      .and_return(['http://lol.wut'])
+      .and_return(['not a url'])
+    fake_response = double(response_code: 404)
+    fake_request = double(run: fake_response).as_null_object
+    allow(Typhoeus::Request).to receive(:new).and_return(fake_request)
     expect { downloader.get_video(clip_url) }
       .to raise_error(WGif::VideoNotFoundException)
   end

data/spec/unit/wgif/video_spec.rb

@@ -51,7 +51,8 @@ describe WGif::Video do
     expect(clip).to receive(:transcode).with(frames, options)
     allow(FileUtils).to receive(:rm)
     expect(clip).to receive(:duration).and_return 2
-    expect(Dir).to receive(:glob).with('/tmp/wgif/frames/*.png').twice
+    expect(Dir).to receive(:glob).with('/tmp/wgif/frames/*.png')
+      .twice.and_return([])
     video = described_class.new 'bjork', '/tmp/wgif/bjork.mp4'
     video.to_frames(frames: 10)
   end
@@ -78,4 +79,16 @@ describe WGif::Video do
     expect { video.trim('00:00:00', 5.0) }
       .to raise_error(WGif::ClipEncodingException)
   end
+
+  it 'sorts frames in lexicographic order' do
+    frames = '/tmp/wgif/frames/%5d.png'
+    options = '-vf fps=24'
+    expect(clip).to receive(:transcode).with(frames, options)
+    allow(FileUtils).to receive(:rm)
+    unsorted_files = ['001.png', '003.png', '002.png']
+    expect(Dir).to receive(:glob).with('/tmp/wgif/frames/*.png')
+      .twice.and_return(unsorted_files)
+    video = described_class.new 'bjork', '/tmp/wgif/bjork.mp4'
+    expect(video.to_frames).to eq(['001.png', '002.png', '003.png'])
+  end
 end

data/wgif.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ruby-progressbar', '1.5.1'
   spec.add_dependency 'streamio-ffmpeg', '1.0.0'
   spec.add_dependency 'typhoeus', '~> 0.6'
-  spec.add_dependency 'viddl-rb', '1.0.3'
+  spec.add_dependency 'viddl-rb', '1.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wgif
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Connor Mendenhall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement