spotify_osx_controller 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a0952ea1a29701c386ce144c4f5913a9eccb455
-  data.tar.gz: 4ab0338761fd7482aa23f06ebf371a4ed82e0ac4
+  metadata.gz: 5382df5adfa86b5ad63d2b7be7c8a5f677290ada
+  data.tar.gz: f7d85d51e1cc85b777502fc491e19655a4077444
 SHA512:
-  metadata.gz: aa3f2947d98531495e70eee3c2cbd7e3c903c0b381ea38f92a4dd148788840a67b95e4d511c21e0647209f96bdb0f3c99b82959d97f834beb5686e7474861db0
-  data.tar.gz: f7d8a6ae7668bf2a9b5e6ae0f89570231c0d4986ca221aa804c6691820cd77303e1f40c104738b7181822b8d3a7def19735b873d5027e24c8bba54b9c56c1b36
+  metadata.gz: 8b2c4eafede4cfa62eda1d0737f9a8eb8cf8cd64d22b0e7d629b58e464fe03c6b9845914c6c29e4972284c970c82b1c1c0c3a861b69ea6d9709ae987674144ed
+  data.tar.gz: 1551684368962b225448391397fecd70023e1ffb743e57945c8af68ac2d35bed05f6d3c8ec967fe263ac808b645ab56c39ebad3699280720c47f63ec87bbeef5

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-*.gem
+*.gem
+.DS_Store

data/README.md

