ffprober 0.5.1 → 0.5.2

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.5.0

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 
 before_install:
- - gem install bundler
+  - gem update --system
+  - gem install bundler
 
 before_script:
   - echo $PATH
@@ -21,14 +22,8 @@ addons:
     repo_token: e319ec7d18fb8e1f05b460c3ef8fac58af3844d7bfa3d44de6b82eb874bb3e31
 
 rvm:
-  - 2.0.0-p648
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - rbx-2
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
   - ruby-head
   - jruby-head
-
-matrix:
-  allow_failures:
-    - rvm: rbx-2

data/CODE_OF_CONDUCT.md

@@ -1,13 +1,73 @@
-# Contributor Code of Conduct
+# Contributor Covenant 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.
+## Our Pledge
 
-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.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
 
-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.
+## Our Standards
 
-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.
+Examples of behavior that contributes to creating a positive environment
+include:
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
-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/)
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+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, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at ich@abwesend.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

data/Changes.md

@@ -1,3 +1,10 @@
+0.5.2 / 2017-01-18
+==========
+
+* exposes a from_url method that allows probing URLs
+* validates URL input and raises error if invalid URL
+* raises an error if ffprobe responses with an error message in the JSON
+
 0.5.1 / 2016-02-07
 ===================
 

data/Gemfile

@@ -1,9 +1,11 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-# gem "pry"
-# gem "rubocop"
-# gem "codeclimate-test-reporter", require: false
-# gem 'simplecov', require: false
+source 'https://rubygems.org'
+
+group :test do
+  gem 'codeclimate-test-reporter', '~> 1.0.0'
+  gem 'simplecov'
+end
 
 # Specify your gem's dependencies in ffprober.gemspec
 gemspec

data/README.md

@@ -27,7 +27,7 @@ Or install it yourself as:
 
 ## FFMPEG version
 
