listlace 0.0.9 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b99b9e103972f209f74a53b2328cc01aef9ee89f
+  data.tar.gz: 335147f7cbda256c7ed70273b14736edf46d697e
+SHA512:
+  metadata.gz: 1e7de49eb1117788b45e41fccee8bbbb987f3b1ee6d1bff7415096a510b4853bf8f2cd7c383d542f2b88cfb7ed5db8f33d92a116cb2203589a3a58a6b2395231
+  data.tar.gz: bd62fdc1d420b838d3699ea10f773e9cd98ceece1ef443a4f4bba7f44cace6d18e35ab91ef442049d15251e713d43edd23922c0098305c0829b28fe3447bdd91

data/Gemfile.lock

@@ -1,47 +1,23 @@
 PATH
   remote: .
   specs:
-    listlace (0.0.9)
-      activerecord
-      activesupport
+    listlace (0.0.1)
       bundler
-      open4
-      plist
+      mpd_client
       pry
-      sqlite3
-      taglib-ruby
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.3)
-    coderay (1.0.7)
-    i18n (0.6.1)
-    method_source (0.8)
-    multi_json (1.3.6)
-    open4 (1.3.0)
-    plist (3.1.0)
-    pry (0.9.10)
-      coderay (~> 1.0.5)
+    coderay (1.1.0)
+    method_source (0.8.2)
+    mpd_client (0.0.3)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
+      slop (~> 3.4)
     rake (0.9.2.2)
-    slop (3.3.3)
-    sqlite3 (1.3.6)
-    taglib-ruby (0.5.1)
-    tzinfo (0.3.33)
+    slop (3.5.0)
 
 PLATFORMS
   ruby

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Jeremy Ruten
+Copyright (c) 2014 Jeremy Ruten
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -1,26 +1,6 @@
-# Listlace
+# ♫> Listlace
 
-Listlace is a music player that does Ruby. Here's how it works:
-
-First add your music library.
-
-    >> add "/path/to/Music"
-    1067 songs added.
-
-...Or import your iTunes library.
-
-    >> import :itunes, "/path/to/iTunes/iTunes Music Library.xml"
-
-Once your library is in place, start grouping your songs into playlists.
-
-    >> save artist("muse"), :muse
-    => muse (108 tracks)
-
-Finally, go ahead and play your playlists.
-
-    >> p :muse
-    Playlist: muse (108 tracks)
-    Blackout - Muse (0:00 / 4:22)
+Listlace is an mpd (music player daemon) client that uses a Ruby prompt as the interface, allowing you to use the power of Ruby to query your music library and build playlists.
 
 ## Install
 
@@ -28,26 +8,24 @@ It's a gem, so do this:
 
     $ gem install listlace
 
-You also need mplayer in your $PATH, if you want to atually play your music.
+Listlace is an mpd client, so make sure mpd is installed and running in the background.
 
 ## Usage
 
 The gem gives you an executable, so do this:
 
     $ listlace
-    Hello, you have 0 songs.
-    >>
+    ♫>
 
-Now you're ready to play.
+It gives you a prompt, which is just a Ruby prompt, with the commands below implemented as methods.
 
-## Library
+## Commands
 
-...
+### p
 
-## Playlists
+`p` is like a play/pause button. If the player is paused, it unpauses. If the player is playing, then it pauses. If the player is stopped, then it starts playing.
 
-...
+### mpd
 
-## The Player
+`mpd` gives you an instance of the `MPDClient` object, which you can use to send any `mpd` command that isn't available in Listlace yet. This'll probably be removed once I actually implement all the commands.
 
-...

data/bin/listlace

@@ -4,22 +4,21 @@ require "bundler/setup"
 require "pry"
 require "listlace"
 
-ActiveRecord::Migration.verbose = false
+host, port = *ARGV
+host ||= "localhost"
+port ||= 6600
 
-Listlace.extend Listlace::Commands::LibraryCommands
-Listlace.extend Listlace::Commands::PlayerCommands
-
-Listlace.library = Listlace::Library.new
-Listlace.player = Listlace::Player.new
-
-puts "Hello, you have #{Listlace.library.size} songs."
-
-at_exit do
-  Listlace.player.stop
+begin
+  listlace = Listlace.new(host, port)
+rescue Exception => e
+  puts "Couldn't connect to MPD server."
+  puts "Reason: #{e.message}"
+  exit
 end
 
-Listlace.pry(
+listlace.pry(
   quiet: true,
-  prompt: [proc { ">> " }, proc { " | " }],
+  prompt: [proc { "\u266B> " }, proc { " | " }],
   print: proc { |output, value| Pry::DEFAULT_PRINT.call(output, value) unless value.nil? }
 )
+

data/lib/listlace/commands.rb

@@ -0,0 +1,18 @@
+class Listlace
+  module Commands
+    REPEAT_SYMBOL = "\u221E"
+    TIMES_SYMBOL = "\u00D7"
+
+    def p
+      case mpd.status["state"]
+      when "play"
+        mpd.pause(1)
+      when "pause"
+        mpd.pause(0)
+      when "stop"
+        mpd.play
+      end
+    end
+  end
+end
+

data/lib/listlace.rb

@@ -1,35 +1,19 @@
-require "open4"
-require "active_record"
-require "fileutils"
-require "plist"
-require "active_support/core_ext/string"
-require "taglib"
+require "mpd_client"
 
-require "listlace/core_ext/array"
-require "listlace/time_helper"
+require "listlace/commands"
 
-require "listlace/models/track"
-require "listlace/models/playlist"
-require "listlace/models/playlist_item"
+class Listlace
+  attr_reader :mpd
 
-require "listlace/library"
-require "listlace/library/database"
-require "listlace/library/selectors"
+  include Commands
 
-require "listlace/simple_track"
-require "listlace/single_player"
-require "listlace/single_players/mplayer"
-require "listlace/player"
-
-require "listlace/commands/library_commands"
-require "listlace/commands/player_commands"
-
-module Listlace
-  extend Listlace::Library::Selectors
-
-  class << self
-    attr_accessor :library, :player
+  def initialize(host, port)
+    @mpd = MPDClient.new
+    @mpd.connect(host, port)
   end
 
-  DIR = ENV["LISTLACE_DIR"] || (ENV["HOME"] + "/.listlace")
+  def disconnect
+    @mpd.disconnect
+  end
 end
+

data/listlace.gemspec

@@ -1,23 +1,21 @@
 Gem::Specification.new do |s|
   s.name = "listlace"
-  s.version = "0.0.9"
-  s.date = "2012-09-17"
-  s.summary = "A music player in a REPL."
-  s.description = "Listlace is a music player which is interacted with through a Ruby REPL."
+  s.version = "0.1.0"
+  s.date = "2014-03-15"
+  s.summary = "An mpd (music player daemon) client with a Ruby shell as the interface."
+  s.description = "Listlace is an mpd (music player daemon) client with a Ruby shell as the interface."
   s.author = "Jeremy Ruten"
   s.email = "jeremy.ruten@gmail.com"
   s.homepage = "http://github.com/yjerem/listlace"
   s.license = "MIT"
   s.required_ruby_version = ">= 1.9.2"
-  s.requirements << "mplayer"
-  s.requirements << "taglib"
   s.executables << "listlace"
 
-  s.files = ["Gemfile", "Gemfile.lock", "LICENSE", "listlace.gemspec", "README.md", "README.old"]
+  s.files = ["Gemfile", "Gemfile.lock", "LICENSE", "listlace.gemspec", "README.md"]
   s.files += ["bin/listlace"]
   s.files += Dir["lib/**/*.rb"]
 
-  %w(bundler pry plist sqlite3 activerecord activesupport open4 taglib-ruby).each do |gem_name|
+  %w(bundler pry mpd_client).each do |gem_name|
     s.add_runtime_dependency gem_name
   end
 
@@ -25,3 +23,4 @@ Gem::Specification.new do |s|
     s.add_development_dependency gem_name
   end
 end
+

metadata

@@ -1,161 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: listlace
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: plist
+  name: mpd_client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: taglib-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Listlace is a music player which is interacted with through a Ruby REPL.
+description: Listlace is an mpd (music player daemon) client with a Ruby shell as
+  the interface.
 email: jeremy.ruten@gmail.com
 executables:
 - listlace
@@ -165,50 +77,33 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- listlace.gemspec
 - README.md
-- README.old
 - bin/listlace
-- lib/listlace/commands/library_commands.rb
-- lib/listlace/commands/player_commands.rb
-- lib/listlace/core_ext/array.rb
-- lib/listlace/library/database.rb
-- lib/listlace/library/selectors.rb
-- lib/listlace/library.rb
-- lib/listlace/models/playlist.rb
-- lib/listlace/models/playlist_item.rb
-- lib/listlace/models/track.rb
-- lib/listlace/player.rb
-- lib/listlace/simple_track.rb
-- lib/listlace/single_player.rb
-- lib/listlace/single_players/mplayer.rb
-- lib/listlace/time_helper.rb
 - lib/listlace.rb
+- lib/listlace/commands.rb
+- listlace.gemspec
 homepage: http://github.com/yjerem/listlace
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- mplayer
-- taglib
+requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: A music player in a REPL.
+specification_version: 4
+summary: An mpd (music player daemon) client with a Ruby shell as the interface.
 test_files: []

data/README.old

@@ -1,86 +0,0 @@
-            < listlace >
-
-listlace is a music player with a REPL.
-It allows you to forge complex playlists
-with ease... as long as you know your
-way around Ruby.
-
-No more staring a database in the face.
-No more click, shift-click, ctrl-click,
-ctrl-click, drag-and-drop, click,
-double-click.
-
-Conjuring audio with spells is much more
-appropriate, don't you think?
-
--- install
-
-It's a gem. So do this:
-
-  $ gem install listlace
-
-But you also need mplayer. It has to be
-at /usr/bin/mplayer, for now.
-
--- usage
-
-The gem gives you an executable called
-'listlace'. So do this:
-
-  $ listlace
-
-It will make a '.listlace' directory in
-$HOME, where the database of tracks and
-playlists is stored. Then it will give you
-a prompt. Don't be alarmed, it speaks
-Ruby.
-
-The only way to populate the database right
-now is to import your iTunes library.
-That goes a little something like this:
-
-  >> import :itunes, "/Users/jeremy/Music/iTunes/iTunes Music Library.xml"
-
-Now you can play your music.
-
--- p's and q's
-
-p is the most important command. It's the
-play command. It's also the pause/resume
-command. You can pass it some tracks or a
-playlist, and it will queue up the music
-and start playing it, sequentially. If you
-don't pass it anything, that's when it acts
-as a pause/resume button.
-
-q is the queue command. You can pass it some
-tracks or a playlist and it'll add them to the
-queue. The queue is just an array of tracks
-to be played in order. The p command by
-itself will start playing the queue.
-
--- commands
-
-* playback
-  - p: play/pause/resume
-  - stop: stop playback
-  - restart: seek back to the beginning of the current track
-  - back: go back a song
-  - skip: go to the next song
-  - seek: move to a different part of the track
-  - ff: fast-forward, or slow down
-  - repeat: choose the repeat mode, either :one or :all
-  - norepeat: turn off the repeat mode
-  - status: show what's currently playing, as well as other information
-* queue
-  - q: append some tracks to the queue, or get the queue
-  - clear: clear the queue
-  - shuffle: shuffle the songs in the queue
-  - sort: sort the songs in the queue however you want
-* library
-  - import: import another program's music library
-  - wipe_library: remove all tracks and playlists from the library
-
--- selectors
-
-...

data/lib/listlace/commands/library_commands.rb

@@ -1,90 +0,0 @@
-module Listlace
-  module Commands
-    module LibraryCommands
-      # Save a playlist to the database. As a shortcut, you can pass the name
-      # to save it as, instead of setting the name on the playlist and then
-      # saving it.
-      def save(playlist, name = nil)
-        playlist.name = name if name
-        library.save_playlist(playlist)
-      end
-
-      def like
-        if player.current_track.respond_to?(:rating)
-          player.current_track.increment! :rating
-        end
-      end
-
-      def dislike
-        if player.current_track.respond_to?(:rating)
-          player.current_track.decrement! :rating
-        end
-      end
-
-      def add(path, options = {})
-        if File.directory?(path)
-          extensions = {}
-          Array(options.delete(:extensions)).each do |ext|
-            extensions[ext.to_s] = true
-          end
-
-          num_tracks = 0
-          Dir[File.join(path, "**", "*")].each do |file|
-            unless File.directory?(file)
-              ext = File.extname(file).sub(/^\./, "")
-              if extensions[ext].nil?
-                print "Do you want to add files with the '.#{ext}' extension [y/N]? "
-                if gets[0].downcase == "y"
-                  extensions[ext] = true
-                else
-                  extensions[ext] = false
-                end
-              end
-
-              if extensions[ext]
-                if library.add_track(file, options)
-                  num_tracks += 1
-                end
-              end
-            end
-          end
-
-          if num_tracks == 0
-            puts "Can't find any audio files there. Perhaps they are already added?"
-          elsif num_tracks == 1
-            puts "1 track added."
-          else
-            puts "#{num_tracks} tracks added."
-          end
-        else
-          if library.add_track(path, options)
-            puts "1 track added."
-          else
-            puts "Track couldn't be added. Perhaps it's not an audio file?"
-          end
-        end
-      rescue Library::FileNotFoundError => e
-        puts e.message
-      end
-
-      # Imports the music library from another program. Currently only iTunes is
-      # supported.
-      def import(from, path)
-        library.import(from, path, logger: method(:puts))
-      rescue Library::FileNotFoundError => e
-        puts e.message
-      end
-
-      # Wipes the database. With no arguments, it just asks "Are you sure?" without
-      # doing anything. To actually wipe the database, pass :yes_im_sure.
-      def wipe_library(are_you_sure = :nope)
-        if are_you_sure == :yes_im_sure
-          library.wipe
-          puts "Library wiped."
-        else
-          puts "Are you sure? If you are, then type: wipe_library :yes_im_sure"
-        end
-      end
-    end
-  end
-end