songbirdsh 0.0.2 → 0.0.3

data/HISTORY.rdoc

@@ -1,3 +1,13 @@
+= 0.0.3
+
+Introduced testing, lastfm support and a few other useful commands
+
+* Started adding specifications
+* Added rubygems-test and various other development dependencies
+* added lastfm support - the setup_scrobbling and scrobble commands
+* added randomisation of search results
+* added a command to list the contents of the playing queue (with approximate times for when each track will play)
+
 = 0.0.2
 
 Enhanced search

data/README.rdoc

@@ -22,21 +22,24 @@ Here you sit expectantly in front of a computer at the command line.
 
 If readline was correctly installed, you should find that tab completion works for all of the commands.
 
-* ? <command>    - show commands/help for command
-* help <command> - show commands/help for command
-* + <id>         - enqueue track with id
-* next           - skip currently playing track
-* start          - start music player
-* stop           - stop music player
-* reload         - reload track information (required for search)
-* search <text>  - search in memory list of tracks (see reload)
-* exit           - exit
-* quit           - exit
+* '                   - show current status (currently playing track)
+* + <id>              - enqueue track with id
+* ? <command>         - show commands/help for command
+* exit                - exit
+* help <command>      - show commands/help for command
+* list <filter>       - show current track queue
+* next                - skip currently playing track
+* quit                - exit
+* reload              - reload track information (required for search)
+* scrobbling <on|off> - turn lastfm scrobbling on or off (note that this will skip the current track)
+* search <filter>     - search for tracks (places ids on the clipboard for convenient pasting to +)
+* setup_scrobbling    - runs through a setup wizard for lastfm integration
+* show  <id>          - shows track details for the specified id
+* shuffle             - shuffles the list of tracks returned by the previous search
+* start               - start music player
+* stop                - stop music player
 
 = Future plans for world domination
 
-* Add documentation for all commands
-* Improve search
-* Add music progress indicator
-* Add some color
+* See cardigan cards
 * Get working on linux and windows

data/Rakefile

@@ -0,0 +1,10 @@
+begin
+  require 'gemesis/rake'
+rescue Exception
+  puts "gemesis related tasks will only be available if you 'gem install gemesis'"
+end
+
+desc 'execute specifications'
+task :test do
+  sh 'rspec spec'
+end

data/lib/songbirdsh/cli.rb

@@ -1,32 +1,34 @@
 require 'shell_shock/context'
 
-require 'songbirdsh'
 require 'songbirdsh/player'
-require 'songbirdsh/library'
-require 'songbirdsh/command/enqueue'
-require 'songbirdsh/command/show_properties'
-require 'songbirdsh/command/start'
-require 'songbirdsh/command/reload'
-require 'songbirdsh/command/stop'
-require 'songbirdsh/command/restart'
-require 'songbirdsh/command/search'
+require 'songbirdsh/preferences'
+require 'songbirdsh/command'
 
-class Songbirdsh::Cli
-  include ShellShock::Context
+require 'yaml'
 
-  def initialize
-    library = Songbirdsh::Library.new
-    player = Songbirdsh::Player.new library
-    at_exit { player.stop }
-    @prompt = "songbirdsh > "
-    @commands = {
-      'show' => Songbirdsh::Command::ShowProperties.new(library),
-      'next' => Songbirdsh::Command::Restart.new(player),
-      'reload' => Songbirdsh::Command::Reload.new(library),
-      'search' => Songbirdsh::Command::Search.new(library),
-      '+' => Songbirdsh::Command::Enqueue.new(player),
-      'start' => Songbirdsh::Command::Start.new(player),
-      'stop' => Songbirdsh::Command::Stop.new(player)
-    }
+module Songbirdsh
+  class Cli
+    include ShellShock::Context
+
+    def with name, *aliases
+      aliases << name.to_s if aliases.empty?
+      add_command Command.load(name, @player), *aliases
+    end
+
+    def with_all *names
+      names.each {|name| with name}
+    end
+
+    def initialize
+      preferences = Preferences.new
+      @player = Player.new preferences
+      at_exit { @player.stop }
+      @prompt = "songbirdsh > "
+      with :status, "'"
+      with :show_properties, 'show'
+      with :restart, 'next'
+      with :enqueue, '+'
+      with_all *%w{reload search start stop scrobbling shuffle list setup_scrobbling}
+    end
   end
 end