-tested with ffprobe version 0.9 upto 2.2
+tested with ffprobe version 0.9 upto 3.3
 
 according to [ffmpeg changelog](http://git.videolan.org/?p=ffmpeg.git;a=blob_plain;f=Changelog) json output was added in version 0.9
 
@@ -43,7 +43,7 @@ help me collecting various version outputs of fprobe/ffmpeg
 
 ## Supported Rubies
 
-Ffprober is tested under 2.0, 2.1, JRuby (head) and Rubinius and ruby-head.
+Ffprober is tested under 2.3, 2.4, 2.5, JRuby (head) and Rubinius and ruby-head.
 
 [![Build Status](https://secure.travis-ci.org/beanieboi/ffprober.png?branch=master)](http://travis-ci.org/beanieboi/ffprober)
 

data/Rakefile

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

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "ffprober"
+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.
@@ -10,5 +11,5 @@ require "ffprober"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/circle.yml

@@ -0,0 +1,5 @@
+dependencies:
+  pre:
+    - echo $PATH
+    - cp test/ffprobe ~/bin
+    - gem update --system

data/examples/from_file.rb

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

data/ffprober.gemspec

@@ -1,26 +1,28 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "ffprober/version"
+require 'ffprober/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ffprober"
+  spec.name          = 'ffprober'
   spec.version       = Ffprober::VERSION
-  spec.authors       = ["beanieboi"]
-  spec.email         = ["beanie@benle.de"]
+  spec.authors       = ['beanieboi']
+  spec.email         = ['beanie@benle.de']
 
-  spec.description   = %q{a Ruby wrapper for ffprobe}
-  spec.summary       = %q{a Ruby wrapper for ffprobe (part of ffmpeg)}
-  spec.homepage      = "https://github.com/beanieboi/ffprober"
-  spec.license       = "MIT"
+  spec.description   = 'a Ruby wrapper for ffprobe'
+  spec.summary       = 'a Ruby wrapper for ffprobe (part of ffmpeg)'
+  spec.homepage      = 'https://github.com/beanieboi/ffprober'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.required_ruby_version = '~> 2.0'
 
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest"
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/ffprober.rb

@@ -1,34 +1,42 @@
-require_relative "ffprober/version"
+# frozen_string_literal: true
 
-autoload :JSON, "json"
+require_relative 'ffprober/version'
+
+autoload :JSON, 'json'
 
 module Ffprober
   class EmptyInput < StandardError; end
   class InvalidInputFileError < StandardError; end
   class NoFfprobeFound < StandardError; end
   class UnsupportedVersion < StandardError; end
+  class FfprobeError < StandardError
+    def initialize(ff_err)
+      super("Ffprobe responded with: #{ff_err[:string]} (#{ff_err[:code]})")
+    end
+  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"
+  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"
+    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"
+    autoload :FileParser, 'ffprober/parsers/file'
+    autoload :UrlParser, 'ffprober/parsers/url'
+    autoload :JsonParser, 'ffprober/parsers/json'
   end
 end

data/lib/ffprober/audio_stream.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ffprober
   class AudioStream < Stream
   end

data/lib/ffprober/chapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ffprober
   class Chapter
     include Ffprober::DynamicInitializer

data/lib/ffprober/data_stream.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ffprober
   class DataStream < Stream
   end

data/lib/ffprober/dynamic_initializer.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 module Ffprober
   module DynamicInitializer
     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
+        next if self.class.method_defined?(key)
+        self.class.send(:define_method, key) do
+          instance_variable_get("@#{key}")
         end
       end
     end

data/lib/ffprober/ffmpeg/exec.rb

@@ -1,29 +1,38 @@
+# frozen_string_literal: true
+
+require 'shellwords'
+
 module Ffprober
   module Ffmpeg
     class Exec
-      CHAPTER_SUPPORT = Gem::Version.new("2.0.0")
+      CHAPTER_SUPPORT = Gem::Version.new('2.0.0')
 
-      def initialize(ffprobe_finder=Ffprober::Ffmpeg::Finder)
-        @ffprobe_finder = ffprobe_finder
+      def initialize(finder = Ffprober::Ffmpeg::Finder)
+        @finder = finder
       end
 
-      def json_output(file_to_parse)
-        `#{@ffprobe_finder.path} #{ffprobe_options} #{Shellwords.escape(file_to_parse)}`
+      def json_output(filename)
+        `#{@finder.path} #{ffprobe_options} #{Shellwords.escape(filename)}`
       end
 
       def ffprobe_version_output
         @ffprobe_version_output ||= begin
-          if @ffprobe_finder.path.nil?
-            ""
+          if @finder.path.nil?
+            ''
           else
-            `#{@ffprobe_finder.path} -version`
+            `#{@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
+        base_options = '-v quiet -print_format json -show_format'\
+                       ' -show_streams -show_error'
+
+        if ffprobe_version.version >= CHAPTER_SUPPORT
+          options = base_options + ' -show_chapters'
+        end
+
         options
       end
 

data/lib/ffprober/ffmpeg/finder.rb

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 module Ffprober
   module Ffmpeg
     class Finder
-      SEARCH_PATHS = ENV["PATH"]
+      SEARCH_PATHS = ENV['PATH']
 
       def self.path
-        fail Ffprober::NoFfprobeFound if executable_path.nil?
+        raise Ffprober::NoFfprobeFound if executable_path.nil?
         @path ||= File.expand_path(executable_name, executable_path)
       end
 
       def self.executable_name
-        @executable_name ||= self.windows? ? "ffprobe.exe" : "ffprobe"
+        @executable_name ||= windows? ? 'ffprobe.exe' : 'ffprobe'
       end
 
       def self.windows?
-        !!(RUBY_PLATFORM =~ /(mingw|mswin)/)
+        !(RUBY_PLATFORM =~ /(mingw|mswin)/).nil?
       end
 
       def self.executable_path
-        @@executable_path ||= begin
+        @executable_path ||= begin
           SEARCH_PATHS.split(File::PATH_SEPARATOR).detect do |path_to_check|
             File.executable?(File.join(path_to_check, executable_name))
           end

data/lib/ffprober/ffmpeg/version.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 module Ffprober
   module Ffmpeg
     class Version
-      def initialize(ffprobe_exec=Ffprober::Ffmpeg::Exec.new)
+      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]
+      VERSION_FALLBACK = [0, 0, 0].freeze
 
       def version
-        @version ||= Gem::Version.new(parse_version.join("."))
+        @version ||= Gem::Version.new(parse_version.join('.'))
       end
 
       def nightly?
-        !!(ffprobe_version_output =~ NIGHTLY_REGEX)
+        !(ffprobe_version_output =~ NIGHTLY_REGEX).nil?
       end
 
       private
@@ -32,7 +34,7 @@ module Ffprober
       end
 
       def to_s
-        parse_version.join(".")
+        parse_version.join('.')
       end
     end
   end