mediainfo 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9b9f915a19f9e7ff51cbda842cb2f163e4c1977dec552db464cf1ad1d6b7c1a
-  data.tar.gz: 5dcd60c6fe17ce779cb051de513ced21b46cb3d3f4d10b3f0ddefdb9d69e15de
+  metadata.gz: a980499371cba6af063e9a484fefdc52bb0ac1d0cf231c2477a9cad13c5a81c9
+  data.tar.gz: 86137ca8a4adf93980fa3069cd828584b974c53a7e7c43375a0f67f13e19a727
 SHA512:
-  metadata.gz: b69a8c19047797e6bdfb71ab9d93b690ec844a3005551868f1326c011d7772b18fa032a118fd60683c32f1c226fc11bfc7b646ba0bd1d509e6688acb6c5ddf83
-  data.tar.gz: ca6efb991313d67c59142fbe98ce82cc6b2f56036d86275e36941dd5a4ca21b23b5038b0a34a57b2edd7e27bdb0c8c6a6f067d6147b34bf95d08eaff94fb37bc
+  metadata.gz: 754815e1737c88fa9b1512eb79ef0f9d610d472f6a1b0c283009319f5d7a1d7f6277470398df1f66f3bf69483d3392658da8827df1f9a780d1cd7c5dfd680b23
+  data.tar.gz: d984ab7702fbba06307f56f510744ca11a4bd6beb9d7ab5e936a4e470a84fa94a4ced6466e26248adc59f6e31abed251cea8b4d7faa2e66654c218c9782eeecd

data/.gitignore

@@ -13,7 +13,7 @@ pkg
 !/spec/fixtures/video/.keep
 /tmp/
 .idea
-
+.vscode
 # rspec failure tracking
 .rspec_status
 

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 2.6.1
+before_install:
+  - sudo apt-get install -y mediainfo
+env:
+  - MEDIAINFO_PATH=/usr/bin/mediainfo
+install:
+  # Install bundler 2
+  - gem update --no-document --system
+  - gem install bundler --no-document
+  # Install gems
+  - bundle install

data/{GemFile → Gemfile}

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
 git_source(:github) {|repo_name| "https://github.com/greatseth/#{repo_name}" }
-
+gem 'pry'
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# MediaInfo
+# MediaInfo [![Build Status](https://travis-ci.org/greatseth/mediainfo.svg?branch=master)](https://travis-ci.org/greatseth/mediainfo)
 
 MediaInfo is a class wrapping [the mediainfo CLI](http://mediainfo.sourceforge.net).
 
@@ -15,9 +15,9 @@ MediaInfo is a class wrapping [the mediainfo CLI](http://mediainfo.sourceforge.n
 #### Handling a URL
     media_info = MediaInfo.from('http://techslides.com/demos/sample-videos/small.mp4')
 
-You can specify an alternate path for the MediaInfo Binary:
+Ensure mediainfo is installed and within your PATH. You can specify an alternate path for the mediainfo binary if needed:
 
-    ENV['MEDIAINFO_PATH'] = "/opt/local/bin/mediainfo"
+    ENV['MEDIAINFO_PATH'] = "/usr/bin/mediainfo"
 
 Once you have an MediaInfo object, you can start inspecting tracks:
 
@@ -82,7 +82,7 @@ Sometimes you'll have more than one track of a given type:
     - You can review lib/attribute_standardization_rules.yml to see them all
 
 
-            media_info.video.bit_rate => nil (\<Bit_rate>41.2 Mbps\</Bit_rate>)    
+            media_info.video.bit_rate => nil (\<Bit_rate>41.2 Mbps\</Bit_rate>)
             media_info.video.bitrate => "41.2 Mbps" (\<Bit_rate>41.2 Mbps\</Bit_rate>)
             media_info.general.filesize => "11.5 MiB" (\<File_size>11.5 MiB\</File_size>
 
@@ -100,7 +100,7 @@ The track type media_info.video5 is available, but no video2, 3, and 4. This is
         <ID>5</ID>
         ...
 
-*The ID will take priority for labeling.* Else if no ID exists, you'll see consecutive numbering for duplicate tracks in the Media.        
+*The ID will take priority for labeling.* Else if no ID exists, you'll see consecutive numbering for duplicate tracks in the Media.
 
 Any second level attributes are also available:
 
@@ -133,7 +133,8 @@ should at least return `nil`.
 
 ## Contributors
 
-* Seth Thomas Rasmussen - [http://greatseth.com](http://greatseth.com)
+* Seth Thomas Rasmussen -
+  [http://github.com/greatseth](http://github.com/greatseth)
 * Peter Vandenberk      - [http://github.com/pvdb](http://github.com/pvdb)
 * Ned Campion           - [http://github.com/nedcampion](http://github.com/nedcampion)
 * Daniel Jagszent       - [http://github.com/d--j](http://github.com/d--j)

data/lib/mediainfo.rb

@@ -6,9 +6,24 @@ require 'mediainfo/string'
 
 module MediaInfo
 
+  def self.which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        return exe if File.executable?(exe) && !File.directory?(exe)
+      }
+    end
+    return nil
+  end
+
   # Allow user to set custom mediainfo_path with ENV['MEDIAINFO_PATH']
   def self.location
-    ENV['MEDIAINFO_PATH'].nil? ? mediainfo_location = '/usr/local/bin/mediainfo' : mediainfo_location = ENV['MEDIAINFO_PATH']
+    if ENV['MEDIAINFO_PATH'].nil?
+      mediainfo_location = which('mediainfo')
+    else
+      mediainfo_location = ENV['MEDIAINFO_PATH']
+    end
     raise EnvironmentError, "#{mediainfo_location} cannot be found. Are you sure mediainfo is installed?" unless ::File.exist? mediainfo_location
     return mediainfo_location
   end
@@ -57,7 +72,7 @@ module MediaInfo
 
   def self.from_string(input)
     return from_xml(input) if input.include?('<?xml')
-    return from_link(input) if input =~ URI::regexp
+    return from_link(input) if input.include?('://') && input =~ URI::regexp
     return from_local_file(input) if input.match(/[^\\]*\.\w+$/)
     raise BadInputError
   end

data/lib/mediainfo/version.rb

@@ -1,3 +1,3 @@
 module MediaInfo
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

data/mediainfo.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   end
 
   # Since Ruby 1.8, REXML is included in the standard Ruby distribution.
-  s.add_development_dependency 'bundler', '~> 1.16'
+  s.add_development_dependency 'bundler', '~> 2'
   s.add_development_dependency 'rake', '~> 12.3'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'nokogiri', '~> 1.8' # Ability to parse XML response # Optional and should be included by user in their own gemfile
+  s.add_development_dependency 'nokogiri', '>= 1.8', '< 2.0' # Ability to parse XML response # Optional and should be included by user in their own gemfile
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediainfo
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Seth Thomas Rasmussen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,22 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: MediaInfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)
   that standardizes attributes/methods and also converts most values into something
   Ruby can understand.
@@ -76,8 +82,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
+- ".vscode/settings.json"
 - Changelog
-- GemFile
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -112,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
-rubyforge_project: mediainfo
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 3
 summary: MediaInfo is a class wrapping the mediainfo CLI (http://mediainfo.sourceforge.net)