youtube-dl.rb 0.2.3.2015.10.24 → 0.2.4.2015.10.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f84b679cf5fdaf07df79d63a0bea60581437e7f6
-  data.tar.gz: d47c54582881bdbda2c16b2fc5791a6c1b5a4d48
+  metadata.gz: d74cb3bb82668e70c653d638cf41ee649eaa7a9a
+  data.tar.gz: 6ba3751db73de31773169515921c50766519d221
 SHA512:
-  metadata.gz: 793a6beeb1db594fb23557188bd285420463c4b56d7117e10361209e2f2860ab961e59dd4d3aec569dbba6bee220c70cba10fb57e2471f71ace2b222de68b2f4
-  data.tar.gz: 3a1e7c289112aee97560df754618bbb1c08811c95557f6f9bb83eca52b0fa1232435fe0f1ad7f2d115c75182c7c962b79dabc902841a810b26738fa279006f29
+  metadata.gz: c0f453a8ca645767ec6c3d477960c4c41fe322297b001845cb6f4e76ff040c64b13d44f4db0f4d4f19bcb674fb882f64bf8b2789d1292cc1ee8535f25e1ba9a0
+  data.tar.gz: 6439079e4ed501bdbe2a3d9cb649178bec79035de392b1d92e63b01a6a722d6351f9fe5c65daa1acd0105035a8d20c75542fcf7457952c8058cc2f85b9c7b655

data/.travis.yml

@@ -1,10 +1,13 @@
-before_install: 'sudo chmod 755 ./vendor/bin/youtube-dl'
+before_install:
+  - sudo chmod 755 ./vendor/bin/youtube-dl
+  - sudo apt-get update -qq
+  
 rvm:
-- 1.9.3 # EOL, but still supporting
-- 2.0.0 # Oldest stable
-- 2.2.3 # Current stable
-- jruby-head # JRuby
-- rbx-2 # Rubinius
+  - 1.9.3 # EOL, but still supporting
+  - 2.0.0 # Oldest stable
+  - 2.2.3 # Current stable
+  - jruby-head # JRuby
+  - rbx-2 # Rubinius
 
 notifications:
   slack: layer8x:cvixULdjCINfq7u9Zs1rS0VY

data/README.md

@@ -33,6 +33,8 @@ Or install it yourself as:
 ## Install youtube-dl
 This gem ships with the latest (working) version of youtube-dl built-in, so you don't have to install youtube-dl at all! Unless you want to.
 
+Some features of youtube-dl require ffmpeg or avconf to be installed.  Normally these are available for installation from your distribution's repositories.
+
 ## Usage
 
 Pretty simple.

data/lib/youtube-dl/output.rb

