walkman 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 428f899c2b92b174d1e6693ee29932c5a9cd94e9
-  data.tar.gz: 5c352d5761efddeddfa5e685dfa4f081845473dc
+  metadata.gz: e685425511a289c81c6f326fd90c6fcec1bd4df7
+  data.tar.gz: 84ae1ad218f87c9eb378f8190ad8475a33631456
 SHA512:
-  metadata.gz: 43891034d99e8453e2dca48a3a839670038ddda1218862e709ab679c4613e15cb3c130e2b767334e07a3f1d1fb52472b776f81abe8effc83fdf37d5b1d67b7a6
-  data.tar.gz: ea21f3a6d49a991556b1dc0f1372a9000841ec7bd5ed3272bb859cac67f0803f8770b3e1bb9ec9056a7ce18f4b686bd93005f2655ec565740af3842a3f194aa9
+  metadata.gz: b935160543578f59fd985fcaca685fca1c5c06978faa9917c6feea21713ffa2af47177a43afca28b8097ef89a15c90d4578ebbeae1d2188c0fd5794447593210
+  data.tar.gz: 5f3c7e726bd5deb8afa29ee285430a8a3b3175c3c2bf5958708178d9efd2bb53f1b01244086323c7a00422d36f6a81f76da49b87f27d398047bd550c2f13982d

data/README.md

@@ -42,11 +42,35 @@ curl -F "api_key=<api_key>" -F "format=json" -F "type=general" -F "name=base_pro
 Create a Walkman config file at `~/.walkman`:
 
 ```
+log_level: debug # optional
+server:
+  host: localhost # optional
+  port: 27001 # optional
 echonest:
-  api_key: ABCDEFGHIJKLMNOP
-  consumer_key: abc123efg456hij789klm098nop765qr
-  shared_secret: 4jh&kjhfg.@3kjfl987FJ3
-  catalog_id: CACABCD1234567890Z
+  api_key: APIKEY
+  consumer_key: CONSUMERKEY
+  shared_secret: SHAREDSECRET
+  catalog_id: CATALOGID
 rdio:
-  playback_token: GAlNi78J_____zlyYWs5ZG02N2pkaHlhcWsyOWJtYjkyN2xvY2FsaG9zdEbwl7EHvbylWSWFWYMZwfc=
+  player_url: http://localhost:4567/rdio # optional
+  playback_token: PLAYBACKTOKEN
+  browser_path: /Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --no-process-singleton-dialog # optional
+```
+
+## Usage
+
+```
+Commands:
+  walkman help [COMMAND]            # Describe available commands or one specific command
+  walkman like                      # plays more music like the current song
+  walkman next                      # plays the next song in the current playlist
+  walkman now_playing               # shows the song that's currently playing
+  walkman play                      # plays the current playlist
+  walkman play_artist ARTIST        # plays songs from the given artist
+  walkman play_artist_radio ARTIST  # plays music like the given artist
+  walkman shutdown                  # stops the walkman server
+  walkman skip COUNT                # skips the given amount of songs
+  walkman start                     # starts the walkman server
+  walkman stop                      # stops playing music
+  walkman up_next                   # shows the next songs on the current playlist
 ```

data/lib/walkman/commands/controls.rb

@@ -3,16 +3,17 @@ module Walkman
     module Controls
       def self.play
         Walkman.player.play
-        song = Walkman.player.current_song
 
-        output = ["♫".blue, "Playing"]
-        output << [song.title.bold, "by", song.artist.bold] if song
-        output.flatten.join(" ")
+        if song = Walkman.player.current_song
+          "♫ Playing #{song.title} by #{song.artist}"
+        else
+          "♫ We're playing but the queue is empty!"
+        end
       end
 
       def self.stop
         Walkman.player.stop
-        ""
+        "Stopping walkman"
       end
 
       def self.next(count = 1)
@@ -21,11 +22,12 @@ module Walkman
         end
 
         Walkman.player.next(count)
-        song = Walkman.player.current_song
 
-        output = ["♫".blue, "Skipping"]
-        output << ["to", song.title.bold, "by", song.artist.bold] if song
-        output.flatten.join(" ")
+        if song = Walkman.player.current_song
+          "♫ Skipping to #{song.title} by #{song.artist}"
+        else
+          "No more songs in the queue. Stopping walkman"
+        end
       end
       define_singleton_method(:skip) { |count| self.next(count) }
     end

data/lib/walkman/commands/information.rb

@@ -3,9 +3,7 @@ module Walkman
     module Information
       def self.now_playing
         if song = Walkman.player.current_song
-          output = ["♫".blue, "Now playing"]
-          output << [song.title.bold, "by", song.artist.bold]
-          output.flatten.join(" ")
+          "♫ Now playing #{song.title} by #{song.artist}"
         else
           "No music is playing"
         end

data/lib/walkman/commands/queueing.rb

@@ -5,8 +5,7 @@ module Walkman
         playlist = self.queue("artist", artist: artist)
 
         if playlist.size > 0
-          output = ["♫".blue, "Playing songs by", artist.titleize.bold]
-          output.flatten.join(" ")
+          "♫ Playing songs by #{artist.titleize}"
         else
           "That artist couldn't be queued"
         end
@@ -16,8 +15,7 @@ module Walkman
         playlist = self.queue("artist-radio", artist: artist)
 
         if playlist.size > 0
-          output = ["♫".blue, "Playing music like", artist.titleize.bold]
-          output.flatten.join(" ")
+          "♫ Playing music like #{artist.titleize}"
         else
           "Music like that artist couldn't be queued"
         end

data/spec/walkman/player_spec.rb

@@ -14,11 +14,6 @@ describe Walkman::Player do
 
     player.playlist = nil
     player.current_song = nil
-    player.startup
-  end
-
-  after do
-    player.shutdown
   end
 
   it "responds to #playlist" do
@@ -34,7 +29,6 @@ describe Walkman::Player do
   describe "#startup" do
     it "starts up all music services" do
       Walkman::Player::SERVICES.each do |service|
-        service.any_instance.unstub(:startup)
         expect_any_instance_of(service).to receive(:startup)
       end
 
@@ -42,13 +36,26 @@ describe Walkman::Player do
     end
 
     describe "play loop" do
+      before do
+        player.services.each_with_index do |(k, service), i|
+          service.stub(:startup)
+          service.stub(:shutdown)
+        end
+
+        player.startup
+      end
+
+      after do
+        player.shutdown
+      end
+
       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
+        sleep 0.2
       end
 
       it "calls #stop if the last loop song is different than the current loop song" do
@@ -56,21 +63,21 @@ describe Walkman::Player do
         player.playlist = create(:playlist)
         player.playlist.add(create(:song))
 
-        expect(player).to receive(:stop)
+        expect(player).to receive(:stop).at_least(1)
 
         player.play
         sleep 0.2
         player.current_song = create(:song)
-        sleep 0.1
+        sleep 0.2
       end
 
       it "calls #play_song if the last loop song is nil" do
         player.current_song = create(:song)
 
-        expect(player).to receive(:play_song)
+        expect(player).to receive(:play_song).at_least(1)
 
         player.play
-        sleep 0.1
+        sleep 0.2
       end
     end
   end
@@ -88,28 +95,29 @@ 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)
         expect_any_instance_of(service).to receive(:play)
+        player.current_song = create(:song, source_type: service.name)
       end
 
       player.play
-      sleep 0.2 # have to give the play loop a chance to pick up the song
+      sleep 0.1
+      player.shutdown
     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
+      sleep 0.2
     end
   end
 
@@ -118,12 +126,11 @@ describe Walkman::Player do
     let!(:playlist) { create(:playlist) }
 
     before do
-      player.startup
       player.playlist = playlist
+      player.playlist.clear
     end
 
     it "plays the next song in the playlist" do
-      player.playlist.clear
       player.playlist.add(song)
       player.current_song = nil
 
@@ -135,7 +142,6 @@ describe Walkman::Player do
     end
 
     it "stops playing if there are no more songs in the playlist queue" do
-      player.playlist.clear
       player.playing = true
       player.current_song = song
 

data/walkman.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name    = "walkman"
-  spec.version = "0.1.2"
+  spec.version = "0.1.3"
 
   spec.author      = "Tres Trantham"
   spec.email       = "tres@trestrantham.com"
@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.1"
 
   spec.add_dependency "activemodel", "~> 4.0.2"
-  spec.add_dependency "colorize", "~> 0.6.0"
   spec.add_dependency "command", "~> 1.0"
   spec.add_dependency "echowrap", "~> 0.1.0"
   spec.add_dependency "sinatra", "~> 1.4.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: walkman
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tres Trantham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !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