From 3cec047f8a74ea329feb42cf09e97ee24a6ddfce Mon Sep 17 00:00:00 2001
From: Dan Barber <hello@danbarber.me>
Date: Fri, 22 Aug 2014 13:52:28 +0100
Subject: [PATCH] Update ruby and add Spotify gems.

---
 .ruby-version |   2 +-
 Gemfile       |  10 ++---
 Gemfile.lock  | 111 +++++++++++++++++++++++++++++---------------------
 3 files changed, 69 insertions(+), 54 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 7fa1d1e..eca07e4 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.0.0-p353
+2.1.2
diff --git a/Gemfile b/Gemfile
index efa9731..c27482d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,16 +1,14 @@
 source 'https://rubygems.org'
 
-ruby '2.0.0'
-
-# todo: get everything working before going whole hog with the gem
-# gemspec
+ruby '2.1.2'
 
 gem 'sinatra'
 gem 'sinatra-contrib'
 gem 'sinatra-asset-pipeline'
 gem 'foreman'
-gem 'ruby-mpd', git: 'git@github.com:archSeer/ruby-mpd.git'
-gem 'active_support', require: false
+gem 'spotify'
+gem 'plaything'
+gem 'activesupport', require: false
 
 group :development, :test do
   gem 'pry'
diff --git a/Gemfile.lock b/Gemfile.lock
index 60f4697..69f6f1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,65 +1,75 @@
-GIT
-  remote: git@github.com:archSeer/ruby-mpd.git
-  revision: 14ad532729529f22a852f747d379c2fa90eacda2
-  specs:
-    ruby-mpd (0.3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    active_support (3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
-    backports (3.3.5)
-    coderay (1.0.9)
-    coffee-script (2.2.0)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    backports (3.6.0)
+    coderay (1.1.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.1)
     daemons (1.1.9)
-    diff-lcs (1.2.4)
-    dotenv (0.9.0)
+    diff-lcs (1.2.5)
+    dotenv (0.11.1)
+      dotenv-deployment (~> 0.0.2)
+    dotenv-deployment (0.0.2)
     eventmachine (1.0.3)
-    execjs (2.0.2)
-    foreman (0.63.0)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
+    execjs (2.2.1)
+    ffi (1.9.3)
+    foreman (0.74.0)
+      dotenv (~> 0.11.1)
+      thor (~> 0.19.1)
     hike (1.2.3)
-    jasmine (2.0.0)
+    i18n (0.6.11)
+    jasmine (2.0.2)
       jasmine-core (~> 2.0.0)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.0.0)
+    jasmine-core (2.0.1)
+    json (1.8.1)
+    libspotify (12.1.51.4)
     method_source (0.8.2)
-    multi_json (1.8.2)
-    phantomjs (1.9.7.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    minitest (5.4.0)
+    multi_json (1.10.1)
+    phantomjs (1.9.7.1)
+    plaything (1.1.1)
+      ffi (~> 1.1)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-protection (1.5.1)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.6)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    sass (3.2.12)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    sass (3.4.0)
     shotgun (0.9)
       rack (>= 1.0)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sinatra-asset-pipeline (0.3.3)
+    sinatra-asset-pipeline (0.4.0)
       coffee-script
       rake
       sass
@@ -67,44 +77,51 @@ GEM
       sprockets
       sprockets-helpers
       sprockets-sass
-    sinatra-contrib (1.4.1)
+    sinatra-contrib (1.4.2)
       backports (>= 2.0)
       multi_json
       rack-protection
       rack-test
       sinatra (~> 1.4.0)
       tilt (~> 1.3)
-    slop (3.4.6)
-    sprockets (2.10.1)
+    slop (3.6.0)
+    spotify (12.5.3)
+      ffi (~> 1.0, >= 1.0.11)
+      libspotify (~> 12.1.51)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.0.2)
+    sprockets-sass (1.2.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    thin (1.6.1)
+    thin (1.6.2)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    thor (0.18.1)
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_support
+  activesupport
   foreman
   jasmine
+  plaything
   pry
   rspec
   rspec-mocks
-  ruby-mpd!
   shotgun
   sinatra
   sinatra-asset-pipeline
   sinatra-contrib
+  spotify
   thin