muzak 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ec08814fbae77829d95ec84d85548eaac56e8f
-  data.tar.gz: c2fd8434c2c313cd9260c9f4a9f6ce6cd1208bb5
+  metadata.gz: faf36636905a8835a68aaa8ec30165784542ee9f
+  data.tar.gz: a70897b4fb5b8531bb218345e7d10c535e9e1531
 SHA512:
-  metadata.gz: 91eaf44a796913f92e3dc0a2f9d98b3e934492ace722bc240216d4918ff5ee1d26f814a589e49b08214d4593c6a165da8a328abeab069447fa40d1759030be33
-  data.tar.gz: be43e3eaba0dbf5891923054602fbcc2cc0c4dabcd4f609990c6e144de946a059a3b46a025014aec6acfc8649f7014ac996114d4a54ae345c5b8a3034adf6f25
+  metadata.gz: afb580f66f98918d8cf11f2732e5b73614288c8f1a3b189b73280d0410b993665b518837f40f3c5624ae3a4442027664b8d8d3faf254581203a8425469ddc396
+  data.tar.gz: 7380f4e9d0433443acbf791e5b99461d597a9a57900ea4cb9bfd471db5c4c61c51f5e7da86bd1d71dd0db6691de9a26afaf27461b797367f348e5ded00164702

data/.yardopts

@@ -1 +1 @@
---tag command:"muzak command" --tag cmdexample:"example invocation" --no-private --markup-provider=redcarpet --markup=markdown - README.md LICENSE
+--tag command:"muzak command" --tag cmdexample:"example invocation" --no-private --markup-provider=redcarpet --markup=markdown - README.md COMMANDS.md LICENSE

data/README.md

@@ -15,19 +15,9 @@ and the state of the player.
 
 Muzak is still a work in process. Don't expect stability or pleasant output.
 
-On the command-line:
-
-```shell
-$ ruby -Ilib bin/muzak.rb
-muzak> help
-```
-
-Daemonized:
-
 ```shell
 $ ruby -Ilib bin/muzakd.rb
-$ echo "command" > ~/.config/muzak/muzak.fifo
-$ ruby -Ilib bin/muzak-cmd "command"
+$ ruby -Ilib bin/muzak-cmd enqueue-artist "The Beatles"
 ```
 
 ### TODO
@@ -35,5 +25,3 @@ $ ruby -Ilib bin/muzak-cmd "command"
 * GUI "frontend"?
 * isolation of art and music output (`Muzak::ArtProvider`?)
 * current indexing/sorting logic is terrible
-* all the documentation
-* readline's tab complete is terrible with spaces (maybe use `bond`?)

data/bin/muzak-cmd

@@ -3,6 +3,7 @@
 require "muzak"
 require "socket"
 require "json"
+require "shellwords"
 
 begin
   server_host = Muzak::Config.daemon_host
@@ -14,6 +15,6 @@ rescue
   exit 1
 end
 
-sock.puts ARGV.join(" ")
+sock.puts Shellwords.shelljoin ARGV
 puts sock.gets
 sock.close

data/bin/muzakd

@@ -14,18 +14,16 @@ muzak = Muzak::Instance.new
 server_port = Muzak::Config.daemon_port || 2669
 server = TCPServer.new server_port
 
-exiting = false
-
 loop do
-  begin
-    client = server.accept
-    cmd_argv = Shellwords.split(client.readline)
-    next if cmd_argv.empty? || cmd_argv.any?(&:empty?)
-    client.puts(muzak.command(*cmd_argv).to_json)
-    break if cmd_argv.first == "quit"
-  rescue Exception => e
-    client.puts({ error: e.to_s }.to_json)
-  ensure
-    client.close if client
+  Thread.new(server.accept) do |client|
+    begin
+      cmd_argv = Shellwords.split(client.readline)
+      client.puts(muzak.command(*cmd_argv).to_json)
+      exit! 0 if cmd_argv.first == "quit"
+    rescue Exception => e
+      client.puts({ response: { error: e.to_s } }.to_json)
+    ensure
+      client.close if client
+    end
   end
 end

data/lib/muzak/cmd.rb

@@ -1,6 +1,8 @@
 Dir.glob(File.join(__dir__, "cmd/*")) { |f| require_relative f }
 
 module Muzak
+  # The namespace for all commands exposed by muzak.
+  # @see file:COMMANDS.md User Commands
   module Cmd
     # load commands included by the user
     Dir.glob(File.join(USER_COMMAND_DIR, "*")) { |file| require file }

data/lib/muzak/cmd/config.rb

@@ -6,7 +6,7 @@ module Muzak
     # @command `config-get <key>`
     # @cmdexample `muzak> config-get player`
     def config_get(key)
-      value = Config.send Utils.resolve_method(key)
+      value = Config.send Utils.resolve_command(key)
 
       build_response data: { key => value }
     end

data/lib/muzak/cmd/meta.rb

@@ -1,13 +1,23 @@
 module Muzak
   module Cmd
-    # Print a "helpful" listing of commands.
+    # Return a simple heartbeat message.
+    # @command `ping`
+    # @cmdexample `muzak> ping`
+    def ping
+      timestamp = Time.now.to_i
+      debug "pong: #{timestamp}"
+
+      build_response data: {
+        pong: timestamp
+      }
+    end
+
+    # Return a "helpful" listing of commands.
     # @command `help`
     # @cmdexample `muzak> help`
     def help(*args)
-      commands = Muzak::Cmd.commands.join(", ")
-
       build_response data: {
-        commands: commands
+        commands: Muzak::Cmd.commands
       }
     end
 
@@ -29,7 +39,7 @@ module Muzak
       verbose "muzak is quitting..."
       player.deactivate!
 
-      build_response
+      build_response data: "quitting"
     end
   end
 end

data/lib/muzak/cmd/player.rb

@@ -7,12 +7,13 @@ module Muzak
     def player_activate
       if player.running?
         warn "player is already running"
-        return
+      else
+        player.activate!
       end
 
-      player.activate!
-
-      build_response
+      build_response data: {
+        player: player.class.name
+      }
     end
 
     # Deactivate the configured player.
@@ -25,7 +26,9 @@ module Muzak
       # do cleanup even if the player isn't running, just in case
       player.deactivate!
 
-      build_response
+      build_response data: {
+        player: player.class.name
+      }
     end
 
     # Tell the player to begin playback.

data/lib/muzak/const.rb

@@ -1,6 +1,6 @@
 module Muzak
   # Muzak's current version
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 
   # The root directory for all user configuration, data, etc
   CONFIG_DIR = File.expand_path("~/.config/muzak").freeze

data/lib/muzak/player/mpv.rb

@@ -161,6 +161,9 @@ module Muzak
         playlist = []
 
         entries.times do |i|
+          # TODO: this is slow and should be avoided at all costs,
+          # since we have access to these Song instances earlier
+          # in the object's lifecycle.
           playlist << Song.new(get_property("playlist/#{i}/filename"))
         end
 
@@ -184,11 +187,11 @@ module Muzak
       end
 
       # Get mpv's currently playing song.
-      # @return [Song] the currently playing song
+      # @return [Song, nil] the currently playing song
       def now_playing
-        return unless running? && playing?
+        return unless playing?
 
-        Song.new(get_property "path")
+        @_now_playing ||= Song.new(get_property "path")
       end
 
       private
@@ -232,17 +235,10 @@ module Muzak
           Thread.new do
             case event
             when "file-loaded"
-              # this really isn't ideal, since we already have access
-              # to Song objects earlier in the object's lifetime.
-              # the "correct" way to do this would be to sync an external
-              # playlist with mpv's internal one and access that instead
-              # of re-creating the Song from mpv properties.
-              # another idea: serialize Song objects into mpv's properties
-              # somehow.
-              song = Song.new(get_property "path")
-              instance.event :song_loaded, song
+              instance.event :song_loaded, now_playing
             when "end-file"
               instance.event :song_unloaded
+              @_now_playing = nil
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby