ffprober 0.1.0 → 0.1.1

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
   - 1.9.3
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-19mode
+  - ruby-head

data/README.md

@@ -27,13 +27,13 @@ Or install it yourself as:
 
 ## FFMPEG version
 
-tested with ffprobe version 0.10.2 and 0.11.1
+tested with ffprobe version 0.9, 0.10, 0.11 and 1.0
 
-according to [ffmpeg changelog](http://git.videolan.org/?p=ffmpeg.git;a=blob_plain;f=Changelog) json out was added in version 0.9
+according to [ffmpeg changelog](http://git.videolan.org/?p=ffmpeg.git;a=blob_plain;f=Changelog) json output 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).
+Ffprober is tested under 1.9.2, 1.9.3, 2.0, 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)
 

data/lib/ffprober/parser.rb

@@ -1,18 +1,57 @@
 module Ffprober
   class Parser
     @@options = '-v quiet -print_format json -show_format -show_streams'
+    @@version_regex = /^ffprobe version (?:(\d+)\.)?(?:(\d+)\.)?(\*|\d+)$/
 
-    def self.from_file(file_to_parse)
-      raise ArgumentError.new("no or unsupported ffprobe version found. (version: #{ffprobe_version})") unless ffprobe_version_valid?
+    class << self
+      def from_file(file_to_parse)
+        unless ffprobe_version_valid?
+          raise ArgumentError.new("no or unsupported ffprobe version found.\
+                                  (version: #{ffprobe_version})")
+        end
 
-      json_output = `#{ffprobe_path} #{@@options} #{file_to_parse}`
-      from_json(json_output)
-    end
+        json_output = `#{ffprobe_path} #{@@options} #{file_to_parse}`
+        from_json(json_output)
+      end
+
+      def from_json(json_to_parse)
+        parser = self.new
+        parser.parse(json_to_parse)
+        parser
+      end
+
+      def ffprobe_version_valid?
+        valid_versions.include?(ffprobe_version)
+      end
+
+      def ffprobe_version
+        version = `#{ffprobe_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
+        {major: major, minor: minor, patch: patch}
+      rescue Errno::ENOENT => e
+        {major: 0, minor: 0, patch: 0}
+      end
+
+      def valid_versions
+        [{major: 0, minor: 9, patch: 0},
+         {major: 0, minor: 10, patch: 0},
+         {major: 0, minor: 11, patch: 0},
+         {major: 1, minor: 0, patch: 0}]
+      end
 
-    def self.from_json(json_to_parse)
-      parser = self.new
-      parser.parse(json_to_parse)
-      parser
+      def ffprobe_path
+        name = 'ffprobe'
+
+        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)
+        end
+      end
     end
 
     def parse(json_to_parse)
@@ -36,30 +75,5 @@ module Ffprober
       end
     end
 
-    def self.ffprobe_version_valid?
-      ffprobe_version[:minor] > 9
-    end
-
-    def self.ffprobe_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
-      name = 'ffprobe'
-
-      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)
-      end
-    end
   end
 end

data/lib/ffprober/version.rb

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

data/spec/ffprober/parser_spec.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Ffprober::Parser do
+  let(:before_one_zero) { {major: 0, minor: 9, patch: 0} }
+  let(:one_zero)        { {major: 1, minor: 0, patch: 0} }
+  let(:after_one_zero)  { {major: 1, minor: 9, patch: 0} }
+
+  context 'validates the ffprobe version' do
+    it 'detects versions < 0.9' do
+      Ffprober::Parser.stub(:ffprobe_version) { before_one_zero }
+      Ffprober::Parser.ffprobe_version_valid?.should be_true
+    end
+
+    it 'detects versions 1.0' do
+      Ffprober::Parser.stub(:ffprobe_version) { one_zero }
+      Ffprober::Parser.ffprobe_version_valid?.should be_true
+    end
+
+    it 'detects versions 1.9' do
+      Ffprober::Parser.stub(:ffprobe_version) { after_one_zero }
+      Ffprober::Parser.ffprobe_version_valid?.should be_false
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
-    none: false
-  prerelease: false
   type: :development
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-    none: false
-  prerelease: false
   type: :development
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
-  prerelease: false
   type: :runtime
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
 description: a Ruby wrapper for ffprobe
 email:
 - beanie@benle.de
@@ -83,6 +83,7 @@ files:
 - lib/ffprober/video_stream.rb
 - spec/assets/301-extracting_a_ruby_gem.json
 - spec/assets/301-extracting_a_ruby_gem.m4v
+- spec/ffprober/parser_spec.rb
 - spec/ffprober_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/beanieboi/ffprober
@@ -92,25 +93,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: ffprober
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: a Ruby wrapper for ffprobe (part of ffmpeg)
 test_files:
 - spec/assets/301-extracting_a_ruby_gem.json
 - spec/assets/301-extracting_a_ruby_gem.m4v
+- spec/ffprober/parser_spec.rb
 - spec/ffprober_spec.rb
 - spec/spec_helper.rb