data/lib/songbirdsh/command/enqueue.rb

@@ -1,11 +1,16 @@
 require 'yaml'
+require 'songbirdsh/command'
 
-class Songbirdsh::Command::Enqueue
-  def initialize player
-    @player = player
+class Songbirdsh::Command::Enqueue < Songbirdsh::Command
+  def execute text
+    text.split(/[^0-9a-z]/).select {|s| s and !s.empty?}.each {|id| @player.enqueue id.to_i(36) }
   end
 
-  def execute text
-    text.split(/\W/).each {|id| @player.enqueue id }
+  def usage
+    '*<id>'
+  end
+
+  def help
+    'enqueues the list of songs with the specified ids'
   end
 end

data/lib/songbirdsh/command/list.rb

@@ -0,0 +1,24 @@
+require 'songbirdsh/command'
+
+class Songbirdsh::Command::List < Songbirdsh::Command
+  def execute text
+    @terms = text.split(/\W/)
+    current = @player.current
+    next_start_time = Time.at current.started
+    show next_start_time, current
+    next_start_time += current.duration
+    @player.each do |track|
+      show next_start_time, track
+      next_start_time += track.duration
+    end
+  end
+
+  def show time, track
+    return unless @terms.empty? or @terms.all? {|term| track.search_string.include? term }
+    puts "#{time}\n\t#{track}"
+  end
+
+  def help
+    'lists the contents of the track queue (and approximate times for when each track will be played)'
+  end
+end

data/lib/songbirdsh/command/reload.rb

@@ -1,9 +1,15 @@
-class Songbirdsh::Command::Reload
-  def initialize library
-    @library = library
-  end
+require 'songbirdsh/command'
 
+class Songbirdsh::Command::Reload < Songbirdsh::Command
   def execute ignored=nil
-    @library.reload
+    @player.library.reload
+  end
+
+  def usage
+    ''
+  end
+
+  def help
+    'reloads the contents of the music library for fast searching'
   end
 end

data/lib/songbirdsh/command/restart.rb

@@ -1,8 +1,6 @@
-class Songbirdsh::Command::Restart
-  def initialize player
-    @player = player
-  end
+require 'songbirdsh/command'
 
+class Songbirdsh::Command::Restart < Songbirdsh::Command
   def execute ignored=nil
     @player.restart
   end

data/lib/songbirdsh/command/scrobbling.rb

@@ -0,0 +1,19 @@
+require 'songbirdsh/command'
+
+class Songbirdsh::Command::Scrobbling < Songbirdsh::Command
+  def execute text
+    scrobbling = (text == 'on')
+    return if @player.scrobbling == scrobbling
+    puts scrobbling ? 'Turning scrobbling on' : 'Turning scrobbling off'
+    @player.scrobbling = scrobbling
+    @player.restart
+  end
+
+  def usage
+    '<on|off>'
+  end
+
+  def help
+    'turns interaction with lastfm on or off'
+  end
+end

data/lib/songbirdsh/command/search.rb

@@ -1,19 +1,19 @@
-class Songbirdsh::Command::Search
-  def initialize library
-    @library = library
-  end
+require 'songbirdsh/command'
 
+class Songbirdsh::Command::Search < Songbirdsh::Command
   def execute text
     terms = text.split(/\W/)
     matches = []
-    @library.reload unless @library.tracks
-    @library.tracks.each do |track|
-      if terms.all? {|term| track[:search_string].include? term }
-        puts track[:display]
-        matches << track[:id]
+    @player.library.reload unless @player.library.tracks
+    matches = []
+    @player.library.tracks.each do |track|
+      if terms.all? {|term| track.search_string.include? term }
+        puts track
+        matches << track.search_id
       end
     end
     puts "Found #{matches.size} matches (ids have been placed on clipboard)"
     matches.join(' ').to_clipboard
+    @player.matches = matches
   end
 end

data/lib/songbirdsh/command/setup_scrobbling.rb

