keenser 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 234add4fefc4b55ee4c6e8908a46229c7d7e545d
-  data.tar.gz: 7b9bb5020bcd4602934bb0894566d33b55e65c08
+  metadata.gz: 8a82b0c422a1dc920fe649ef09c2fc057d4673da
+  data.tar.gz: ca07f7ac0c8def3bda386609c3ae2ef74c7b6605
 SHA512:
-  metadata.gz: 2d830374f89a3d1018036d40640a3f316dc21441ec03228a7333dcd1eeeef12906ed8dcaeb6acc2df8beeaafaec5bf137a0d7442cf601645169b35879a263414
-  data.tar.gz: 7aa2a31c19ecfe293227344b641068188f2bda7afd42fcdbe849404d366c0d6865fca600eec91cfac27b876a782c6c125a510623bcc566b54bf7edcbc7e872f4
+  metadata.gz: b92a2b36d02f38f21fe08edfcd4ae0d0384935a8f53ff13595d4c2a046bf94f1a390122d3324479613e67393eefa25945c567b84c8e9decf38bf2bfb848d5f2a
+  data.tar.gz: d0a1b396f1ffdd39575d3cbc06cd37a81218b666c02dc128d5f0255aed4a1225cc1346ee7549625b91a6228f84059aa64fab8d122dbb6cf9f1795345ee223898

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in keenser.gemspec
 gemspec

data/bin/keenser

@@ -1,85 +1,40 @@
 #!/usr/bin/env ruby
 
-%w{
-  colorize json pry thor
-}.each { |m| require m }
-
-require_relative "../lib/keenser"
-
-# TODO: make asks readline friendly
-class Default < Thor
-  desc "setup", "Set up the database"
-  def setup
-    unless ENV["SYNC"]
-      ENV["SYNC"] = ask "Path to sync directory >"
-      puts %!You should probably add `export SYNC="#{ENV['SYNC']}"` to your .*rc file!.yellow
-      puts
-    end
-
-    Keenser::DB.setup!
-
-    # FIXME: need to do something to reload the connection / model after the 
-    #        db is setup for the first time
-    unless Keenser::Computer.local
-      puts arr "Configuring local machine"
-
-      role = askd "Role", :client
-      music = askd "Music directory", "#{ENV['SYNC']}/Music"
-      playlists = askd "Playlist directory", "#{ENV['HOME']}/Playlists"
-
-      Keenser::Computer.create({
-        name:      `hostname`,
-        role:      role,
-        music:     music,
-        playlists: playlists
-      })
-
-      puts "Saved local config"
-      puts
-    end
-
-    puts "You're all set!"
-  end
-
-  desc "console", "Attach to a database console"
-  def console
-    Keenser.pry
-  end
-
-  # TODO: look into subcommands
-  desc "play", "Play music"
-  def play *args
-    cmd = args.shift || "pause"
-    Keenser::Music.send cmd, *args
-  rescue => e
-    puts "✗ #{e.message}"
-  end
-
-  desc "status", "Show current dependency status"
-  def status
-    [Keenser::DB, Keenser::Music].each do |m|
-      name = m.name.sub /^Keenser::/, ''
-      status, msg = begin
-        ['✓'.green, m.status]
-      rescue => e
-        ['✗'.red, e.to_s]
-      end
-      puts "#{status} #{name.underline}\t #{msg}"
+cmd     = ARGV.shift
+session = "keenser"
+
+
+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
   end
+end
 
-  no_commands do
-
-  def arr str
-    "#{'==>'.light_blue} #{str}"
-  end
 
-  def askd field, default
-    val = ask("#{field} (#{default}) >").strip
-    val.empty? ? default : val
-  end
+require_relative "../lib/keenser"
 
-  end
+case cmd
+when "boot"
+  # No-op, just run the above startup logic
+when nil, "console"
+  require "pry"
+  Pry.commands.delete "play"
+  Keenser.pry
+when "server"
+  Keenser.start_server!
+when "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}"
 end
-
-Default.start

data/keenser.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "colorize", "~> 0.6"
   spec.add_dependency "pry", "~> 0.9"
   spec.add_dependency "sequel", "~> 4.6"
-  spec.add_dependency "thor", "~> 0.18"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.1"

data/lib/keenser.rb

@@ -1,7 +1,9 @@
-require "sequel"
+# encoding: utf-8
+# FIXME: lazy-load everything
+%w{ colorize sequel }.each { |m| require m }
 
 %w{
-  version error db music
+  version error db music server
 }.each { |m| require_relative "../lib/keenser/#{m}" }
 
 module Keenser
@@ -19,4 +21,62 @@ module Keenser
     :Tag      => "tag",
     :SongTag  => "song_tag"
   }.each { |name,m| autoload name, src("model/#{m}") }
+
+  def self.setup
+    unless ENV["SYNC"]
+      ENV["SYNC"] = ask "Path to sync directory >"
+      puts %!You should probably add `export SYNC="#{ENV['SYNC']}"` to your .*rc file!.yellow
+      puts
+    end
+
+    DB.setup!
+
+    # FIXME: need to do something to reload the connection / model after the 
+    #        db is setup for the first time
+    unless Computer.local
+      puts arr "Configuring local machine"
+
+      role = ask "Role", :client
+      music = ask "Music directory", "#{ENV['SYNC']}/Music"
+      playlists = ask "Playlist directory", "#{ENV['HOME']}/Playlists"
+
+      Computer.create({
+        name:      `hostname`,
+        role:      role,
+        music:     music,
+        playlists: playlists
+      })
+
+      puts "Saved local config"
+      puts
+    end
+
+    puts "You're all set!"
+  end
+
+  def self.status
+    [Keenser::DB, Keenser::Music].each do |m|
+      name = m.name.sub /^Keenser::/, ''
+      status, msg = begin
+        ['✓'.green, m.status]
+      rescue => e
+        ['✗'.red, e.to_s]
+      end
+      puts "#{status} #{name.underline}\t #{msg}"
+    end
+  end
+
+  private
+
+  def self.arr str
+    "#{'==>'.light_blue} #{str}"
+  end
+
+  def self.ask field, default=nil
+    print field
+    print " (#{default})" if default
+    print " > "
+    val = STDIN.gets.strip
+    val.empty? ? default : val
+  end
 end

data/lib/keenser/music.rb

@@ -1,9 +1,8 @@
+# encoding: utf-8
 module Keenser
   module Music
     extend self
 
-    SESSION_NAME = "music"
-
     def status
       expect "tmux"
       expect "cmus-remote"
@@ -15,29 +14,30 @@ module Keenser
       end
     end
 
+    def show
+      playing.to_s
+    end
+
     %w{ prev pause next }.each do |cmd|
-      define_method(cmd) { remote cmd; puts playing.to_s }
+      define_method cmd do
+        puts "Pressed #{cmd}"
+        `cmus-remote --#{cmd}`
+        show
+      end
     end
 
     def tag name
       playing.tag name
-      puts "#{name} ← #{playing}"
-    end
-
-    def method_missing *args
-      name = args.first.to_s
-      if Tag.where(name: name).any?
-        list name
-      else
-        raise Error.new "Don't know how to play '#{args}'"
-      end
+      puts "Tagging #{playing} as #{name}"
+      "#{name} ← #{playing}"
     end
 
     def list name
-      t = Tag.where(name: name).first
+      t = Tag.where(name: name.to_s).first
+      t.export!
       raise Error.new "Cannot find tag '#{t}'" unless t
       `echo "load -p #{t.playlist}\nset play_library=false\nplayer-next" | cmus-remote`
-      puts "'#{name}' now playing"
+      "'#{name}' now playing"
     end
 
     def import name, path
@@ -51,12 +51,13 @@ module Keenser
         n += 1
       end
       t.export!
-      puts "Imported #{n} songs"
+      "Imported #{n} songs"
     end
 
     def all
+      puts "Playing all songs"
       `echo "set play_library=true\nplayer-next" | cmus-remote`
-      puts playing.to_s
+      show
     end
 
     private
@@ -77,7 +78,6 @@ module Keenser
       s
     end
 
-
     def test cmd
       system "#{cmd} >/dev/null 2>&1"
     end
@@ -85,14 +85,5 @@ module Keenser
     def expect bin
       raise Error.new "'#{bin}' is not present" unless test "which #{bin}"
     end
-
-    def remote cmd
-      unless test "tmux list-windows -t '#{SESSION_NAME}'"
-        # tmux might complain about starting nested sessions without the TMUX=
-        `TMUX= tmux new-session -s '#{SESSION_NAME}' -d 'cmus'`
-      end
-
-      `cmus-remote --#{cmd}`
-    end
   end
 end

data/lib/keenser/server.rb

@@ -0,0 +1,25 @@
+require "drb/drb"
+require "pry"
+
+module Keenser
+  def self.start_server!
+    # FIXME: $SAFE = 1
+
+    puts "Starting DRb server at '#{Server.uri}'"
+    DRb.start_service Server.uri, Server.new
+    DRb.thread.join
+  end
+
+  class Server
+    def self.uri
+      "druby://localhost:8787"
+    end
+
+    def play *args
+      cmd = args.shift || "pause"
+      Music.send cmd, *args
+    rescue => e
+      puts "#{'✗'.red} #{e.message}"
+    end
+  end
+end

data/lib/keenser/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keenser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - James Dabbs
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.6'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +106,7 @@ files:
 - lib/keenser/model/song_tag.rb
 - lib/keenser/model/tag.rb
 - lib/keenser/music.rb
+- lib/keenser/server.rb
 - lib/keenser/version.rb
 homepage: ''
 licenses:
@@ -146,3 +133,4 @@ signing_key:
 specification_version: 4
 summary: A wee sidekick
 test_files: []
+has_rdoc: