mpg321 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da2b38df3bd14d07e31d8530bb53a0466639305c
-  data.tar.gz: 60fe5ecaff83ac9e184e4423b95629a12d677249
+  metadata.gz: 8d42e22e01a5a3b5250a777fc39905db9c69e600
+  data.tar.gz: 314b8dcfe79580dd115b20254b90a6b6e0cad49b
 SHA512:
-  metadata.gz: e59f321744297579547f84c2d08788f7c631e31ae24ab6faa0427523b8bb8d3a4e68399ac07e613e3484712f669bc7e53e82c9b9b561006bd2d1c7673cfe66dc
-  data.tar.gz: 14a75a87353e176209675242be693ed347c1c8ae981e3e63f89899896bbd90e4517c0e73f2c71a956d43c9d5312cdf69d0f73fe824a201ea3fe6a50f477d80f1
+  metadata.gz: ecc9a456d50dc3228748a28f271a11bd103c68aa2e3ac6c3d9c797ae36196a895bff143d4639dd1ba3d1aa6e6ae87fc888c0533a7da4e5c173b981c6c052403b
+  data.tar.gz: adeef58146da29e6397418e7c0f89feb21eb39a712004e12ed48539ad58b48675286a6a475e1310e9df588abe8bd1c2bf56c4a59b449c6aedaf2f31d46f340bb

data/.semver

@@ -1,6 +1,6 @@
 ---
 :major: 0
-:minor: 1
+:minor: 2
 :patch: 0
 :special: ''
 :metadata: ''

data/README.md

@@ -25,8 +25,43 @@ Here's how you can easily play an mp3:
 
 ```ruby
 require 'mpg321'
+mog321 = Mpg321.new
 
-Mpg321.new.play('/some_path/song.mp3')
+mpg321.play('/some_path/song.mp3') #=> to play a song from a file
+
+mpg321.play('http://example.com/a_hosted_song.mp3') #=> to play a song from the web
+```
+To play a list of songs:
+
+```ruby
+require 'mpg321'
+
+mog321 = Mpg321.new
+mpg321.play(['/some_path/song.mp3', '/another_path/another_song'])
+```
+
+Volume controls:
+
+```ruby
+require 'mpg321'
+mog321 = Mpg321.new
+
+mpg321.volume #=> initialized to 50
+
+mpg321.volume = 10 #=> Set volume to a number between 0 and 100
+
+mpg321.volume_up(10)   #=> Increase volume by 10
+mpg321.volume_down(10) #=> Decrease volume by 10
+```
+Other controls:
+
+```ruby
+require 'mpg321'
+mog321 = Mpg321.new
+
+mpg321.pause #=> Pause / unpause song
+
+mpg321.stop  #=> Stop playing song / song list
 ```
 
 Contributing

data/lib/mpg321.rb

@@ -5,9 +5,9 @@ class Mpg321
 
   def initialize
     @volume = 50
-    @music_input, _stdout, _stderr, _thread = Open3.popen3("mpg321 -R mpg321_ruby")
-    Thread.new { loop do _stderr.readline end }
-    Thread.new { loop do _stdout.readline end }
+    @music_input, @stdout, @stderr, _thread = Open3.popen3("mpg321 -R mpg321_ruby")
+    handle_stderr
+    handle_stdout
     send_volume
   end
 
@@ -19,8 +19,15 @@ class Mpg321
     @music_input.puts "S"
   end
 
-  def play song
-    @music_input.puts "L #{song}"
+  def play song_list
+    @song_list = song_list
+    if song_list.class == Array
+      @list = true
+      play_song @song_list.shift
+    else
+      @list = false
+      play_song song_list
+    end
   end
 
   def volume_up volume
@@ -48,7 +55,27 @@ class Mpg321
 
   private
 
+  def play_song song
+    @music_input.puts "L #{song}"
+  end
+
   def send_volume
     @music_input.puts "G #{@volume}"
   end
+
+  def handle_stderr
+    Thread.new { loop do @stderr.readline end }
+  end
+
+  def handle_stdout
+    Thread.new do
+      loop do
+        line = @stdout.readline
+        #Not sure how to test this yet
+        if @list && line.match(/@P 3/)
+          play @song_list
+        end
+      end
+    end
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Mpg321
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/mpg321_spec.rb

@@ -77,9 +77,18 @@ describe Mpg321 do
   end
 
   describe '#play' do
-    it 'sends a message to play a song' do
-      expect(stdin).to receive(:puts).with "L /some_path/file_name"
-      subject.play '/some_path/file_name'
+    context 'when there is only one song' do
+      it 'sends a message to play a song' do
+        expect(stdin).to receive(:puts).with "L /some_path/file_name"
+        subject.play '/some_path/file_name'
+      end
+    end
+
+    context 'when there moer than one song' do
+      it 'sends a message to play the first song' do
+        expect(stdin).to receive(:puts).with "L /some_path/file_name"
+        subject.play ['/some_path/file_name', '/some_other_song']
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mpg321
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Richard Vickerstaff