spotify_osx_controller 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8c09b2e7939824e408a91b99bdb58a8ceaa3c2d
-  data.tar.gz: 007311e989e00a18310408ef994b158133f4c730
+  metadata.gz: 472671d88cff5d0ba3919bc94641e730dde3a966
+  data.tar.gz: 1ed10f8288b908033b19fc228708c4af6fbe4e63
 SHA512:
-  metadata.gz: c6718440324ca8d12ea1d60c206c63e568d3c9cff2a468fbcef9dedcf883761793371cbae05cee0805f98278625ebcaa2a61b8805f7bcae81a9dfc3a679856a2
-  data.tar.gz: b254ce9cc76bb18f4ec5f4a8c9984a405631212176775f23bbf79230e5b5b28fd059591ea621df5e9c9c30e2a4d5d6019374ca5747569cba45db0bbdf8b0aed9
+  metadata.gz: 6dabf9970dd4f0f6fff2749807d41dace3603544ca76bc10a9ef3000d3f79a716a555716564f31f658176f1a2900e2040980d36e634d76863bae387a61719068
+  data.tar.gz: 12ba5c342ab4277a71a1a913b314941e2d4a73d93f46678e54367472ed1da5cf3a64ff3593b271576dc477654c72547c88694ae055bf4fb1cdd6a0bb24b6c1c8

data/bin/spotify_osx_controller

@@ -47,16 +47,27 @@ def global_cmds (opts)
 	end
 end
 
+def parse (array)
+	array.join('+') if array
+end
+
+
 
 cmd = ARGV.shift
 case cmd
 when "play"
 	cmd_opts = Trollop::options do
-		opt :track,  "Track to play", type: :strings, short: 't', default: []
-		opt :artist, "Artist to play", type: :strings, short: 'a', default: []
-		opt :album,  "Album to play", type: :strings, short: 'A', default: []
+		opt :track,  "Track to play", type: :strings, short: 't', default: nil
+		opt :artist, "Artist to play", type: :strings, short: 'a', default: nil
+		opt :album,  "Album to play", type: :strings, short: 'A', default: nil
 	end
-	SpotifyOsxController.play track: cmd_opts[:track], artist: cmd_opts[:artist], album: cmd_opts[:album]
+
+	params = Hash.new
+	params[:track] = parse(cmd_opts[:track]) if cmd_opts[:track]
+	params[:artist] = parse(cmd_opts[:artist]) if cmd_opts[:artist]
+	params[:album] = parse(cmd_opts[:album]) if cmd_opts[:album]
+	
+	SpotifyOsxController.play params
 when "play-pause"	
 	SpotifyOsxController.play_pause
 when "stop"

data/lib/spotify_osx_controller/search.rb

@@ -5,9 +5,9 @@ module SpotifyOsxController
 	class Search
 
 		def initialize (parameters = {})
-			@track = parse parameters[:track]
-			@artist = parse parameters[:artist]
-			@album = parse parameters[:album]
+			@track = parameters[:track]
+			@artist = parameters[:artist]
+			@album = parameters[:album]
 			@query = construct_query
 			@results = run_query
 		end
@@ -23,22 +23,18 @@ module SpotifyOsxController
 		private 
 
 		def run_query ()
-			if @track.empty? 
+			if !@track
 				RSpotify::Album.search @query
 			else
 				RSpotify::Track.search @query
 			end		 
 		end
 
-		def parse (array)
-			array.join('+') if array
-		end
-
 		def construct_query
 			query = ""
-			query += "artist:#{@artist} " if !@artist.empty? 
-			query += "track:#{@track} " if !@track.empty?
-			query += "album:#{@album}" if !@album.empty?
+			query += "artist:#{@artist} " if @artist
+			query += "track:#{@track} " if @track
+			query += "album:#{@album}" if @album
 			query
 		end
 	end

data/lib/spotify_osx_controller/version.rb

@@ -1,3 +1,3 @@
 module SpotifyOsxController
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/lib/spotify_osx_controller.rb

@@ -4,10 +4,11 @@ require "spotify_osx_controller/search.rb"
 module SpotifyOsxController
 
 		def self.play(parameters = {})
-			if !parameters.values.all? &:empty?
+			if !parameters.empty?
 				search = Search.new(parameters)
 
 				if search.any?
+					puts search.first
 					uri = search.first.uri
 					buildScript  "tell application \"Spotify\" to play track \"#{uri}\"\n"
 				else 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotify_osx_controller
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Daniel Swensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop