youtube-dl.rb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7c86b235fb38c06bc33f5984e8993d166da84c8
-  data.tar.gz: 3711e90fbc95e01c0f1175ccdf2833c1f188908d
+  metadata.gz: 1c86f76bf2febd54113c84142274c4c496855ebf
+  data.tar.gz: 0da55077bb17767338d0bde1ae75ed1fc1d9e78d
 SHA512:
-  metadata.gz: aad917d66ff21d4ecb11bf1f8228c1091dd9b618ab56cded145ed0bac9ef4685d6098860cbeb06cf5c66d7abd651259fe76fc157af82934ab1cc02e4f34b8795
-  data.tar.gz: dea3940ed3ef94ad31e38f177c4b6824ec11f086038d014e590425d15d5760767b29614ca01948bf4b406854c60e5c8b7932b0f302367d31ef18b9826d5c57bb
+  metadata.gz: ef750607464a9a53882193569508b45b5f59d9b8c60fa30166bcded52a7a4ef1ae46223849aded5de47cbef64960a4958c78591d15528a46971465ca5d545d7a
+  data.tar.gz: b18889569bf6401ee10bffc6edab536d0f066cd3379cd487b65f2038b743ec1a7509f333e01c492d0dd81791df8c070d53e7b4de9dc9eb1a967d292b8ef0cc2d

data/lib/youtube-dl.rb

@@ -1,7 +1,9 @@
 require 'youtube-dl/version'
 require 'youtube-dl/support'
 require 'youtube-dl/options'
+require 'youtube-dl/output'
 require 'youtube-dl/runner'
+require 'youtube-dl/video'
 
 module YoutubeDL
   extend self
@@ -12,22 +14,33 @@ module YoutubeDL
   # @param urls [String, Array] URLs to download
   # @param options [Hash] Downloader options
   def download(urls, options={})
-    # force convert urls to array
-    urls = [urls] unless urls.is_a? Array
-
-    urls.each do |url|
-      runner = YoutubeDL::Runner.new(url, YoutubeDL::Options.new(options))
-      runner.run
+    if urls.is_a? Array
+      urls.map { |url| YoutubeDL::Video.get(url, options) }
+    else
+      YoutubeDL::Video.get(urls, options) # Urls should be singular but oh well. url = urls. There. Go cry in a corner.
     end
   end
 
   alias_method :get, :download
 
+  # Lists extractors
+  #
+  # @return [Array] list of extractors
   def extractors
-    Cocaine::CommandLine.new(usable_executable_path_for('youtube-dl'), '--list-extractors').run.split("\n")
+    @extractors ||= cocaine_line('--list-extractors').run.split("\n")
   end
 
+  # Returns youtube-dl's version
+  #
+  # @return [String] youtube-dl version
   def binary_version
-    Cocaine::CommandLine.new(usable_executable_path_for('youtube-dl'), '--version').run.chomp
+    @binary_version ||= cocaine_line('--version').run.strip
+  end
+
+  # Returns user agent
+  #
+  # @return [String] user agent
+  def user_agent
+    @user_agent ||= cocaine_line('--dump-user-agent').run.strip
   end
 end

data/lib/youtube-dl/options.rb

@@ -6,7 +6,11 @@ module YoutubeDL
     #
     # @param options [Hash] a hash of options
     def initialize(options={})
-      @store = options
+      if options.is_a? Hash
+        @store = options
+      else
+        @store = options.to_h
+      end
     end
 
     # Returns options as a hash
@@ -40,9 +44,8 @@ module YoutubeDL
     # Set options using a block
     #
     # @yield [config] self
-    # TODO: support calling without arguments
-    def configure(&block)
-      block.call(self)
+    def configure
+      yield(self) if block_given?
     end
 
     # Get option with brackets syntax

data/lib/youtube-dl/output.rb

@@ -0,0 +1,51 @@
+module YoutubeDL
+  # A class of voodoo methods for parsing youtube-dl output
+  class Output < Struct.new(:output)
+    # Takes the output of '--list-formats'
+    #
+    # @return [Array] Array of supported formats
+    def supported_formats
+      # WARNING: This shit won't be documented or even properly tested. It's almost 3 in the morning and I have no idea what I'm doing.
+      header_index = output.index('format code')
+      return nil if header_index.nil?
+
+      formats = []
+      output.slice(header_index..-1).split("\n").each do |line|
+        format = {}
+        format[:format_code], format[:extension], format[:resolution], format[:note] = line.scan(/\A(\d+)\s+(\w+)\s+(\S+)\s(.*)/)[0]
+        formats.push format
+      end
+      formats.shift # The first line is just headers
+      formats.map do |format|
+        format[:note].strip! # Get rid of any trailing whitespace on the note.
+        format[:format_code] = format[:format_code].to_i # convert format code to integer
+        format
+      end
+    end
+
+    # Takes the output of a download
+    #
+    # @return [String] filename saved, nil if no match
+    def filename
+      # Check to see if file was already downloaded
+      if already_downloaded?
+        output.scan(/\[download\]\s(.*)\shas already been downloaded/)[0][0]
+      else
+        if output.include? 'Merging formats into'
+          output.scan(/Merging formats into \"(.*)\"/)[0][0]
+        else
+          output.scan(/\[download\] Destination:\s(.*)$/)[0][0]
+        end
+      end
+    rescue NoMethodError # There wasn't a match somewhere. Kill it with fire
+      nil
+    end
+
+    # Takes the output of a download
+    #
+    # @return [Boolean] Has the file already been downloaded?
+    def already_downloaded?
+      output.include? 'has already been downloaded'
+    end
+  end
+end

data/lib/youtube-dl/runner.rb

@@ -4,18 +4,33 @@ module YoutubeDL
   class Runner
     include YoutubeDL::Support
 
+    # [String] URL to download
     attr_accessor :url
+
+    # [YoutubeDL::Options] Options access.
     attr_accessor :options
-    attr_accessor :executable_path
+
+    # [String] Executable path
+    attr_reader :executable_path
+
+    # [String] Executable name to use
+    attr_accessor :executable
 
     # Command Line runner initializer
     #
     # @param url [String] URL to pass to youtube-dl executable
     # @param options [Hash, Options] options to pass to the executable. Automatically converted to Options if it isn't already
-    def initialize(url, options=YoutubeDL::Options.new)
+    def initialize(url, options = {})
       @url = url
-      @options = YoutubeDL::Options.new(options.to_hash)
-      @executable_path = usable_executable_path_for('youtube-dl')
+      @options = YoutubeDL::Options.new(options)
+      @executable = 'youtube-dl'
+    end
+
+    # Returns usable executable path for youtube-dl
+    #
+    # @return [String] usable executable path for youtube-dl
+    def executable_path
+      @executable_path ||= usable_executable_path_for(@executable)
     end
 
     # Returns Cocaine's runner engine
@@ -28,6 +43,7 @@ module YoutubeDL
     # Sets Cocaine's runner engine
     #
     # @param [CommandLineRunner] backend runner class
+    # @return [Object] whatever Cocaine::CommandLine.runner= returns.
     def backend_runner=(cocaine_runner)
       Cocaine::CommandLine.runner = cocaine_runner
     end
@@ -41,30 +57,25 @@ module YoutubeDL
     alias_method :command, :to_command
 
     # Runs the command
+    #
+    # @return [String] the output of youtube-dl
     def run
       cocaine_line(options_to_commands).run(@options.store)
     end
     alias_method :download, :run
 
-    # Returns a list of supported formats for the video in the form of
-    # [{:format_code => '000', :extension => 'avi', :resolution => '320x240', :note => 'More details about the format'}]
-    #
-    # @return [Array] Format list
-    def formats
-      # TODO: Move formats to its own model?
-      parse_format_output(cocaine_line("--list-formats #{quoted(url)}").run)
-    end
-
-    private
+  private
 
     # Parses options and converts them to Cocaine's syntax
     #
     # @return [String] commands ready to do cocaine
     def options_to_commands
       commands = []
-      options.sanitize_keys.each_paramized_key do |key, paramized_key|
-        if options[key].to_s == 'true'
+      @options.sanitize_keys.each_paramized_key do |key, paramized_key|
+        if @options[key].to_s == 'true'
           commands.push "--#{paramized_key}"
+        elsif @options[key].to_s == 'false'
+          commands.push "--no-#{paramized_key}"
         else
           commands.push "--#{paramized_key} :#{key}"
         end
@@ -72,37 +83,5 @@ module YoutubeDL
       commands.push quoted(url)
       commands.join(' ')
     end
-
-    # Helper to add quotes to beginning and end of a URL.
-    #
-    # @param url [String] Raw URL
-    # @return [String] Quoted URL
-    def quoted(url)
-      "\"#{url}\""
-    end
-
-    # Helper for doing lines of cocaine (initializing, auto executable stuff, etc)
-    #
-    # @param command [String] command switches to run
-    # @return [Cocaine::CommandLine] initialized Cocaine instance
-    def cocaine_line(command)
-      Cocaine::CommandLine.new(@executable_path, command)
-    end
-
-    # Do you like voodoo?
-    #
-    # @param format_output [String] output from youtube-dl --list-formats
-    # @return [Array] Magic.
-    def parse_format_output(format_output)
-      # WARNING: This shit won't be documented or even properly tested. It's almost 3 in the morning and I have no idea what I'm doing.
-      this_shit = []
-      format_output.slice(format_output.index('format code')..-1).split("\n").each do |line|
-        a = {}
-        a[:format_code], a[:extension], a[:resolution], a[:note] = line.scan(/\A(\d+)\s+(\w+)\s+(\S+)\s(.*)/)[0]
-        this_shit.push a
-      end
-      this_shit.shift
-      this_shit.map { |gipo| gipo[:note].strip!; gipo }
-    end
   end
 end

data/lib/youtube-dl/support.rb

@@ -11,11 +11,31 @@ module YoutubeDL
       if $?.exitstatus == 0 # $? is an object with information on that last command run with backticks.
         system_path.strip
       else
-        # TODO: Search vendor bin for executable before just saying it's there. 
+        # TODO: Search vendor bin for executable before just saying it's there.
         vendor_path = File.absolute_path("#{__FILE__}/../../../vendor/bin/#{exe}")
         File.chmod(775, vendor_path) unless File.executable?(vendor_path) # Make sure vendor binary is executable
         vendor_path
       end
     end
+
+    alias_method :executable_path_for, :usable_executable_path_for
+
+    # Helper for doing lines of cocaine (initializing, auto executable stuff, etc)
+    #
+    # @param command [String] command switches to run
+    # @param executable_path [String] executable to run. Defaults to usable youtube-dl.
+    # @return [Cocaine::CommandLine] initialized Cocaine instance
+    def cocaine_line(command, executable_path = nil)
+      executable_path = executable_path_for('youtube-dl') if executable_path.nil?
+      Cocaine::CommandLine.new(executable_path, command)
+    end
+
+    # Helper to add quotes to beginning and end of a URL or whatever you want....
+    #
+    # @param url [String] Raw URL
+    # @return [String] Quoted URL
+    def quoted(url)
+      "\"#{url}\""
+    end
   end
 end

data/lib/youtube-dl/version.rb

@@ -1,3 +1,3 @@
 module YoutubeDL
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/youtube-dl/video.rb

@@ -0,0 +1,60 @@
+module YoutubeDL
+  # Video model
+  class Video < Runner
+    class << self
+      # Instantiate a new Video model and download the video
+      #
+      # @param url [String] URL to use and download
+      # @param options [Hash] Options to pass in
+      # @return [YoutubeDL::Video] new Video model
+      def download(url, options={})
+        video = new(url, options)
+        video.download
+        video
+      end
+
+      alias_method :get, :download
+    end
+
+    # [YoutubeDL::Options] Download Options for the last download
+    attr_reader :download_options
+
+    # Instantiate new model
+    #
+    # @param url [String] URL to initialize with
+    # @param options [Hash] Options to populate the everything with
+    def initialize(url, options={})
+      @url = url
+      @options = YoutubeDL::Options.new(options)
+    end
+
+    # Download the video.
+    def download
+      @download_options = YoutubeDL::Options.new(runner_options)
+      @last_download_output = YoutubeDL::Runner.new(url, @download_options).run
+    end
+
+    alias_method :get, :download
+
+    # Returns a list of supported formats for the video in the form of
+    # [{:format_code => '000', :extension => 'avi', :resolution => '320x240', :note => 'More details about the format'}]
+    #
+    # @return [Array] Format list
+    def formats
+      @formats ||= YoutubeDL::Output.new(cocaine_line("--list-formats #{quoted(url)}").run).supported_formats
+    end
+
+    # @return [String] Filename downloaded to
+    def filename
+      @filename ||= YoutubeDL::Output.new(@last_download_output).filename
+    end
+
+  private
+    # Add in other default options here.
+    def runner_options
+      {
+        no_color: true
+      }.merge(@options)
+    end
+  end
+end

data/test/test_helper.rb

@@ -24,7 +24,7 @@ TEST_FORMAT = "5"
 TEST_GLOB = "nope*"
 
 def remove_downloaded_files
-  Dir.glob("**/nope*").each do |nope|
+  Dir.glob("**/*nope*").each do |nope|
     File.delete(nope)
   end
 end

data/test/youtube-dl/options_test.rb

@@ -5,87 +5,141 @@ describe YoutubeDL::Options do
     @options = YoutubeDL::Options.new
   end
 
-  it 'should symbolize option keys' do
-    @options.store['key'] = "value"
-    @options.sanitize_keys!
-    assert_equal({key: 'value'}, @options.store)
+  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
 
-  it 'should be able to set options with method_missing' do
-    @options.test = true
+  describe '#to_hash, #to_h' do
+    before do
+      @options.store[:key] = "value"
+    end
 
-    assert @options.store[:test]
+    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
 
-  it 'should be able to retrieve options with method_missing' do
-    @options.store[:walrus] = 'haswalrus'
+  describe '#each_paramized' do
+    it 'should properly paramize keys and not values' do
+      @options.some_key = "some value"
 
-    assert @options.walrus == 'haswalrus'
+      @options.each_paramized do |key, value|
+        assert_equal key, 'some-key'
+        assert_equal value, 'some value'
+      end
+    end
   end
 
-  it 'should be able to use brackets' do
-    @options[:mtn] = :dew
-    assert @options[:mtn] == :dew
+  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
 
-  it 'should be able to use a configuration block' do
-    @options.configure do |c|
-      c.get_operator = true
-      c['get_index'] = true
+  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
 
-    assert @options.store[:get_operator], "Actual: #{@options.store[:get_operator]}"
-    assert @options.store[:get_index], "Actual: #{@options.store[:get_index]}"
+    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
 
-  it 'should automatically symbolize keys' do
-    @options.get_operator = true
-    @options['get_index'] = true
+  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}"
+      [:get_operator, :get_index].each do |d|
+        assert @options.store.keys.include?(d), "keys not symbolizing automatically: #{d}"
+      end
     end
   end
 
-  it 'should properly paramize keys and not values' do
-    @options.some_key = "some value"
+  describe '#method_missing' do
+    it 'should be able to set options with method_missing' do
+      @options.test = true
 
-    @options.each_paramized do |key, value|
-      assert_equal key, 'some-key'
-      assert_equal value, 'some value'
+      assert @options.store[:test]
     end
-  end
 
-  it 'should make each_paramized_key work' do # TODO: Write a better test name
-    @options.some_key = "some value"
+    it 'should be able to retrieve options with method_missing' do
+      @options.store[:walrus] = 'haswalrus'
 
-    @options.each_paramized_key do |key, paramized_key|
-      assert_equal :some_key, key
-      assert_equal 'some-key', paramized_key
+      assert @options.walrus == 'haswalrus'
     end
   end
 
-  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)
+  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
 
-  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
+  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
 
-  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
+  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 manipulate keys' do
-    @options.some_key = 'value'
-    @options.manipulate_keys! do |key|
-      key.to_s.upcase
+    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
-    assert_equal({'SOME_KEY' => 'value'}, @options.store)
   end
 end

data/test/youtube-dl/output_test.rb

@@ -0,0 +1,100 @@
+require_relative '../test_helper'
+
+module OutputFactory
+  extend self
+  extend YoutubeDL::Support
+
+  def download
+    remove_downloaded_files # Make sure there isn't a file there
+    @download ||= cocaine_line(quoted(TEST_URL)).run
+  end
+
+  def download_exists
+    @download_exists ||= lambda do
+      cocaine_line(quoted(TEST_URL)).run # two times to make sure it's there.
+      cocaine_line(quoted(TEST_URL)).run
+    end.call
+  end
+
+  def list_formats
+    @list_formats ||= cocaine_line("--list-formats #{quoted(TEST_URL)}").run
+  end
+end
+
+# For debugging
+# puts
+# puts " --------------- OutputFactory.download --------------- "
+# puts OutputFactory.download
+# puts
+# puts " --------------- OutputFactory.download_exists --------------- "
+# puts OutputFactory.download_exists
+# puts
+# puts " --------------- OutputFactory.list_formats --------------- "
+# puts OutputFactory.list_formats
+# puts
+
+describe YoutubeDL::Output do
+  describe '#initialize' do
+    it 'should set the output variable' do
+      sample_output = "some sample output\n\n"
+      parser = YoutubeDL::Output.new(sample_output)
+      assert_equal sample_output, parser.output
+    end
+  end
+
+  describe '#supported_formats' do
+    before do
+      @parser = YoutubeDL::Output.new(OutputFactory.list_formats)
+    end
+
+    it 'should find a match given the correct output' do
+      refute_nil @parser.supported_formats
+    end
+
+    it 'should find the correct match and in the correct format' do
+      assert_includes(@parser.supported_formats, {format_code: 5, extension: 'flv', resolution: '400x240', note: 'small'})
+    end
+
+    it 'should return nil if no match or wrong log format' do
+      bad_parser = YoutubeDL::Output.new(OutputFactory.download)
+      assert_nil bad_parser.supported_formats
+    end
+  end
+
+  describe '#filename' do
+    before do
+      @parser_download = YoutubeDL::Output.new(OutputFactory.download)
+      @parser_download_exists = YoutubeDL::Output.new(OutputFactory.download_exists)
+    end
+
+    it 'should find a match given the correct output' do
+      refute_nil @parser_download.filename
+      refute_nil @parser_download_exists.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_exists.filename
+    end
+
+    it 'should return nil if no match or wrong log format' do
+      bad_parser = YoutubeDL::Output.new(OutputFactory.list_formats)
+      assert_nil bad_parser.filename
+    end
+  end
+
+  describe '#already_downloaded?' do
+    before do
+      @parser_download = YoutubeDL::Output.new(OutputFactory.download)
+      @parser_download_exists = YoutubeDL::Output.new(OutputFactory.download_exists)
+    end
+
+    it 'should return a truthy value if true' do
+      assert @parser_download_exists.already_downloaded?
+    end
+
+    it 'should return a falsy value if false' do
+      refute @parser_download.already_downloaded?
+    end
+  end
+end

data/test/youtube-dl/runner_test.rb

@@ -9,75 +9,68 @@ describe YoutubeDL::Runner do
     remove_downloaded_files
   end
 
-  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
+  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
 
-  it 'should set executable path automatically' do
-    assert_match 'youtube-dl', @runner.executable_path
-  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
+    it 'should not have a newline char in the executable_path' do
+      assert_match /youtube-dl\z/, @runner.executable_path
+    end
   end
 
-  it 'should not have newline char in to_command' do
-    assert_match /youtube-dl\s/, @runner.to_command
+  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
 
-  it 'should parse key-values from options' do
-    @runner.options.some_key = "a value"
+  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
+      refute_nil @runner.to_command.match(/--some-key\s.*a value.*/)
+    end
 
-  it 'should not include the value if value is true' do
-    @runner.options.some_key = true
+    it 'should handle true boolean values' do
+      @runner.options.truthy_value = true
 
-    refute @runner.to_command.include?("--some-key 'true'"), "adding true to boolean key >:("
-  end
+      assert_match /youtube-dl .*--truthy-value\s--|\"http.*/, @runner.to_command
+    end
 
-  it 'should run commands' do
-    @runner.options.output = TEST_FILENAME
-    @runner.options.format = TEST_FORMAT
-    @runner.run
-    assert File.exists? TEST_FILENAME
-  end
+    it 'should handle false boolean values' do
+      @runner.options.false_value = false
 
-  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'
+      assert_match /youtube-dl .*--no-false-value\s--|\"http.*/, @runner.to_command
     end
 
-    assert_includes r.to_command, "--some-key"
-    assert_includes r.to_command, "--another-key"
+    it 'should not have newline char in to_command' do
+      assert_match /youtube-dl\s/, @runner.to_command
+    end
   end
 
-  it 'might list formats' do
-    formats = @runner.formats
-    assert_instance_of Array, formats
-    assert_instance_of Hash, formats.first
-    assert_equal 4, formats.first.size
-    [:format_code, :resolution, :extension, :note].each do |key|
-      assert_includes formats.first, key
-      assert_includes formats.last, key
+  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
-  
-  it 'should handle strangely-formatted options correctly' do # See issue #9
-    options = {
-      format: 'bestaudio',
-      :"prefer-ffmpeg" => "true",
-      :"extract-audio" => true,
-      :"audio-format" => "mp3"
-    }
-
-    @runner.options = YoutubeDL::Options.new(options)
-    assert_match /youtube-dl --format 'bestaudio' --prefer-ffmpeg --extract-audio --audio-format 'mp3'/, @runner.to_command
-  end
 end

data/test/youtube-dl/support_test.rb

@@ -33,4 +33,26 @@ describe YoutubeDL::Support 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
 end

