ffprober 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92baf6e0fb2e8d71014e68f76eac308b66bf10d
-  data.tar.gz: 3ac7b04d07344108f8d6619e993aa926f4fc01c8
+  metadata.gz: b9720e6501e9017095339eeeda71ea175a478645
+  data.tar.gz: 1779005a50673b1ef183320d7702287ef9186bfa
 SHA512:
-  metadata.gz: 7b23f169a5065a20efc7e73c248b87474f29e0c74a0fee9ab216d4266f857cea2f50410adda49881657c38dcb73336bc440ad7d9ad0ee078fe0673b05d7460b0
-  data.tar.gz: 28bd43b6fc75c819fe8fa90fd40c788df8e97cf4db873e3a1bd99de726d145ad358d04df5eaf89333f22dcd84a8d2b9f02e93772887022391ab4c69db364314f
+  metadata.gz: bb08ab86f81c9c662c708954bad57a92dc49f77ada054d5828b2f5df7ae7d95a646ef2ac0b55ce729aa3fff47330aa3223677ef3e49982ac4a1bb3c37634337f
+  data.tar.gz: ee31e032b48e4a923df8a4f31525874a80dcac433747039310e069ad40b68ed8d8c9993c5067961d41886b9ccce5f21381231049e640d73685520dcd889db0c4

data/.travis.yml

@@ -11,5 +11,5 @@ rvm:
   - 2.0.0
   - 2.1.0
   - jruby-19mode
-  - rbx
+  - rbx-2
   - ruby-head

data/Changes.md

@@ -1,6 +1,11 @@
 MASTER
 -----------
+
+0.3.7
+-----------
 - upgrade to rspec 3
+- support for ffmpeg 2.1.4
+- support for ffmpeg 2.2.0
 
 0.3.6
 -----------

data/Gemfile

@@ -1,9 +1,6 @@
 source 'https://rubygems.org'
 
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubysl-json', '~> 2.0'
-end
+gem 'pry'
 
 # Specify your gem's dependencies in ffprober.gemspec
 gemspec

data/ffprober.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
 
   gem.licenses      = ['MIT']
 
-  gem.add_development_dependency "rspec", "~> 2.9"
+  gem.add_development_dependency "rspec", "~> 3.0.0.beta1"
 
   gem.files         = `git ls-files`.split("\n")
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/ffprober/ffprobe_version.rb

@@ -4,7 +4,7 @@ module Ffprober
     @@nightly_regex = /^(ffprobe|avprobe|ffmpeg) version (N|git)-/
 
     MIN_VERSION = Gem::Version.new("0.9.0")
-    MAX_VERSION = Gem::Version.new("2.0.1")
+    MAX_VERSION = Gem::Version.new("2.2")
 
     def self.valid?
       self.new.valid?

data/lib/ffprober/version.rb

@@ -1,3 +1,3 @@
 module Ffprober
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/spec/assets/version_outputs/osx-2_1_2

@@ -0,0 +1,11 @@
+ffprobe version 2.1.2-tessus
+built on Jan 13 2014 18:27:44 with llvm-gcc 4.2.1 (LLVM build 2336.1.00)
+configuration: --prefix=/Users/tessus/data/ext/ffmpeg/sw --as=yasm --extra-version=tessus --disable-shared --enable-static --disable-ffplay --enable-gpl --enable-pthreads --enable-postproc --enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264 --enable-libxvid --enable-libspeex --enable-bzlib --enable-zlib --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libxavs --enable-version3 --enable-libvo-aacenc --enable-libvo-amrwbenc --enable-libvpx --enable-libgsm --enable-libopus --enable-fontconfig --enable-libfreetype --enable-libass --enable-libbluray --enable-filters --enable-runtime-cpudetect
+libavutil      52. 48.101 / 52. 48.101
+libavcodec     55. 39.101 / 55. 39.101
+libavformat    55. 19.104 / 55. 19.104
+libavdevice    55.  5.100 / 55.  5.100
+libavfilter     3. 90.100 /  3. 90.100
+libswscale      2.  5.101 /  2.  5.101
+libswresample   0. 17.104 /  0. 17.104
+libpostproc    52.  3.100 / 52.  3.100

data/spec/assets/version_outputs/osx-2_1_4

@@ -0,0 +1,11 @@
+ffprobe version 2.1.4-tessus
+built on Feb 23 2014 19:51:22 with llvm-gcc 4.2.1 (LLVM build 2336.1.00)
+configuration: --prefix=/Users/tessus/data/ext/ffmpeg/sw --as=yasm --extra-version=tessus --disable-shared --enable-static --disable-ffplay --enable-gpl --enable-pthreads --enable-postproc --enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264 --enable-libxvid --enable-libspeex --enable-bzlib --enable-zlib --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libxavs --enable-version3 --enable-libvo-aacenc --enable-libvo-amrwbenc --enable-libvpx --enable-libgsm --enable-libopus --enable-libmodplug --enable-fontconfig --enable-libfreetype --enable-libass --enable-libbluray --enable-filters --enable-runtime-cpudetect
+libavutil      52. 48.101 / 52. 48.101
+libavcodec     55. 39.101 / 55. 39.101
+libavformat    55. 19.104 / 55. 19.104
+libavdevice    55.  5.100 / 55.  5.100
+libavfilter     3. 90.100 /  3. 90.100
+libswscale      2.  5.101 /  2.  5.101
+libswresample   0. 17.104 /  0. 17.104
+libpostproc    52.  3.100 / 52.  3.100

data/spec/assets/version_outputs/osx-2_2

@@ -0,0 +1,11 @@
+ffprobe version 2.2-tessus
+built on Mar 24 2014 22:25:11 with llvm-gcc 4.2.1 (LLVM build 2336.1.00)
+configuration: --prefix=/Users/tessus/data/ext/ffmpeg/sw --as=yasm --extra-version=tessus --disable-shared --enable-static --disable-ffplay --enable-gpl --enable-pthreads --enable-postproc --enable-libmp3lame --enable-libtheora --enable-libvorbis --enable-libx264 --enable-libxvid --enable-libspeex --enable-bzlib --enable-zlib --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libxavs --enable-version3 --enable-libvo-aacenc --enable-libvo-amrwbenc --enable-libvpx --enable-libgsm --enable-libopus --enable-libmodplug --enable-fontconfig --enable-libfreetype --enable-libass --enable-libbluray --enable-filters --enable-runtime-cpudetect
+libavutil      52. 66.100 / 52. 66.100
+libavcodec     55. 52.102 / 55. 52.102
+libavformat    55. 33.100 / 55. 33.100
+libavdevice    55. 10.100 / 55. 10.100
+libavfilter     4.  2.100 /  4.  2.100
+libswscale      2.  5.102 /  2.  5.102
+libswresample   0. 18.100 /  0. 18.100
+libpostproc    52.  3.100 / 52.  3.100

data/spec/ffprober/ffprobe_version_spec.rb

@@ -8,14 +8,22 @@ describe Ffprober::FfprobeVersion do
     { version: "1.1.0", pass: true },
     { version: "2.9.0", pass: false },
     { version: "1.2.1", pass: true },
-    { version: "2.0", pass: true}
+    { version: "2.0", 	pass: true},
+    { version: "2.0.1", pass: true },
+    { version: "2.0.2", pass: true },
+    { version: "2.1.1", pass: true },
+    { version: "2.1.2", pass: true },
+    { version: "2.1.4", pass: true },
+    { version: "2.2",   pass: true }
   ]
 
+  subject(:ffprobe_version) { Ffprober::FfprobeVersion.new }
+
   context 'validates the ffprobe version' do
     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])
+        allow(ffprobe_version).to receive(:version).and_return(Gem::Version.new(check[:version]))
+        expect(ffprobe_version.valid?).to be(check[:pass])
       end
     end
   end
@@ -27,22 +35,22 @@ describe Ffprober::FfprobeVersion do
 
       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
+
+        allow(ffprobe_version).to receive(:version_output).and_return(version_output)
 
         if expected_version == "nightly"
-          version_check.nightly?.should eq(true)
-          version_check.valid?.should eq(true)
+          expect(ffprobe_version.nightly?).to eq(true)
+          expect(ffprobe_version.valid?).to eq(true)
         else
-          version_check.version.should eq(Gem::Version.new(expected_version.gsub("_", ".")))
+          expect(ffprobe_version.version).to eq(Gem::Version.new(expected_version.gsub("_", ".")))
         end
       end
     end
 
     it "should not be valid if no ffprobe could be found in PATH" do
-      Ffprober.stub(:path).and_return(nil)
-      Ffprober::FfprobeVersion.new.version.to_s.should eq("0.0.0")
-      Ffprober::FfprobeVersion.valid?.should eq(false)
+      allow(Ffprober).to receive(:path).and_return(nil)
+      expect(ffprobe_version.version.to_s).to eq("0.0.0")
+      expect(Ffprober::FfprobeVersion.valid?).to eq(false)
     end
 
   end

data/spec/ffprober/parser_spec.rb

@@ -4,112 +4,98 @@ require 'spec_helper'
 describe Ffprober::Parser do
 
   describe "from_file with whitespace", if: Ffprober::FfprobeVersion.valid? do
-    before :each do
-      @ffprobe = Ffprober::Parser.from_file('spec/assets/301 extracting a ruby gem.m4v')
-    end
+    let(:ffprobe) { Ffprober::Parser.from_file('spec/assets/301 extracting a ruby gem.m4v') }
 
     describe "format" do
       it "should determine the correct filename" do
-        @ffprobe.format.filename.should eq("spec/assets/301 extracting a ruby gem.m4v")
+        expect(ffprobe.format.filename).to eq("spec/assets/301 extracting a ruby gem.m4v")
       end
 
       it "should find the correct size" do
-        @ffprobe.format.size.should eq("130694")
+        expect(ffprobe.format.size).to eq("130694")
       end
 
       it "should find the correct bit_rate" do
-        @ffprobe.format.bit_rate.should eq("502669")
+        expect(ffprobe.format.bit_rate).to eq("502669")
       end
     end
   end
 
   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
+    let(:ffprobe) { Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v') }
 
     describe "format" do
       it "should determine the correct filename" do
-        @ffprobe.format.filename.should eq("spec/assets/301-extracting_a_ruby_gem.m4v")
+        expect(ffprobe.format.filename).to eq("spec/assets/301-extracting_a_ruby_gem.m4v")
       end
 
       it "should find the correct size" do
-        @ffprobe.format.size.should eq("130694")
+        expect(ffprobe.format.size).to eq("130694")
       end
 
       it "should find the correct bit_rate" do
-        @ffprobe.format.bit_rate.should eq("502669")
+        expect(ffprobe.format.bit_rate).to 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
+    let(:ffprobe) { Ffprober::Parser.from_file('spec/assets/empty_file') }
 
     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
+        expect { ffprobe.format.filename }.to raise_error
       end
 
       it "should find the correct size" do
-        expect do
-          @ffprobe.format.size.should eq("130694")
-        end.to raise_error
+        expect { ffprobe.format.size }.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
+        expect { ffprobe.format.bit_rate }.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
+    let(:ffprobe) { Ffprober::Parser.from_json(File.read('spec/assets/301-extracting_a_ruby_gem.json')) }
 
     describe "format" do
       it "should determine the correct filename" do
-        @ffprobe.format.filename.should eq("301-extracting-a-ruby-gem.mp4")
+        expect(ffprobe.format.filename).to eq("301-extracting-a-ruby-gem.mp4")
       end
 
       it "should find the correct size" do
-        @ffprobe.format.size.should eq("44772490")
+        expect(ffprobe.format.size).to eq("44772490")
       end
 
       it "should find the correct bit_rate" do
-        @ffprobe.format.bit_rate.should eq("361309")
+        expect(ffprobe.format.bit_rate).to 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)
+        expect(ffprobe.audio_streams.count).to 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")
+        expect(ffprobe.audio_streams.first.sample_rate).to 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)
+        expect(ffprobe.video_streams.first.width).to eq(960)
       end
 
       it "should determine the correct width of the first video streams" do
-        @ffprobe.video_streams.first.height.should eq(600)
+        expect(ffprobe.video_streams.first.height).to eq(600)
       end
 
       it "should determine the correct number of video streams" do
-        @ffprobe.video_streams.count.should eq(1)
+        expect(ffprobe.video_streams.count).to eq(1)
       end
     end
   end

data/spec/ffprober_spec.rb

@@ -5,17 +5,18 @@ describe Ffprober do
 
   describe "if no ffprobe is found" do
     it "should raise a exception if there is no ffmpeg" do
-      Ffprober.stub(:path).and_return("nonexistant")
+      allow(Ffprober).to receive(:path).and_return("nonexistant")
+
       expect {
-        @ffprobe = Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v')
+        Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v')
         }.to raise_error
     end
 
     it "should raise a exception if there is no valid ffmpeg" do
-      Ffprober::FfprobeVersion.stub(:valid?).and_return(false)
+      allow(Ffprober::FfprobeVersion).to receive(:valid?).and_return(false)
 
       expect {
-        @ffprobe = Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v')
+        Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v')
       }.to raise_error(ArgumentError)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - beanieboi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 3.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 3.0.0.beta1
 description: a Ruby wrapper for ffprobe
 email:
 - beanie@benle.de
@@ -57,6 +57,9 @@ files:
 - spec/assets/version_outputs/osx-1_2_0
 - spec/assets/version_outputs/osx-2_0
 - spec/assets/version_outputs/osx-2_0_1
+- spec/assets/version_outputs/osx-2_1_2
+- spec/assets/version_outputs/osx-2_1_4
+- spec/assets/version_outputs/osx-2_2
 - spec/assets/version_outputs/raspian-0_8_6
 - spec/assets/version_outputs/ubuntu-0_10_6
 - spec/assets/version_outputs/windows-nightly
@@ -98,6 +101,9 @@ test_files:
 - spec/assets/version_outputs/osx-1_2_0
 - spec/assets/version_outputs/osx-2_0
 - spec/assets/version_outputs/osx-2_0_1
+- spec/assets/version_outputs/osx-2_1_2
+- spec/assets/version_outputs/osx-2_1_4
+- spec/assets/version_outputs/osx-2_2
 - spec/assets/version_outputs/raspian-0_8_6
 - spec/assets/version_outputs/ubuntu-0_10_6
 - spec/assets/version_outputs/windows-nightly