mplayer.rb 0.0.1.1 → 0.0.2

data/lib/mplayer.rb

@@ -1,8 +1,9 @@
+require 'open3'
 require_relative "./mplayer_commands"
 
 class MPlayer
   include MPlayerCommands
-  attr_accessor :player_pid,:logfile
+  attr_accessor :player_pid,:log,:thread,:stdout,:stdin, :lock
 
   # returns an instance of MPlayer. The fifo-file to control the related mplayer-process is created. Also
   # an mplayer-instance gests startet.
@@ -10,17 +11,21 @@ class MPlayer
   # Some Options can be used to describe different asspects of the object.
   # They can be set in the options-hash. Following options are avaiable:
   # * fifo: path to the fifo-file which will be created
-  # * logfile: path to a file, where all the std-out and std-err gets stored
   #
   # @param options [Hash] Specifies some options for the mplayer-instance.
   # @return [MPlayer] New MPlayer-object
-  def initialize options={fifo: "/tmp/mplayer_rb_#{$$}_fifo",logfile: "/tmp/mplayer_rb_log"}
+  def initialize options={fifo: "/tmp/mplayer_rb_#{$$}_fifo"}
     @options = options
-    self.logfile = File.new(@options[:logfile],"w")
+    @command = "mplayer -slave -idle -quiet -input file=#{options[:fifo]}"
+    @log = ""
+    @lock = Mutex.new
     create_fifo
     start_mplayer
   end
 
+  def player_pid
+    @lock.synchronize { @player_pid }
+  end
   # sends a command to the FIFO-file, which controlls the related mplayer-instance.
   # Example:
   # mp = MPlayer.new
@@ -29,9 +34,20 @@ class MPlayer
   # @params cmd [String] The command which should be sent to mplayer
   # @return nil at the moment @TODO:it should return the output of mplayer for the sent command
   def run(cmd)
+    begin
+      @stdout.read_nonblock 1500
+    rescue
+    end
     File.open(@options[:fifo],"w+") do |f|
       f.puts cmd
     end
+    begin
+      sleep 0.1
+      response = @stdout.read_nonblock 1500
+    rescue
+      response = ""
+    end
+    response
   end
 
   # override respond_to_missing?, so when a method is called, whichs name is a mplayer-command, 
@@ -81,18 +97,16 @@ class MPlayer
   #
   # @return [Fixnum] The process-id of the mkfifo-command
   def create_fifo
-    spawn "mkfifo #{@options[:fifo]}", out: self.logfile, err: self.logfile
+    system "mkfifo #{@options[:fifo]}"
   end
 
   # kill_mplayer kills the related mplayer-instance and deletes all created files.
   #
   # @return [Boolean] True if the mplayer-instance-kill-command succeeded
   def kill_mplayer
-    self.logfile.close
-    [@options[:logfile],@options[:fifo]].each do |file|
-      File.delete(file) if File.exists? file
-    end
-    system "kill -9 #{self.player_pid.to_s}"
+    File.delete(@options[:fifo]) if File.exists? @options[:fifo]
+    `kill -9 #{@player_pid}`
+    thread.join
   end
 
   # starts the related mplayer-instance and stores the pid of it in the player_pid-attribute
@@ -103,6 +117,7 @@ class MPlayer
       kill_mplayer
     end
 
-    self.player_pid = spawn("mplayer -slave -idle -quiet -input file=#{@options[:fifo]}", out: self.logfile, err: self.logfile)
+    @stdin,@stdout,@thread = Open3.popen2e(@command)
+    @player_pid = @thread.pid
   end
 end

data/spec/mplayer_spec.rb

@@ -15,10 +15,6 @@ describe MPlayer do
       File.exists?(fifo_file).should be_true
     end
 
-    it 'creates a file, whichs path is described in the logfile-option' do
-      logfile = @mplayer.instance_variable_get(:@options)[:logfile]
-      File.exists?(logfile).should be_true
-    end
   end
 
   describe "#player_pid" do
@@ -40,6 +36,10 @@ describe MPlayer do
       data = fifo_stream.read_nonblock(6)
       data.should eql cmd+"\n"
     end
+
+    it 'returns the output of the given command' do
+      @mplayer.run("loadfile ./song.mp3").should =~ "Playing "
+    end
   end
 
   context "using mplayer-commands as method-calls" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mplayer.rb
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: