walkman 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e3d7ee1e1eeb85342fc9df700432e1a1879cf58
-  data.tar.gz: 7538521e2f9691d497aa9f780279fe6034d995d0
+  metadata.gz: 428f899c2b92b174d1e6693ee29932c5a9cd94e9
+  data.tar.gz: 5c352d5761efddeddfa5e685dfa4f081845473dc
 SHA512:
-  metadata.gz: fb245267ddb8f2c75c0cf3711ee9d4006df6c2deefed5985cabb458d0b0bd38a48d6cce3c04fdca97ab3fa0fa397838cc2d9c14f6c2af7571a3bb657471cb20f
-  data.tar.gz: 549890eeb0a29f384329909e17d59d71ac0b69060489aad7d19f55a97a0adb0461e74d0b16f8f67a21cf2c7945e3b5e039ee25e2012314d33ad689182b4f7ef9
+  metadata.gz: 43891034d99e8453e2dca48a3a839670038ddda1218862e709ab679c4613e15cb3c130e2b767334e07a3f1d1fb52472b776f81abe8effc83fdf37d5b1d67b7a6
+  data.tar.gz: ea21f3a6d49a991556b1dc0f1372a9000841ec7bd5ed3272bb859cac67f0803f8770b3e1bb9ec9056a7ce18f4b686bd93005f2655ec565740af3842a3f194aa9

data/README.md

@@ -29,7 +29,7 @@ with support for [Spotify](http://spotify.com) and local file playback via
 3. Create a catalog (taste profile) to use as your base library and grab its `id` to use as `catalog_id`:
 
 ```
-curl -F "api_key=<api_key>" -F "format=json" -F "type=general" -F "name=base_profile"
+curl -F "api_key=<api_key>" -F "format=json" -F "type=general" -F "name=base_profile" "http://developer.echonest.com/api/v4/tasteprofile/create"
 ```
 
 ### Rdio
@@ -49,4 +49,4 @@ echonest:
   catalog_id: CACABCD1234567890Z
 rdio:
   playback_token: GAlNi78J_____zlyYWs5ZG02N2pkaHlhcWsyOWJtYjkyN2xvY2FsaG9zdEbwl7EHvbylWSWFWYMZwfc=
-```
+```

data/bin/walkman

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require "walkman"
+
+Walkman::CLI.start

data/lib/walkman.rb

@@ -1,6 +1,7 @@
 require "echowrap"
 
 require "walkman/config"
+require "walkman/logger"
 
 require "walkman/services/base"
 require "walkman/services/rdio"
@@ -19,34 +20,6 @@ require "walkman/commands/queueing"
 require "walkman/cli"
 
 module Walkman
-  def self.logger
-    @@logger ||= ::Logger.new(STDOUT).tap do |l|
-      l.level = log_level(Walkman.config.log_level)
-      l.formatter = proc do |severity, _, _, message|
-        "[walkman](#{severity.downcase}): #{message}\n"
-      end
-    end
-  end
-
-  def self.log_level(log_level_string)
-    case log_level_string.to_s
-    when "unknown"
-      ::Logger::UNKNOWN
-    when "fatal"
-      ::Logger::FATAL
-    when "error"
-      ::Logger::ERROR
-    when "warn"
-      ::Logger::WARN
-    when "info"
-      ::Logger::INFO
-    when "debug"
-      ::Logger::DEBUG
-    else
-      raise "Unknown log level given #{log_level_string}"
-    end
-  end
-
   def self.echowrap
     @echowrap ||= Echowrap.configure do |config|
       config.api_key       = Walkman.config.echonest_api_key

data/lib/walkman/cli.rb

@@ -4,14 +4,13 @@ require "colorize"
 
 module Walkman
   class CLI < Thor
-
     # server tasks
 
     desc "start", "starts the walkman server"
     option :daemon, type: :boolean, aliases: "-d"
     def start
       if options[:daemon]
-        Process.daemon 
+        Process.daemon
       else
         puts "Starting walkman server"
         puts "Run `walkman start -d` for daemon"
@@ -19,11 +18,9 @@ module Walkman
 
         trap("INT") do
           # calling this in a thread to get proper logging
-          thread = Thread.new do
+          Thread.new do
             shutdown
-          end
-
-          thread.join
+          end.join
         end
       end
 
@@ -58,13 +55,13 @@ module Walkman
 
     desc "next", "plays the next song in the current playlist"
     def next(count = 1)
-      response = server.run_command(:next, { count: count.to_i })
+      response = server.run_command(:next, count: count.to_i)
       puts response unless response.empty?
     end
 
     desc "skip COUNT", "skips the given amount of songs"
     def skip(count = 1)
-      response = server.run_command(:skip, { count: count.to_i })
+      response = server.run_command(:skip, count: count.to_i)
       puts response unless response.empty?
     end
 
@@ -83,14 +80,14 @@ module Walkman
     desc "play_artist ARTIST", "plays songs from the given artist"
     def play_artist(*artist)
       artist = artist.join(" ")
-      response = server.run_command(:artist, { artist: artist })
+      response = server.run_command(:artist, artist: artist)
       puts response unless response.empty?
     end
 
     desc "play_artist_radio ARTIST", "plays music like the given artist"
     def play_artist_radio(*artist)
       artist = artist.join(" ")
-      response = server.run_command(:artist_radio, { artist: artist })
+      response = server.run_command(:artist_radio, artist: artist)
       puts response unless response.empty?
     end
 

data/lib/walkman/commands/controls.rb

@@ -17,7 +17,7 @@ module Walkman
 
       def self.next(count = 1)
         if current_song = Walkman.player.current_song
-          Walkman.player.playlist.skip(current_song)
+          Walkman.player.playlist.feedback(:skip, current_song)
         end
 
         Walkman.player.next(count)

data/lib/walkman/commands/playlist.rb

@@ -6,12 +6,21 @@ module Walkman
         playlist = Walkman.player.playlist
 
         if current_song && playlist
-          playlist.favorite(current_song)
+          playlist.feedback(:favorite, current_song)
           "Awesome! I'll play more songs like this."
         else
           "No music is playing. Are you hearing things?"
         end
       end
+
+      def self.shuffle!
+        if playlist = Walkman.player.playlist
+          playlist.shuffle!
+          "Shaking things up a bit."
+        else
+          "No music is queued."
+        end
+      end
     end
   end
 end

data/lib/walkman/commands/queueing.rb

@@ -2,11 +2,9 @@ module Walkman
   module Commands
     module Queueing
       def self.artist(artist)
-        playlist = Walkman::Playlist.new(type: "artist", artist: artist, auto_queue: true)
-        Walkman.player.playlist = playlist
+        playlist = self.queue("artist", artist: artist)
 
         if playlist.size > 0
-          Walkman.player.next
           output = ["♫".blue, "Playing songs by", artist.titleize.bold]
           output.flatten.join(" ")
         else
@@ -15,17 +13,30 @@ module Walkman
       end
 
       def self.artist_radio(artist)
-        playlist = Walkman::Playlist.new(type: "artist-radio", artist: artist, auto_queue: true)
-        Walkman.player.playlist = playlist
+        playlist = self.queue("artist-radio", artist: artist)
 
         if playlist.size > 0
-          Walkman.player.next
           output = ["♫".blue, "Playing music like", artist.titleize.bold]
           output.flatten.join(" ")
         else
           "Music like that artist couldn't be queued"
         end
       end
+
+      private
+
+      def self.queue(type, args = {})
+        args.merge!(type: type.to_s, auto_queue: true)
+
+        playlist = Walkman::Playlist.new(args)
+        Walkman.player.playlist = playlist
+
+        if playlist.size > 0
+          Walkman.player.next
+        end
+
+        playlist
+      end
     end
   end
 end

data/lib/walkman/logger.rb

@@ -0,0 +1,27 @@
+module Walkman
+  def self.logger
+    @@logger ||= ::Logger.new(STDOUT).tap do |l|
+      l.level = log_level(Walkman.config.log_level)
+      l.formatter = proc do |severity, _, _, message|
+        "[walkman](#{severity.downcase}): #{message}\n"
+      end
+    end
+  end
+
+  def self.log_level(log_level_string)
+    case log_level_string.to_s
+    when "debug"
+      ::Logger::DEBUG
+    when "info"
+      ::Logger::INFO
+    when "warn"
+      ::Logger::WARN
+    when "error"
+      ::Logger::ERROR
+    when "fatal"
+      ::Logger::FATAL
+    else
+      raise "Unknown log level given #{log_level_string}"
+    end
+  end
+end

data/lib/walkman/player.rb

@@ -5,6 +5,7 @@ module Walkman
 
   class Player
     attr_accessor :current_song, :playing
+    attr_writer   :playlist
 
     SERVICES = [Walkman::Services::Rdio]
 
@@ -92,10 +93,6 @@ module Walkman
       @playlist ||= Walkman::Playlist.new
     end
 
-    def playlist=(playlist)
-      @playlist = playlist
-    end
-
     private
 
     def play_song(song)

data/lib/walkman/playlist.rb

@@ -1,6 +1,7 @@
 module Walkman
   class Playlist
     attr_accessor :session_id
+    attr_reader   :queue
 
     def initialize(options = {})
       songs = options.delete(:songs) || []
@@ -12,14 +13,11 @@ module Walkman
       end
 
       if @auto_queue && @session_id
-        auto_queue && self.next
+        auto_queue
+        self.next
       end
     end
 
-    def queue
-      @queue
-    end
-
     def clear
       @queue = []
     end
@@ -29,7 +27,7 @@ module Walkman
     end
     alias_method :queued?, :include?
 
-    def shuffle
+    def shuffle!
       @queue.shuffle!
     end
 
@@ -51,7 +49,7 @@ module Walkman
       song = songs.pop # the last song skipped
 
       # skip and unplay songs so our echonest catalog/profile stays true
-      skip(songs)
+      feedback([:skip, :unplay], songs) unless songs.empty?
 
       if @auto_queue && size <= 5
         auto_queue(5) if @session_id
@@ -64,76 +62,65 @@ module Walkman
       @queue.size
     end
 
-    def unplay(songs)
-      songs = [songs].flatten # one or more
-
-      songs.each do |song|
-        echonest_playlist_feedback({ unplay_song: song.echonest_song_id })
-      end
-    end
-
-    def skip(songs)
-      songs = [songs].flatten # one or more
+    def feedback(types, songs)
+      songs    = [songs].flatten # one or more
+      types    = [types].flatten # one or more
+      song_ids = songs.map(&:echonest_song_id)
+      args     = { session_id: @session_id }
 
-      songs.each do |song|
-        echonest_playlist_feedback({ skip_song: song.echonest_song_id, unplay_song: song.echonest_song_id })
+      if types.include?(:favorite)
+        args[:favorite_song] = song_ids
+        args[:favorite_artist] = songs.map(&:echonest_artist_id)
       end
-    end
 
-    def favorite(songs)
-      songs = [songs].flatten # one or more
+      args[:unplay_song] = song_ids if types.include?(:unplay)
+      args[:skip_song] = song_ids if types.include?(:skip)
 
-      songs.each do |song|
-        echonest_playlist_feedback({ favorite_song: song.echonest_song_id, favorite_artist: song.echonest_artist_id })
-      end
+      Walkman.echowrap.playlist_dynamic_feedback(args)
     end
 
     private
 
-    def echonest_playlist_create(options = {})
-      return nil unless options.keys.include?(:type)
+    def echonest_playlist_create(args = {})
+      return nil unless args.keys.include?(:type)
 
-      options[:bucket] = ["id:rdio-US", "tracks"]
-      options[:seed_catalog] = Walkman.config.echonest_catalog_id
-      options[:session_catalog] = Walkman.config.echonest_catalog_id
+      args[:bucket] = ["id:rdio-US", "tracks"]
+      args[:seed_catalog] = Walkman.config.echonest_catalog_id
+      args[:session_catalog] = Walkman.config.echonest_catalog_id
 
-      if remote_playlist = Walkman.echowrap.playlist_dynamic_create(options)
+      if remote_playlist = Walkman.echowrap.playlist_dynamic_create(args)
         remote_playlist
       else
         nil
       end
     end
 
-    def echonest_playlist_feedback(args = {})
-      args[:session_id] = @session_id
-
-      Walkman.echowrap.playlist_dynamic_feedback(args)
-    end
-
     def auto_queue(count = 5)
       return 0 unless @session_id
 
       result = Walkman.echowrap.playlist_dynamic_next(session_id: @session_id, results: count)
-      songs = []
+      songs = parse_remote_songs(result.songs)
+      add(songs)
+    end
 
-      result.songs.each do |song|
+    def parse_remote_songs(remote_songs)
+      remote_songs.map do |song|
         # find the first track with a rdio foreign key
         track = song.tracks.find do |t|
           t.foreign_id && t.foreign_id.split(":")[0] == "rdio-US"
         end
 
-        next unless track
-
-        songs << Walkman::Song.new(artist: song.artist_name,
-                                   title: song.title,
-                                   source_type: "Walkman::Services::Rdio",
-                                   source_id: track.foreign_id.split(":").last,
-                                   echonest_artist_id: song.artist_id,
-                                   echonest_song_id: song.id)
-      end
-
-      add(songs)
-      songs.count
+        if track
+          Walkman::Song.new(artist: song.artist_name,
+                            title: song.title,
+                            source_type: "Walkman::Services::Rdio",
+                            source_id: track.foreign_id.split(":").last,
+                            echonest_artist_id: song.artist_id,
+                            echonest_song_id: song.id)
+        else
+          nil
+        end
+      end.compact # prune any nil elements
     end
   end
 end

data/lib/walkman/services/base.rb

@@ -2,23 +2,23 @@ module Walkman
   module Services
     class Base
       def startup
-        raise("Implement in Service")
+        raise "Implement in Service"
       end
 
       def shutdown
-        raise("Implement in Service")
+        raise "Implement in Service"
       end
 
       def restart
-        raise("Implement in Service")
+        raise "Implement in Service"
       end
 
       def play(song)
-        raise("Implement in Service")
+        raise "Implement in Service"
       end
 
       def stop
-        raise("Implement in Service")
+        raise "Implement in Service"
       end
     end
   end

data/lib/walkman/services/rdio.rb

@@ -12,6 +12,7 @@ module Walkman
       def shutdown
         Walkman.logger.debug "stopping Rdio service"
 
+        quit_browser
         @player_thread.terminate if @player_thread
       end
 

data/spec/fixtures/walkman.yml

@@ -0,0 +1,13 @@
+log_level: info
+server:
+  host: localhost
+  port: 27001
+echonest:
+  api_key: ABC
+  consumer_key: DEF
+  shared_secret: GHI
+  catalog_id: JKL
+rdio:
+  playback_token: MNO
+  player_url: http://localhost:1/rdio
+  browser_path: /path/to/browser

data/spec/spec_helper.rb

@@ -7,4 +7,11 @@ require "walkman"
 
 Dir[File.expand_path("../support/*.rb", __FILE__)].each { |f| require f }
 
-Walkman.logger.level = Walkman.log_level(:info)
+Walkman.config.log_level = :info
+
+before do
+  Walkman.echowrap.stub(:playlist_dynamic_create)
+  Walkman.echowrap.stub(:playlist_dynamic_feedback)
+  Walkman.echowrap.stub(:playlist_dynamic_next)
+  Command.stub(:run)
+end

data/spec/support/rspec.rb

@@ -0,0 +1,5 @@
+RSpec.configure do |config|
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end

data/spec/walkman/commands/controls_spec.rb

@@ -3,6 +3,10 @@ require "spec_helper"
 describe Walkman::Commands::Controls do
   let!(:player) { Walkman.player }
 
+  before do
+    Walkman.echowrap.stub(:playlist_dynamic_feedback)
+  end
+
   describe ".play" do
     it "calls play on the player" do
       expect(player).to receive(:play)
@@ -22,5 +26,24 @@ describe Walkman::Commands::Controls do
       expect(player).to receive(:next)
       Walkman::Commands::Controls.next
     end
+
+    it "updates the current song's skip count" do
+      song = create(:song)
+      player.current_song = song
+      player.playlist = create(:playlist)
+
+      expect(player.playlist).to receive(:feedback).with(:skip, song).once
+
+      Walkman::Commands::Controls.next
+    end
+
+    it "updates the skipped songs' skip count" do
+      songs = create_list(:song, 3)
+      player.playlist = create(:playlist, songs: songs)
+
+      expect(player.playlist).to receive(:feedback).with([:skip, :unplay], songs.take(2)).once
+
+      Walkman::Commands::Controls.skip(3)
+    end
   end
 end

data/spec/walkman/commands/playlist_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+describe Walkman::Commands::Playlist do
+  let!(:player) { Walkman.player }
+  let!(:playlist) { Walkman::Playlist.new }
+
+  before do
+    Walkman.echowrap.stub(:playlist_dynamic_feedback)
+  end
+
+  describe ".like" do
+    it "updates the song's like count" do
+      player.playlist = playlist
+      song = create(:song)
+      player.current_song = song
+
+      expect(player.playlist).to receive(:feedback).with(:favorite, song)
+
+      expect(Walkman::Commands::Playlist.like).to eq("Awesome! I'll play more songs like this.")
+    end
+
+    it "returns a notification if there is not a current song" do
+      player.current_song = nil
+
+      expect(Walkman::Commands::Playlist.like).to eq("No music is playing. Are you hearing things?")
+    end
+  end
+end

data/spec/walkman/commands/queueing_spec.rb

@@ -12,6 +12,7 @@ describe Walkman::Commands::Queueing do
 
     Walkman.echowrap.stub(:playlist_dynamic_create) { playlist_dynamic_create }
     Walkman.echowrap.stub(:playlist_dynamic_next) { playlist_dynamic_next }
+    Walkman.echowrap.stub(:playlist_dynamic_feedback)
   end
 
   describe ".artist" do

data/spec/walkman/config_spec.rb

@@ -0,0 +1,78 @@
+require "spec_helper"
+
+describe Walkman::Config do
+  let!(:config) { Walkman::Config.new }
+
+  it "ensures only one Config object exists" do
+    config = Walkman.config
+
+    expect(config).to eq(Walkman.config)
+  end
+
+  describe "global configs" do
+    it "has a log level" do
+      expect(config.log_level).to eq("debug")
+
+      config.log_level = "info"
+
+      expect(config.log_level).to eq("info")
+    end
+  end
+
+  describe "server configs" do
+    it "has a server host" do
+      expect(config.server_host).to eq("localhost")
+    end
+
+    it "has a server port" do
+      expect(config.server_port).to eq(27001)
+    end
+
+    it "has a DRb URI" do
+      expect(config.drb_uri).to eq("druby://localhost:27001")
+    end
+  end
+
+  describe "echo nest configs" do
+    it "has a echo nest api key" do
+      expect(config.echonest_api_key).to be_nil
+    end
+
+    it "has a echo nest consumer key" do
+      expect(config.echonest_consumer_key).to be_nil
+    end
+
+    it "has a echo nest shared secret" do
+      expect(config.echonest_shared_secret).to be_nil
+    end
+
+    it "has a echo nest catalog id" do
+      expect(config.echonest_catalog_id).to be_nil
+    end
+  end
+
+  describe "rdio configs" do
+    it "has a rdio player url" do
+      expect(config.rdio_player_url).to eq("http://localhost:4567/rdio")
+    end
+
+    it "has a rdio playback token" do
+      expect(config.rdio_playback_token).to be_nil
+    end
+
+    it "has a rdio browser path" do
+      expect(config.rdio_browser_path).to eq('/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --no-process-singleton-dialog')
+    end
+  end
+
+  it "can load config values from a given YAML file" do
+    config_file = File.join(File.dirname(__FILE__), "..", "fixtures", "walkman.yml")
+    config.load_file(config_file)
+
+    expect(config.echonest_api_key).to eq("ABC")
+    expect(config.echonest_consumer_key).to eq("DEF")
+    expect(config.echonest_shared_secret).to eq("GHI")
+    expect(config.echonest_catalog_id).to eq("JKL")
+    expect(config.rdio_playback_token).to eq("MNO")
+  end
+end

data/spec/walkman/player_spec.rb

@@ -3,9 +3,22 @@ require "spec_helper"
 describe Walkman::Player do
   let!(:player) { Walkman.player }
 
-  after :each do
-    player.shutdown
+  before do
+    Walkman.echowrap.stub(:playlist_dynamic_feedback)
+    Command.stub(:run)
+
+    Walkman::Player::SERVICES.each do |service|
+      service.any_instance.stub(:startup)
+      service.any_instance.stub(:shutdown)
+    end
+
     player.playlist = nil
+    player.current_song = nil
+    player.startup
+  end
+
+  after do
+    player.shutdown
   end
 
   it "responds to #playlist" do
@@ -21,12 +34,45 @@ describe Walkman::Player do
   describe "#startup" do
     it "starts up all music services" do
       Walkman::Player::SERVICES.each do |service|
-        service.any_instance.stub(:startup)
+        service.any_instance.unstub(:startup)
         expect_any_instance_of(service).to receive(:startup)
       end
 
       player.startup
     end
+
+    describe "play loop" do
+      it "calls #next if there is no current song" do
+        player.current_song = nil
+
+        expect(player).to receive(:next).at_least(1)
+
+        player.play
+        sleep 0.1
+      end
+
+      it "calls #stop if the last loop song is different than the current loop song" do
+        player.current_song = create(:song)
+        player.playlist = create(:playlist)
+        player.playlist.add(create(:song))
+
+        expect(player).to receive(:stop)
+
+        player.play
+        sleep 0.2
+        player.current_song = create(:song)
+        sleep 0.1
+      end
+
+      it "calls #play_song if the last loop song is nil" do
+        player.current_song = create(:song)
+
+        expect(player).to receive(:play_song)
+
+        player.play
+        sleep 0.1
+      end
+    end
   end
 
   describe "#shutdown" do
@@ -42,8 +88,6 @@ describe Walkman::Player do
 
   describe "#play" do
     it "plays a song from a specific music service" do
-      player.startup
-
       Walkman::Player::SERVICES.each do |service|
         service.any_instance.stub(:play)
         player.current_song = create(:song, source_type: service.name)
@@ -51,19 +95,21 @@ describe Walkman::Player do
       end
 
       player.play
-
       sleep 0.2 # have to give the play loop a chance to pick up the song
     end
   end
 
   describe "#stop" do
     it "stops all music services" do
+      player.instance_variable_set("@play_loop", nil)
+
       Walkman::Player::SERVICES.each do |service|
         service.any_instance.stub(:stop)
         expect_any_instance_of(service).to receive(:stop)
       end
 
       player.stop
+      sleep 0.2 # have to give the play loop a chance to pick up the song
     end
   end
 
@@ -96,7 +142,7 @@ describe Walkman::Player do
       player.next
 
       expect(player.current_song).to be_nil
-      expect(player.playing).to be_false
+      expect(player.playing).to eq(false)
     end
   end
 end

data/spec/walkman/playlist_spec.rb

@@ -4,6 +4,11 @@ describe Walkman::Playlist do
   let(:playlist) { create(:playlist) }
   let(:song) { create(:song) }
 
+  before do
+    Walkman.echowrap.stub(:playlist_dynamic_feedback)
+    playlist.session_id = "ABC123"
+  end
+
   it "responds to #session_id" do
     expect(playlist).to respond_to(:session_id)
   end
@@ -39,13 +44,13 @@ describe Walkman::Playlist do
     it "returns true if the given song is currently queued" do
       playlist.add(song)
 
-      expect(playlist.include?(song)).to be_true
-      expect(playlist.queued?(song)).to be_true
+      expect(playlist.include?(song)).to eq(true)
+      expect(playlist.queued?(song)).to eq(true)
     end
 
     it "returns false if the given song is not currently queued" do
-      expect(playlist.include?(song)).to be_false
-      expect(playlist.queued?(song)).to be_false
+      expect(playlist.include?(song)).to eq(false)
+      expect(playlist.queued?(song)).to eq(false)
     end
   end
 
@@ -117,12 +122,12 @@ describe Walkman::Playlist do
     end
   end
 
-  describe "#shuffle" do
+  describe "#shuffle!" do
     it "changes the order of songs in the queue" do
       100.times { playlist.add(create(:song)) }
 
       expect {
-        playlist.shuffle
+        playlist.shuffle!
       }.to change {
         playlist.queue.first
       }
@@ -147,4 +152,30 @@ describe Walkman::Playlist do
       expect(playlist.size).to eq(3)
     end
   end
+
+  describe "#feedback" do
+    it "updates favorites" do
+      args = { session_id: "ABC123", favorite_song: [song.echonest_song_id], favorite_artist: [song.echonest_artist_id] }
+
+      expect(Walkman.echowrap).to receive(:playlist_dynamic_feedback).with(args)
+
+      playlist.feedback(:favorite, song)
+    end
+
+    it "updates unplay counts" do
+      args = { session_id: "ABC123", unplay_song: [song.echonest_song_id] }
+
+      expect(Walkman.echowrap).to receive(:playlist_dynamic_feedback).with(args)
+
+      playlist.feedback(:unplay, song)
+    end
+
+    it "updates skip counts" do
+      args = { session_id: "ABC123", skip_song: [song.echonest_song_id] }
+
+      expect(Walkman.echowrap).to receive(:playlist_dynamic_feedback).with(args)
+
+      playlist.feedback(:skip, song)
+    end
+  end
 end

data/spec/walkman_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe Walkman do
+  before :each do
+    Walkman.class_variable_set("@@logger", nil) # reset logger
+  end
+
+  describe ".logger" do
+    it "sets the log level according to config.log_level" do
+      expect(Walkman.logger.level).to eq(Walkman.log_level(Walkman.config.log_level))
+    end
+
+    it "allows symbols when setting log level" do
+      [:debug, :info, :warn, :error, :fatal].each do |level|
+        Walkman.class_variable_set("@@logger", nil) # reset logger
+        Walkman.config.log_level = level
+
+        expect(Walkman.logger.level).to eq(Walkman.log_level(level))
+      end
+    end
+
+    it "raises an error if an incorrect log level is set" do
+      Walkman.config.log_level = :foo
+
+      expect {
+        Walkman.logger.level
+      }.to raise_error(RuntimeError)
+    end
+  end
+end

data/walkman.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name    = "walkman"
-  spec.version = "0.1.1"
+  spec.version = "0.1.2"
 
   spec.author      = "Tres Trantham"
   spec.email       = "tres@trestrantham.com"
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.test_files    = spec.files.grep(/^spec/)
   spec.require_paths = ["lib"]
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = "walkman"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1"

metadata

@@ -1,149 +1,150 @@
 --- !ruby/object:Gem::Specification
 name: walkman
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tres Trantham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2013-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: command
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: echowrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: titleize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
 description: Control your music
 email: tres@trestrantham.com
-executables: []
+executables:
+- walkman
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -156,6 +157,7 @@ files:
 - lib/walkman/commands/playlist.rb
 - lib/walkman/commands/queueing.rb
 - lib/walkman/config.rb
+- lib/walkman/logger.rb
 - lib/walkman/player.rb
 - lib/walkman/playlist.rb
 - lib/walkman/services/base.rb
@@ -165,20 +167,26 @@ files:
 - spec/factories/echowrap.rb
 - spec/factories/playlist.rb
 - spec/factories/song.rb
+- spec/fixtures/walkman.yml
 - spec/sinatra_helper.rb
 - spec/spec_helper.rb
 - spec/support/factory_girl.rb
+- spec/support/rspec.rb
 - spec/walkman/commands/controls_spec.rb
 - spec/walkman/commands/information_spec.rb
 - spec/walkman/commands/player_spec.rb
+- spec/walkman/commands/playlist_spec.rb
 - spec/walkman/commands/queueing_spec.rb
+- spec/walkman/config_spec.rb
 - spec/walkman/player_spec.rb
 - spec/walkman/playlist_spec.rb
 - spec/walkman/services/base_spec.rb
 - spec/walkman/services/rdio/rdio_player_spec.rb
 - spec/walkman/services/rdio_spec.rb
 - spec/walkman/song_spec.rb
+- spec/walkman_spec.rb
 - walkman.gemspec
+- bin/walkman
 homepage: https://github.com/trestrantham/walkman
 licenses:
 - MIT
@@ -189,12 +197,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -207,16 +215,21 @@ test_files:
 - spec/factories/echowrap.rb
 - spec/factories/playlist.rb
 - spec/factories/song.rb
+- spec/fixtures/walkman.yml
 - spec/sinatra_helper.rb
 - spec/spec_helper.rb
 - spec/support/factory_girl.rb
+- spec/support/rspec.rb
 - spec/walkman/commands/controls_spec.rb
 - spec/walkman/commands/information_spec.rb
 - spec/walkman/commands/player_spec.rb
+- spec/walkman/commands/playlist_spec.rb
 - spec/walkman/commands/queueing_spec.rb
+- spec/walkman/config_spec.rb
 - spec/walkman/player_spec.rb
 - spec/walkman/playlist_spec.rb
 - spec/walkman/services/base_spec.rb
 - spec/walkman/services/rdio/rdio_player_spec.rb
 - spec/walkman/services/rdio_spec.rb
 - spec/walkman/song_spec.rb
+- spec/walkman_spec.rb