@@ -7,19 +7,20 @@ Apple script forked from: [dronir/SpotifyControl](https://github.com/dronir/Spot
 ## Command-line options
 
 ```
-  -p, --play <s>:       Start playback of the given track, where <s> is the spotify URI
-  -P, --play-pause:     Play/pause playback
-  -s, --stop:           Stop playback
-  -n, --next:           Play next track
-  -N, --previous:       Play previous track
-  -j, --jump <i>:       Jump to position given position of the current track, where <i> is track position in
-                       	seconds
-  -f, --forward <i>:    Jump <i> number of seconds ahead
-  -r, --rewind <i>:     Rewind <i> number of seconds backwards
-  -v, --volume <i>:     Set playback volume to <i>, where <i> is number between 0 and 100
-  -S, --shuffle:        Toggle shuffle
-  -R, --repeat:         Toggle repeat
-  -i, --info:           Display information about the current track
+spotify_osx_controller [options] play [--track=<name>][--artist=<name>][--album=<name>] Start playback
+spotify_osx_controller [options] play-pause 						Play/pause playback
+spotify_osx_controller [options] stop								Stop playback
+spotify_osx_controller [options] next								Play next track
+spotify_osx_controller [options] previous							Play previous track
+spotify_osx_controller [options] jump [--seconds=<seconds>]			Jump to <seconds> of current track
+spotify_osx_controller [options] forward [--seconds=<seconds>]		Jump <seconds> ahead
+spotify_osx_controller [options] rewind [--seconds=<seconds>]		Rewind <seconds> backwards
+
+	Where available [options] are the following:
+  -v, --volume=<i>    Set playback volume to <i>, where <i> is number between 0 and 100
+  -S, --shuffle       Toggle shuffle
+  -R, --repeat        Toggle repeat
+  -i, --info          Display information about the current track
 ```
 
 ## Installation

data/bin/spotify_osx_controller

@@ -3,56 +3,94 @@ require "spotify_osx_controller"
 require "trollop"
 
 
+SUB_COMMANDS = %w(play play-pause stop next previous jump forward rewind)
 opts = Trollop::options do
-  	banner <<-EOS
-OSX CLI for Spotify
+	banner <<-EOS
+	OSX CLI for Spotify
 
 Usage:
-	spotify_osx_controller [command]
-
-Where [command]	is one of the following:
-
-EOS
-	opt :play,            'Start playback of the given track, where <s> is the spotify URI',    							type: :string,  short: 'p', default: nil 
-	opt :play_pause,      'Play/pause playback',		  																	type: :boolean, short: 'P'
-	opt :stop,            'Stop playback'              
-	opt :next,            'Play next track'       	  
-	opt :previous,        'Play previous track',                                                                                            short: 'N'        
-	opt :jump, 			  'Jump to position given position of the current track, where <i> is track position in seconds', 	type: :integer
-	opt :forward,         'Jump <i> number of seconds ahead', 																type: :integer
-	opt :rewind,		  'Rewind <i> number of seconds backwards', 														type: :integer
+
+spotify_osx_controller [options] play [--track=<name>] [--artist=<name>] [--album=<name>] 		Start playback
+spotify_osx_controller [options] play-pause 								Play/pause playback
+spotify_osx_controller [options] stop									Stop playback
+spotify_osx_controller [options] next									Play next track
+spotify_osx_controller [options] previous								Play previous track
+spotify_osx_controller [options] jump [--seconds=<seconds>]						Jump to <seconds> of current track
+spotify_osx_controller [options] forward [--seconds=<seconds>]						Jump <seconds> ahead
+spotify_osx_controller [options] rewind [--seconds=<seconds>]						Rewind <seconds> backwards
+
+	Where available [options] are the following:
+
+	EOS
+                 
 	opt :volume,		  'Set playback volume to <i>, where <i> is number between 0 and 100', 								type: :integer
 	opt :shuffle, 		  'Toggle shuffle',			  																		type: :boolean, short: 'S'
 	opt :repeat,		  'Toggle repeat',				  																	type: :boolean, short: 'R'
-	opt :info,			  'Display information about the current track'
-	conflicts :play, :play_pause, :next, :previous, :jump, :forward, :rewind, :volume, :shuffle, :repeat, :info 
+	opt :info,			  'Display information about the current track',													type: :boolean, short: 'i'
+	stop_on SUB_COMMANDS 
 end
 
 
+def global_cmds (opts)
+	if opts[:volume]
+		Trollop::die :volume, "must be between 0 and 100" if opts[:volume] < 0 or opts[:volume] > 100 
+		SpotifyOsxController.volume opts[:volume]
+	end	
+	if opts[:shuffle]
+		SpotifyOsxController.shuffle
+	end
+	if opts[:repeat]
+		SpotifyOsxController.repeat
+	end
+	if opts[:info]
+		SpotifyOsxController.info
+	end
+end
+
 
-if 	opts[:play]	
-	SpotifyOsxController.play opts[:play]
-elsif opts[:play_pause]
+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: []
+	end
+	SpotifyOsxController.play track: cmd_opts[:track], artist: cmd_opts[:artist], album: cmd_opts[:album]
+when "play-pause"	
 	SpotifyOsxController.play_pause
-elsif opts[:stop]
+when "stop"
 	SpotifyOsxController.pause
-elsif opts[:next]
+when "next"
 	SpotifyOsxController.next
-elsif opts[:previous]
+when "previous"
 	SpotifyOsxController.previous
-elsif opts[:jump]
-	SpotifyOsxController.jump opts[:jump]
-elsif opts[:forward]
-	SpotifyOsxController.forward opts[:forward]
-elsif opts[:rewind]
-	SpotifyOsxController.rewind opts[:rewind]
-elsif opts[:volume]
-	Trollop::die :volume, "must be between 0 and 100" if opts[:volume] < 0 or opts[:volume] > 100 
-	SpotifyOsxController.volume opts[:volume]
-elsif opts[:shuffle]
-	SpotifyOsxController.shuffle
-elsif opts[:repeat]
-	SpotifyOsxController.repeat
-elsif opts[:info]
-	SpotifyOsxController.info
+when "jump"
+	cmd_opts = Trollop::options do
+		opt :seconds, "Position in seconds to start play from", type: :integer, short: 's', required: true
+	end
+	Trollop::die :seconds, "must be greater that 0" if cmd_opts[:seconds] < 0
+	SpotifyOsxController.jump cmd_opts[:seconds]
+when "forward"
+	cmd_opts = Trollop::options do
+		opt :seconds, "Number of seconds to jump ahead", type: :integer, short: 's', required: true
+	end
+
+	SpotifyOsxController.forward cmd_opts[:seconds]
+when "rewind"
+	cmd_opts = Trollop::options do
+		opt :seconds, "Number of seconds to rewind", type: :integer, short: 's', required: true
+	end
+
+	SpotifyOsxController.rewind cmd_opts[:seconds]
+
+when nil
+	global_cmds opts
+	run_global = true
+else
+	Trollop::die "unknown subcommand #{cmd.inspect}"
 end
+
+global_cmds opts if !run_global
+
+

data/lib/spotify_osx_controller/search.rb

@@ -0,0 +1,43 @@
+require "rspotify"
+
+module SpotifyOsxController
+
+	class Search
+
+		def initialize (parameters = {})
+			@track = parse parameters[:track]
+			@artist = parse parameters[:artist]
+			@album = parse parameters[:album]
+			@query = construct_query
+			@results = run_query
+		end
+
+		def any?
+			@results.any?
+		end
+
+		def first
+			@results.first
+		end
+
+		private 
+
+		def run_query () 
+			RSpotify::Track.search @query 
+		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
+		end
+	end
+
+
+end

data/lib/spotify_osx_controller/version.rb

@@ -1,3 +1,3 @@
 module SpotifyOsxController
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/spotify_osx_controller.rb

@@ -1,9 +1,18 @@
 require "spotify_osx_controller/version"
+require "spotify_osx_controller/search.rb"
 
 module SpotifyOsxController
-		def self.play(url)
-			if url
-				buildScript  "tell application \"Spotify\" to play track \"#{url}\"\n"
+
+		def self.play(parameters = {})
+			if !parameters.values.all? &:empty?
+				search = Search.new(parameters)
+
+				if search.any?
+					uri = search.first.uri
+					buildScript  "tell application \"Spotify\" to play track \"#{uri}\"\n"
+				else 
+					puts "Error: no results"
+				end
 			else 
 				buildScript "tell application \"Spotify\" to play\n"
 			end

data/spotify_osx_controller.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "trollop"
+  spec.add_dependency "rspotify", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotify_osx_controller
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Swensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspotify
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +82,7 @@ files:
 - Rakefile
 - bin/spotify_osx_controller
 - lib/spotify_osx_controller.rb
+- lib/spotify_osx_controller/search.rb
 - lib/spotify_osx_controller/version.rb
 - spotify_osx_controller.gemspec
 homepage: https://github.com/DanielSwensson/SpotifyControl