@@ -0,0 +1,11 @@
+require 'songbirdsh/command'
+
+class Songbirdsh::Command::SetupScrobbling < Songbirdsh::Command
+  def execute text
+    @player.scrobbler.setup
+  end
+
+  def help
+    'runs through the steps required to get lastfm scrobbling working'
+  end
+end

data/lib/songbirdsh/command/show_properties.rb

@@ -1,11 +1,8 @@
+require 'songbirdsh/command'
 require 'pp'
 
-class Songbirdsh::Command::ShowProperties
-  def initialize library
-    @library = library
-  end
-
+class Songbirdsh::Command::ShowProperties < Songbirdsh::Command
   def execute id
-    @library.with_track(id) {|track| pp track }
+    @player.library.with_track(id.to_i(36)) {|track| pp track }
   end
 end

data/lib/songbirdsh/command/shuffle.rb

@@ -0,0 +1,15 @@
+require 'songbirdsh/command'
+
+class Songbirdsh::Command::Shuffle < Songbirdsh::Command
+  def execute text
+    if @player.matches
+      @player.matches.sort_by { rand }.join(' ').to_clipboard
+    else
+      puts 'nothing to shuffle - please search for some tracks'
+    end
+  end
+
+  def help
+    'shuffles the results from the last search and places them on the clipboard'
+  end
+end

data/lib/songbirdsh/command/start.rb

@@ -1,8 +1,6 @@
-class Songbirdsh::Command::Start
-  def initialize player
-    @player = player
-  end
+require 'songbirdsh/command'
 
+class Songbirdsh::Command::Start < Songbirdsh::Command
   def execute ignored=nil
     @player.start
   end

data/lib/songbirdsh/command/status.rb

@@ -0,0 +1,12 @@
+require 'yaml'
+require 'songbirdsh/command'
+
+class Songbirdsh::Command::Status < Songbirdsh::Command
+  def execute text
+    puts @player.status
+  end
+
+  def help
+    'shows the current playing status'
+  end
+end

data/lib/songbirdsh/command/stop.rb

@@ -1,8 +1,6 @@
-class Songbirdsh::Command::Stop
-  def initialize player
-    @player = player
-  end
+require 'songbirdsh/command'
 
+class Songbirdsh::Command::Stop < Songbirdsh::Command
   def execute ignored=nil
     @player.stop
   end

data/lib/songbirdsh/command.rb

@@ -0,0 +1,13 @@
+module Songbirdsh
+  class Command
+    def self.load name, *args
+      require "songbirdsh/command/#{name}"
+      classname = name.to_s.split('_').map{|s|s.capitalize}.join
+      Songbirdsh::Command.const_get(classname).new *args
+    end
+
+    def initialize player
+      @player = player
+    end
+  end
+end

data/lib/songbirdsh/debug.rb

@@ -0,0 +1,16 @@
+module Songbirdsh
+  module Debug
+    def debug message
+      if ENV['DEBUG']
+        puts message 
+      end
+    end
+
+    def pause
+      if ENV['DEBUG']
+        puts "Hit enter to continue"
+        gets
+      end
+    end
+  end
+end

data/lib/songbirdsh/library.rb

@@ -1,18 +1,36 @@
+require 'sequel'
+require 'songbirdsh/track'
+require 'songbirdsh/debug'
+
 class Songbirdsh::Library
+  include Songbirdsh::Debug
   attr_reader :tracks
 
-  def initialize
+  def initialize preferences
     home = File.expand_path '~'
     debug "Home Directory is \"#{home}\""
     songbird_home = "#{home}/Library/Application Support/Songbird2"
     debug "Songbird home is \"#{songbird_home}\""
     profiles = "#{songbird_home}/Profiles"
-    profile = `ls \"#{profiles}\"`.chomp
-    debug "found profile \"#{profile}\""
-    @db_path = "#{profiles}/#{profile}/db/main@library.songbirdnest.com.db"
+    preferences['profile'] ||= choose_profile profiles
+    debug "found profile \"#{preferences['profile']}\""
+    @db_path = "#{profiles}/#{preferences['profile']}/db/main@library.songbirdnest.com.db"
     debug "using db \"#{@db_path}\""
   end
 
+  def choose_profile path
+    choices = Dir.entries(path).select {|path| !['.','..'].include?(path) }
+    raise 'no profiles found' if choices.empty?
+    return choices.first if choices.size == 1
+    loop do
+      choices.each {|choice| puts "* #{choice}"}
+      print "please enter your preferred songbird profile > "
+      subset = choices.grep(/#{gets.chomp}/)
+      return subset.first if subset.size == 1
+      puts 'invalid choice - please enter the full name of the profile'
+    end
+  end
+
   def with_db
     db = Sequel.sqlite @db_path
     begin
@@ -24,43 +42,59 @@ class Songbirdsh::Library
   end
 
   def with_track id
+    track = Songbirdsh::Track.new id
     with_db do |db|
       db[:resource_properties].filter(:media_item_id=>id).each do |row|
-        yield to_track(row) if row[:property_id] == 3
+        append_to_track track, row
       end
     end
+    yield track
   end
 
   def reload
     s = Time.now.to_i
     @tracks = []
     with_db do |db|
-      db[:resource_properties].each do |row|
-        @tracks << to_track(row) if row[:property_id] == 3
+      current_media_item_id, current_track = nil, nil
+      db[:resource_properties].order(:media_item_id).each do |row|
+        unless row[:media_item_id] == current_media_item_id
+          append current_track
+          current_track = Songbirdsh::Track.new row[:media_item_id]
+          debug "Created new track with id #{current_track.id}"
+          current_media_item_id = current_track.id
+        end
+        append_to_track current_track, row
       end
+      append current_track
     end
-    puts "reloaded db with #{@tracks.size} tracks in #{Time.now.to_i-s} seconds"
+    puts "Reloaded db with #{@tracks.size} tracks in #{Time.now.to_i-s} seconds"
   end
 private
-  def debug message
-    if ENV['DEBUG']
-      puts message 
-      gets
+  def append track
+    unless track and track.valid?
+      debug "Discarding #{track.inspect}"
+      return
     end
+    @tracks << track
+    debug "Appended #{track}"
+    debug "Now up to #{@tracks.size} tracks"
+    pause
   end
 
-  def to_track row
-    rest = row[:obj_secondary_sortable].split("\037")
-    track = {
-      :id => row[:media_item_id],
-      :artist => row[:obj_sortable],
-      :album => rest.shift,
-      :disc => rest.shift.to_i,
-      :number => rest.shift.to_i,
-      :track => rest.shift
-    }
-    track[:search_string] = track[:artist]+track[:album]+track[:track]
-    track[:display] = "#{track[:id]}: #{track[:artist]} #{track[:album]} #{track[:number]} #{track[:track]}"
-    track
+  def append_to_track track, row
+    debug row.inspect
+    case row[:property_id]
+      when 1;  track.track       = row[:obj_searchable]
+      when 2;  track.album       = row[:obj_searchable]
+      when 3;  track.artist      = row[:obj_searchable]
+      when 4;  track.duration    = row[:obj].to_i/1000000
+      when 5;  track.genre       = row[:obj_searchable]
+      when 6;  track.number      = row[:obj].to_i
+      when 7;  track.year        = row[:obj].to_i
+      when 8;  track.disc        = row[:obj].to_i
+      when 9;  track.disc_total  = row[:obj].to_i
+      when 10; track.track_total = row[:obj].to_i
+      when 23; track.label       = row[:obj_searchable]
+    end
   end
 end

data/lib/songbirdsh/player.rb

@@ -1,52 +1,90 @@
 require 'songbirdsh/queue'
+require 'songbirdsh/library'
+
 require 'cgi'
 require 'yaml'
 require 'fileutils'
 require 'splat'
 
-class Songbirdsh::Player
-  include Songbirdsh::Queue
+require 'songbirdsh/scrobbler'
 
-  def initialize library
-    @library=library
-  end
+module Songbirdsh
+  class Player
+    include Queue
+    attr_reader :library, :scrobbler
+    attr_accessor :scrobbling, :matches
 
-  def start
-    if @pid
-      puts "Already started (pid #{@pid})"
-      return
+    def initialize preferences
+      @scrobbler = Scrobbler.new preferences
+      @scrobbling = true
+      @library = Library.new preferences
     end
-    @pid = fork do
-      player_pid = nil
-      Signal.trap('TERM') do
-        Process.kill 'TERM', player_pid if player_pid
-        exit
+
+    def status
+      if @pid
+        track = self.current
+        puts "Since #{Time.at(track.started)}\n\t#{track}"
+        played = Time.now.to_i-track.started
+        puts "#{played} seconds (#{track.duration-played} remaining)"
+      else
+        puts 'not playing'
       end
-      total_tracks = @library.with_db {|db| db[:media_items].count }
-      loop do
-        id = dequeue || (rand * total_tracks).to_i
-        row = @library.with_db {|db| db[:media_items][:media_item_id=>id] }
-        if row
+    end
+
+    def current 
+      YAML.load(File.read('current_song'))
+    end
+
+    def register track
+      track.started = Time.now.to_i
+      File.open('current_song', 'w') {|f| f.print track.to_yaml }
+    end
+
+    def start
+      if @pid
+        puts "Already started (pid #{@pid})"
+        return
+      end
+      @pid = fork do
+        player_pid = nil
+        Signal.trap('TERM') do
+          Process.kill 'TERM', player_pid if player_pid
+          exit
+        end
+        total_tracks = @library.with_db {|db| db[:media_items].count }
+        loop do
+          id = dequeue || (rand * total_tracks).to_i
+          row = @library.with_db {|db| db[:media_items][:media_item_id=>id] }
+          unless row
+            puts "track with id #{id} did not exist"
+            next
+          end
           path = CGI.unescape(row[:content_url].slice(7..-1)) if row[:content_url] =~ /^file/
-          if path
-            puts "playing #{id}: \"#{path}\""
+          unless path and File.exist? path
+            puts "track with id #{id} did not refer to a file"
+            next
+          end
+          @library.with_track(id) do |track|
+            @scrobbler.update track if @scrobbling
+            register track
             player_pid = path.to_player
             Process.wait player_pid
+            @scrobbler.scrobble track if @scrobbling
           end
         end
       end
+      puts "Started (pid #{@pid})"
     end
-    puts "Started (pid #{@pid})"
-  end
 
-  def stop
-    return unless @pid
-    Process.kill 'TERM', @pid 
-    @pid = nil
-  end
+    def stop
+      return unless @pid
+      Process.kill 'TERM', @pid 
+      @pid = nil
+    end
 
-  def restart
-    stop
-    start
+    def restart
+      stop
+      start
+    end
   end
 end

data/lib/songbirdsh/preferences.rb

@@ -0,0 +1,29 @@
+module Songbirdsh
+  class Preferences
+    def initialize
+      @preference_path = home_path '.songbirdsh'
+      if File.exists? @preference_path
+        @preferences = YAML.load File.read(@preference_path)
+      else
+        @preferences = {}
+      end
+    end
+
+    def home_path *paths
+      File.join File.expand_path('~'), *paths
+    end
+
+    def [] key
+      @preferences[key]
+    end
+
+    def []= key, value
+      @preferences[key] = value
+      persist
+    end
+
+    def persist
+      File.open(@preference_path, 'w') {|f| f.puts @preferences.to_yaml}
+    end
+  end
+end

data/lib/songbirdsh/queue.rb

@@ -1,16 +1,26 @@
-module Songbirdsh::Queue
-  def enqueue id
-    @library.with_db do |db|
-      File.open("#{Time.now.to_i}-#{id}.song", 'w') {|f| f.print db[:media_items][:media_item_id=>id].to_yaml }
+module Songbirdsh
+  module Queue
+    def enqueue id
+      @sequence ||= 0
+      @library.with_track id do |track|
+        File.open("#{Time.now.to_i}-#{@sequence.to_s.rjust(8,'0')}.song", 'w') {|f| f.print track.to_yaml }
+        @sequence += 1
+      end
+    end
+
+    def each
+      Dir.glob('*.song').sort.each do |file|
+        yield YAML.load File.read(file)
+      end
     end
-  end
 
-  def dequeue
-    file = Dir.glob('*.song').sort.first
-    return nil unless file
-    hash = YAML.load(File.read(file))
-    id = hash[:media_item_id] if hash
-    FileUtils.rm file
-    id
+    def dequeue
+      file = Dir.glob('*.song').sort.first
+      return nil unless file
+      hash = YAML.load(File.read(file))
+      id = hash[:id] if hash
+      FileUtils.rm file
+      id
+    end
   end
 end

data/lib/songbirdsh/scrobbler.rb

@@ -0,0 +1,74 @@
+require 'splat'
+require 'simple_scrobbler'
+require 'songbirdsh/debug'
+
+module Songbirdsh
+  class Scrobbler
+    include Debug
+
+    def initialize preferences
+      @preferences = preferences
+      if preferences['lastfm']
+        @scrobbler = SimpleScrobbler.new *%w{api_key secret user session_key}.map{|k| [k]}
+      end
+    end
+
+    def scrobble track
+      return unless @scrobbler
+      debug "Scrobbling to last fm: #{track.inspect}"
+      send_to_scrobbler :submit, track
+    end
+
+    def update track
+      return unless @scrobbler
+      debug "Updating now listening with last fm: #{track.inspect}"
+      send_to_scrobbler :now_playing, track
+    end
+
+    def ask question
+      print question
+      gets.chomp
+    end
+
+    def setup
+      puts <<-EOF
+      Because of the way lastfm authentication works, setting up lastfm involves two steps:
+      Firstly, you need to register that you are developing an application. This will give you an api key and an associated 'secret'
+      Secondly, you need to gives your application access your lastfm account.  This will give a authenticated session.
+
+      Step 1. Logging in to your lastfm account and register an application
+      This will launch a browser.  You need to log in and fill out the API registration form
+      EOF
+      answer = ask 'Are you ready ? '
+      return unless answer.downcase.start_with? 'y'
+      "http://www.last.fm/api/account".to_launcher
+      preferences = {}
+      preferences['api_key'] = ask 'What is your API key ? '
+      preferences['secret'] = ask 'What is your secret ? '
+      puts <<-EOF
+      Now you've got you application details, you need to create an authentication session between your application and your lastfm account
+      Step 2. Authorising your application to access your lastfm account
+      This will launch another browser. You just need to give your application permission to access your account
+      EOF
+      preferences['user'] = ask 'What is your lastfm user name ? '
+      @scrobbler = SimpleScrobbler.new preferences['api_key'], preferences['secret'], preferences['user']
+      preferences['session_key'] = @scrobbler.fetch_session_key do |url|
+        url.to_launcher
+        ask 'Hit enter when you\'ve allowed your application access to your account'
+      end
+      @preferences['lastfm'] = preferences
+    end
+private
+    def send_to_scrobbler message, track
+      begin
+        @scrobbler.send message, track[:artist],
+          track[:track],
+          :length => track[:duration],
+          :album => track[:album],
+          :track_number => track[:number]
+      rescue Exception => e
+        puts "Failed to scrobble: #{e}"
+      end
+    end
+  end
+end

data/lib/songbirdsh/track.rb

@@ -0,0 +1,29 @@
+module Songbirdsh
+  class Track
+    attr_accessor *%w{id track album artist duration genre number year disc disc_total track_total label started}
+
+    def initialize id
+      @id = id
+    end
+
+    def [] key
+      self.send key
+    end
+
+    def valid?
+      @track
+    end
+
+    def search_id
+      id.to_s 36
+    end
+
+    def search_string
+      "#{self.artist}#{self.album}#{self.track}"
+    end
+
+    def to_s
+      "#{self.search_id}: #{self.artist} - #{self.album} - #{self.number} #{self.track} (#{self.duration})"
+    end
+  end
+end

data/lib/songbirdsh.rb

@@ -1,7 +1,2 @@
 require 'rubygems'
-require 'sequel'
-
-module Songbirdsh
-  module Command
-  end
-end
+require 'sequel'

data/spec/songbirdsh/command/enqueue_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__)+'/../../spec_helper'
+require 'songbirdsh/command/enqueue'
+
+describe Songbirdsh::Command::Enqueue do
+  extend ShellShock::CommandSpec
+
+  with_usage '*<id>'
+  with_help 'enqueues the list of songs with the specified ids'
+
+  before do
+    @player = stub('player')
+    @command = Songbirdsh::Command::Enqueue.new @player
+  end
+
+  it 'should enqueue a single track' do
+    @player.should_receive(:enqueue).with(1371)
+    @command.execute '123'
+  end
+
+  it 'should enqueue multiple tracks separated by any non digit' do
+    %w{1371 5370 9369}.each do |id|
+      @player.should_receive(:enqueue).with(id.to_i)
+    end
+    @command.execute "123 \t 456  , 789 "
+  end
+end

