mpv 1.2.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5f7875932a25a59627917afb95371783162e45c
-  data.tar.gz: 621441b57e73a1e599616e4ef7f3fbd980eb0a3d
+  metadata.gz: 5a28500919bd886fcb25f03be50439131c8f9c12
+  data.tar.gz: aa2dd2f726680599a0b6e48266e1586755bc8f38
 SHA512:
-  metadata.gz: bea68288b46ccf3802c3fc59e0e5c99a297475d5f18ebf8d8a71825b0be9a5574c2281b8732fc62095333a24a94f8c7806a4c2ad2abc4b8fa1914b32e19e71dc
-  data.tar.gz: 54c7eee347775ddb511177fb02559182a986e633e3f20a7d44d93f276fbd6524cbe9a4894c35f4a802f35e479b2a8fafcfe6520e07004d10577893a7d53ef64c
+  metadata.gz: 2405d8b355035b1dffb513e92f89a1b5975816a3c381c7d4d0dc7521f77d3e550675ce492540ecf34e974dfe256840a6d9c157fad5dd718ee6b911f4d69e07a2
+  data.tar.gz: e1e01d4e9735dab1b7cf2966cec6ee7d52bfa2697a5c0e73d62c831ad67b4b11288137a76cf1b5c097c23e675067fde9d2e4caf903aa52a9ae46685ffaa259f7

data/README.md

@@ -23,7 +23,7 @@ def something_happened(event)
 end
 
 session = MPV::Session.new # contains both a MPV::Server and a MPV::Client
-session.callbacks << MPV::Callback.new(self, :something_happened)
+session.callbacks << method(:something_happened)
 session.get_property "pause"
 session.command "get_version"
 session.command "loadlist", "my_huge_playlist.txt", "append"

data/lib/mpv.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require_relative "mpv/exceptions"
 require_relative "mpv/utils"
-require_relative "mpv/callback"
 require_relative "mpv/client"
 require_relative "mpv/server"
 require_relative "mpv/session"
@@ -8,5 +9,5 @@ require_relative "mpv/session"
 # The toplevel namespace for ruby-mpv.
 module MPV
   # The current version of ruby-mpv.
-  VERSION = "1.2.1".freeze
+  VERSION = "2.0.1"
 end

data/lib/mpv/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "socket"
 require "json"
 require "thread"
@@ -13,7 +15,7 @@ module MPV
     # @return [String] the path of the socket used to communicate with mpv
     attr_reader :socket_path
 
-    # @return [Array<MPV::Callback>] callback objects that will be invoked
+    # @return [Array<Proc>] callback procs that will be invoked
     #  whenever mpv emits an event
     attr_accessor :callbacks
 
@@ -50,7 +52,7 @@ module MPV
       return unless alive?
 
       payload = {
-        "command" => args
+        "command" => args,
       }
 
       @command_queue << JSON.generate(payload)
@@ -84,8 +86,7 @@ module MPV
     # @return [void]
     # @note this object becomes garbage once this method is run
     def quit!
-      return unless alive?
-      command "quit"
+      command "quit" if alive?
     ensure
       @alive = false
       @socket = nil
@@ -131,7 +132,7 @@ module MPV
 
         callbacks.each do |callback|
           Thread.new do
-            callback.dispatch! event
+            callback.call event
           end
         end
       end

data/lib/mpv/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MPV
   # A generic error class for ruby-mpv.
   class MPVError < RuntimeError

data/lib/mpv/server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "tempfile"
 
 module MPV
@@ -19,14 +21,14 @@ module MPV
 
     # @return [Boolean] whether `mpv` supports the given flag
     # @note returns false if `mpv` is not available
-    def self.has_flag?(flag)
+    def self.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*/, '')
+      normalized_flag = flag.sub(/^--no-/, "--").sub(/=\S*/, "")
 
       flags = `mpv --list-options`.split.select { |s| s.start_with?("--") }
       flags.include?(normalized_flag)
@@ -43,7 +45,7 @@ module MPV
     # @raise [MPVUnsupportedFlagError] if `mpv` does not support the given flag
     def self.ensure_flag!(flag)
       ensure_available!
-      raise MPVUnsupportedFlagError, flag unless has_flag?(flag)
+      raise MPVUnsupportedFlagError, flag unless flag?(flag)
     end
 
     # @param path [String] the path of the socket to be created
@@ -57,7 +59,7 @@ module MPV
       @args = [
         "--idle",
         "--terminal=no",
-        "--input-ipc-server=%{path}" % { path: @socket_path },
+        "--input-ipc-server=%<path>s" % { path: @socket_path },
       ].concat(user_args).uniq
 
       @args.each { |arg| self.class.ensure_flag! arg }
@@ -67,11 +69,9 @@ module MPV
 
     # @return [Boolean] whether or not the mpv process is running
     def running?
-      begin
-        !!@pid && Process.waitpid(@pid, Process::WNOHANG).nil?
-      rescue Errno::ECHILD
-        false
-      end
+      !!@pid && Process.waitpid(@pid, Process::WNOHANG).nil?
+    rescue Errno::ECHILD
+      false
     end
   end
 end

data/lib/mpv/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "forwardable"
 
 module MPV
@@ -25,9 +27,7 @@ module MPV
 
       @server = Server.new(path: @socket_path, user_args: user_args)
 
-      until File.exist?(@socket_path)
-        sleep 0.1
-      end
+      sleep 0.1 until File.exist?(@socket_path)
 
       @client = Client.new(@socket_path)
     end

data/lib/mpv/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MPV
   # Various utility methods for ruby-mpv.
   module Utils

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpv
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.1
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-06-04 00:00:00.000000000 Z
 dependencies: []
 description: A library for creating and controlling mpv instances.
 email: william@tuffbizz.com
@@ -20,7 +20,6 @@ files:
 - LICENSE
 - README.md
 - lib/mpv.rb
-- lib/mpv/callback.rb
 - lib/mpv/client.rb
 - lib/mpv/exceptions.rb
 - lib/mpv/server.rb
@@ -38,7 +37,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -46,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: mpv - A ruby library for controlling mpv processes.

data/lib/mpv/callback.rb

@@ -1,35 +0,0 @@
-module MPV
-  # Encapsulates an object-method pair that will be invoked whenever
-  # an {MPV::Client} receives an event.
-  class Callback
-    # @return [Object] the object that the callback will be issued to
-    attr_accessor :object
-
-    # @return [Symbol] the method that the callback will invoke
-    attr_accessor :method
-
-    # @param object [Object] the object that the callback will be issued to
-    # @param method [Symbol] the method that the callback will invoke
-    def initialize(object, method)
-      @object = object
-      @method = method
-    end
-
-    # Determines the validity of the instantiated callback. A callback
-    # is said to be valid if the object responds to the given method
-    # and the method has an arity of 1 (for the event data).
-    # @return [Boolean] whether or not the callback is valid
-    def valid?
-      object.respond_to?(method) && object.method(method).arity == 1
-    end
-
-    # Dispatches the callback. Does nothing unless {#valid?} is true.
-    # @param event [string] the event name
-    # @return [void]
-    def dispatch!(event)
-      return unless valid?
-
-      object.send method, event
-    end
-  end
-end