mpv 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d25be70e3e15c8720044d842ed74d45c977abec9
-  data.tar.gz: 7b62cdd7455685761611b49ae7e34b25c68f1f15
+  metadata.gz: a56beb79994103bfdb822f55160b357c84288459
+  data.tar.gz: 8c8356594fd17c1887019136f3f57f9eb359668d
 SHA512:
-  metadata.gz: d4ddcf887372cd392010ba7f3503bee58ac09ef1a9fec8bc6c52874a76f25bd38f773d533ed12ac84d1aef7e6427d382df3e8b7c56da8e198a7f8ad973d6f323
-  data.tar.gz: f4d3527f5e8a6a1059ac92b0179edc7b69bd72bf5c90e75b7bcc8aac49eef5e33a23b4171e9c1f2659d92b44f509e9339d8d0306271536c33879b452e3f7fc86
+  metadata.gz: a5cccbc367d135c2da27cc9dc881df213df3ddb3a85585381828283197f5a3eb8e28ca9077d43209076c62899085fa92a449b18099807191612fb41d3ad0ab6d
+  data.tar.gz: d76614aacb7a00f0fba4758ff0c30f857b43fadb02c2747bef1e72a6c88aea3c71af3a1cd2f299430e346ba4f398aa33bef638f23f3debb173f22564ab9a391d

data/lib/mpv.rb

@@ -1,3 +1,5 @@
+require_relative "mpv/exceptions"
+require_relative "mpv/utils"
 require_relative "mpv/callback"
 require_relative "mpv/client"
 require_relative "mpv/server"
@@ -6,5 +8,5 @@ require_relative "mpv/session"
 # The toplevel namespace for ruby-mpv.
 module MPV
   # The current version of ruby-mpv.
-  VERSION = "1.1.2".freeze
+  VERSION = "1.2.0".freeze
 end

data/lib/mpv/exceptions.rb

@@ -0,0 +1,16 @@
+module MPV
+  class MPVError < RuntimeError
+  end
+
+  class MPVNotAvailableError < MPVError
+    def initialize
+      super "Could not find an mpv binary to execute in the system path"
+    end
+  end
+
+  class MPVUnsupportedFlagError < MPVError
+    def initialize(flag)
+      super "Installed mpv doesn't support the #{flag} flag"
+    end
+  end
+end

data/lib/mpv/server.rb

@@ -12,19 +12,56 @@ module MPV
     # @return [Fixnum] the process id of the mpv process
     attr_reader :pid
 
+    # @return [Boolean] whether `mpv` is executable within the system path
+    def self.available?
+      Utils.which?("mpv")
+    end
+
+    # @return [Boolean] whether `mpv` supports the given flag
+    # @note returns false if `mpv` is not available
+    def self.has_flag?(flag)
+      return false unless available?
+
+      # MPV allows flags to be suffixed with =yes or =no, but doesn't
+      # include these variations in their list. They also allow a --no-
+      # prefix that isn't included in the list, so we normalize these out.
+      # Additionally, we need to remove trailing arguments.
+      normalized_flag = flag.sub(/^--no-/, '--').sub(/=\S*/, '')
+
+      flags = `mpv --list-options`.split.select { |s| s.start_with?("--") }
+      flags.include?(normalized_flag)
+    end
+
+    # Ensures that a binary named `mpv` can be executed.
+    # @raise [MPVNotAvailableError] if no `mpv` executable in the system path
+    def self.ensure_available!
+      raise MPVNotAvailableError unless available?
+    end
+
+    # Ensures that that the `mpv` being executed supports the given flag.
+    # @raise [MPVNotAvailableError] if no `mpv` executable in the system path
+    # @raise [MPVUnsupportedFlagError] if `mpv` does not support the given flag
+    def self.ensure_flag!(flag)
+      ensure_available!
+      raise MPVUnsupportedFlagError, flag unless has_flag?(flag)
+    end
+
     # @param path [String] the path of the socket to be created
     #  (defaults to a tmpname in `/tmp`)
     # @param user_args [Array<String>] additional arguments to use when
     #  spawning mpv
     def initialize(path: Dir::Tmpname.make_tmpname("/tmp/mpv", ".sock"),
                    user_args: [])
+
       @socket_path = path
       @args = [
         "--idle",
-        "--no-terminal",
+        "--terminal=no",
         "--input-ipc-server=%{path}" % { path: @socket_path },
       ].concat(user_args).uniq
 
+      @args.each { |arg| self.class.ensure_flag! arg }
+
       @pid = Process.spawn("mpv", *@args)
     end
 

data/lib/mpv/utils.rb

@@ -0,0 +1,13 @@
+module MPV
+  module Utils
+    # Tests whether the given utility is available in the system path.
+    # @param util [String] the utility to test
+    # @return [Boolean] whether or not the utility is available
+    # @api private
+    def self.which?(util)
+      ENV["PATH"].split(File::PATH_SEPARATOR).any? do |path|
+        File.executable?(File.join(path, util))
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpv
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-15 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies: []
 description: A library for creating and controlling mpv instances.
 email: william@tuffbizz.com
@@ -22,8 +22,10 @@ files:
 - lib/mpv.rb
 - lib/mpv/callback.rb
 - lib/mpv/client.rb
+- lib/mpv/exceptions.rb
 - lib/mpv/server.rb
 - lib/mpv/session.rb
+- lib/mpv/utils.rb
 homepage: https://github.com/woodruffw/ruby-mpv
 licenses:
 - MIT