ffprober 0.4.6 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f48bb0db1f7f7a981b59f158ab245b6570f173f6
-  data.tar.gz: d6c4ab9014aaf6f000ae11db448620f15002fe7d
+  metadata.gz: 0f39ab8330d7d9b69833af671fe9c2c6d5584821
+  data.tar.gz: 7425cb1dd0befdc48e282f2bd34e3a60f1d82521
 SHA512:
-  metadata.gz: 2996def445326304ff4ccafa381a855a43f5503a244b22bde01c5731c8b48aa50faae084b9e9985684710534cd2003ea1ca06c3837d1b029cf173045c1a42b4f
-  data.tar.gz: e2dd182e05eeaaeff74d9c59bff424358a9ff831a07b7ccf530ed76612c76dd1af82c5be850d03ccf7110a0ea3f33ca131e0352cd136c11223efa5a8e61ca7a3
+  metadata.gz: a72e307e9379573aa6a068add8e04e00760f3c195c822d208c120e3af0b5dfd1b706daed1685e3d58aef5ee9d2fc6f3a5970b9c3be9abdb1b205c5dfb7699cb4
+  data.tar.gz: 067184e0af61e726393c57ee5b829c96cb7f6f9b87cd0e7c58aee460ba8bf662caf566b1162fe4cb2f78589dc7d2b23ded8fe5d3a3620e17ec9943ed52748298

data/.ruby-version

@@ -1 +1 @@
-2.2.1
+2.3.0

data/.travis.yml

@@ -1,6 +1,13 @@
 language: ruby
 
-script: rspec spec
+before_install:
+ - gem install bundler
+
+before_script:
+  - echo $PATH
+  - cp test/ffprobe /home/travis/bin
+
+script: rake
 
 sudo: false
 
@@ -14,9 +21,14 @@ addons:
     repo_token: e319ec7d18fb8e1f05b460c3ef8fac58af3844d7bfa3d44de6b82eb874bb3e31
 
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.1
+  - 2.0.0-p648
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - rbx-2
   - ruby-head
   - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: rbx-2

data/Changes.md

@@ -1,3 +1,15 @@
+0.5.1 / 2016-02-07
+===================
+
+* expose parsed json via ffprober.json
+
+0.5.0 / unreleased
+===================
+
+* autoload, reduce initial object count by 3k
+* refactorings, clean up warnings etc.
+* remove check for maximum ffprober version, makes upgrading ffmpeg way easier
+
 0.4.6 / 2015-11-12
 ===================
 

data/Gemfile

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

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+task default: :test

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "ffprober"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/examples/from_file.rb

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

data/ffprober.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '~> 2.0'
 
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "minitest"
 end

data/lib/ffprober.rb

@@ -1,23 +1,34 @@
 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/data_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"
 
-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"
+autoload :JSON, "json"
 
 module Ffprober
+  class EmptyInput < StandardError; end
+  class InvalidInputFileError < StandardError; end
+  class NoFfprobeFound < StandardError; end
+  class UnsupportedVersion < StandardError; end
+
+  autoload :AudioStream, "ffprober/audio_stream"
+  autoload :Chapter, "ffprober/chapter"
+  autoload :DataStream, "ffprober/data_stream"
+  autoload :DynamicInitializer, "ffprober/dynamic_initializer"
+  autoload :FfprobeVersion, "ffprober/ffprobe_version"
+  autoload :Format, "ffprober/format"
+  autoload :Parser, "ffprober/parser"
+  autoload :Stream, "ffprober/stream"
+  autoload :SubtitleStream, "ffprober/subtitle_stream"
+  autoload :VideoStream, "ffprober/video_stream"
+  autoload :Wrapper, "ffprober/wrapper"
+
+  module Ffmpeg
+    autoload :Exec, "ffprober/ffmpeg/exec"
+    autoload :Finder, "ffprober/ffmpeg/finder"
+    autoload :Version, "ffprober/ffmpeg/version"
+    autoload :VersionValidator, "ffprober/ffmpeg/version_validator"
+  end
+
+  module Parsers
+    autoload :File, "ffprober/parsers/file"
+    autoload :Json, "ffprober/parsers/json"
+  end
 end

data/lib/ffprober/ffmpeg/exec.rb

@@ -0,0 +1,35 @@
+module Ffprober
+  module Ffmpeg
+    class Exec
+      CHAPTER_SUPPORT = Gem::Version.new("2.0.0")
+
+      def initialize(ffprobe_finder=Ffprober::Ffmpeg::Finder)
+        @ffprobe_finder = ffprobe_finder
+      end
+
+      def json_output(file_to_parse)
+        `#{@ffprobe_finder.path} #{ffprobe_options} #{Shellwords.escape(file_to_parse)}`
+      end
+
+      def ffprobe_version_output
+        @ffprobe_version_output ||= begin
+          if @ffprobe_finder.path.nil?
+            ""
+          else
+            `#{@ffprobe_finder.path} -version`
+          end
+        end
+      end
+
+      def ffprobe_options
+        options = "-v quiet -print_format json -show_format -show_streams"
+        options << " -show_chapters" if ffprobe_version.version >= CHAPTER_SUPPORT
+        options
+      end
+
+      def ffprobe_version
+        Ffprober::Ffmpeg::Version.new(self)
+      end
+    end
+  end
+end

data/lib/ffprober/ffmpeg/finder.rb

@@ -1,14 +1,11 @@
 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
+      SEARCH_PATHS = ENV["PATH"]
 
-          path && File.expand_path(executable_name, path)
-        end
+      def self.path
+        fail Ffprober::NoFfprobeFound if executable_path.nil?
+        @path ||= File.expand_path(executable_name, executable_path)
       end
 
       def self.executable_name
@@ -18,6 +15,14 @@ module Ffprober
       def self.windows?
         !!(RUBY_PLATFORM =~ /(mingw|mswin)/)
       end
+
+      def self.executable_path
+        @@executable_path ||= begin
+          SEARCH_PATHS.split(File::PATH_SEPARATOR).detect do |path_to_check|
+            File.executable?(File.join(path_to_check, executable_name))
+          end
+        end
+      end
     end
   end
 end

data/lib/ffprober/ffmpeg/version.rb

@@ -1,8 +1,13 @@
 module Ffprober
   module Ffmpeg
     class Version
+      def initialize(ffprobe_exec=Ffprober::Ffmpeg::Exec.new)
+        @ffprobe_exec = ffprobe_exec
+      end
+
       VERSION_REGEX = /^(ffprobe|avprobe|ffmpeg) version (\d+)\.?(\d+)\.?(\d+)*/
       NIGHTLY_REGEX = /^(ffprobe|avprobe|ffmpeg) version (N|git)-/
+      VERSION_FALLBACK = [0, 0, 0]
 
       def version
         @version ||= Gem::Version.new(parse_version.join("."))
@@ -18,16 +23,12 @@ module Ffprober
         @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 || VERSION_FALLBACK
         end
       end
 
       def ffprobe_version_output
-        @ffprobe_version_output ||= ffprobe_finder.path.nil? ? "" : `#{ffprobe_finder.path} -version`
-      end
-
-      def ffprobe_finder
-        Ffprober::Ffmpeg::Finder
+        @ffprobe_exec.ffprobe_version_output
       end
 
       def to_s

data/lib/ffprober/ffmpeg/version_validator.rb

@@ -2,7 +2,6 @@ module Ffprober
   module Ffmpeg
     class VersionValidator
       MIN_VERSION = Gem::Version.new("0.9.0")
-      MAX_VERSION = Gem::Version.new("2.8.1")
 
       def initialize(ffmpeg_version)
         @ffmpeg_version = ffmpeg_version
@@ -15,8 +14,7 @@ module Ffprober
       private
 
       def version_requirement_statisfied?
-        version = ffmpeg_version.version
-        (MIN_VERSION <= version && version <= MAX_VERSION)
+        MIN_VERSION <= ffmpeg_version.version
       end
 
       def ffmpeg_version

data/lib/ffprober/ffprobe_version.rb

@@ -1,21 +1,31 @@
 module Ffprober
   class FfprobeVersion
+    def self.invalid?
+      !new.valid?
+    end
+
     def self.valid?
       new.valid?
+    rescue NoFfprobeFound
+      false
     end
 
     def valid?
       validator.valid?
     end
 
-    private
-
-    def validator
-      Ffprober::Ffmpeg::VersionValidator.new(version)
+    def self.version
+      new.version
     end
 
     def version
       Ffprober::Ffmpeg::Version.new
     end
+
+    private
+
+    def validator
+      Ffprober::Ffmpeg::VersionValidator.new(version)
+    end
   end
 end

data/lib/ffprober/parser.rb

@@ -3,8 +3,12 @@ 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: #{Ffprober::Ffmpeg::Version.new})")
+      if FfprobeVersion.invalid?
+        fail UnsupportedVersion, "found version: #{FfprobeVersion.version}"
+      end
+
+      if File.zero?(file_to_parse)
+        fail EmptyInput, file_to_parse
       end
 
       file_parser = Ffprober::Parsers::File.new(file_to_parse)

data/lib/ffprober/parsers/file.rb

@@ -1,33 +1,17 @@
 module Ffprober
   module Parsers
     class File
-      def initialize(file_to_parse)
+      def initialize(file_to_parse, exec=Ffprober::Ffmpeg::Exec.new)
         unless ::File.exist?(file_to_parse)
           fail ArgumentError.new("File not found #{file_to_parse}")
         end
 
         @file_to_parse = file_to_parse
+        @exec = exec
       end
 
       def load
-        json_output = `#{ffprobe_finder.path} #{options} #{Shellwords.escape(@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
+        Ffprober::Parsers::Json.new(@exec.json_output(@file_to_parse))
       end
     end
   end

data/lib/ffprober/version.rb

@@ -1,3 +1,3 @@
 module Ffprober
-  VERSION = "0.4.6"
+  VERSION = "0.5.1"
 end

data/lib/ffprober/wrapper.rb

@@ -1,5 +1,7 @@
 module Ffprober
   class Wrapper
+    attr_reader :json
+
     def initialize(json)
       @json = json
     end
@@ -37,9 +39,5 @@ module Ffprober
     def streams
       json[:streams]
     end
-
-    def json
-      @json
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffprober
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.1
 platform: ruby
 authors:
 - beanieboi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: a Ruby wrapper for ffprobe
 email:
 - beanie@benle.de
@@ -57,6 +57,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - examples/from_file.rb
 - ffprober.gemspec
 - lib/ffprober.rb
@@ -64,7 +66,7 @@ files:
 - lib/ffprober/chapter.rb
 - lib/ffprober/data_stream.rb
 - lib/ffprober/dynamic_initializer.rb
-- lib/ffprober/errors.rb
+- lib/ffprober/ffmpeg/exec.rb
 - lib/ffprober/ffmpeg/finder.rb
 - lib/ffprober/ffmpeg/version.rb
 - lib/ffprober/ffmpeg/version_validator.rb
@@ -98,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: a Ruby wrapper for ffprobe (part of ffmpeg)

data/lib/ffprober/errors.rb

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