mediainfo 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9a2a120f86327b4a88642ff37e80810eb03c4ce4322875344e19149a14658cc
-  data.tar.gz: 50b75301c095921c24d41930781d8580884fefaf534fc1b5252dc1920096775a
+  metadata.gz: 4008669b840fdfc16238d0e8650a6960437d77a65daa2b69ebaf74007e849a70
+  data.tar.gz: f1c8031c41b8466b7e0c916f361316a294629e60565e12cc160e452b38e219d6
 SHA512:
-  metadata.gz: d86c27802289727bffe005dfede51c3b009f317f7275da592db1239434f1e72d7ea919ba2c654e63ebea0fcf40e67b8912157c304787a5c7c3357f73921a12ab
-  data.tar.gz: f55349f8f875e8535f6f935caa6f3dab5d10c9ddda74887b08305cbf7b6db8ba716c4c7c8c14fabd8588e85611661adbedbc5282f527167cd3c95e587a8532fe
+  metadata.gz: 6c12fa15b217f661a9d242fb2f54a7dbc52eeac835e41cc3ecb5cd6905b5b9b35c09097f9b8b2b0aab5652cc1a8f59768ebab3dbbac185f13c3f6fafc6d5091a
+  data.tar.gz: 5e75f9f1da3a1d807421cd201615497d577706dc337c59dd6f95eb814b46bd886eb5553f09d6c805727d9a60caedda46415aece461676969b3d18db5b48c7edb

data/README.md

@@ -8,6 +8,8 @@ MediaInfo is a class wrapping [the mediainfo CLI](http://mediainfo.sourceforge.n
 
 ## Usage
 
+- Versions > 1.3.0 support S3 URLs. See rspec test for example of how to obtain the supported URL.
+
 #### Parsing raw XML
     media_info = MediaInfo.from(File.open('iphone6+_video.mov.xml').read)
 #### Handling a local file

data/lib/mediainfo.rb

@@ -55,16 +55,6 @@ module MediaInfo
     return xml_parser
   end
 
-  def self.run(input = nil)
-    raise ArgumentError, 'Your input cannot be blank.' if input.nil?
-    command = "#{location} #{input} --Output=XML 2>&1"
-    raw_response = `#{command}`
-    unless $? == 0
-      raise ExecutionError, "Execution of '#{command}' failed. #{raw_response.inspect}"
-    end
-    return raw_response
-  end
-
   def self.from(input)
     return from_uri(input) if input.is_a?(URI)
     return from_string(input) if input.is_a?(String)
@@ -96,13 +86,27 @@ module MediaInfo
     from_uri(URI(input))
   end
 
+  def self.run(input = nil)
+    raise ArgumentError, 'Your input cannot be blank.' if input.nil?
+    command = "#{location} '#{input}' --Output=XML"
+    raw_response, errors, status = Open3.capture3(command)
+    unless errors.empty? && status.exitstatus == 0
+      raise ExecutionError, "Execution of '#{command}' failed: \n #{errors.red}"
+    end
+    return raw_response
+  end
+
   def self.from_uri(input)
-    http = Net::HTTP.new(input.host, input.port) # Check if input is valid
-    request = Net::HTTP::Head.new(input.request_uri) # Only grab the Headers to be sure we don't try and download the whole file
-    http.use_ssl = true if input.is_a? URI::HTTPS # For https support
-    http_request = http.request(request)
-    raise RemoteUrlError, "HTTP call to #{input} is not working : #{http_request.value}" unless http_request.is_a?(Net::HTTPOK)
-    MediaInfo::Tracks.new(MediaInfo.run(URI.escape(input.to_s)))
+    if input.host.include?('amazonaws.com')
+      MediaInfo::Tracks.new(MediaInfo.run(input.to_s)) # Removed URI.escape due to Error parsing the X-Amz-Credential parameter; the Credential is mal-formed; expecting "<YOUR-AKID>/YYYYMMDD/REGION/SERVICE/aws4_request"
+    else
+      http = Net::HTTP.new(input.host, input.port) # Check if input is valid
+      request = Net::HTTP::Head.new(input.request_uri) # Only grab the Headers to be sure we don't try and download the whole file; Doesn't work with presigned_urls in aws/s3
+      http.use_ssl = true if input.is_a? URI::HTTPS # For https support
+      http_request = http.request(request)
+      raise RemoteUrlError, "HTTP call to #{input} is not working : #{http_request.value}" unless http_request.is_a?(Net::HTTPOK)
+      MediaInfo::Tracks.new(MediaInfo.run(URI.escape(input.to_s)))
+    end
   end
 
   def self.set_singleton_method(object,name,parameters)

data/lib/mediainfo/string.rb

@@ -10,6 +10,24 @@ class String
   #
   # see: http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_02_03
   def shell_escape_double_quotes
-    '"'+gsub(/\\|"|\$|`/, '\\\\\0')+'"'
+    ''+gsub(/\\|"|\$|`/, '\\\\\0')+''
   end unless method_defined?(:shell_escape_double_quotes)
+
+  # colorization
+  def colorize(color_code)
+    "\e[#{color_code}m#{self}\e[0m"
+  end
+
+  def red
+    colorize(31)
+  end
+
+  def green
+    colorize(32)
+  end
+
+  def yellow
+    colorize(33)
+  end
+
 end

data/lib/mediainfo/version.rb

@@ -1,3 +1,3 @@
 module MediaInfo
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end

data/mediainfo.gemspec

@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake', '~> 12.3'
   s.add_development_dependency 'rspec', '~> 3.0'
   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
+  s.add_development_dependency 'aws-sdk-s3'
+  s.add_development_dependency 'pry'
 
   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.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Seth Thomas Rasmussen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '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.