youtube-dl.rb 0.3.0.2016.06.16 → 0.3.1.2016.06.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74be0f96111b3354e98fb70ee2ea266f1979164f
-  data.tar.gz: 16847ea04ae98a7c93ecf6618026f1ef70d82412
+  metadata.gz: 48ee28869c55458c861f8a280af1fc4ab86dad21
+  data.tar.gz: b04682f8a13d5fa865a92ecc7c20409d311fc0cf
 SHA512:
-  metadata.gz: a0532e24ebff562b0daea48b9380fb8b751602bba23f37449704b850c0e2a59cb186471c6526f2739e17268255f9d0231c15188c85c00804f92e50d2107fa71c
-  data.tar.gz: 1baee97d5b6bcd2ac2af90dedc77b7cfecc54b4a94d451c52fcf91f71c50cee3b8526a104bbbf62c9eae37a61edf08da14f090aab91aa42a2403f2745d929708
+  metadata.gz: 06b8a17a9269a9691a5c408dc64a827ca100f3a04e98702c3aea6df39e175909312ad448332615836a707c8f38c8b5cea20e898a45295547ea76c42a593402b9
+  data.tar.gz: 0d0ac754552c1eba401ee68c220c8a9b6fe8b337c15de208b98d27737d379f52d7c3355764fe09426a322f62806c8296cc33d171ef23b08aff53fa6d357af3c1

data/.travis.yml

@@ -2,14 +2,16 @@ before_install:
 - sudo chmod 755 ./vendor/bin/youtube-dl
 - sudo apt-get update -qq
 
+bundler_args: --without extras
+
 rvm:
 - 2.0.0 # Too old stable
-- 2.1.8 # Old stable
-- 2.2.4 # Previous Stable
-- 2.3.0 # Current stable
+- 2.1.9 # Old stable
+- 2.2.5 # Previous Stable
+- 2.3.1 # Current stable
 - ruby-head # MRI head
 - jruby # JRuby RVM default
-- jruby-9.0.4.0 # JRuby 9k series
+- jruby-9.1.2.0 # JRuby 9k series
 - jruby-head # JRuby Head
 - rbx-2 # Rubinius stable
 
@@ -19,6 +21,7 @@ matrix:
   allow_failures:
   - rvm: jruby
   - rvm: jruby-head
+  - rvm: ruby-head
 
 notifications:
   slack: layer8x:cvixULdjCINfq7u9Zs1rS0VY

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in youtube-dl.rb.gemspec
 gemspec
+
+group :extras do
+  gem 'pry'
+  gem 'pry-byebug'
+  gem 'm'
+end

data/README.md

@@ -9,6 +9,7 @@ Ruby wrapper for [youtube-dl](http://rg3.github.io/youtube-dl/).
 [![Inline docs](http://inch-ci.org/github/layer8x/youtube-dl.rb.svg?branch=master)](http://inch-ci.org/github/layer8x/youtube-dl.rb)
 [![Dependency Status](https://gemnasium.com/layer8x/youtube-dl.rb.svg)](https://gemnasium.com/layer8x/youtube-dl.rb)
 
+[![Build history for master branch](https://buildstats.info/travisci/chart/layer8x/youtube-dl.rb?branch=master&buildCount=50)](https://travis-ci.org/layer8x/youtube-dl.rb/builds)
 [![Stories in Ready](https://badge.waffle.io/layer8x/youtube-dl.rb.svg?label=ready&title=Ready)](http://waffle.io/layer8x/youtube-dl.rb)
 
 

data/lib/youtube-dl/options.rb

@@ -4,6 +4,9 @@ module YoutubeDL
     # @return [Hash] key value storage object
     attr_accessor :store
 
+    # @return [Array] array of keys that won't be saved to the options store
+    attr_accessor :banned_keys
+
     # Options initializer
     #
     # @param options [Hash] a hash of options
@@ -13,12 +16,15 @@ module YoutubeDL
       else
         @store = options.to_h
       end
+
+      @banned_keys = []
     end
 
     # Returns options as a hash
     #
     # @return [Hash] hash of options
     def to_hash
+      remove_banned
       @store
     end
     alias_method :to_h, :to_hash
@@ -50,6 +56,8 @@ module YoutubeDL
     # @yield [config] self
     def configure
       yield(self) if block_given?
+      remove_banned
+      self
     end
 
     # Get option with brackets syntax
@@ -57,6 +65,8 @@ module YoutubeDL
     # @param key [Object] key
     # @return [Object] value
     def [](key)
+      remove_banned
+      return nil if banned? key
       @store[key.to_sym]
     end
 
@@ -66,9 +76,23 @@ module YoutubeDL
     # @param value [Object] value
     # @return [Object] whatever Hash#= returns
     def []=(key, value)
+      remove_banned
+      return nil if banned? key
       @store[key.to_sym] = value
     end
 
+    # Merge options with given hash, removing banned keys, and returning a
+    # new instance of Options.
+    #
+    # @param hash [Hash] Hash to merge options with
+    # @return [YoutubeDL::Options] Merged Options instance
+    def with(hash)
+      merged = Options.new(@store.merge(hash.to_h))
+      merged.banned_keys = @banned_keys
+      merged.send(:remove_banned)
+      merged
+    end
+
     # Option getting and setting using ghost methods
     #
     # @param method [Symbol] method name
@@ -76,10 +100,13 @@ module YoutubeDL
     # @param block [Proc] implicit block given
     # @return [Object] the value of method in the options store
     def method_missing(method, *args, &_block)
+      remove_banned
       if method.to_s.include? '='
         method = method.to_s.tr('=', '').to_sym
+        return nil if banned? method
         @store[method] = args.first
       else
+        return nil if banned? method
         @store[method]
       end
     end
@@ -120,7 +147,15 @@ module YoutubeDL
       safe_copy
     end
 
-    private
+    # Check if key is a banned key
+    #
+    # @param key [Object] key to check
+    # @return [Boolean] true if key is banned, false if not.
+    def banned?(key)
+      @banned_keys.include? key
+    end
+
+  private
 
     # Helper function to convert option keys into command-line-friendly parameters
     #
@@ -129,5 +164,10 @@ module YoutubeDL
     def paramize(key)
       key.to_s.tr('_', '-')
     end
+
+    # Helper to remove banned keys from store
+    def remove_banned
+      @store.delete_if { |key, value| banned? key }
+    end
   end
 end

data/lib/youtube-dl/version.rb

@@ -1,5 +1,5 @@
 module YoutubeDL
   # Semantic Version as well as the bundled binary version.
   # "(major).(minor).(teeny).(pre-release).(binary-version)"
-  VERSION = '0.3.0.2016.06.16'
+  VERSION = '0.3.1.2016.06.16'.freeze
 end

data/lib/youtube-dl/video.rb

@@ -27,7 +27,8 @@ module YoutubeDL
     # @param options [Hash] Options to populate the everything with
     def initialize(url, options = {})
       @url = url
-      @options = YoutubeDL::Options.new(options)
+      @options = YoutubeDL::Options.new(options.merge(default_options))
+      @options.banned_keys = banned_keys
     end
 
     # Download the video.
@@ -35,8 +36,7 @@ module YoutubeDL
       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)
-      set_information_from_json(YoutubeDL::Runner.new(url, @download_options).run)
+      set_information_from_json(YoutubeDL::Runner.new(url, runner_options).run)
     end
 
     alias_method :get, :download
@@ -45,7 +45,7 @@ module YoutubeDL
     #
     # @return [String] Filename downloaded to
     def filename
-      @information._filename
+      self._filename
     end
 
     # Metadata information for the video, gotten from --print-json
@@ -62,7 +62,7 @@ module YoutubeDL
     # @param block [Proc] explict block
     # @return [Object] The value from @information
     def method_missing(method, *args, &block)
-      value = information.send(method, *args, &block)
+      value = information[method]
 
       if value.nil?
         super
@@ -74,20 +74,37 @@ module YoutubeDL
   private
 
     # Add in other default options here.
-    def runner_options
+    def default_options
       {
         color: false,
         progress: false,
         print_json: true
-      }.merge(@options)
+      }
+    end
+
+    def banned_keys
+      [
+        :get_url,
+        :get_title,
+        :get_id,
+        :get_thumbnail,
+        :get_description,
+        :get_duration,
+        :get_filename,
+        :get_format
+      ]
+    end
+
+    def runner_options
+      YoutubeDL::Options.new(@options.to_h.merge(default_options))
     end
 
     def set_information_from_json(json) # :nodoc:
-      @information = OpenStruct.new(JSON.parse(json))
+      @information = JSON.parse(json, symbolize_names: true)
     end
 
     def grab_information_without_download # :nodoc:
-      set_information_from_json(YoutubeDL::Runner.new(url, runner_options.merge({skip_download: true})).run)
+      set_information_from_json(YoutubeDL::Runner.new(url, runner_options.with({skip_download: true})).run)
     end
   end
 end

data/youtube-dl.rb.gemspec

@@ -13,16 +13,14 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/layer8x/youtube-dl.rb'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  #spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_dependency 'cocaine', '>=0.5.4'
 
   spec.add_development_dependency 'bundler', '>= 1.6'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'm'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.8.1'
   spec.add_development_dependency 'purdytest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: youtube-dl.rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0.2016.06.16
+  version: 0.3.1.2016.06.16
 platform: ruby
 authors:
 - sapslaj
@@ -39,34 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: m
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,12 +118,6 @@ files:
 - lib/youtube-dl/support.rb
 - lib/youtube-dl/version.rb
 - lib/youtube-dl/video.rb
-- test/test_helper.rb
-- test/youtube-dl/options_test.rb
-- test/youtube-dl/runner_test.rb
-- test/youtube-dl/support_test.rb
-- test/youtube-dl/video_test.rb
-- test/youtube-dl_test.rb
 - vendor/bin/youtube-dl
 - vendor/bin/youtube-dl.exe
 - youtube-dl.rb.gemspec
@@ -179,10 +145,4 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: youtube-dl wrapper for Ruby
-test_files:
-- test/test_helper.rb
-- test/youtube-dl/options_test.rb
-- test/youtube-dl/runner_test.rb
-- test/youtube-dl/support_test.rb
-- test/youtube-dl/video_test.rb
-- test/youtube-dl_test.rb
+test_files: []

data/test/test_helper.rb

@@ -1,36 +0,0 @@
-if RUBY_PLATFORM == "java"
-  require 'simplecov'
-  SimpleCov.start
-else
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-gem 'minitest'
-require 'minitest/autorun'
-require 'minitest/spec'
-require 'purdytest' # minitest-colorize is broken in minitest version 5
-require 'pry'
-require 'fileutils'
-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"
-TEST_FORMAT = "5"
-TEST_GLOB = "nope*"
-
-def remove_downloaded_files
-  Dir.glob("**/*nope*").each do |nope|
-    File.delete(nope)
-  end
-end
-
-def travis_ci?
-  !!ENV['TRAVIS']
-end

data/test/youtube-dl/options_test.rb

@@ -1,145 +0,0 @@
-require_relative '../test_helper'
-
-describe YoutubeDL::Options do
-  before do
-    @options = YoutubeDL::Options.new
-  end
-
-  describe '#initialize' do
-    it 'should symbolize option keys' do
-      @options.store['key'] = "value"
-      @options.sanitize_keys!
-      assert_equal({key: 'value'}, @options.store)
-    end
-
-    it 'should accept a parent Options as a param' do
-      parent = YoutubeDL::Options.new(parent_key: 'parent value')
-      child = YoutubeDL::Options.new(parent)
-      assert_equal parent.store, child.store
-    end
-
-    it 'should accept a Hash as a param' do
-      hash = {parent_key: 'parent value'}
-      options = YoutubeDL::Options.new(hash)
-      assert_equal hash, options.store
-    end
-  end
-
-  describe '#to_hash, #to_h' do
-    before do
-      @options.store[:key] = "value"
-    end
-
-    it 'should return a hash' do
-      assert_instance_of Hash, @options.to_hash
-    end
-
-    it 'should be equal to store' do
-      assert_equal @options.store, @options.to_hash
-    end
-  end
-
-  describe '#each_paramized' do
-    it 'should properly paramize keys and not values' do
-      @options.some_key = "some value"
-
-      @options.each_paramized do |key, value|
-        assert_equal key, 'some-key'
-        assert_equal value, 'some value'
-      end
-    end
-  end
-
-  describe '#each_paramized_key' do
-    it 'should properly paramize keys' do # TODO: Write a better test name
-      @options.some_key = "some value"
-
-      @options.each_paramized_key do |key, paramized_key|
-        assert_equal :some_key, key
-        assert_equal 'some-key', paramized_key
-      end
-    end
-  end
-
-  describe '#configure' do
-    it 'should be able to use an explicit configuration block' do
-      @options.configure do |c|
-        c.get_operator = true
-        c['get_index'] = true
-      end
-
-      assert @options.store[:get_operator], "Actual: #{@options.store[:get_operator]}"
-      assert @options.store[:get_index], "Actual: #{@options.store[:get_index]}"
-    end
-
-    it 'should not override parent configuration' do
-      opts = YoutubeDL::Options.new(parent: 'value')
-      opts.configure do |c|
-        c.child = 'vlaue'
-      end
-
-      assert_equal opts.store[:parent], 'value'
-      assert_equal opts.store[:child], 'vlaue'
-    end
-  end
-
-  describe '#[], #[]==' do
-    it 'should be able to use brackets' do
-      @options[:mtn] = :dew
-      assert @options[:mtn] == :dew
-    end
-
-    it 'should automatically symbolize keys' do
-      @options.get_operator = true
-      @options['get_index'] = true
-
-      [:get_operator, :get_index].each do |d|
-        assert @options.store.keys.include?(d), "keys not symbolizing automatically: #{d}"
-      end
-    end
-  end
-
-  describe '#method_missing' do
-    it 'should be able to set options with method_missing' do
-      @options.test = true
-
-      assert @options.store[:test]
-    end
-
-    it 'should be able to retrieve options with method_missing' do
-      @options.store[:walrus] = 'haswalrus'
-
-      assert @options.walrus == 'haswalrus'
-    end
-  end
-
-  describe '#manipulate_keys!' do
-    it 'should manipulate keys' do
-      @options.some_key = 'value'
-      @options.manipulate_keys! do |key|
-        key.to_s.upcase
-      end
-      assert_equal({'SOME_KEY' => 'value'}, @options.store)
-    end
-  end
-
-  describe '#sanitize_keys!' do
-    it 'should convert hyphens to underscores in keys' do # See issue #9
-      @options.store[:"hyphenated-key"] = 'value'
-      @options.sanitize_keys!
-      assert_equal({hyphenated_key: 'value'}, @options.to_h)
-    end
-  end
-
-  describe '#sanitize_keys' do
-    it 'should not modify the original by calling sanitize_keys without bang' do
-      @options.store['some-key'] = "some_value"
-      refute_equal @options.sanitize_keys, @options
-    end
-
-    it 'should return instance of Options when calling sanitize_keys' do
-      @options.store['some-key'] = "some_value"
-      assert_instance_of YoutubeDL::Options, @options.sanitize_keys
-    end
-  end
-end

data/test/youtube-dl/runner_test.rb

@@ -1,86 +0,0 @@
-require_relative '../test_helper'
-
-describe YoutubeDL::Runner do
-  before do
-    @runner = YoutubeDL::Runner.new(TEST_URL)
-  end
-
-  after do
-    remove_downloaded_files
-  end
-
-  describe '#initialize' do
-    it 'should take options as a hash yet still have configuration blocks work' do
-      r = YoutubeDL::Runner.new(TEST_URL, {some_key: 'some value'})
-      r.options.configure do |c|
-        c.another_key = 'another_value'
-      end
-
-      assert_includes r.to_command, "--some-key"
-      assert_includes r.to_command, "--another-key"
-    end
-  end
-
-  describe '#executable_path' do
-    it 'should set executable path automatically' do
-      assert_match 'youtube-dl', @runner.executable_path
-    end
-
-    it 'should not have a newline char in the executable_path' do
-      assert_match(/youtube-dl\z/, @runner.executable_path)
-    end
-  end
-
-  describe '#backend_runner=, #backend_runner' do
-    it 'should set cocaine runner' do
-      @runner.backend_runner = Cocaine::CommandLine::BackticksRunner.new
-      assert_instance_of Cocaine::CommandLine::BackticksRunner, @runner.backend_runner
-
-      @runner.backend_runner = Cocaine::CommandLine::PopenRunner.new
-      assert_instance_of Cocaine::CommandLine::PopenRunner, @runner.backend_runner
-    end
-  end
-
-  describe '#to_command' do
-    it 'should parse key-values from options' do
-      @runner.options.some_key = "a value"
-
-      refute_nil @runner.to_command.match(/--some-key\s.*a value.*/)
-    end
-
-    it 'should handle true boolean values' do
-      @runner.options.truthy_value = true
-
-      assert_match(/youtube-dl .*--truthy-value\s--|\"http.*/, @runner.to_command)
-    end
-
-    it 'should handle false boolean values' do
-      @runner.options.false_value = false
-
-      assert_match(/youtube-dl .*--no-false-value\s--|\"http.*/, @runner.to_command)
-    end
-
-    it 'should not have newline char in to_command' do
-      assert_match(/youtube-dl\s/, @runner.to_command)
-    end
-  end
-
-  describe '#run' do
-    it 'should run commands' do
-      @runner.options.output = TEST_FILENAME
-      @runner.options.format = TEST_FORMAT
-      @runner.run
-      assert File.exists? TEST_FILENAME
-    end
-  end
-
-  describe '#configure' do
-    it 'should update configuration options' do
-      @runner.configure do |c|
-        c.output = TEST_FILENAME
-      end
-
-      assert_equal TEST_FILENAME, @runner.options.output
-    end
-  end
-end

data/test/youtube-dl/support_test.rb

@@ -1,64 +0,0 @@
-require_relative '../test_helper'
-
-TestKlass = Class.new do
-  include YoutubeDL::Support
-
-  def executable_path
-    usable_executable_path_for 'youtube-dl'
-  end
-end
-
-describe YoutubeDL::Support do
-  before do
-    @klass = TestKlass.new
-  end
-
-  describe '#usable_executable_path' do
-    it 'should detect system executable' do
-      vendor_bin = File.join(Dir.pwd, 'vendor', 'bin', 'youtube-dl')
-      Dir.mktmpdir do |tmpdir|
-        FileUtils.cp vendor_bin, tmpdir
-
-        old_path = ENV["PATH"]
-        ENV["PATH"] = "#{tmpdir}:#{old_path}"
-
-        usable_path = @klass.usable_executable_path_for('youtube-dl')
-        assert_match usable_path, "#{tmpdir}/youtube-dl"
-
-        ENV["PATH"] = old_path
-      end
-    end
-
-    it 'should not have a newline char in the executable_path' do
-      assert_match(/youtube-dl\z/, @klass.executable_path)
-    end
-  end
-
-  describe '#cocaine_line' do
-    it 'should return a Cocaine::CommandLine instance' do
-      assert_instance_of Cocaine::CommandLine, @klass.cocaine_line('')
-    end
-
-    it 'should be able to override the executable' do
-      line = @klass.cocaine_line('hello', 'echo')
-      assert_equal "echo hello", line.command
-    end
-
-    it 'should default to youtube-dl' do
-      line = @klass.cocaine_line(@klass.quoted(TEST_URL))
-      assert_includes line.command, "youtube-dl \"#{TEST_URL}\""
-    end
-  end
-
-  describe '#quoted' do
-    it 'should add quotes' do
-      assert_equal "\"#{TEST_URL}\"", @klass.quoted(TEST_URL)
-    end
-  end
-
-  describe '#which' do
-    it 'should find a proper executable' do
-      assert File.exists?(@klass.which('ls'))
-    end
-  end
-end

data/test/youtube-dl/video_test.rb

@@ -1,136 +0,0 @@
-require_relative '../test_helper'
-
-describe YoutubeDL::Video do
-  before do
-    @video = YoutubeDL::Video.new TEST_URL
-  end
-
-  after do
-    remove_downloaded_files
-  end
-
-  describe '.download' do
-    it 'should download videos without options' do
-      YoutubeDL::Video.download TEST_URL
-      assert_equal 1, Dir.glob(TEST_GLOB).length
-    end
-
-    it 'should download videos with options' do
-      YoutubeDL::Video.download TEST_URL, output: TEST_FILENAME, format: TEST_FORMAT
-      assert File.exist? TEST_FILENAME
-    end
-
-    it 'should return an instance of YoutubeDL::Video' do
-      video = YoutubeDL::Video.download TEST_URL
-      assert_instance_of YoutubeDL::Video, video
-    end
-  end
-
-  describe '.get' do
-    it 'should download videos, exactly like .download' do
-      YoutubeDL::Video.get TEST_URL
-      assert_equal Dir.glob(TEST_GLOB).length, 1
-    end
-  end
-
-  describe '#initialize' do
-    it 'should return an instance of YoutubeDL::Video' do
-      assert_instance_of YoutubeDL::Video, @video
-    end
-
-    it 'should not download anything' do
-      assert_empty Dir.glob(TEST_GLOB)
-    end
-  end
-
-  describe '#download' do
-    it 'should download the file' do
-      assert_equal 0, Dir.glob(TEST_GLOB).length
-      @video.download
-      assert_equal 1, Dir.glob(TEST_GLOB).length
-    end
-
-    it 'should set model variables accordingly' 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 '#filename' do
-    before do
-      @video.options.configure do |c|
-        c.output = TEST_FILENAME
-      end
-    end
-
-    it 'should be able to get the filename from the output' do
-      @video.download
-      assert_equal TEST_FILENAME, @video.filename
-    end
-
-    it 'should be able to be predicted' do
-      predicted_filename = @video.information[:_filename]
-      @video.download
-      assert_equal predicted_filename, @video.filename
-    end
-
-    it 'should not return previously predicted filename' do
-      predicted_filename = @video.information[:_filename]
-      @video.configure do |c|
-        c.output = "#{TEST_FILENAME}.2"
-      end
-      @video.download
-      refute_equal @video.filename, predicted_filename
-    end
-
-    # Broken on Travis. Output test should be fine.
-    # it 'should give the correct filename when run through ffmpeg' do
-    #   skip if travis_ci?
-    #   @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
-
-  describe '#information' do
-    before do
-      @information = @video.information
-    end
-
-    it 'should be an OpenStruct' do
-      assert_instance_of OpenStruct, @information
-    end
-  end
-
-  describe '#method_missing' do
-    it 'should pull values from @information' do
-      assert_equal 'youtube', @video.information[:extractor] # Sanity Check
-      assert_equal 'youtube', @video.extractor
-    end
-
-    it 'should return correct formats for things' do
-      assert_instance_of Array, @video.formats
-      assert_instance_of Hash, @video.subtitles
-    end
-
-    it 'should fail if a method does not exist' do
-      assert_raises NoMethodError do
-        @video.i_dont_exist
-      end
-    end
-  end
-end

data/test/youtube-dl_test.rb

@@ -1,84 +0,0 @@
-require_relative './test_helper'
-
-describe YoutubeDL do
-  describe '.download' do
-    after do
-      remove_downloaded_files
-    end
-
-    it 'should download videos without options' do
-      YoutubeDL.download TEST_URL
-      assert_equal 1, Dir.glob(TEST_GLOB).length
-    end
-
-    it 'should download videos with options' do
-      YoutubeDL.download TEST_URL, output: TEST_FILENAME, format: TEST_FORMAT
-      assert File.exist? TEST_FILENAME
-    end
-
-    it 'should download multiple videos without options' do
-      YoutubeDL.download [TEST_URL, TEST_URL2]
-      assert_equal 2, Dir.glob(TEST_GLOB).length
-    end
-
-    it 'should download multiple videos with options' do
-      YoutubeDL.download [TEST_URL, TEST_URL2], output: 'test_%(title)s-%(id)s.%(ext)s'
-      assert_equal 2, Dir.glob('test_' + TEST_GLOB).length
-    end
-  end
-
-  describe '.get' do
-    after do
-      remove_downloaded_files
-    end
-
-    it 'should download videos, exactly like .download' do
-      YoutubeDL.get TEST_URL
-      assert_equal Dir.glob(TEST_GLOB).length, 1
-    end
-  end
-
-  describe '.extractors' do
-    before do
-      @extractors = YoutubeDL.extractors
-    end
-
-    it 'should return an Array' do
-      assert_instance_of Array, @extractors
-    end
-
-    it 'should include the youtube extractors' do
-      ['youtube', 'youtube:channel', 'youtube:search', 'youtube:show', 'youtube:user', 'youtube:playlist'].each do |e|
-        assert_includes @extractors, e
-      end
-    end
-  end
-
-  describe '.binary_version' do
-    before do
-      @version = YoutubeDL.binary_version
-    end
-
-    it 'should return a string' do
-      assert_instance_of String, @version
-    end
-
-    it 'should be a specific format with no newlines' do
-      assert_match /\d+.\d+.\d+\z/, @version
-    end
-  end
-
-  describe '.user_agent' do
-    before do
-      @user_agent = YoutubeDL.user_agent
-    end
-
-    it 'should return a string' do
-      assert_instance_of String, @user_agent
-    end
-
-    it 'should be a specific format with no newlines' do
-      assert_match /Mozilla\/5\.0\s.*\)\z/, @user_agent
-    end
-  end
-end