muzak 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2c396ccd25b5ca8dad7e33aad87e5e6f277f82f
-  data.tar.gz: 28f0518d153ca7dffa8713884a481b583ccdbdbb
+  metadata.gz: db204b0d9f256751a68fa9cb597ed3473d4a87ec
+  data.tar.gz: 7008b0cdffc2b98ccaedacaa7a5ca01eb23bbbf1
 SHA512:
-  metadata.gz: 7619e9fec7c0413fadbd240c3abc828cef121aa8e9f34ba0a1c504750c31171a29aa0c43f18fdbac8d99de2ed68815db88266852ddaf0ed353dd525ee53f598a
-  data.tar.gz: a3b2b9fa7d6606a4d1f081878034890358fe97b763bcc8816365bf7cd24690905414631754c39450b1aca3d01aabe45792daa40eb0ef2a7978022effe5a045e3
+  metadata.gz: f333cb37e5e8f88082fdb693dd4dfdb3055ecbc84f6d56b976c5f5c0575f5135ad63c596b4fe113074a8d172b8f0de5ccc2ed3d82b24deb74bbc32585a16138d
+  data.tar.gz: 3b3da27b4177a24104bf88df29cfbbc04e235b611a8ed2adcaffc7c1c4a51f964a4d802ca13c30fa597ac9809b7812024e01338cba0e00c4170ab97f55e5f99e

data/lib/muzak.rb

@@ -12,5 +12,5 @@ require_relative "muzak/instance"
 # The primary namespace for muzak.
 module Muzak
   # Muzak's current version
-  VERSION = "0.3.1".freeze
+  VERSION = "0.3.2".freeze
 end

data/lib/muzak/player/vlc.rb

@@ -4,18 +4,6 @@ module Muzak
   module Player
     # Exposes a VLC process to muzak for playback control.
     class VLC < StubPlayer
-      # The expression used to extract the filename out of {#status}
-      # @api private
-      INPUT_REGEX = /\( new input: file:\/\/(.*) \)/.freeze
-
-      # The expression used to extract the volume out of {#status}
-      # @api private
-      VOLUME_REGEX = /\( audio volume: (\d+) \)/.freeze
-
-      # The expression used to extract the playing status out of {#status}
-      # @api private
-      PLAYING_REGEX = /\( state (.*) \)/.freeze
-
       # @return [Boolean] whether or not VLC is available
       def self.available?
         Utils.which?("vlc") && Utils.which?("cvlc")
@@ -68,6 +56,8 @@ module Muzak
 
       # @return [Boolean] whether or not VLC is currently playing.
       def playing?
+        return false unless running?
+
         @vlc.playing?
       end
 
@@ -146,8 +136,9 @@ module Muzak
       # Get VLC's currently loaded song.
       # @return [Song, nil] the currently loaded song
       def now_playing
-        filename = INPUT_REGEX.match(status.first)[1]
-        Song.new(filename)
+        return unless playing?
+
+        Song.new(@vlc.status[:file])
       end
 
       # Load a song into VLC.
@@ -158,16 +149,6 @@ module Muzak
         @vlc.add_to_playlist song.path
         @vlc.play if Config.autoplay
       end
-
-      # Get VLC's status.
-      # @return [Array<String>] the loaded file, volume, and playing statuses
-      # @api private
-      # @note The strings returned by this method can be handled via
-      #  {INPUT_REGEX}, {VOLUME_REGEX}, and {PLAYING_REGEX}.
-      def status
-        @vlc.connection.write "status"
-        3.times.collect { @vlc.connection.read }
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - William Woodruff
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 description: A library for controlling playlists and media players.
 email: william@tuffbizz.com
 executables: