spotify_osx_controller 0.1.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89bb1950ecc832c36ca545debbf835d377107ead
-  data.tar.gz: 5d524d64520316e907f751a2d0645bbd9a6d7ade
+  metadata.gz: 3a0952ea1a29701c386ce144c4f5913a9eccb455
+  data.tar.gz: 4ab0338761fd7482aa23f06ebf371a4ed82e0ac4
 SHA512:
-  metadata.gz: 3c12423d950ceed93b214ee995c0ab1ee2d79523ba3bb8e52da59f0a05e8771af6b3cdf3a349148df32ff3b2c2667751927d7ef71b0ae6063dbafa493035efb3
-  data.tar.gz: 95f359599e19118973a569f737437b14592e749d81082a95c41f4d8963764668ac9ca612af46a96d9bbe73a697ea5391eaba8a4604f005e9ac33fac76ac89a59
+  metadata.gz: aa3f2947d98531495e70eee3c2cbd7e3c903c0b381ea38f92a4dd148788840a67b95e4d511c21e0647209f96bdb0f3c99b82959d97f834beb5686e7474861db0
+  data.tar.gz: f7d8a6ae7668bf2a9b5e6ae0f89570231c0d4986ca221aa804c6691820cd77303e1f40c104738b7181822b8d3a7def19735b873d5027e24c8bba54b9c56c1b36

data/README.md

@@ -4,6 +4,24 @@ CLI for Spotify running on OSX
 
 Apple script forked from: [dronir/SpotifyControl](https://github.com/dronir/SpotifyControl)
 
+## 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
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/bin/spotify_osx_controller

@@ -1,34 +1,58 @@
 #!/usr/bin/env ruby
 require "spotify_osx_controller"
+require "trollop"
 
-command = ARGV[0]
-arg1 = ARGV[1]
-case command.downcase 
-	when 'play', 'start' 
-		SpotifyOsxController.play arg1
-	when 'play/pause'
-		SpotifyOsxController.play_pause
-	when 'pause', 'stop'
-		SpotifyOsxController.pause
-	when 'next'
-		SpotifyOsxController.next
-	when 'previous'
-		SpotifyOsxController.previous
-	when 'jump'
-		SpotifyOsxController.jump arg1
-	when 'forward'
-		SpotifyOsxController.forward arg1
-	when 'rewind'
-		SpotifyOsxController.rewind arg1
-	when 'volume'
-		SpotifyOsxController.volume arg1
-	when 'shuffle'
-		SpotifyOsxController.shuffle
-	when 'repeat'
-		SpotifyOsxController.repeat
-	when 'info'
-		SpotifyOsxController.info
-		exit
+
+opts = Trollop::options do
+  	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
+	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 
 end
 
-SpotifyOsxController.info
+
+
+if 	opts[:play]	
+	SpotifyOsxController.play opts[:play]
+elsif opts[:play_pause]
+	SpotifyOsxController.play_pause
+elsif opts[:stop]
+	SpotifyOsxController.pause
+elsif opts[:next]
+	SpotifyOsxController.next
+elsif opts[: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
+end

data/lib/spotify_osx_controller/version.rb

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

data/lib/spotify_osx_controller.rb

@@ -126,7 +126,37 @@ module SpotifyOsxController
 			END
 		end
 
-		def self.info
+
+		def self.info 
+			buildScript String <<-END 
+				set info to "Error."
+				 tell application "Spotify"
+			        set myTrack to name of current track
+			        set myArtist to artist of current track
+			        set myAlbum to album of current track
+			        set tM to round ((duration of current track / 1000) / 60) rounding down
+			        set tS to round ((duration of current track / 1000) mod 60) rounding down
+			        set myTime to tM as text & "min " & tS as text & "s"
+			        set nM to round (player position / 60) rounding down
+			        set nS to round (player position mod 60) rounding down
+			        set nowAt to nM as text & "min " & nS as text & "s"
+			        set info to "Current track:"
+			        set info to info & "\n Artist:   " & myArtist
+			        set info to info & "\n Track:    " & myTrack
+			        set info to info & "\n Album:    " & myAlbum
+			        set info to info & "\n URI:      " & spotify url of current track
+			        set info to info & "\n Duration: " & mytime & " ("& (round ((duration of current track / 1000)) rounding down) & " seconds)"
+			        set info to info & "\n Now at:   " & nowAt
+			        set info to info & "\n Player:   " & player state
+			        set info to info & "\n Volume:   " & sound volume
+			        if shuffling then set info to info & "\n Shuffle is on."
+			        if repeating then set info to info & "\n Repeat is on."
+      			end tell
+				return info
+			END
+		end	
+
+		def self.info_json
 			buildScript String <<-END 
 				set info to "Error."
 				tell application "Spotify" 

data/spotify_osx_controller.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-
+  spec.add_dependency "trollop"
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
+
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spotify_osx_controller
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.0
 platform: ruby
 authors:
 - Daniel Swensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-02-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,8 +58,6 @@ description: |2
 email:
 - daniel@danielswensson.se
 executables:
-- console
-- setup
 - spotify_osx_controller
 extensions: []
 extra_rdoc_files: []
@@ -54,8 +66,6 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - bin/spotify_osx_controller
 - lib/spotify_osx_controller.rb
 - lib/spotify_osx_controller/version.rb

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "spotify_osx_controller"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here