data/test/youtube-dl/video_test.rb

@@ -0,0 +1,89 @@
+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
+  end
+
+  describe '#formats' do
+    before do
+      @formats = @video.formats
+    end
+
+    it 'should be an Array' do
+      assert_instance_of Array, @formats
+    end
+
+    it 'should be an Array of Hashes' do
+      assert_instance_of Hash, @formats.first
+    end
+
+    it 'should have a hash size of 4' do
+      assert_equal 4, @formats.first.size
+    end
+
+    it 'should include the correct information' do
+      [:format_code, :resolution, :extension, :note].each do |key|
+        assert_includes @formats.first, key
+        assert_includes @formats.last, key
+      end
+    end
+
+    it 'should not have any whitespace in the notes' do
+      @formats.each do |format|
+        assert_nil format[:note].strip!
+      end
+    end
+  end
+end

data/test/youtube-dl_test.rb

@@ -0,0 +1,84 @@
+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

data/youtube-dl.rb.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
   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.5.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.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - sapslaj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !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
@@ -125,14 +139,18 @@ files:
 - Rakefile
 - lib/youtube-dl.rb
 - lib/youtube-dl/options.rb
+- lib/youtube-dl/output.rb
 - lib/youtube-dl/runner.rb
 - 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/output_test.rb
 - test/youtube-dl/runner_test.rb
 - test/youtube-dl/support_test.rb
-- test/youtube-dl/youtube-dl_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
@@ -163,6 +181,8 @@ summary: youtube-dl wrapper for Ruby
 test_files:
 - test/test_helper.rb
 - test/youtube-dl/options_test.rb
+- test/youtube-dl/output_test.rb
 - test/youtube-dl/runner_test.rb
 - test/youtube-dl/support_test.rb
-- test/youtube-dl/youtube-dl_test.rb
+- test/youtube-dl/video_test.rb
+- test/youtube-dl_test.rb

data/test/youtube-dl/youtube-dl_test.rb

@@ -1,41 +0,0 @@
-require_relative '../test_helper'
-
-describe YoutubeDL do
-  describe '.download' do
-    after do
-      remove_downloaded_files
-    end
-
-    it 'should download videos' do
-      YoutubeDL.get TEST_URL, output: TEST_FILENAME, format: TEST_FORMAT
-      assert File.exist? TEST_FILENAME
-    end
-
-    it 'should download multiple videos' do
-      YoutubeDL.download [TEST_URL, TEST_URL2]
-      assert_equal Dir.glob('nope*').length, 2
-    end
-  end
-
-  describe '.extractors' do
-    it 'should return an Array of Strings' do
-      extractors = YoutubeDL.extractors
-      assert_instance_of Array, extractors
-      assert_instance_of String, extractors.first
-    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
-end