ffprober 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b29847084d8dbc8e10c2c4193b5957a6fcf08af9
-  data.tar.gz: 9fe8c79d5a88d4c4a5cf740e98ba55081b9c83ac
+  metadata.gz: 601137d7c5b4608a87e94ee51eecf53b14feed41
+  data.tar.gz: 95281fcb4d95afa5c26624689d49be75c362ce94
 SHA512:
-  metadata.gz: 72b340b1bbf4e915a1bcfb4dc6d6c10d99aefd74054e2f4a789607db5e8492950e9d2712d6739963c9e4583ac440e5c21c16a44d666f6e500fc227bd195cfbba
-  data.tar.gz: 421320686370ba7698fd688312fed908a3d1f10c63be8abcb734de04561bcfef42682dd564299e29e7c69041984cf5514e44ca04f92102f57dca06d0d55f3b4f
+  metadata.gz: 82193fa36d33469563bcda19253d32f8df70f8423c169c0799da6da6ca86993af6d20134caf31122736e5aa7ba8dd9e0e7ba0df1de9f28ad1463b36a3f096ed1
+  data.tar.gz: 4d07d14c7ad89713b97c3cc9b62d3893e6d3e06b11620a5993b61f23a59d65ae766bdfd61326bbae0887d1ad30ced8d3a5cb4a8b30aad84a7c52fcd211262b6e

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p0
+2.0.0-p195

data/Changes.md

@@ -0,0 +1,68 @@
+unrelaesed
+-----------
+- correctly detect ffprobe path on windows
+- correctly detect avprobe
+- detect nighlt builds
+- refactor ffprobe version detection (+spec)
+
+0.2.3
+-----------
+- Raise error if input file is invalid (InvalidInputFileError)
+- Added support for Ffmpeg 1.1.4 and 1.2.1
+
+0.2.2
+-----------
+- Added Caching to instantiated Stream Objects
+- Switched from attr_reader to of attr_accessor in stream classes
+
+0.2.1
+-----------
+- Refactored Ffmpeg version check
+- Convert to ruby 1.9 hash syntax
+- Bumped minmun required ruby version to 1.9.3
+- JSON input will be parsed lazily
+- Moved Ffprobe path finder into Ffprober Module
+
+0.2.0
+-----------
+- Droped ruby 1.8 support
+- Switched from multi_json to json
+- Updated travis config
+
+0.1.7
+-----------
+- Added support for Ffmpeg 1.1.4 and 1.2
+
+0.1.6
+-----------
+- added bit rate attribute to video stream
+- Added support for Ffmpeg 1.1.3
+
+0.1.5
+-----------
+- Added support for Ffmpeg 1.1.2
+
+0.1.4
+-----------
+- Added support for Ffmpeg 1.1.1
+- Bumped rake dependency to 0.10
+
+0.1.3
+-----------
+- Added support for Ffmpeg 1.1 and 1.0.1
+
+0.1.1
+-----------
+- Added support for Ffmpeg 1.0
+- Added tests for ffmpeg version checker
+- Updated README
+
+0.1.0
+-----------
+- Added missing License to README
+- Improved Ffmpeg version detection
+- Updated README
+
+0.0.2
+-----------
+- first working version (supports Ffmpeg 0.10.2)

data/README.md

@@ -33,12 +33,25 @@ according to [ffmpeg changelog](http://git.videolan.org/?p=ffmpeg.git;a=blob_pla
 
 [ffprobe documentation](http://www.ffmpeg.org/ffprobe.html)
 
+## Improve FFMPEG version detection
+
+help me collecting various version outputs of fprobe/ffmpeg
+
+1. run `ffprobe -version` on your system
+2. open an issue and send the output to me along with the expected version
+3. profit
+
 ## Supported Rubies
 
 Ffprober is tested under 1.9.3, 2.0, JRuby (1.9mode) and Rubinius (1.9mode) and ruby-head.
 
 [![Build Status](https://secure.travis-ci.org/beanieboi/ffprober.png?branch=master)](http://travis-ci.org/beanieboi/ffprober)
 
+## Contributors
+
+- Michael B. Kulik
+- rmoriz
+
 ## Contributing
 
 1. Fork it

data/lib/ffprober/ffprobe_version.rb

@@ -1,21 +1,40 @@
 module Ffprober
   class FfprobeVersion
-    @@version_regex = /^ffprobe version (\d+)\.?(\d+)\.?(|\d+)$/
+    @@version_regex = /^(ffprobe|avprobe|ffmpeg) version (\d+)\.?(\d+)\.?(\d+)*/
+    @@nightly_regex = /^(ffprobe|avprobe|ffmpeg) version N-/
 
     MIN_VERSION = Gem::Version.new("0.9.0")
     MAX_VERSION = Gem::Version.new("1.2.1")
 
     def self.valid?
-      MIN_VERSION <= parsed_version && parsed_version <= MAX_VERSION
+      self.new.valid?
     end
 
-    def self.parsed_version
-      version = `#{Ffprober.path} -version`.match(@@version_regex)
-      raise Errno::ENOENT  if version.nil?
-      major, minor, patch = version[1].to_i, version[2].to_i, version[3].to_i
-      Gem::Version.new([major, minor, patch].join("."))
-    rescue Errno::ENOENT => e
-      Gem::Version.new("0.0.0")
+    def valid?
+      nightly? || (MIN_VERSION <= version && version <= MAX_VERSION)
+    end
+
+    def parse_version
+      @parse_version ||= begin
+        _p = version_output.match(@@version_regex)
+        if _p.nil?
+          [0, 0, 0]
+        else
+          [_p[2].to_i, _p[3].to_i, _p[4].to_i]
+        end
+      end
+    end
+
+    def version
+      @version ||= Gem::Version.new(parse_version.join("."))
+    end
+
+    def nightly?
+      !!(version_output =~ @@nightly_regex)
+    end
+
+    def version_output
+      @version_output ||= `#{Ffprober.path} -version`
     end
   end
 end

data/lib/ffprober/version.rb

@@ -1,3 +1,3 @@
 module Ffprober
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/ffprober.rb

@@ -10,15 +10,17 @@ require "json"
 module Ffprober
   def self.path
     name = 'ffprobe'
+    name << '.exe' if self.windows?
 
-    if File.executable? name
-      cmd
-    else
-      path = ENV['PATH'].split(File::PATH_SEPARATOR).find { |path|
-        File.executable? File.join(path, name)
-      }
-      path && File.expand_path(name, path)
+    path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |path|
+      File.executable?(File.join(path, name))
     end
+
+    path && File.expand_path(name, path)
+  end
+
+  def self.windows?
+    !!(RUBY_PLATFORM =~ /(mingw|mswin)/)
   end
 
   class InvalidInputFileError < ::StandardError; end

data/spec/assets/version_outputs/osx-1_0

@@ -0,0 +1,11 @@
+ffprobe version 1.0
+built on May 18 2013 15:54:36 with Apple LLVM version 4.2 (clang-425.0.28) (based on LLVM 3.2svn)
+configuration: --prefix=/usr/local/Cellar/ffmpeg/1.2.1 --enable-shared --enable-pthreads --enable-gpl --enable-version3 --enable-nonfree --enable-hardcoded-tables --enable-avresample --enable-vda --cc=cc --host-cflags= --host-ldflags= --enable-libx264 --enable-libfaac --enable-libmp3lame --enable-libxvid
+libavutil      52. 18.100 / 52. 18.100
+libavcodec     54. 92.100 / 54. 92.100
+libavformat    54. 63.104 / 54. 63.104
+libavdevice    54.  3.103 / 54.  3.103
+libavfilter     3. 42.103 /  3. 42.103
+libswscale      2.  2.100 /  2.  2.100
+libswresample   0. 17.102 /  0. 17.102
+libpostproc    52.  2.100 / 52.  2.100

data/spec/assets/version_outputs/osx-1_2_0

@@ -0,0 +1,11 @@
+ffprobe version 1.2.0
+built on May 18 2013 15:54:36 with Apple LLVM version 4.2 (clang-425.0.28) (based on LLVM 3.2svn)
+configuration: --prefix=/usr/local/Cellar/ffmpeg/1.2.1 --enable-shared --enable-pthreads --enable-gpl --enable-version3 --enable-nonfree --enable-hardcoded-tables --enable-avresample --enable-vda --cc=cc --host-cflags= --host-ldflags= --enable-libx264 --enable-libfaac --enable-libmp3lame --enable-libxvid
+libavutil      52. 18.100 / 52. 18.100
+libavcodec     54. 92.100 / 54. 92.100
+libavformat    54. 63.104 / 54. 63.104
+libavdevice    54.  3.103 / 54.  3.103
+libavfilter     3. 42.103 /  3. 42.103
+libswscale      2.  2.100 /  2.  2.100
+libswresample   0. 17.102 /  0. 17.102
+libpostproc    52.  2.100 / 52.  2.100

data/spec/assets/version_outputs/raspian-0_8_6

@@ -0,0 +1,10 @@
+avprobe version 0.8.6-6:0.8.6-1+rpi1, Copyright (c) 2007-2013 the Libav developers
+  built on Mar 31 2013 13:58:10 with gcc 4.6.3
+avprobe 0.8.6-6:0.8.6-1+rpi1
+libavutil    51. 22. 1 / 51. 22. 1
+libavcodec   53. 35. 0 / 53. 35. 0
+libavformat  53. 21. 1 / 53. 21. 1
+libavdevice  53.  2. 0 / 53.  2. 0
+libavfilter   2. 15. 0 /  2. 15. 0
+libswscale    2.  1. 0 /  2.  1. 0
+libpostproc  52.  0. 0 / 52.  0. 0

data/spec/assets/version_outputs/ubuntu-0_10_6

@@ -0,0 +1,11 @@
+ffprobe version 0.10.6-6:0.10.6-0ubuntu0jon1
+built on Nov 12 2012 12:53:40 with gcc 4.7.2
+configuration: --arch=amd64 --enable-pthreads --enable-runtime-cpudetect --extra-version='6:0.10.6-0ubuntu0jon1' --libdir=/usr/lib/x86_64-linux-gnu --disable-stripping --prefix=/usr --enable-bzlib --enable-libdc1394 --enable-libfreetype --enable-frei0r --enable-gnutls --enable-libgsm --enable-libmp3lame --enable-librtmp --enable-libopencv --enable-libopenjpeg --enable-libpulse --enable-libschroedinger --enable-libspeex --enable-libtheora --enable-vaapi --enable-vdpau --enable-libvorbis --enable-libvpx --enable-zlib --enable-gpl --enable-postproc --enable-libcdio --enable-x11grab --enable-libx264 --shlibdir=/usr/lib/x86_64-linux-gnu --enable-shared --disable-static
+libavutil      51. 35.100 / 51. 35.100
+libavcodec     53. 61.100 / 53. 61.100
+libavformat    53. 32.100 / 53. 32.100
+libavdevice    53.  4.100 / 53.  4.100
+libavfilter     2. 61.100 /  2. 61.100
+libswscale      2.  1.100 /  2.  1.100
+libswresample   0.  6.100 /  0.  6.100
+libpostproc    52.  0.100 / 52.  0.100

data/spec/assets/version_outputs/windows-nightly

@@ -0,0 +1,2 @@
+ffmpeg version N-50354-g2ecf564 Copyright (c) 2000-2013 the FFmpeg developers
+built on Feb 27 2013 17:51:13 with gcc 4.7.2 (GCC)

data/spec/ffprober/ffprobe_version_spec.rb

@@ -2,37 +2,40 @@
 require 'spec_helper'
 
 describe Ffprober::FfprobeVersion do
-  let(:before_one_zero) { Gem::Version.new("0.9.0") }
-  let(:one_zero)        { Gem::Version.new("1.0.0") }
-  let(:one_one)         { Gem::Version.new("1.1.0") }
-  let(:after_one_zero)  { Gem::Version.new("1.9.0") }
-  let(:latest)          { Gem::Version.new("1.2") }
+  VERSION_CHECKS = [
+    { version: "0.9.0", pass: true },
+    { version: "1.0.0", pass: true },
+    { version: "1.1.0", pass: true },
+    { version: "1.9.0", pass: false },
+    { version: "1.2.1", pass: true }
+  ]
 
   context 'validates the ffprobe version' do
-    it 'detects versions < 0.9' do
-      Ffprober::FfprobeVersion.stub(:parsed_version) { before_one_zero }
-      Ffprober::FfprobeVersion.valid?.should be_true
-    end
-
-    it 'detects versions 1.0' do
-      Ffprober::FfprobeVersion.stub(:parsed_version) { one_zero }
-      Ffprober::FfprobeVersion.valid?.should be_true
+    VERSION_CHECKS.each do |check|
+      it "detects version #{check[:version]}" do
+        Ffprober::FfprobeVersion.any_instance.stub(:version) { Gem::Version.new(check[:version]) }
+        Ffprober::FfprobeVersion.valid?.should be(check[:pass])
+      end
     end
+  end
 
-    it 'detects versions 1.1' do
-      Ffprober::FfprobeVersion.stub(:parsed_version) { one_one }
-      Ffprober::FfprobeVersion.valid?.should be_true
-    end
+  describe 'detects the version of ffprobe' do
+    Dir.new("spec/assets/version_outputs").each do |entry|
+      next if [".", "..", ".DS_Store"].include?(entry)
+      os, expected_version = entry.split("-")
 
-    it 'detects versions 1.9' do
-      Ffprober::FfprobeVersion.stub(:parsed_version) { after_one_zero }
-      Ffprober::FfprobeVersion.valid?.should be_false
-    end
+      it "on #{os} from #{expected_version}" do
+        version_output = File.read("spec/assets/version_outputs/" + entry)
+        Ffprober::FfprobeVersion.any_instance.stub(:version_output) { version_output }
+        version_check = Ffprober::FfprobeVersion.new
 
-    it 'detects latest' do
-      Ffprober::FfprobeVersion.stub(:parsed_version) { latest }
-      Ffprober::FfprobeVersion.valid?.should be_true
+        if expected_version == "nightly"
+          version_check.nightly?.should eq(true)
+          version_check.valid?.should eq(true)
+        else
+          version_check.version.should eq(Gem::Version.new(expected_version.gsub("_", ".")))
+        end
+      end
     end
-
   end
 end

data/spec/ffprober/parser_spec.rb

@@ -0,0 +1,97 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Ffprober::Parser do
+
+  describe "from_file", if: Ffprober::FfprobeVersion.valid? do
+    before :each do
+      @ffprobe = Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v')
+    end
+
+    describe "format" do
+      it "should determine the correct filename" do
+        @ffprobe.format.filename.should eq("spec/assets/301-extracting_a_ruby_gem.m4v")
+      end
+
+      it "should find the correct size" do
+        @ffprobe.format.size.should eq("130694")
+      end
+
+      it "should find the correct bit_rate" do
+        @ffprobe.format.bit_rate.should eq("502669")
+      end
+    end
+  end
+
+  describe "from invalid file", if: Ffprober::FfprobeVersion.valid? do
+    before :each do
+      @ffprobe = Ffprober::Parser.from_file('spec/assets/empty_file')
+    end
+
+    describe "format" do
+      it "should determine the correct filename" do
+        expect do
+          @ffprobe.format.filename.should eq("spec/assets/empty_file")
+        end.to raise_error
+      end
+
+      it "should find the correct size" do
+        expect do
+          @ffprobe.format.size.should eq("130694")
+        end.to raise_error
+      end
+
+      it "should find the correct bit_rate" do
+        expect do
+          @ffprobe.format.bit_rate.should eq("502669")
+        end.to raise_error
+      end
+    end
+  end
+
+  describe "from_json" do
+    before :each do
+      @ffprobe = Ffprober::Parser.from_json(File.read('spec/assets/301-extracting_a_ruby_gem.json'))
+    end
+
+    describe "format" do
+      it "should determine the correct filename" do
+        @ffprobe.format.filename.should eq("301-extracting-a-ruby-gem.mp4")
+      end
+
+      it "should find the correct size" do
+        @ffprobe.format.size.should eq("44772490")
+      end
+
+      it "should find the correct bit_rate" do
+        @ffprobe.format.bit_rate.should eq("361309")
+      end
+    end
+
+    describe "audio_streams" do
+      it "should determine the correct number of audio streams" do
+        @ffprobe.audio_streams.count.should eq(1)
+      end
+
+      it "should determine the correct sample rate of the first audio stream" do
+        @ffprobe.audio_streams.first.sample_rate.should eq("48000")
+      end
+
+    end
+
+    describe "video_streams" do
+      it "should determine the correct width of the first video streams" do
+        @ffprobe.video_streams.first.width.should eq(960)
+      end
+
+      it "should determine the correct width of the first video streams" do
+        @ffprobe.video_streams.first.height.should eq(600)
+      end
+
+      it "should determine the correct number of video streams" do
+        @ffprobe.video_streams.count.should eq(1)
+      end
+    end
+  end
+
+end

data/spec/ffprober_spec.rb

@@ -2,51 +2,6 @@
 require 'spec_helper'
 
 describe Ffprober do
-  describe "from_file", if: Ffprober::FfprobeVersion.valid? do
-    before :each do
-      @ffprobe = Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v')
-    end
-
-    describe "format" do
-      it "should determine the correct filename" do
-        @ffprobe.format.filename.should eq("spec/assets/301-extracting_a_ruby_gem.m4v")
-      end
-
-      it "should find the correct size" do
-        @ffprobe.format.size.should eq("130694")
-      end
-
-      it "should find the correct bit_rate" do
-        @ffprobe.format.bit_rate.should eq("502669")
-      end
-    end
-  end
-
-  describe "from invalid file", if: Ffprober::FfprobeVersion.valid? do
-    before :each do
-      @ffprobe = Ffprober::Parser.from_file('spec/assets/empty_file')
-    end
-
-    describe "format" do
-      it "should determine the correct filename" do
-        expect do
-          @ffprobe.format.filename.should eq("spec/assets/empty_file")
-        end.to raise_error
-      end
-
-      it "should find the correct size" do
-        expect do
-          @ffprobe.format.size.should eq("130694")
-        end.to raise_error
-      end
-
-      it "should find the correct bit_rate" do
-        expect do
-          @ffprobe.format.bit_rate.should eq("502669")
-        end.to raise_error
-      end
-    end
-  end
 
   describe "if no ffprobe is found" do
     it "should raise a exception" do
@@ -55,48 +10,4 @@ describe Ffprober do
     end
   end
 
-  describe "from_json" do
-    before :each do
-      @ffprobe = Ffprober::Parser.from_json(File.read('spec/assets/301-extracting_a_ruby_gem.json'))
-    end
-
-    describe "format" do
-      it "should determine the correct filename" do
-        @ffprobe.format.filename.should eq("301-extracting-a-ruby-gem.mp4")
-      end
-
-      it "should find the correct size" do
-        @ffprobe.format.size.should eq("44772490")
-      end
-
-      it "should find the correct bit_rate" do
-        @ffprobe.format.bit_rate.should eq("361309")
-      end
-    end
-
-    describe "audio_streams" do
-      it "should determine the correct number of audio streams" do
-        @ffprobe.audio_streams.count.should eq(1)
-      end
-
-      it "should determine the correct sample rate of the first audio stream" do
-        @ffprobe.audio_streams.first.sample_rate.should eq("48000")
-      end
-
-    end
-
-    describe "video_streams" do
-      it "should determine the correct width of the first video streams" do
-        @ffprobe.video_streams.first.width.should eq(960)
-      end
-
-      it "should determine the correct width of the first video streams" do
-        @ffprobe.video_streams.first.height.should eq(600)
-      end
-
-      it "should determine the correct number of video streams" do
-        @ffprobe.video_streams.count.should eq(1)
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - beanieboi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -49,6 +49,7 @@ files:
 - .rspec
 - .ruby-version
 - .travis.yml
+- Changes.md
 - Gemfile
 - LICENSE
 - README.md
@@ -65,7 +66,13 @@ files:
 - spec/assets/301-extracting_a_ruby_gem.json
 - spec/assets/301-extracting_a_ruby_gem.m4v
 - spec/assets/empty_file
+- spec/assets/version_outputs/osx-1_0
+- spec/assets/version_outputs/osx-1_2_0
+- spec/assets/version_outputs/raspian-0_8_6
+- spec/assets/version_outputs/ubuntu-0_10_6
+- spec/assets/version_outputs/windows-nightly
 - spec/ffprober/ffprobe_version_spec.rb
+- spec/ffprober/parser_spec.rb
 - spec/ffprober_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/beanieboi/ffprober
@@ -88,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ffprober
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: a Ruby wrapper for ffprobe (part of ffmpeg)
@@ -96,6 +103,13 @@ test_files:
 - spec/assets/301-extracting_a_ruby_gem.json
 - spec/assets/301-extracting_a_ruby_gem.m4v
 - spec/assets/empty_file
+- spec/assets/version_outputs/osx-1_0
+- spec/assets/version_outputs/osx-1_2_0
+- spec/assets/version_outputs/raspian-0_8_6
+- spec/assets/version_outputs/ubuntu-0_10_6
+- spec/assets/version_outputs/windows-nightly
 - spec/ffprober/ffprobe_version_spec.rb
+- spec/ffprober/parser_spec.rb
 - spec/ffprober_spec.rb
 - spec/spec_helper.rb
+has_rdoc: