ffprober 0.0.2 → 0.1.0

data/README.md

@@ -1,7 +1,9 @@
 # FfprobeR
 
-a Ruby wrapper for ffprobe (part of ffmpeg)
-[![Build Status](https://secure.travis-ci.org/beanieboi/ffprober.png?branch=master)](http://travis-ci.org/beanieboi/ffprober)
+a Ruby wrapper for ffprobe (which is part of ffmpeg)
+
+ffprobe gathers information from multimedia streams and prints it in human- and machine-readable fashion.
+
 
 ## Installation
 
@@ -23,11 +25,17 @@ Or install it yourself as:
     ffprobe = Ffprober::Parser.from_file("my_awesome_video.mp4")
     ffprobe.size #=> 44772490
 
-## TODOS
-a smarter way to determine the version of ffprobe
-
 ## FFMPEG version
-tested with ffprobe version 0.10.2
+
+tested with ffprobe version 0.10.2 and 0.11.1
+
+according to [ffmpeg changelog](http://git.videolan.org/?p=ffmpeg.git;a=blob_plain;f=Changelog) json out was added in version 0.9
+
+## Supported Rubies
+
+OmniAuth Vimeo is tested under 1.9.2, 1.9.3, JRuby (1.9mode) and Rubinius (1.9mode).
+
+[![Build Status](https://secure.travis-ci.org/beanieboi/ffprober.png?branch=master)](http://travis-ci.org/beanieboi/ffprober)
 
 ## Contributing
 
@@ -36,3 +44,14 @@ tested with ffprobe version 0.10.2
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## License
+
+Copyright (c) 2011 Benjamin Fritsch.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/lib/ffprober/parser.rb

@@ -3,7 +3,7 @@ module Ffprober
     @@options = '-v quiet -print_format json -show_format -show_streams'
 
     def self.from_file(file_to_parse)
-      raise ArgumentError.new("found unsupported ffprobe version") unless ffprobe_version_valid?
+      raise ArgumentError.new("no or unsupported ffprobe version found. (version: #{ffprobe_version})") unless ffprobe_version_valid?
 
       json_output = `#{ffprobe_path} #{@@options} #{file_to_parse}`
       from_json(json_output)
@@ -37,11 +37,16 @@ module Ffprober
     end
 
     def self.ffprobe_version_valid?
-      !(ffprobe_version =~ /ffprobe version 0.10.2/).nil?
+      ffprobe_version[:minor] > 9
     end
 
     def self.ffprobe_version
-      version = `#{ffprobe_path} -version`
+      version = `#{ffprobe_path} -version`.match(/^ffprobe version (?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)$/)
+      raise Errno::ENOENT  if version.nil?
+      major, minor, patch = version[1].to_i, version[2].to_i, version[3].to_i
+      {major: major, minor: minor, patch: patch}
+    rescue Errno::ENOENT => e
+      {major: 0, minor: 0, patch: 0}
     end
 
     def self.ffprobe_path

data/lib/ffprober/version.rb

@@ -1,3 +1,3 @@
 module Ffprober
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/ffprober_spec.rb

@@ -20,7 +20,13 @@ describe Ffprober do
         @ffprobe.format.bit_rate.should eq("502669")
       end
     end
+  end
 
+  describe "if no ffprobe is found" do
+    it "should raise a exception" do
+      Ffprober::Parser.stub(:ffprobe_path).and_return("nonexistant")
+      lambda { @ffprobe = Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v') }.should raise_error
+    end
   end
 
   describe "from_json" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,41 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70204608840140 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
-  type: :development
+    none: false
   prerelease: false
-  version_requirements: *70204608840140
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70204608838580 !ruby/object:Gem::Requirement
+  type: :development
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.9'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :development
+    none: false
   prerelease: false
-  version_requirements: *70204608838580
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: &70204608836960 !ruby/object:Gem::Requirement
+  type: :development
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :runtime
+    none: false
   prerelease: false
-  version_requirements: *70204608836960
+  type: :runtime
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
 description: a Ruby wrapper for ffprobe
 email:
 - beanie@benle.de
@@ -77,20 +92,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: ffprober
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: a Ruby wrapper for ffprobe (part of ffmpeg)