ffprober 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9720e6501e9017095339eeeda71ea175a478645
-  data.tar.gz: 1779005a50673b1ef183320d7702287ef9186bfa
+  metadata.gz: 335f955c6a41d70b64d1512ce6aacef8884a78a5
+  data.tar.gz: f59078e50164de065d560d8d4cffa03cbd196840
 SHA512:
-  metadata.gz: bb08ab86f81c9c662c708954bad57a92dc49f77ada054d5828b2f5df7ae7d95a646ef2ac0b55ce729aa3fff47330aa3223677ef3e49982ac4a1bb3c37634337f
-  data.tar.gz: ee31e032b48e4a923df8a4f31525874a80dcac433747039310e069ad40b68ed8d8c9993c5067961d41886b9ccce5f21381231049e640d73685520dcd889db0c4
+  metadata.gz: 44f0fd8b01673b663dcfcf5906ff09227d48fe5626cfbe26e98211136ffb0636d839d5258b9bf4ef925b498f7f36ecb56cb956acfd02f8751441acd2d320d66e
+  data.tar.gz: 5823b8621fe69ff3b089c7b626854dadb0782ab04867020ac790bcbca4ce8a2eb6bb85ddf6dd2e3ed85031258ea6f765b531881a0bd2e6a389b549cb2d963c10

data/.rspec

@@ -1 +1,2 @@
 --color
+--warnings

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.2

data/CONTRIBUTING.md

@@ -0,0 +1,42 @@
+# Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help
+improve this project.
+
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
+
+Here are some ways *you* can contribute:
+
+* by using alpha, beta, and prerelease versions
+* by reporting bugs
+* by suggesting new features
+* by writing or editing documentation
+* by writing specifications
+* by writing code ( **no patch is too small** : fix typos, add comments, clean up inconsistent whitespace )
+* by refactoring code
+* by closing [issues][]
+* by reviewing patches
+
+[issues]: https://github.com/beanieboi/ffprober/issues
+
+## Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and features. Before
+submitting a bug report or feature request, check to make sure it hasn't
+already been submitted. When submitting a bug report, please include a [Gist][]
+that includes a stack trace and any details that may be necessary to reproduce
+the bug, including your gem version, Ruby version, and operating system.
+Ideally, a bug report should include a pull request with failing specs.
+
+[gist]: https://gist.github.com/
+
+## Submitting a Pull Request
+1. [Fork the repository.][fork]
+2. [Create a topic branch.][branch]
+3. Implement your feature or bug fix.
+4. Add, commit, and push your changes.
+5. [Submit a pull request.][pr]
+
+[fork]: http://help.github.com/fork-a-repo/
+[branch]: http://learn.github.com/p/branching.html
+[pr]: http://help.github.com/send-pull-requests/
+
+This file was taken from https://github.com/middleman/middleman-heroku/blob/master/CONTRIBUTING.md

data/Changes.md

@@ -1,5 +1,28 @@
-MASTER
------------
+0.4.0 / 2014-08-22
+==================
+
+ * update sample video
+ * set 2.3.2 as new max version
+ * Merge pull request #42 from beanieboi/feature/chapters-new
+ * warn if file to parse does not exist
+ * add Chapters
+ * Merge pull request #41 from beanieboi/feature/refator-specs
+ * update ruby-version to 2.1.2
+ * share specs and add sample json with chapters
+ * use self.options
+ * Merge pull request #40 from beanieboi/feature/refactor
+ * set max version to 2.2.2
+ * fix variable shadowing
+ * allow all object attributes, smaller cleanup
+ * Merge pull request #39 from beanieboi/feature/upgrade-rspec
+ * Merge pull request #38 from mbkulik/ffmpeg-2.2.2-support
+ * update Changes.md
+ * relax rspec dependency and add a sample spec_helper
+ * fix shadowing path in ffprober.rb:15
+ * enable rspec warnings
+ * add CONTRIBUTING.md
+ * Update README.md
+ * some code style fixes
 
 0.3.7
 -----------

data/README.md

@@ -27,7 +27,7 @@ Or install it yourself as:
 
 ## FFMPEG version
 
-tested with ffprobe version 0.9, 0.10, 0.11, 1.0, 1.1 and 1.2
+tested with ffprobe version 0.9 upto 2.2
 
 according to [ffmpeg changelog](http://git.videolan.org/?p=ffmpeg.git;a=blob_plain;f=Changelog) json output was added in version 0.9
 
@@ -57,11 +57,9 @@ Ffprober is tested under 1.9.3, 2.0, 2.1, JRuby (1.9mode) and Rubinius (1.9mode)
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-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
+see [CONTRIBUTING.md][contributing]
+
+[contributing]: https://github.com/beanieboi/ffprober/blob/master/CONTRIBUTING.md
 
 ## License
 

data/ffprober.gemspec

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

data/lib/ffprober/audio_stream.rb

@@ -1,7 +1,4 @@
 module Ffprober
   class AudioStream < Stream
-    attr_accessor :sample_fmt, :sample_rate, :channels,
-                  :bits_per_sample
-
   end
 end

data/lib/ffprober/chapter.rb

@@ -0,0 +1,15 @@
+module Ffprober
+  class Chapter
+    def initialize(object_attribute_hash)
+      object_attribute_hash.each do |key, value|
+        instance_variable_set("@#{key}", value)
+
+        unless self.class.method_defined?(key)
+          self.class.send(:define_method, key) do
+            instance_variable_get("@#{key}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ffprober/ffprobe_version.rb

@@ -1,13 +1,17 @@
 module Ffprober
   class FfprobeVersion
-    @@version_regex = /^(ffprobe|avprobe|ffmpeg) version (\d+)\.?(\d+)\.?(\d+)*/
-    @@nightly_regex = /^(ffprobe|avprobe|ffmpeg) version (N|git)-/
+    VERSION_REGEX = /^(ffprobe|avprobe|ffmpeg) version (\d+)\.?(\d+)\.?(\d+)*/
+    NIGHTLY_REGEX = /^(ffprobe|avprobe|ffmpeg) version (N|git)-/
 
-    MIN_VERSION = Gem::Version.new("0.9.0")
-    MAX_VERSION = Gem::Version.new("2.2")
+    MIN_VERSION = Gem::Version.new('0.9.0')
+    MAX_VERSION = Gem::Version.new('2.3.2')
 
     def self.valid?
-      self.new.valid?
+      new.valid?
+    end
+
+    def self.version
+      new.version
     end
 
     def valid?
@@ -16,26 +20,22 @@ module Ffprober
 
     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
+        ffprobe_version_output.match(VERSION_REGEX) do |match|
+          [match[2].to_i, match[3].to_i, match[4].to_i]
+        end || [0, 0, 0]
       end
     end
 
     def version
-      @version ||= Gem::Version.new(parse_version.join("."))
+      @version ||= Gem::Version.new(parse_version.join('.'))
     end
 
     def nightly?
-      !!(version_output =~ @@nightly_regex)
+      !!(ffprobe_version_output =~ NIGHTLY_REGEX)
     end
 
-    def version_output
-      return "" if Ffprober.path.nil?
-      @version_output ||= `#{Ffprober.path} -version`
+    def ffprobe_version_output
+      @ffprobe_version_output ||= Ffprober.path.nil? ? '' : `#{Ffprober.path} -version`
     end
   end
 end

data/lib/ffprober/format.rb

@@ -1,11 +1,15 @@
 module Ffprober
   class Format
-    attr_reader :filename, :nb_streams, :format_name,
-                :format_long_name, :start_time, :duration,
-                :size, :bit_rate
-
     def initialize(object_attribute_hash)
-      object_attribute_hash.each {|k,v| instance_variable_set("@#{k}",v)}
+      object_attribute_hash.each do |key, value|
+        instance_variable_set("@#{key}", value)
+
+        unless self.class.method_defined?(key)
+          self.class.send(:define_method, key) do
+            instance_variable_get("@#{key}")
+          end
+        end
+      end
     end
   end
 end

data/lib/ffprober/parser.rb

@@ -1,48 +1,52 @@
 module Ffprober
   class Parser
-    @@options = '-v quiet -print_format json -show_format -show_streams'
-
-    class << self
-      def from_file(file_to_parse)
-        unless FfprobeVersion.valid?
-          raise ArgumentError.new("no or unsupported ffprobe version found.\
-                                  (version: #{FfprobeVersion.new.version.to_s})")
-        end
-
-        json_output = `#{Ffprober.path} #{@@options} '#{file_to_parse}'`
-        from_json(json_output)
+    def self.from_file(file_to_parse)
+      unless FfprobeVersion.valid?
+        fail ArgumentError.new("no or unsupported ffprobe version found.\
+                                (version: #{FfprobeVersion.new.version})")
       end
 
-      def from_json(json_to_parse)
-        parser = self.new
-        parser.parse(json_to_parse)
-        parser
+      unless File.exist?(file_to_parse)
+        fail ArgumentError.new("File not found #{file_to_parse}")
       end
+
+      json_output = `#{Ffprober.path} #{options} '#{file_to_parse}'`
+      from_json(json_output)
     end
 
-    def parse(json_to_parse)
-      raise ArgumentError.new("No JSON found") if json_to_parse.nil?
-      @json_to_parse = json_to_parse
+    def self.from_json(json_to_parse)
+      parser = new
+      parser.parse(json_to_parse)
+      parser
     end
 
-    def parsed_json
-      @parsed_json ||=  begin
-                          json = JSON.parse(@json_to_parse, symbolize_names: true)
-                          raise InvalidInputFileError.new("Invalid input file") if json.empty?
-                          json
-                        end
+    def parse(json_to_parse)
+      fail ArgumentError.new('No JSON input data') if json_to_parse.nil?
+      @json = JSON.parse(json_to_parse, symbolize_names: true)
     end
 
     def format
-      @format ||= Ffprober::Format.new(parsed_json[:format])
+      @format ||= Ffprober::Format.new(@json[:format])
     end
 
     def video_streams
-      @video_streams ||= stream_by_codec('video').map { |s| Ffprober::VideoStream.new(s) }
+      @video_streams ||= stream_by_codec('video').map { |stream| Ffprober::VideoStream.new(stream) }
     end
 
     def audio_streams
-      @audio_streams ||= stream_by_codec('audio').map { |s| Ffprober::AudioStream.new(s) }
+      @audio_streams ||= stream_by_codec('audio').map { |stream| Ffprober::AudioStream.new(stream) }
+    end
+
+    def chapters
+      @chapters ||= @json[:chapters].map { |chapter| Ffprober::Chapter.new(chapter) }
+    end
+
+    private
+
+    def self.options
+      options = '-v quiet -print_format json -show_format -show_streams'
+      options << ' -show_chapters' if FfprobeVersion.version >= Gem::Version.new('2.0.0')
+      options
     end
 
     def stream_by_codec(codec_type)
@@ -50,7 +54,7 @@ module Ffprober
     end
 
     def streams
-      parsed_json[:streams]
+      @json[:streams]
     end
   end
 end

data/lib/ffprober/stream.rb

@@ -1,13 +1,15 @@
 module Ffprober
   class Stream
-    attr_reader :codec_name, :codec_long_name, :codec_type,
-                :codec_time_base, :codec_tag_string, :codec_tag,
-                :r_frame_rate, :avg_frame_rate,
-                :time_base, :start_time, :duration,
-                :nb_frames
-
     def initialize(object_attribute_hash)
-      object_attribute_hash.each {|k,v| instance_variable_set("@#{k}",v)}
+      object_attribute_hash.each do |key, value|
+        instance_variable_set("@#{key}", value)
+
+        unless self.class.method_defined?(key)
+          self.class.send(:define_method, key) do
+            instance_variable_get("@#{key}")
+          end
+        end
+      end
     end
   end
 end

data/lib/ffprober/version.rb

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

data/lib/ffprober/video_stream.rb

@@ -1,7 +1,4 @@
 module Ffprober
   class VideoStream < Stream
-    attr_accessor :width, :height, :has_b_frames,
-                  :sample_aspect_ratio, :display_aspect_ratio,
-                  :pix_fmt, :level, :is_avc, :nal_length_size, :bit_rate
   end
 end

data/lib/ffprober.rb

@@ -1,22 +1,26 @@
-require "ffprober/version"
-require "ffprober/parser"
-require "ffprober/format"
-require "ffprober/stream"
-require "ffprober/audio_stream"
-require "ffprober/video_stream"
-require "ffprober/ffprobe_version"
-require "json"
+require_relative 'ffprober/version'
+require_relative 'ffprober/parser'
+require_relative 'ffprober/format'
+require_relative 'ffprober/stream'
+require_relative 'ffprober/audio_stream'
+require_relative 'ffprober/video_stream'
+require_relative 'ffprober/chapter'
+require_relative 'ffprober/ffprobe_version'
+require 'json'
 
 module Ffprober
   def self.path
-    name = 'ffprobe'
-    name << '.exe' if self.windows?
+    @path ||= begin
+      path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |path_to_check|
+        File.executable?(File.join(path_to_check, executable_name))
+      end
 
-    path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |path|
-      File.executable?(File.join(path, name))
+      path && File.expand_path(executable_name, path)
     end
+  end
 
-    path && File.expand_path(name, path)
+  def self.executable_name
+    @executable_name ||= self.windows? ? 'ffprobe.exe' : 'ffprobe'
   end
 
   def self.windows?

data/spec/assets/sample video.json

@@ -0,0 +1,177 @@
+{
+    "streams": [
+        {
+            "index": 0,
+            "codec_name": "aac",
+            "codec_long_name": "AAC (Advanced Audio Coding)",
+            "codec_type": "audio",
+            "codec_time_base": "1/44100",
+            "codec_tag_string": "mp4a",
+            "codec_tag": "0x6134706d",
+            "sample_fmt": "fltp",
+            "sample_rate": "44100",
+            "channels": 2,
+            "channel_layout": "stereo",
+            "bits_per_sample": 0,
+            "r_frame_rate": "0/0",
+            "avg_frame_rate": "0/0",
+            "time_base": "1/44100",
+            "start_pts": 0,
+            "start_time": "0.000000",
+            "duration_ts": 7168,
+            "duration": "0.162540",
+            "bit_rate": "73582",
+            "nb_frames": "7",
+            "disposition": {
+                "default": 1,
+                "dub": 0,
+                "original": 0,
+                "comment": 0,
+                "lyrics": 0,
+                "karaoke": 0,
+                "forced": 0,
+                "hearing_impaired": 0,
+                "visual_impaired": 0,
+                "clean_effects": 0,
+                "attached_pic": 0
+            },
+            "tags": {
+                "creation_time": "2013-12-28 21:17:44",
+                "language": "und",
+                "handler_name": "Core Media Audio"
+            }
+        },
+        {
+            "index": 1,
+            "codec_name": "h264",
+            "codec_long_name": "H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10",
+            "profile": "Constrained Baseline",
+            "codec_type": "video",
+            "codec_time_base": "1/5000",
+            "codec_tag_string": "avc1",
+            "codec_tag": "0x31637661",
+            "width": 480,
+            "height": 272,
+            "has_b_frames": 0,
+            "sample_aspect_ratio": "0:1",
+            "display_aspect_ratio": "0:1",
+            "pix_fmt": "yuv420p",
+            "level": 21,
+            "r_frame_rate": "25/1",
+            "avg_frame_rate": "25/1",
+            "time_base": "1/2500",
+            "start_pts": 0,
+            "start_time": "0.000000",
+            "duration_ts": 300,
+            "duration": "0.120000",
+            "bit_rate": "79066",
+            "nb_frames": "3",
+            "disposition": {
+                "default": 1,
+                "dub": 0,
+                "original": 0,
+                "comment": 0,
+                "lyrics": 0,
+                "karaoke": 0,
+                "forced": 0,
+                "hearing_impaired": 0,
+                "visual_impaired": 0,
+                "clean_effects": 0,
+                "attached_pic": 0
+            },
+            "tags": {
+                "creation_time": "2013-12-28 21:17:44",
+                "language": "und",
+                "handler_name": "Core Media Video"
+            }
+        },
+        {
+            "index": 2,
+            "codec_name": "mov_text",
+            "codec_long_name": "3GPP Timed Text subtitle",
+            "codec_type": "subtitle",
+            "codec_time_base": "1/1000",
+            "codec_tag_string": "text",
+            "codec_tag": "0x74786574",
+            "r_frame_rate": "0/0",
+            "avg_frame_rate": "0/0",
+            "time_base": "1/1000",
+            "start_pts": 0,
+            "start_time": "0.000000",
+            "duration_ts": 98,
+            "duration": "0.098000",
+            "bit_rate": "5690",
+            "nb_frames": "3",
+            "disposition": {
+                "default": 0,
+                "dub": 0,
+                "original": 0,
+                "comment": 0,
+                "lyrics": 0,
+                "karaoke": 0,
+                "forced": 0,
+                "hearing_impaired": 0,
+                "visual_impaired": 0,
+                "clean_effects": 0,
+                "attached_pic": 0
+            },
+            "tags": {
+                "creation_time": "2013-12-28 21:28:08",
+                "language": "eng"
+            }
+        }
+    ],
+    "chapters": [
+        {
+            "id": 0,
+            "time_base": "1/1000",
+            "start": 0,
+            "start_time": "0.000000",
+            "end": 10,
+            "end_time": "0.010000",
+            "tags": {
+                "title": "Chapter 1"
+            }
+        },
+        {
+            "id": 1,
+            "time_base": "1/1000",
+            "start": 10,
+            "start_time": "0.010000",
+            "end": 20,
+            "end_time": "0.020000",
+            "tags": {
+                "title": "Chapter 2"
+            }
+        },
+        {
+            "id": 2,
+            "time_base": "1/1000",
+            "start": 20,
+            "start_time": "0.020000",
+            "end": 97,
+            "end_time": "0.097000",
+            "tags": {
+                "title": "Chapter 3"
+            }
+        }
+    ],
+    "format": {
+        "filename": "spec/assets/sample video.m4v",
+        "nb_streams": 3,
+        "nb_programs": 0,
+        "format_name": "mov,mp4,m4a,3gp,3g2,mj2",
+        "format_long_name": "QuickTime / MOV",
+        "start_time": "0.000000",
+        "duration": "0.097600",
+        "size": "4611",
+        "bit_rate": "377950",
+        "probe_score": 100,
+        "tags": {
+            "major_brand": "M4V ",
+            "minor_version": "1",
+            "compatible_brands": "M4V M4A mp42isom",
+            "creation_time": "2013-12-28 21:17:44"
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+ffprobe version 2.2.2-tessus Copyright (c) 2007-2014 the FFmpeg developers
+  built on May  7 2014 23:17:42 with clang version 3.3 (tags/RELEASE_33/final)
+  configuration: --cc=/opt/local/bin/clang-mp-3.3 --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-libx265 --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 --disable-indev=qtkit --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
+Simple multimedia streams analyzer
+usage: ffprobe [OPTIONS] [INPUT_FILE]
+
+You have to specify one input file.
+Use -h to get full help or, even better, run 'man ffprobe'.

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

@@ -0,0 +1,12 @@
+ffprobe version 2.3.2 Copyright (c) 2007-2014 the FFmpeg developers
+built on Aug 22 2014 12:11:42 with Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn)
+configuration: --prefix=/usr/local/Cellar/ffmpeg/2.3.2 --enable-shared --enable-pthreads --enable-gpl --enable-version3 --enable-nonfree --enable-hardcoded-tables --enable-avresample --enable-vda --cc=clang --host-cflags= --host-ldflags= --enable-libx264 --enable-libfaac --enable-libmp3lame --enable-libxvid
+libavutil      52. 92.100 / 52. 92.100
+libavcodec     55. 69.100 / 55. 69.100
+libavformat    55. 48.100 / 55. 48.100
+libavdevice    55. 13.102 / 55. 13.102
+libavfilter     4. 11.100 /  4. 11.100
+libavresample   1.  3.  0 /  1.  3.  0
+libswscale      2.  6.100 /  2.  6.100
+libswresample   0. 19.100 /  0. 19.100
+libpostproc    52.  3.100 / 52.  3.100

data/spec/ffprober/ffprobe_version_spec.rb

@@ -3,18 +3,19 @@ require 'spec_helper'
 
 describe Ffprober::FfprobeVersion do
   VERSION_CHECKS = [
-    { version: "0.9.0", pass: true },
-    { version: "1.0.0", pass: true },
-    { 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.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 }
+    { version: '0.9.0', pass: true },
+    { version: '1.0.0', pass: true },
+    { 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.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 },
+    { version: '2.2.2', pass: true }
   ]
 
   subject(:ffprobe_version) { Ffprober::FfprobeVersion.new }
@@ -29,27 +30,27 @@ describe Ffprober::FfprobeVersion do
   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("-")
+    Dir.new('spec/assets/version_outputs').each do |entry|
+      next if ['.', '..', '.DS_Store'].include?(entry)
+      os, expected_version = entry.split('-')
 
       it "on #{os} from #{expected_version}" do
-        version_output = File.read("spec/assets/version_outputs/" + entry)
+        version_output = File.read('spec/assets/version_outputs/' + entry)
 
-        allow(ffprobe_version).to receive(:version_output).and_return(version_output)
+        allow(ffprobe_version).to receive(:ffprobe_version_output).and_return(version_output)
 
-        if expected_version == "nightly"
+        if expected_version == 'nightly'
           expect(ffprobe_version.nightly?).to eq(true)
           expect(ffprobe_version.valid?).to eq(true)
         else
-          expect(ffprobe_version.version).to 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
+    it 'should not be valid if no ffprobe could be found in PATH' do
       allow(Ffprober).to receive(:path).and_return(nil)
-      expect(ffprobe_version.version.to_s).to eq("0.0.0")
+      expect(ffprobe_version.version.to_s).to eq('0.0.0')
       expect(Ffprober::FfprobeVersion.valid?).to eq(false)
     end
 

data/spec/ffprober/parser_spec.rb

@@ -1,103 +1,93 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Ffprober::Parser do
+def shared_specs
+  describe 'format' do
+    it 'should determine the correct filename' do
+      expect(ffprobe.format.filename).to eq('spec/assets/sample video.m4v')
+    end
 
-  describe "from_file with whitespace", if: Ffprober::FfprobeVersion.valid? do
-    let(:ffprobe) { Ffprober::Parser.from_file('spec/assets/301 extracting a ruby gem.m4v') }
+    it 'should find the correct size' do
+      expect(ffprobe.format.size).to eq('4611')
+    end
 
-    describe "format" do
-      it "should determine the correct filename" do
-        expect(ffprobe.format.filename).to eq("spec/assets/301 extracting a ruby gem.m4v")
-      end
+    it 'should find the correct bit_rate' do
+      expect(ffprobe.format.bit_rate).to eq('377950')
+    end
+  end
 
-      it "should find the correct size" do
-        expect(ffprobe.format.size).to eq("130694")
-      end
+  describe 'audio_streams' do
+    it 'should determine the correct number of audio streams' do
+      expect(ffprobe.audio_streams.count).to eq(1)
+    end
 
-      it "should find the correct bit_rate" do
-        expect(ffprobe.format.bit_rate).to eq("502669")
-      end
+    it 'should determine the correct sample rate of the first audio stream' do
+      expect(ffprobe.audio_streams.first.sample_rate).to eq('44100')
     end
   end
 
-  describe "from_file", if: Ffprober::FfprobeVersion.valid? do
-    let(:ffprobe) { Ffprober::Parser.from_file('spec/assets/301-extracting_a_ruby_gem.m4v') }
-
-    describe "format" do
-      it "should determine the correct filename" do
-        expect(ffprobe.format.filename).to eq("spec/assets/301-extracting_a_ruby_gem.m4v")
-      end
+  describe 'video_streams' do
+    it 'should determine the correct width of the first video streams' do
+      expect(ffprobe.video_streams.first.width).to eq(480)
+    end
 
-      it "should find the correct size" do
-        expect(ffprobe.format.size).to eq("130694")
-      end
+    it 'should determine the correct width of the first video streams' do
+      expect(ffprobe.video_streams.first.height).to eq(272)
+    end
 
-      it "should find the correct bit_rate" do
-        expect(ffprobe.format.bit_rate).to eq("502669")
-      end
+    it 'should determine the correct number of video streams' do
+      expect(ffprobe.video_streams.count).to eq(1)
     end
   end
 
-  describe "from invalid file", if: Ffprober::FfprobeVersion.valid? do
-    let(:ffprobe) { Ffprober::Parser.from_file('spec/assets/empty_file') }
+  describe 'chapters' do
+    it 'should contain the chapters' do
+      expect(ffprobe.chapters.count).to eq(3)
+    end
 
-    describe "format" do
-      it "should determine the correct filename" do
-        expect { ffprobe.format.filename }.to raise_error
-      end
+    describe 'chapter' do
+      subject(:chapter) { ffprobe.chapters.first }
 
-      it "should find the correct size" do
-        expect { ffprobe.format.size }.to raise_error
-      end
-
-      it "should find the correct bit_rate" do
-        expect { ffprobe.format.bit_rate }.to raise_error
-      end
+      it 'should contain id' do expect(chapter.id).to eq(0) end
+      it 'should contain time_base' do expect(chapter.time_base).to eq('1/1000') end
+      it 'should contain start' do expect(chapter.start).to eq(0) end
+      it 'should contain start_time' do expect(chapter.start_time).to eq('0.000000') end
+      it 'should contain end' do expect(chapter.end).to eq(10) end
+      it 'should contain end_time' do expect(chapter.end_time).to eq('0.010000') end
+      it 'should contain tags' do expect(chapter.tags).to eq(title: 'Chapter 1') end
     end
   end
+end
 
-  describe "from_json" do
-    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
-        expect(ffprobe.format.filename).to eq("301-extracting-a-ruby-gem.mp4")
-      end
+describe Ffprober::Parser do
 
-      it "should find the correct size" do
-        expect(ffprobe.format.size).to eq("44772490")
-      end
+  context 'from_file', if: Ffprober::FfprobeVersion.valid? do
+    let(:ffprobe) { Ffprober::Parser.from_file('spec/assets/sample video.m4v') }
 
-      it "should find the correct bit_rate" do
-        expect(ffprobe.format.bit_rate).to eq("361309")
-      end
-    end
+    shared_specs
+  end
 
-    describe "audio_streams" do
-      it "should determine the correct number of audio streams" do
-        expect(ffprobe.audio_streams.count).to eq(1)
-      end
+  context 'from_json' do
+    let(:ffprobe) { Ffprober::Parser.from_json(File.read('spec/assets/sample video.json')) }
 
-      it "should determine the correct sample rate of the first audio stream" do
-        expect(ffprobe.audio_streams.first.sample_rate).to eq("48000")
-      end
+    shared_specs
+  end
 
-    end
+  context 'from invalid file', if: Ffprober::FfprobeVersion.valid? do
+    let(:ffprobe) { Ffprober::Parser.from_file('spec/assets/empty_file') }
 
-    describe "video_streams" do
-      it "should determine the correct width of the first video streams" do
-        expect(ffprobe.video_streams.first.width).to eq(960)
+    describe 'format' do
+      it 'should determine the correct filename' do
+        expect { ffprobe.format.filename }.to raise_error
       end
 
-      it "should determine the correct width of the first video streams" do
-        expect(ffprobe.video_streams.first.height).to eq(600)
+      it 'should find the correct size' do
+        expect { ffprobe.format.size }.to raise_error
       end
 
-      it "should determine the correct number of video streams" do
-        expect(ffprobe.video_streams.count).to eq(1)
+      it 'should find the correct bit_rate' do
+        expect { ffprobe.format.bit_rate }.to raise_error
       end
     end
   end
-
 end

data/spec/ffprober_spec.rb

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

data/spec/spec_helper.rb

@@ -1 +1,61 @@
 require 'ffprober'
+
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    expectations.syntax = :expect
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+    mocks.syntax = :expect
+
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended.
+    mocks.verify_partial_doubles = true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - beanieboi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: '3.0'
 description: a Ruby wrapper for ffprobe
 email:
 - beanie@benle.de
@@ -35,6 +35,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CONTRIBUTING.md
 - Changes.md
 - Gemfile
 - LICENSE
@@ -42,6 +43,7 @@ files:
 - ffprober.gemspec
 - lib/ffprober.rb
 - lib/ffprober/audio_stream.rb
+- lib/ffprober/chapter.rb
 - lib/ffprober/ffprobe_version.rb
 - lib/ffprober/format.rb
 - lib/ffprober/parser.rb
@@ -49,9 +51,9 @@ files:
 - lib/ffprober/version.rb
 - lib/ffprober/video_stream.rb
 - spec/assets/301 extracting a ruby gem.m4v
-- spec/assets/301-extracting_a_ruby_gem.json
-- spec/assets/301-extracting_a_ruby_gem.m4v
 - spec/assets/empty_file
+- spec/assets/sample video.json
+- spec/assets/sample video.m4v
 - spec/assets/version_outputs/linux-nightly
 - spec/assets/version_outputs/osx-1_0
 - spec/assets/version_outputs/osx-1_2_0
@@ -60,6 +62,8 @@ files:
 - 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/osx-2_2_2
+- spec/assets/version_outputs/osx-2_3_2
 - spec/assets/version_outputs/raspian-0_8_6
 - spec/assets/version_outputs/ubuntu-0_10_6
 - spec/assets/version_outputs/windows-nightly
@@ -87,15 +91,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ffprober
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: a Ruby wrapper for ffprobe (part of ffmpeg)
 test_files:
 - spec/assets/301 extracting a ruby gem.m4v
-- spec/assets/301-extracting_a_ruby_gem.json
-- spec/assets/301-extracting_a_ruby_gem.m4v
 - spec/assets/empty_file
+- spec/assets/sample video.json
+- spec/assets/sample video.m4v
 - spec/assets/version_outputs/linux-nightly
 - spec/assets/version_outputs/osx-1_0
 - spec/assets/version_outputs/osx-1_2_0
@@ -104,6 +108,8 @@ test_files:
 - 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/osx-2_2_2
+- spec/assets/version_outputs/osx-2_3_2
 - spec/assets/version_outputs/raspian-0_8_6
 - spec/assets/version_outputs/ubuntu-0_10_6
 - spec/assets/version_outputs/windows-nightly

data/spec/assets/301-extracting_a_ruby_gem.json

@@ -1,74 +0,0 @@
-{
-    "streams": [
-        {
-            "index": 0,
-            "codec_name": "h264",
-            "codec_long_name": "H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10",
-            "codec_type": "video",
-            "codec_time_base": "1/180000",
-            "codec_tag_string": "avc1",
-            "codec_tag": "0x31637661",
-            "width": 960,
-            "height": 600,
-            "has_b_frames": 2,
-            "sample_aspect_ratio": "1:1",
-            "display_aspect_ratio": "8:5",
-            "pix_fmt": "yuv420p",
-            "level": 31,
-            "is_avc": "1",
-            "nal_length_size": "4",
-            "r_frame_rate": "25/1",
-            "avg_frame_rate": "320805000/44607683",
-            "time_base": "1/90000",
-            "start_time": "0.000000",
-            "duration": "991.281844",
-            "nb_frames": "7129",
-            "tags": {
-                "creation_time": "2011-11-21 06:45:09",
-                "language": "und",
-                "handler_name": ""
-            }
-        },
-        {
-            "index": 1,
-            "codec_name": "aac",
-            "codec_long_name": "Advanced Audio Coding",
-            "codec_type": "audio",
-            "codec_time_base": "1/48000",
-            "codec_tag_string": "mp4a",
-            "codec_tag": "0x6134706d",
-            "sample_fmt": "s16",
-            "sample_rate": "48000",
-            "channels": 1,
-            "bits_per_sample": 0,
-            "r_frame_rate": "0/0",
-            "avg_frame_rate": "375/8",
-            "time_base": "1/48000",
-            "start_time": "0.000000",
-            "duration": "991.338667",
-            "nb_frames": "46469",
-            "tags": {
-                "creation_time": "2011-11-21 06:45:09",
-                "language": "eng",
-                "handler_name": ""
-            }
-        }
-    ],
-    "format": {
-        "filename": "301-extracting-a-ruby-gem.mp4",
-        "nb_streams": 2,
-        "format_name": "mov,mp4,m4a,3gp,3g2,mj2",
-        "format_long_name": "QuickTime/MPEG-4/Motion JPEG 2000 format",
-        "start_time": "0.000000",
-        "duration": "991.338667",
-        "size": "44772490",
-        "bit_rate": "361309",
-        "tags": {
-            "major_brand": "mp42",
-            "minor_version": "0",
-            "compatible_brands": "mp42isomavc1",
-            "creation_time": "2011-11-21 06:45:09",
-            "encoder": "HandBrake 0.9.5 2011010300"
-        }
-    }
-}