spotify_osx_controller 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b32ccb34db51d624be9e88475bddd73de2b2828
-  data.tar.gz: eeccdb9b9ec4f00192687af0f23113cd838d543a
+  metadata.gz: 67fcb17ea1040a5fbd1c0d1d9dc429d51d540fc8
+  data.tar.gz: 06bdda14f3c34bd949e1f5a4d86dfc573607a093
 SHA512:
-  metadata.gz: cc4648e297f4b1debbd3e31f6cf8c9c140cb67c562d2c4e8ecedd56242adbe76e11c4879a8e68df5aee5b5183c888477de3906e7b9ce949550f4398da0003799
-  data.tar.gz: f0f61b1b383c5afc8bb4721de53cb49f95d230489d718d0d4b19b0bdcdaaa62bce852f30a0830f4b3a2a7174c9c9aaedc7dfcecabff719565fde40aabc837574
+  metadata.gz: dddca84e7fe1e59972427c0e2221b29497e9e05c6eb7883ccf4f0f04fc2317c38b1559c010db2b1955426c74ea5447cd2a8d5707de3c96f7675ddbb159075d8a
+  data.tar.gz: b4f770a239ffcfba5ae8c2bbab315446f7a7728fdb31b863592913ed0f055d74f1612bb97b12c4fc55d11e901ae8c30bfdd5a99c83bc0e537373e10de21f5f94

data/.gitignore

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

data/README.md

@@ -1,8 +1,6 @@
 # SpotifyOsxController
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/spotify_osx_controller`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+CLI for Spotify running on OSX
 
 ## Installation
 
@@ -20,15 +18,6 @@ Or install it yourself as:
 
     $ gem install spotify_osx_controller
 
-## Usage
-
-TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/spotify_osx_controller/version.rb

@@ -1,3 +1,3 @@
 module SpotifyOsxController
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spotify_osx_controller.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "spotify_osx_controller"
   spec.version       = SpotifyOsxController::VERSION
   spec.authors       = ["Daniel Swensson"]
-  spec.email         = ["danielswensson@hotmail.com"]
+  spec.email         = ["daniel@danielswensson.se"]
   spec.licenses      = ['MIT']
 
   spec.summary       = %q{Ruby wrapper for Spotify applescript API}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotify_osx_controller
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Swensson
@@ -40,7 +40,7 @@ dependencies:
         version: '10.0'
 description: Control Spotify running on a Mac
 email:
-- danielswensson@hotmail.com
+- daniel@danielswensson.se
 executables:
 - console
 - setup
@@ -48,19 +48,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
-- SpotifyControl.rb
-- SpotifyControl.scpt
 - bin/console
 - bin/setup
 - bin/spotify_osx_controller
 - lib/spotify_osx_controller.rb
 - lib/spotify_osx_controller/version.rb
-- spotify_osx_controller-0.1.0.gem
 - spotify_osx_controller.gemspec
 homepage: https://github.com/DanielSwensson/SpotifyControl
 licenses:

data/SpotifyControl.rb

@@ -1,200 +0,0 @@
-#!/usr/bin/env ruby
-
-class Command 
-
-	def self.play(url)
-		if url
-			buildScript  "tell application \"Spotify\" to play track \"#{url}\"\n"
-		else 
-			buildScript "tell application \"Spotify\" to play\n"
-		end
-	end 
-
-	def self.play_pause
-		buildScript String <<-END 
-			tell application "Spotify" to playpause
-		END
-	end
-
-	def self.pause
-		buildScript "tell application \"Spotify\" to pause"
-	end
-
-	def self.next
-		buildScript "tell application \"Spotify\" to next track"
-	end
-
-	def self.previous 
-		buildScript "tell application \"Spotify\" to previous track"
-	end
-
-	def self.jump seconds
-		return if !seconds
-		buildScript String <<-END 
-			tell application "Spotify"
-				set jumpTo to #{seconds} as real
-				set tMax to duration of current track
-				if jumpTo > tMax
-					return "Can't jump past end of track."
-				else if jumpTo < 0
-					return "Can't jump past start of track."
-				end if
-				set nM to round (jumpTo / 60) rounding down
-				set nS to round (jumpTo mod 60) rounding down
-				set newTime to nM as text & "min " & nS as text & "s"
-				set player position to jumpTo
-				return "Jumped to " & newTime
-			end tell
-		END
-	end
-
-	def self.forward seconds
-		return if !seconds
-		buildScript String <<-END 
-			set jump to #{seconds} as real
-			tell application "Spotify"
-				set now to player position
-				set tMax to duration of current track
-				set jumpTo to now + jump
-				if jumpTo > tMax
-					return "Can't jump past end of track."
-				else if jumpTo < 0
-					set jumpTo to 0
-				end if
-				set nM to round (jumpTo / 60) rounding down
-				set nS to round (jumpTo mod 60) rounding down
-				set newTime to nM as text & "min " & nS as text & "s"
-				set player position to jumpTo
-				return "Jumped to " & newTime
-			end tell
-		END
-	end
-
-	def self.rewind seconds
-		return if !seconds
-		buildScript String <<-END 
-			set jump to #{seconds} as real
-			tell application "Spotify"
-				set now to player position
-				set tMax to duration of current track
-				set jumpTo to now - jump
-				if jumpTo > tMax
-					return "Can't jump past end of track."
-				else if jumpTo < 0
-					set jumpTo to 0
-				end if
-				set nM to round (jumpTo / 60) rounding down
-				set nS to round (jumpTo mod 60) rounding down
-				set newTime to nM as text & "min " & nS as text & "s"
-				set player position to jumpTo
-				return "Jumped to " & newTime
-			end tell
-		END
-	end
-
-	def self.volume volume
-		return if !volume
-		buildScript String <<-END 
-			set newVolume to #{volume} as real
-			if newVolume < 0 then set newVolume to 0
-			if newVolume > 100 then set newVolume to 100
-			tell application "Spotify"
-				set sound volume to newVolume
-			end tell
-			return "Changed volume to " & newVolume
-		END
-	end
-
-	def self.shuffle 
-		buildScript String <<-END 
-			tell application "Spotify"
-				set shuffling to not shuffling
-				return "Shuffle is now " & shuffling
-			end tell
-		END
-	end
-
-	def self.repeat 
-		buildScript String <<-END 
-			tell application "Spotify"
-				set repeating to not repeating
-				return "Repeat is now " & repeating
-			end tell
-		END
-	end
-
-	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 / 60) rounding down
-				set tS to duration of current track mod 60
-				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 player position
-				set info to "{"
-				set info to info & "\\"artist\\":   \\"" & myArtist & "\\","
-				set info to info & "\\"track\\":    \\"" & myTrack & "\\","
-				set info to info & "\\"album\\":    \\"" & myAlbum & "\\","
-				set info to info & "\\"URI\\":      \\"" & spotify url of current track & "\\","
-				set info to info & "\\"duration\\": \\"" & duration of current track & "\\","
-				set info to info & "\\"player\\":   \\"" & player state & "\\","
-				set info to info & "\\"position\\":   \\"" & nowAt & "\\""
-				set info to info & "}"
-			end tell
-			return info
-		END
-	end
-
-	private 
-
-	def self.buildScript(body) 
-		header = "using terms from application \"Spotify\""
-		footer = "end using terms from"
-		osascript <<-END
-			#{header} 
-				#{body}
-			#{footer} 
-		END
-	end
-
-	def self.osascript(script) 
-  		system 'osascript', *script.split(/\n/).map { |line| ['-e', line] }.flatten
-	end
-end
-
-command = ARGV[0]
-arg1 = ARGV[1]
-case command.downcase 
-	when 'play', 'start' 
-		Command.play arg1
-	when 'play/pause'
-		Command.play_pause
-	when 'pause', 'stop'
-		Command.pause
-	when 'next'
-		Command.next
-	when 'previous'
-		Command.previous
-	when 'jump'
-		Command.jump arg1
-	when 'forward'
-		Command.forward arg1
-	when 'rewind'
-		Command.rewind arg1
-	when 'volume'
-		Command.volume arg1
-	when 'shuffle'
-		Command.shuffle
-	when 'repeat'
-		Command.repeat
-	when 'info'
-		Command.info
-		exit
-end
-
-Command.info

data/SpotifyControl.scpt

@@ -1,157 +0,0 @@
-on run argv
-	if count of argv is equal to 0 then
-		set msg to "Use the following commands:\n"
-		set msg to msg & "  start, play [uri]  - Start playback / play uri\n"
-		set msg to msg & "  pause, stop        - Stop playback\n"
-		set msg to msg & "  play/pause         - Toggle playback\n"
-		set msg to msg & "  next               - Next track\n"
-		set msg to msg & "  previous, prev     - Previous track\n"
-		set msg to msg & "  info               - Print track info\n"
-		set msg to msg & "  jump N             - Jump to N seconds in the song\n"
-		set msg to msg & "  forward N          - Jump N seconds forwards\n"
-		set msg to msg & "  rewind N           - Jump N seconds backwards\n"
-		set msg to msg & "  shuffle            - Toggle shuffle\n"
-		set msg to msg & "  repeat             - Toggle repeat\n"
-		set msg to msg & "  volume N           - Set Volume to N (0...100)\n"
-		return msg
-	end if
-	set command to item 1 of argv
-	using terms from application "Spotify"
-		set info to "Error."
-		if command is equal to "play" or command is equal to "start" then
-			if count of argv is equal to 1 then
-				tell application "Spotify" to play
-			else
-				set uri to item 2 of argv
-				tell application "Spotify" to play track uri
-			end if	
-		else if command is equal to "play/pause" then
-			tell application "Spotify" to playpause
-			return "Toggled."
-			
-		else if command is equal to "pause" or command is equal to "stop" then
-			tell application "Spotify" to pause
-			return "Paused."
-			
-		else if command is equal to "next" then
-			tell application "Spotify" to next track
-
-		else if command is equal to "previous" or command is equal to "prev" then
-			tell application "Spotify" to previous track
-			
-		else if command is equal to "jump"
-			set jumpTo to item 2 of argv as real
-			tell application "Spotify"
-				set tMax to duration of current track
-				if jumpTo > tMax
-					return "Can't jump past end of track."
-				else if jumpTo < 0
-					return "Can't jump past start of track."
-				end if
-				set nM to round (jumpTo / 60) rounding down
-				set nS to round (jumpTo mod 60) rounding down
-				set newTime to nM as text & "min " & nS as text & "s"
-				set player position to jumpTo
-				return "Jumped to " & newTime
-			end tell
-			
-		else if command is equal to "forward"
-			set jump to item 2 of argv as real
-			tell application "Spotify"
-				set now to player position
-				set tMax to duration of current track
-				set jumpTo to now + jump
-				if jumpTo > tMax
-					return "Can't jump past end of track."
-				else if jumpTo < 0
-					set jumpTo to 0
-				end if
-				set nM to round (jumpTo / 60) rounding down
-				set nS to round (jumpTo mod 60) rounding down
-				set newTime to nM as text & "min " & nS as text & "s"
-				set player position to jumpTo
-				return "Jumped to " & newTime
-			end tell
-			
-		else if command is equal to "rewind"
-			set jump to item 2 of argv as real
-			tell application "Spotify"
-				set now to player position
-				set tMax to duration of current track
-				set jumpTo to now - jump
-				if jumpTo > tMax
-					return "Can't jump past end of track."
-				else if jumpTo < 0
-					set jumpTo to 0
-				end if
-				set nM to round (jumpTo / 60) rounding down
-				set nS to round (jumpTo mod 60) rounding down
-				set newTime to nM as text & "min " & nS as text & "s"
-				set player position to jumpTo
-				return "Jumped to " & newTime
-			end tell
-			
-		else if command is equal to "volume" then
-			set newVolume to item 2 of argv as real
-			if newVolume < 0 then set newVolume to 0
-			if newVolume > 100 then set newVolume to 100
-			tell application "Spotify"
-				set sound volume to newVolume
-			end tell
-			return "Changed volume to " & newVolume
-		
-		else if command is equal to "shuffle" then
-			tell application "Spotify"
-				set shuffling to not shuffling
-				return "Shuffle is now " & shuffling
-			end tell
-
-		else if command is equal to "repeat" then
-			tell application "Spotify"
-				set repeating to not repeating
-				return "Repeat is now " & repeating
-			end tell
-			
-		else if command is equal to "info" then
-			my getInfo()
-		end if
-		
-		tell application "Spotify"
-			if player state as text is equal to "playing"
-				my getInfo()
-			end if
-		end tell
-
-
-	end using terms from
-end run
-
-
-on getInfo()
-	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 / 60) rounding down
-		set tS to duration of current track mod 60
-		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 player position
-		set info to "{"
-		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 & " ("& duration of current track & " seconds)" & "\","
-		set info to info & "\n \"player\":   \"" & player state & "\""
-		set info to info & "\n \"position\":   \"" & nowAt & "\"\n"
-		set info to info & "}"
-	end tell
-	return info
-end getInfo
-
-
-
-