@@ -45,7 +45,7 @@ module YoutubeDL
         if output.include? 'Merging formats into'
           output.scan(/Merging formats into \"(.*)\"/)[0][0]
         else
-          output.scan(/\[download\] Destination:\s(.*)$/)[0][0]
+          output.scan(/\[.*\] Destination:\s(.*)$/).last.last
         end
       end
     rescue NoMethodError # There wasn't a match somewhere. Kill it with fire

data/lib/youtube-dl/version.rb

@@ -1,5 +1,5 @@
 module YoutubeDL
   # Semantic Version as well as the bundled binary version.
   # "(semver)(pre-release)(binary-version)"
-  VERSION = '0.2.3.2015.10.24'
+  VERSION = '0.2.4.2015.10.24'
 end

data/lib/youtube-dl/video.rb

@@ -32,6 +32,8 @@ module YoutubeDL
 
     # Download the video.
     def download
+      raise ArgumentError.new('url cannot be nil') if url.nil?
+      raise ArgumentError.new('url cannot be empty') if url.empty?
       @download_options = YoutubeDL::Options.new(runner_options)
       @last_download_output = YoutubeDL::Runner.new(url, @download_options).run
     end

data/test/fixtures.yml

@@ -29,6 +29,17 @@
     [youtube] gvdf5n-zI14: Downloading DASH manifest
     [download] nope.avi-gvdf5n-zI14.mp4 has already been downloaded
     [download] 100% of 1.31MiB
+  :download_audio: |
+    [youtube] gvdf5n-zI14: Downloading webpage
+    [youtube] gvdf5n-zI14: Downloading video info webpage
+    [youtube] gvdf5n-zI14: Extracting video information
+    [youtube] gvdf5n-zI14: Downloading DASH manifest
+    [youtube] gvdf5n-zI14: Downloading DASH manifest
+    [download] Destination: nope-gvdf5n-zI14.m4a
+    [download] Download completed
+    [ffmpeg] Correcting container in "nope-gvdf5n-zI14.m4a"
+    [ffmpeg] Destination: nope-gvdf5n-zI14.mp3
+    Deleting original file nope-gvdf5n-zI14.m4a (pass -k to keep)
   :list_formats: "[youtube] gvdf5n-zI14: Downloading webpage\n[youtube] gvdf5n-zI14:
     Downloading video info webpage\n[youtube] gvdf5n-zI14: Extracting video information\n[youtube]
     gvdf5n-zI14: Downloading DASH manifest\n[youtube] gvdf5n-zI14: Downloading DASH

data/test/test_helper.rb

@@ -18,6 +18,7 @@ require 'yaml'
 
 require 'youtube-dl'
 
+TEST_ID = "gvdf5n-zI14"
 TEST_URL = "https://www.youtube.com/watch?feature=endscreen&v=gvdf5n-zI14"
 TEST_URL2 = "https://www.youtube.com/watch?v=Mt0PUjh-nDM"
 TEST_FILENAME = "nope.avi.mp4"

data/test/youtube-dl/output_test.rb

@@ -33,18 +33,21 @@ describe YoutubeDL::Output do
       @parser_download = YoutubeDL::Output.new(fixture(:output, :download))
       @parser_download_ffmpeg = YoutubeDL::Output.new(fixture(:output, :download_ffmpeg))
       @parser_download_exists = YoutubeDL::Output.new(fixture(:output, :download_exists))
+      @parser_download_audio = YoutubeDL::Output.new(fixture(:output, :download_audio))
     end
 
     it 'should find a match given the correct output' do
       refute_nil @parser_download.filename
       refute_nil @parser_download_ffmpeg.filename
       refute_nil @parser_download_exists.filename
+      refute_nil @parser_download_audio.filename
     end
 
     it 'should find the correct match' do
       assert_equal 'nope.avi-gvdf5n-zI14.mp4', @parser_download.filename
       assert_equal 'nope.avi-gvdf5n-zI14.mp4', @parser_download_ffmpeg.filename
       assert_equal 'nope.avi-gvdf5n-zI14.mp4', @parser_download_exists.filename
+      assert_equal 'nope-gvdf5n-zI14.mp3', @parser_download_audio.filename
     end
 
     it 'should return nil if no match or wrong log format' do

data/test/youtube-dl/video_test.rb

@@ -54,6 +54,16 @@ describe YoutubeDL::Video do
       @video.download
       assert_equal Dir.glob(TEST_GLOB).first, @video.filename
     end
+
+    it 'should raise ArgumentError if url is nil or empty' do
+      assert_raises ArgumentError do
+        YoutubeDL::Video.new(nil).download
+      end
+
+      assert_raises ArgumentError do
+        YoutubeDL::Video.new('').download
+      end
+    end
   end
 
   describe '#formats' do
@@ -100,5 +110,16 @@ describe YoutubeDL::Video do
       @video.download
       assert_equal TEST_FILENAME, @video.filename
     end
+
+    # Broken on Travis. Output test should be fine.
+    # it 'should give the correct filename when run through ffmpeg' do
+    #   @video.configure do |c|
+    #     c.output = 'nope-%(id)s.%(ext)s'
+    #     c.extract_audio = true
+    #     c.audio_format = 'mp3'
+    #   end
+    #   @video.download
+    #   assert_equal "nope-#{TEST_ID}.mp3", @video.filename
+    # end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: youtube-dl.rb
 version: !ruby/object:Gem::Version
-  version: 0.2.3.2015.10.24
+  version: 0.2.4.2015.10.24
 platform: ruby
 authors:
 - sapslaj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine