keenser 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a82b0c422a1dc920fe649ef09c2fc057d4673da
-  data.tar.gz: ca07f7ac0c8def3bda386609c3ae2ef74c7b6605
+  metadata.gz: 1cd662a26ed0e144ce18028fdd47f6c7303721e6
+  data.tar.gz: 5c6badda070063a7461fcff53e0e2a608f49210d
 SHA512:
-  metadata.gz: b92a2b36d02f38f21fe08edfcd4ae0d0384935a8f53ff13595d4c2a046bf94f1a390122d3324479613e67393eefa25945c567b84c8e9decf38bf2bfb848d5f2a
-  data.tar.gz: d0a1b396f1ffdd39575d3cbc06cd37a81218b666c02dc128d5f0255aed4a1225cc1346ee7549625b91a6228f84059aa64fab8d122dbb6cf9f1795345ee223898
+  metadata.gz: 1455a3aec26e933b11aec49ec7c39417fa7010030a33c46f605bd5b81b8304a70613678291143c401b58d9d583e434ab9279d86d3b54cde2afd1d01753830918
+  data.tar.gz: c6fc26ba9a993d0cada2c9bfb9bfacbe0efba672293d8e9c7096da976058d4a4edb4156da9a2b688b0eb07d98177347a3cee6284a4fec32fad876c4689d65b74

data/bin/keenser

@@ -1,28 +1,29 @@
 #!/usr/bin/env ruby
 
-cmd     = ARGV.shift
-session = "keenser"
-
+# FIXME: don't hardcode this; ensure SYNC
+ENV['PATH'] = "/usr/local/bin:#{ENV['PATH']}"
 
-if cmd == "boot"
-  unless system "tmux list-windows -t '#{session}' >/dev/null 2>&1"
-    `TMUX= tmux new-session -s '#{session}' -d`
-    `tmux send-keys -t '#{session}' '#{__FILE__} server' C-m`
-    `tmux split-window -h -t '#{session}'`
-    `tmux send-keys -t '#{session}' "cmus" C-m`
-    if ENV["TMUX"]
-      puts "Started new session '#{session}'"
-      exit
-    else
-      exec "tmux attach -t '#{session}'"
-    end
+%w{ tmux cmus cmus-remote }.each do |bin|
+  unless system "which #{bin} >/dev/null 2>&1"
+    puts "Couldn't find #{bin}. Is it on $PATH?"
+    exit 1
   end
 end
 
+session = "keenser"
+unless system "tmux list-windows -t '#{session}' >/dev/null 2>&1"
+  puts "Booting server in tmux session '#{session}'"
+  `TMUX= tmux new-session -s '#{session}' -d`
+  `tmux send-keys -t '#{session}' '#{__FILE__} server' C-m`
+  `tmux split-window -h -t '#{session}'`
+  `tmux send-keys -t '#{session}' "cmus" C-m`
+  sleep 1
+end
+
 
 require_relative "../lib/keenser"
 
-case cmd
+case cmd = ARGV.shift
 when "boot"
   # No-op, just run the above startup logic
 when nil, "console"
@@ -31,10 +32,16 @@ when nil, "console"
   Keenser.pry
 when "server"
   Keenser.start_server!
-when "remote"
+when "status"
+  Keenser.status
+when "setup"
+  Keenser.setup
+else # Pass command to remote
   require "drb/drb"
   DRb.start_service
-  puts DRbObject.new_with_uri(Keenser::Server.uri).send *ARGV
-else
-  raise Keenser::Error.new "Not implemented: #{cmd}"
+  begin
+    puts DRbObject.new_with_uri(Keenser::Server.uri).send cmd, *ARGV
+  rescue DRb::DRbConnError => e
+    puts "Could not connect to Keenser server: #{e.message}"
+  end
 end

data/lib/keenser/model/song.rb

@@ -9,8 +9,7 @@ module Keenser
     end
 
     def to_s
-      pre  = status == "playing" ? "" : "[#{status}] "
-      disp = "#{pre}#{artist} - #{title}"
+      disp = "#{badge} #{name}".gsub /\s+/, ' '
       if disp.length > 40
         disp.slice(0,39) + "…"
       else
@@ -18,6 +17,18 @@ module Keenser
       end
     end
 
+    def badge
+      status == "playing" ? "" : "[#{status}]"
+    end
+
+    def name
+      if artist && title
+        "#{artist} - #{title}"
+      else
+        path
+      end
+    end
+
     def local_path
       "#{Computer.local.music}/#{path}"
     end

data/lib/keenser/music.rb

@@ -28,14 +28,15 @@ module Keenser
 
     def tag name
       playing.tag name
-      puts "Tagging #{playing} as #{name}"
+      puts "Tagging #{playing.strip} as #{name}"
       "#{name} ← #{playing}"
     end
 
     def list name
+      return all if name == "all"
       t = Tag.where(name: name.to_s).first
-      t.export!
       raise Error.new "Cannot find tag '#{t}'" unless t
+      t.export!
       `echo "load -p #{t.playlist}\nset play_library=false\nplayer-next" | cmus-remote`
       "'#{name}' now playing"
     end

data/lib/keenser/server.rb

@@ -11,6 +11,7 @@ module Keenser
   end
 
   class Server
+    # FIXME: set up access control list
     def self.uri
       "druby://localhost:8787"
     end
@@ -20,6 +21,7 @@ module Keenser
       Music.send cmd, *args
     rescue => e
       puts "#{'✗'.red} #{e.message}"
+      "✗ #{e.message}"
     end
   end
 end

data/lib/keenser/version.rb

@@ -1,3 +1,3 @@
 module Keenser
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keenser
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - James Dabbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize