ffprober 0.4.2 → 0.4.3

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/Changes.md

@@ -1,3 +1,8 @@
+0.4.3 / 2015-06-22
+===================
+
+* add support for ffmpeg 2.6.3
+
 0.4.2 / 2015-03-27
 ===================
 

data/Gemfile

@@ -1,6 +1,7 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'pry'
+gem "pry"
+gem "rubocop"
 gem "codeclimate-test-reporter", require: nil
 
 # Specify your gem's dependencies in ffprober.gemspec

data/examples/from_file.rb

@@ -0,0 +1,4 @@
+require_relative "../lib/ffprober"
+
+parser = Ffprober::Parser.from_file("../spec/assets/sample video.m4v")
+puts parser.video_streams.inspect

data/lib/ffprober/errors.rb

@@ -0,0 +1,5 @@
+module Ffprober
+  module Errors
+    class InvalidInputFileError < ::StandardError; end
+  end
+end

data/lib/ffprober/ffmpeg/finder.rb

@@ -0,0 +1,23 @@
+module Ffprober
+  module Ffmpeg
+    class Finder
+      def self.path
+        @path ||= begin
+          path = ENV["PATH"].split(File::PATH_SEPARATOR).detect do |path_to_check|
+            File.executable?(File.join(path_to_check, executable_name))
+          end
+
+          path && File.expand_path(executable_name, path)
+        end
+      end
+
+      def self.executable_name
+        @executable_name ||= self.windows? ? "ffprobe.exe" : "ffprobe"
+      end
+
+      def self.windows?
+        !!(RUBY_PLATFORM =~ /(mingw|mswin)/)
+      end
+    end
+  end
+end

data/lib/ffprober/ffmpeg/version.rb

@@ -0,0 +1,38 @@
+module Ffprober
+  module Ffmpeg
+    class Version
+      VERSION_REGEX = /^(ffprobe|avprobe|ffmpeg) version (\d+)\.?(\d+)\.?(\d+)*/
+      NIGHTLY_REGEX = /^(ffprobe|avprobe|ffmpeg) version (N|git)-/
+
+      def version
+        @version ||= Gem::Version.new(parse_version.join("."))
+      end
+
+      def nightly?
+        !!(ffprobe_version_output =~ NIGHTLY_REGEX)
+      end
+
+      private
+
+      def parse_version
+        @parse_version ||= begin
+          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 ffprobe_version_output
+        @ffprobe_version_output ||= ffprobe_finder.path.nil? ? "" : `#{ffprobe_finder.path} -version`
+      end
+
+      def ffprobe_finder
+        Ffprober::Ffmpeg::Finder
+      end
+
+      def to_s
+        parse_version.join(".")
+      end
+    end
+  end
+end

data/lib/ffprober/ffmpeg/version_validator.rb

@@ -0,0 +1,27 @@
+module Ffprober
+  module Ffmpeg
+    class VersionValidator
+      MIN_VERSION = Gem::Version.new("0.9.0")
+      MAX_VERSION = Gem::Version.new("2.6.3")
+
+      def initialize(ffmpeg_version)
+        @ffmpeg_version = ffmpeg_version
+      end
+
+      def valid?
+        ffmpeg_version.nightly? || version_requirement_statisfied?
+      end
+
+      private
+
+      def version_requirement_statisfied?
+        version = ffmpeg_version.version
+        (MIN_VERSION <= version && version <= MAX_VERSION)
+      end
+
+      def ffmpeg_version
+        @ffmpeg_version
+      end
+    end
+  end
+end

data/lib/ffprober/ffprobe_version.rb

@@ -1,41 +1,21 @@
 module Ffprober
   class FfprobeVersion
-    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.5.4')
-
     def self.valid?
       new.valid?
     end
 
-    def self.version
-      new.version
-    end
-
     def valid?
-      nightly? || (MIN_VERSION <= version && version <= MAX_VERSION)
+      validator.valid?
     end
 
-    def parse_version
-      @parse_version ||= begin
-        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
+    private
 
-    def version
-      @version ||= Gem::Version.new(parse_version.join('.'))
-    end
-
-    def nightly?
-      !!(ffprobe_version_output =~ NIGHTLY_REGEX)
+    def validator
+      Ffprober::Ffmpeg::VersionValidator.new(version)
     end
 
-    def ffprobe_version_output
-      @ffprobe_version_output ||= Ffprober.path.nil? ? '' : `#{Ffprober.path} -version`
+    def version
+      Ffprober::Ffmpeg::Version.new
     end
   end
 end

data/lib/ffprober/parser.rb

@@ -1,66 +1,20 @@
-require 'shellwords'
+require "shellwords"
 
 module Ffprober
   class Parser
     def self.from_file(file_to_parse)
       unless FfprobeVersion.valid?
-        fail ArgumentError.new("no or unsupported ffprobe version found.\
-                                (version: #{FfprobeVersion.new.version})")
+        fail ArgumentError.new("no or unsupported ffprobe version found. (version: #{Ffprober::Ffmpeg::Version.new})")
       end
 
-      unless File.exist?(file_to_parse)
-        fail ArgumentError.new("File not found #{file_to_parse}")
-      end
-
-      json_output = `#{Ffprober.path} #{options} #{Shellwords.escape(file_to_parse)}`
-      from_json(json_output)
+      file_parser = Ffprober::Parsers::File.new(file_to_parse)
+      json_parser = file_parser.load
+      Ffprober::Wrapper.new(json_parser.json)
     end
 
     def self.from_json(json_to_parse)
-      parser = new
-      parser.parse(json_to_parse)
-      parser
-    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(@json[:format])
-    end
-
-    def video_streams
-      @video_streams ||= stream_by_codec('video').map { |stream| Ffprober::VideoStream.new(stream) }
-    end
-
-    def audio_streams
-      @audio_streams ||= stream_by_codec('audio').map { |stream| Ffprober::AudioStream.new(stream) }
-    end
-
-    def subtitle_streams
-      @subtitle_streams ||= stream_by_codec('subtitle').map { |stream| Ffprober::SubtitleStream.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)
-      streams.select { |stream| stream[:codec_type] == codec_type }
-    end
-
-    def streams
-      @json[:streams]
+      json_parser = Ffprober::Parsers::Json.new(json_to_parse)
+      Ffprober::Wrapper.new(json_parser.json)
     end
   end
 end

data/lib/ffprober/parsers/file.rb

@@ -0,0 +1,34 @@
+module Ffprober
+  module Parsers
+    class File
+      def initialize(file_to_parse)
+        unless ::File.exist?(file_to_parse)
+          fail ArgumentError.new("File not found #{file_to_parse}")
+        end
+
+        @file_to_parse = file_to_parse
+      end
+
+      def load
+        json_output = `#{ffprobe_finder.path} #{options} '#{@file_to_parse}'`
+        Ffprober::Parsers::Json.new(json_output)
+      end
+
+      private
+
+      def options
+        options = "-v quiet -print_format json -show_format -show_streams"
+        options << " -show_chapters" if ffprobe_version.version >= Gem::Version.new("2.0.0")
+        options
+      end
+
+      def ffprobe_version
+        Ffprober::Ffmpeg::Version.new
+      end
+
+      def ffprobe_finder
+        Ffprober::Ffmpeg::Finder
+      end
+    end
+  end
+end

data/lib/ffprober/parsers/json.rb

@@ -0,0 +1,14 @@
+module Ffprober
+  module Parsers
+    class Json
+      def initialize(json_to_parse)
+        fail ArgumentError.new("No JSON input data") if json_to_parse.nil?
+        @json_to_parse = json_to_parse
+      end
+
+      def json
+        @json ||= JSON.parse(@json_to_parse, symbolize_names: true)
+      end
+    end
+  end
+end

data/lib/ffprober/subtitle_stream.rb

@@ -1,4 +1,4 @@
 module Ffprober
   class SubtitleStream < Stream
   end
-end
+end

data/lib/ffprober/version.rb

@@ -1,3 +1,3 @@
 module Ffprober
-  VERSION = '0.4.2'
+  VERSION = "0.4.3"
 end

data/lib/ffprober/wrapper.rb

@@ -0,0 +1,41 @@
+module Ffprober
+  class Wrapper
+    def initialize(json)
+      @json = json
+    end
+
+    def format
+      @format ||= Ffprober::Format.new(json[:format])
+    end
+
+    def video_streams
+      @video_streams ||= stream_by_codec("video").map { |data| Ffprober::VideoStream.new(data) }
+    end
+
+    def audio_streams
+      @audio_streams ||= stream_by_codec("audio").map { |data| Ffprober::AudioStream.new(data) }
+    end
+
+    def chapters
+      @chapters ||= json[:chapters].map { |chapter| Ffprober::Chapter.new(chapter) }
+    end
+
+    def subtitle_streams
+      @subtitle_streams ||= stream_by_codec("subtitle").map { |stream| Ffprober::SubtitleStream.new(stream) }
+    end
+
+    private
+
+    def stream_by_codec(codec_type)
+      streams.select { |stream| stream[:codec_type] == codec_type }
+    end
+
+    def streams
+      json[:streams]
+    end
+
+    def json
+      @json
+    end
+  end
+end

data/lib/ffprober.rb

@@ -1,33 +1,22 @@
-require_relative 'ffprober/version'
-require_relative 'ffprober/dynamic_initializer'
-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/subtitle_stream'
-require_relative 'ffprober/chapter'
-require_relative 'ffprober/ffprobe_version'
-require 'json'
+require_relative "ffprober/version"
+require_relative "ffprober/dynamic_initializer"
+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/subtitle_stream"
+require_relative "ffprober/chapter"
+require_relative "ffprober/ffprobe_version"
+require_relative "ffprober/wrapper"
+require_relative "ffprober/errors"
 
-module Ffprober
-  def self.path
-    @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 && File.expand_path(executable_name, path)
-    end
-  end
-
-  def self.executable_name
-    @executable_name ||= self.windows? ? 'ffprobe.exe' : 'ffprobe'
-  end
+require_relative "ffprober/ffmpeg/finder"
+require_relative "ffprober/ffmpeg/version"
+require_relative "ffprober/ffmpeg/version_validator"
+require_relative "ffprober/parsers/file"
+require_relative "ffprober/parsers/json"
+require "json"
 
-  def self.windows?
-    !!(RUBY_PLATFORM =~ /(mingw|mswin)/)
-  end
-
-  class InvalidInputFileError < ::StandardError; end
+module Ffprober
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - beanieboi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,26 +47,36 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Changes.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- examples/from_file.rb
 - ffprober.gemspec
 - lib/ffprober.rb
 - lib/ffprober/audio_stream.rb
 - lib/ffprober/chapter.rb
 - lib/ffprober/dynamic_initializer.rb
+- lib/ffprober/errors.rb
+- lib/ffprober/ffmpeg/finder.rb
+- lib/ffprober/ffmpeg/version.rb
+- lib/ffprober/ffmpeg/version_validator.rb
 - lib/ffprober/ffprobe_version.rb
 - lib/ffprober/format.rb
 - lib/ffprober/parser.rb
+- lib/ffprober/parsers/file.rb
+- lib/ffprober/parsers/json.rb
 - lib/ffprober/stream.rb
 - lib/ffprober/subtitle_stream.rb
 - lib/ffprober/version.rb
 - lib/ffprober/video_stream.rb
+- lib/ffprober/wrapper.rb
 homepage: https://github.com/beanieboi/ffprober
 licenses:
 - MIT
@@ -92,3 +102,4 @@ signing_key:
 specification_version: 4
 summary: a Ruby wrapper for ffprobe (part of ffmpeg)
 test_files: []
+has_rdoc: