youtube-dl.rb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2f3b80e2f598cbea19cdb6aa760535bd1735ef1
-  data.tar.gz: 372eadeb8f68fe3d9bf659ea1d1528b26b028b72
+  metadata.gz: c8aa4aaf1fec27c155961efff901ade4498033d3
+  data.tar.gz: caf564fb87360422cbfaedacf413aa3dc7929a41
 SHA512:
-  metadata.gz: 5bfdb2529020c00c0baa402acabd604e970c82cccd126aefb651ea26b39e89a15ea7d08ade283c1763785f46378fa6cced2ed3a548ea94b60bbc93ccbe8940c1
-  data.tar.gz: 4d151900a4a7a2dd3556e01c9f4236820b27b7532a71a1200678dc9e3dfe4603da960c4d4e5b07cdba6c88fce94d99383b76c789f6fa61be8f9d5e5caf1e1acc
+  metadata.gz: 45a5112701f59e6b028a329000e056c70b3f1575d70cb3517c8c6ca07fc7d23c42e16c002a13df663c07bf6b64dc21b98fae3063fc07bbb7d39541cc281da4c6
+  data.tar.gz: 84321d4274729c199d4c9f893b71205b0c8bb46bba71f2185bdd2c2073f44ac5c464a054ad17ff3fe9d46060dbe2fa1c843d95e98a0dfd485a35027f129fae13

data/.travis.yml

@@ -1,4 +1,4 @@
-before_install: 'sudo pip install youtube-dl'
+before_install: 'sudo chmod 755 ./vendor/bin/youtube-dl'
 rvm:
 - 1.9.3
 - 2.0.0

data/README.md

@@ -3,25 +3,6 @@
 Ruby wrapper for [youtube-dl](http://rg3.github.io/youtube-dl/).
 [![Build Status](https://travis-ci.org/layer8x/youtube-dl.rb.svg?branch=master)](https://travis-ci.org/layer8x/youtube-dl.rb)
 
-## Installing youtube-dl
-This gem does not ship with the `youtube-dl` command-line program (yet!) so you will need to install `youtube-dl` manually.  Luckily there are three ways to do it.
-
-### The easy way
-Use your distro's package manager!
-
-    $ apt-get install youtube-dl
-    $ brew install youtube-dl
-
-Or through Pip
-
-    $ pip install youtube-dl
-
-### The slightly harder way
-```bash
-sudo wget https://yt-dl.org/downloads/latest/youtube-dl -O /usr/local/bin/youtube-dl
-sudo chmod a+x /usr/local/bin/youtube-dl
-```
-
 ## Install the gem
 
 Add this line to your application's Gemfile:
@@ -38,6 +19,9 @@ Or install it yourself as:
 
     $ gem install youtube-dl.rb
 
+## 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.
+
 ## Usage
 
 Pretty simple.
@@ -67,3 +51,5 @@ YoutubeDL.download "https://www.youtube.com/watch?v=gvdf5n-zI14", options
 4. Pass test suite (`rake test`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create a new Pull Request
+
+Remember: commit now, commit often. 

data/Rakefile

@@ -6,3 +6,22 @@ Rake::TestTask.new do |t|
 end
 
 task :default => [:test]
+
+namespace :binaries do
+  def get_binaries(version)
+    puts "Updating python script"
+    system("wget -O ./vendor/bin/youtube-dl https://yt-dl.org/downloads/#{version}/youtube-dl")
+    puts "Updating Windows EXE"
+    system("wget -O ./vendor/bin/youtube-dl.exe https://yt-dl.org/downloads/#{version}/youtube-dl.exe")
+  end
+
+  desc "Get latest binaries"
+  task :latest do
+    get_binaries('latest')
+  end
+
+  desc "Get binaries for specific version (run with `rake binaries:version[2015.07.07]`)"
+  task :version, [:ver] do |t, a|
+    get_binaries(a[:ver])
+  end
+end

data/lib/youtube-dl/runner.rb

@@ -13,7 +13,7 @@ module YoutubeDL
     def initialize(url, options=YoutubeDL::Options.new)
       @url = url
       @options = YoutubeDL::Options.new(options.to_hash)
-      @executable_path = 'youtube-dl'
+      @executable_path = usable_executable_path
     end
 
     # Returns Cocaine's runner engine
@@ -68,5 +68,19 @@ module YoutubeDL
     def cocaine_line(command)
       Cocaine::CommandLine.new(@executable_path, command)
     end
+
+    # Returns a usable executable (system or vendor)
+    #
+    # @return [String] youtube-dl executable path
+    def usable_executable_path
+      system_path = `which youtube-dl`
+      if $?.exitstatus == 0
+        system_path
+      else
+        vendor_path = File.absolute_path("#{__FILE__}/../../../vendor/bin/youtube-dl")
+        File.chmod(775, vendor_path) unless File.executable?(vendor_path) # Make sure vendor binary is executable
+        vendor_path
+      end
+    end
   end
 end

data/lib/youtube-dl/version.rb

@@ -1,3 +1,3 @@
 module YoutubeDL
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/spec'

data/test/youtube-dl/runner_test.rb

@@ -18,13 +18,13 @@ describe YoutubeDL::Runner do
   end
 
   it 'should set executable path automatically' do
-    assert_equal @runner.executable_path, 'youtube-dl'
+    assert_match 'youtube-dl', @runner.executable_path
   end
 
   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.*/) 
+    refute_nil @runner.to_command.match(/--some-key\s.*a value.*/)
   end
 
   it 'should not include the value if value is true' do

data/youtube-dl.rb.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.5.1"
   spec.add_development_dependency "purdytest"
+  spec.add_development_dependency "codeclimate-test-reporter"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: youtube-dl.rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - sapslaj
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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'
 description: in the spirit of pygments.rb and MiniMagick, youtube-dl.rb is a command
   line wrapper for the python script youtube-dl
 email:
@@ -117,6 +131,8 @@ files:
 - test/youtube-dl/options_test.rb
 - test/youtube-dl/runner_test.rb
 - test/youtube-dl/youtube-dl_test.rb
+- vendor/bin/youtube-dl
+- vendor/bin/youtube-dl.exe
 - youtube-dl.rb.gemspec
 homepage: https://github.com/layer8x/youtube-dl.rb
 licenses:
@@ -138,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: youtube-dl wrapper for Ruby