data/spec/songbirdsh/command/reload_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__)+'/../../spec_helper'
+require 'songbirdsh/command/reload'
+
+describe Songbirdsh::Command::Reload do
+  extend ShellShock::CommandSpec
+
+  with_usage ''
+  with_help 'reloads the contents of the music library for fast searching'
+
+  before do
+    @library = stub('library')
+    @player = stub('player', :library => @library)
+    @command = Songbirdsh::Command::Reload.new @player
+  end
+
+  it 'should reload the library' do
+    @library.should_receive(:reload)
+    @command.execute '123'
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$: << File.dirname(__FILE__)+'/../lib'
+
+require 'shell_shock/command_spec'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mark Ryall
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 +10:00
+date: 2011-02-20 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,9 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 0
-        - 5
-        version: 0.0.5
+        version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -87,7 +84,7 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: simple_scrobbler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -96,13 +93,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: gemesis
+  name: rake
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -111,11 +106,23 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 0
-        - 4
-        version: 0.0.4
+        - 8
+        version: "0.8"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  version_requirements: *id008
 description: |
   A command line jukebox music player that uses your songbird music player database
 
@@ -129,21 +136,35 @@ extra_rdoc_files: []
 files: 
 - lib/songbirdsh/cli.rb
 - lib/songbirdsh/command/enqueue.rb
+- lib/songbirdsh/command/list.rb
 - lib/songbirdsh/command/reload.rb
 - lib/songbirdsh/command/restart.rb
+- lib/songbirdsh/command/scrobbling.rb
 - lib/songbirdsh/command/search.rb
+- lib/songbirdsh/command/setup_scrobbling.rb
 - lib/songbirdsh/command/show_properties.rb
+- lib/songbirdsh/command/shuffle.rb
 - lib/songbirdsh/command/start.rb
+- lib/songbirdsh/command/status.rb
 - lib/songbirdsh/command/stop.rb
+- lib/songbirdsh/command.rb
+- lib/songbirdsh/debug.rb
 - lib/songbirdsh/library.rb
 - lib/songbirdsh/player.rb
+- lib/songbirdsh/preferences.rb
 - lib/songbirdsh/queue.rb
+- lib/songbirdsh/scrobbler.rb
+- lib/songbirdsh/track.rb
 - lib/songbirdsh.rb
+- spec/songbirdsh/command/enqueue_spec.rb
+- spec/songbirdsh/command/reload_spec.rb
+- spec/spec_helper.rb
 - bin/songbirdsh
 - README.rdoc
 - HISTORY.rdoc
 - MIT-LICENSE
-- gemspec
+- .gemtest
+- Rakefile
 has_rdoc: true
 homepage: http://github.com/markryall/songbirdsh
 licenses: []

data/gemspec

@@ -1,22 +0,0 @@
-Gem::Specification.new do |spec|
-  spec.name = 'songbirdsh'
-  spec.version = '0.0.2'
-  spec.summary = 'command line jukebox music player'
-  spec.description = <<-EOF
-A command line jukebox music player that uses your songbird music player database
-EOF
-  spec.authors << 'Mark Ryall'
-  spec.email = 'mark@ryall.name'
-  spec.homepage = 'http://github.com/markryall/songbirdsh'
-  spec.files = Dir['lib/**/*'] + Dir['bin/*'] + ['README.rdoc', 'HISTORY.rdoc','MIT-LICENSE', 'gemspec']
-  spec.executables << 'songbirdsh'
-
-  spec.add_dependency 'splat', '~>0.1'
-  spec.add_dependency 'shell_shock', '~>0.0.5'
-  spec.add_dependency 'sequel', '~> 3'
-  spec.add_dependency 'splat', '~> 0.1'
-  spec.add_dependency 'sqlite3', '~> 1'
-
-  spec.add_development_dependency 'rake', '~>0.8.7'
-  spec.add_development_dependency 'gemesis', '~>0.0.4'
-end