spotify-to-mp3 0.6.1 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3e09cd40e8d3fd9fa8a9005348f187a7f301f613
+  data.tar.gz: 48170d9318b1a5bdb7b76abeb449cf6d97a523a6
+SHA512:
+  metadata.gz: 7c07693aa826b648138bfdd7a6e0e1702f5c57844e19435c70768278850b3cae235c9e8e707d8425aa312a367b0b462ec25bea1cdb95a1c9a36d2db605d37a1e
+  data.tar.gz: 237746ec5370e849a32020cb0a55135f02b51f9425b024c52311049c88ede37b7e8d9ae7c27364371aa6aa550bd9955d0fc0b40cddfd3f2f21a71e1c57c19973

data/Gemfile.lock

@@ -1,28 +1,60 @@
 PATH
   remote: .
   specs:
-    spotify-to-mp3 (0.6.0)
+    spotify-to-mp3 (0.6.1)
       colorize
       grooveshark
       json_pure
       rest-client
+      rspotify
+      ruby-progressbar
 
 GEM
   remote: https://rubygems.org/
   specs:
-    colorize (0.7.2)
+    coderay (1.1.0)
+    colorize (0.7.5)
     diff-lcs (1.2.5)
-    grooveshark (0.2.11)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    grooveshark (0.2.12)
       json (>= 1.4.6)
       rest-client (>= 1.5.1)
       uuid (~> 2.0)
-    json (1.8.1)
-    json_pure (1.8.1)
+    hashie (3.3.2)
+    json (1.8.2)
+    json_pure (1.8.2)
+    jwt (1.2.0)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
-    mime-types (2.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    method_source (0.8.2)
+    mime-types (2.4.3)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    netrc (0.10.2)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
+      rack (~> 1.0)
+    omniauth-oauth2 (1.2.0)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.0)
+    rest-client (1.7.2)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -31,6 +63,11 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    rspotify (1.11.0)
+      omniauth-oauth2 (~> 1.1)
+      rest-client (~> 1.7)
+    ruby-progressbar (1.7.1)
+    slop (3.6.0)
     systemu (2.6.4)
     uuid (2.3.7)
       macaddr (~> 1.0)
@@ -39,5 +76,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  pry
   rspec
   spotify-to-mp3!

data/README.md

@@ -1,6 +1,17 @@
 # Spotify to MP3
 
-A simple command line utility to download MP3 files of Spotify tracks
+A simple command line utility to download MP3 files of Spotify tracks. *Note those files are downloaded from Grooveshark, not from Spotify itself.*
+
+---
+
+**THIS PROJECT IS IN MAINTENANCE MODE**
+
+Time is finite and these days I'm focusing on other projects. Hope you understand.
+
+- I'll keep working on the occasional bug fixing and making sure it still works on the supported platforms.
+- Most probably I won't add any new feature. [Feature requests](https://github.com/frosas/spotify-to-mp3/labels/Feature) will be kept open in case somebody wants to contribute with a pull request.
+
+---
 
 ## Installation
 
@@ -58,6 +69,13 @@ and drag the songs from the Spotify app to the terminal.
 
 ## Changelog
 
+2015-01-25
+
+- Accept album URI's
+- Download progress bar
+
+A big thanks to @dulakm for such great contributions!
+
 2014-05-05
 
 - Accept track IDs from stdin
@@ -78,7 +96,18 @@ and drag the songs from the Spotify app to the terminal.
 
 - Both Spotify URLs and plain song names are accepted
 
-## Testing
+## Development
+
+Install Ruby.
+
+```bash
+$ gem install bundler
+$ bundle install
+```
+
+Do some coding.
+
+Run the tests:
 
 ```bash
 $ rspec

data/lib/spotify_to_mp3/app.rb

@@ -1,39 +1,82 @@
-require 'colorize'
 require 'fileutils'
-require 'spotify_to_mp3/app/stream_track_ids'
+require 'spotify_to_mp3/app/stream_queries'
+require 'spotify_to_mp3/app/download_progress_bar'
 
 module SpotifyToMp3
   class App
-    def initialize(track_id_resolver, grooveshark)
-      @track_id_resolver = track_id_resolver
+    def initialize(query_resolver, grooveshark, logger)
+      @query_resolver = query_resolver
       @grooveshark = grooveshark
+      @logger = logger
     end
 
     def run
-      StreamTrackIds.new(ARGF).each do |track_id|
-        begin
-          puts "Resolving \"#{track_id}\""
-          track = @track_id_resolver.resolve(track_id)
+      tracks_to_download = []
+
+      StreamQueries.new(ARGF).each do |query|
+        @logger.info "Resolving \"#{query}\""
+        tracks = @query_resolver.resolve(query)
 
-          puts "Searching \"#{track}\" on Grooveshark"
-          grooveshark_track = @grooveshark.get_track(track.grooveshark_query)
+        tracks.each do |track|
+          begin
+            @logger.info "Searching \"#{track}\" on Grooveshark"
+            grooveshark_track = @grooveshark.get_track(track.grooveshark_query)
 
-          if File.exists?(grooveshark_track.filename)
-            # To know about songs no longer in download list
-            FileUtils.touch grooveshark_track.filename
+            if File.exists?(grooveshark_track.filename)
+              # To know about songs no longer in download list
+              FileUtils.touch grooveshark_track.filename
 
-            puts "Skipping \"#{grooveshark_track}\", it already exists"
-          else
-            puts "Downloading \"#{grooveshark_track}\""
-            @grooveshark.download(grooveshark_track)
+              @logger.info "Skipping \"#{grooveshark_track}\", it already exists"
+            else
+              @logger.info "\"#{grooveshark_track}\" will be downloaded"
+              tracks_to_download << grooveshark_track
+            end
+          rescue Exception => exception # For some reason without the "Exception" it is ignored
+            @logger.error "\"#{track}\" won't be downloaded - #{exception.message}"
+            # Continue with the next track
           end
-        rescue Exception => exception # For some reason without the "Exception" it is ignored
-          puts exception.message.red
-          # Continue with the next track
         end
       end
+      
+      @logger.info("\n")
+
+      download tracks_to_download
     rescue
-      puts "#{$!}".red
+      @logger.error "#{$!}"
     end
+    
+    private
+    
+    def download(tracks)
+      if tracks.empty?
+        @logger.info "Nothing to download"
+        return
+      end
+      
+      @logger.info "Downloading tracks..."
+      tracks.each_with_index do |track, i|
+        begin
+          progress_bar = nil
+          @grooveshark.download(
+            track: track,
+            on_response: Proc.new { |response|
+              progress_bar = DownloadProgressBar.new(
+                track: track,
+                track_number: i.next,
+                track_size: response['content-length'].to_i,
+                total_tracks: tracks.length
+              )                
+            },
+            on_body_chunk: Proc.new { |chunk|
+              progress_bar.progress += chunk.length
+            }
+          )
+          progress_bar.finish
+        rescue Exception => exception
+          @logger.error exception.message
+        end
+      end
+      @logger.success "Download complete"
+    end      
   end
 end

data/lib/spotify_to_mp3/app/download_progress_bar.rb

@@ -0,0 +1,34 @@
+require 'ruby-progressbar'
+require 'forwardable'
+
+module SpotifyToMp3
+  class App
+    class DownloadProgressBar
+      extend Forwardable
+      
+      def_delegators :@progress_bar, :progress, :progress=, :finish
+      
+      def initialize(options)
+        track = options.fetch(:track)
+        track_number = options.fetch(:track_number)
+        track_size = options.fetch(:track_size)
+        total_tracks = options.fetch(:total_tracks)
+        
+        @progress_bar = ProgressBar.create(
+          title: cut_title("[#{track_number}/#{total_tracks}] #{track}"),
+          total: track_size,
+          format: "%t %p%% [%B] %E"
+        )
+      end
+      
+      private
+      
+      def cut_title(title)
+        win_half = $stdout.winsize[1] / 2
+        cut_title = title[0..win_half.pred].ljust win_half
+        cut_title.gsub(/.{3}$/, '...') if title.length > win_half
+        cut_title
+      end
+    end
+  end
+end

data/lib/spotify_to_mp3/app/{stream_track_ids.rb → stream_queries.rb}

@@ -1,6 +1,6 @@
 module SpotifyToMp3
   class App
-    class StreamTrackIds
+    class StreamQueries
       include Enumerable
 
       def initialize(stream)
@@ -8,10 +8,10 @@ module SpotifyToMp3
       end
 
       def each
-        @stream.each do |track_id|
-          track_id.strip!
-          next if track_id.empty?
-          yield track_id
+        @stream.each do |query|
+          query.strip!
+          next if query.empty?
+          yield query
         end
       end
     end

data/lib/spotify_to_mp3/dependency_container.rb

@@ -2,20 +2,26 @@ require 'grooveshark'
 require 'spotify_to_mp3/app'
 require 'spotify_to_mp3/grooveshark'
 require 'spotify_to_mp3/spotify'
-require 'spotify_to_mp3/track_id_resolver'
+require 'spotify_to_mp3/query_resolver'
+require 'spotify_to_mp3/logger'
 
 module SpotifyToMp3
   class DependencyContainer
-    def track_id_resolver
-      @track_id_resolver ||= TrackIdResolver.new(Spotify.new)
+    def query_resolver
+      @query_resolver ||= QueryResolver.new(Spotify.new)
     end
 
     def grooveshark
       @grooveshark ||= Grooveshark.new(::Grooveshark::Client.new)
     end
 
+    def logger
+      @logger ||= Logger.new($stdout)
+    end
+
     def app
-      @app ||= App.new(track_id_resolver, grooveshark)
+      @app ||= App.new(query_resolver, grooveshark, logger)
     end
+
   end
 end

data/lib/spotify_to_mp3/grooveshark.rb

@@ -1,5 +1,4 @@
-require 'fileutils'
-require 'rest-client'
+require 'net/http'
 require 'spotify_to_mp3/grooveshark/track'
 
 module SpotifyToMp3
@@ -13,10 +12,23 @@ module SpotifyToMp3
       Track.new(client_track)
     end
 
-    def download(track)
-      url = @client.get_song_url(track.client_track)
-      file = RestClient::Request.execute(:method => :post, :url => url, :raw_response => true).file
-      FileUtils.mv(file.path, track.filename)
+    def download(options)
+      track = options.fetch(:track)
+      on_response = options.fetch(:on_response)
+      on_body_chunk = options.fetch(:on_body_chunk)
+      
+      url = URI(@client.get_song_url(track.client_track))
+      Net::HTTP.start(url.host) do |http|
+        http.request_post("#{url.path}?#{url.query}", "") do |response|
+          on_response.call(response)
+          File.open(track.filename, 'w') do |f|
+            response.read_body do |chunk|
+              on_body_chunk.call(chunk)
+              f.write(chunk)
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/spotify_to_mp3/logger.rb

@@ -0,0 +1,31 @@
+require 'colorize'
+
+module SpotifyToMp3
+  class Logger
+    def initialize(io_stream)
+      @io_stream = io_stream
+    end
+
+    def info(str)
+      @io_stream.puts str
+    end
+
+    def success(str)
+      @io_stream.puts colorize_success(str)
+    end
+
+    def error(str)
+      @io_stream.puts colorize_error(str)
+    end
+
+    private
+
+    def colorize_success(str)
+      str.green
+    end
+
+    def colorize_error(str)
+      str.red
+    end
+  end
+end

data/lib/spotify_to_mp3/query_resolver.rb

@@ -0,0 +1,38 @@
+require 'spotify_to_mp3/track'
+
+module SpotifyToMp3
+  class QueryResolver
+    def initialize(spotify)
+      @spotify = spotify
+    end
+
+    def resolve(query)
+      tracks = []
+
+      if @spotify.track_uri?(query)
+        spotify_track = @spotify.get_track(query)
+        tracks << convert_spotify_track(spotify_track)
+      elsif @spotify.album_uri?(query)
+        spotify_album = @spotify.get_album(query)
+        spotify_album.tracks.each { |track| tracks << convert_spotify_track(track) }
+      else
+        tracks << resolve_plain_track(query)
+      end
+
+      tracks
+    end
+    
+    private
+
+    def convert_spotify_track(track)
+      description = "#{track.artist} - #{track.name}"
+      grooveshark_query = "artist:\"#{track.artist}\" title:\"#{track.name}\""
+
+      Track.new(description, grooveshark_query)
+    end
+
+    def resolve_plain_track(description)
+      Track.new(description)
+    end
+  end
+end

data/lib/spotify_to_mp3/spotify.rb

@@ -1,17 +1,41 @@
-require 'cgi'
-require 'open-uri'
+require 'rspotify'
 require 'spotify_to_mp3/spotify/track'
+require 'spotify_to_mp3/spotify/album'
 
 module SpotifyToMp3
   class Spotify
     def get_track(uri)
-      content = open('http://ws.spotify.com/lookup/1/.json?uri=' + CGI.escape(uri))
-      json = JSON.parse(content.string)
-      Track.new(json)
+      track_id = parse_id(uri)
+      track = RSpotify::Track.find(track_id)
+      Track.new(track.artists.first.name, track.name)
     end
 
-    def resolvable_uri?(uri)
+    def get_album(uri)
+      album_id = parse_id(uri)
+      album = RSpotify::Album.find(album_id)
+
+      tracks = []
+      album.tracks.each do |track|
+        tracks << Track.new(album.artists.first.name, track.name)
+      end
+
+      Album.new(album.artists.first.name, album.name, tracks)
+    end
+
+    def track_uri?(uri)
       uri.start_with?('http://open.spotify.com/track/', 'spotify:track:')
     end
+
+    def album_uri?(uri)
+      uri.start_with?('http://open.spotify.com/album/', 'spotify:album:')
+    end
+
+    private
+
+    def parse_id(uri)
+      id = uri.sub(/.*:/, '')
+      id = id.sub(/.*\//, '') if uri.start_with?('http')
+      id
+    end
   end
 end

data/lib/spotify_to_mp3/spotify/album.rb

@@ -0,0 +1,13 @@
+module SpotifyToMp3
+  class Spotify
+    class Album
+      attr_reader :artist, :name, :tracks
+
+      def initialize(artist, name, tracks)
+        @artist = artist
+        @name = name
+        @tracks = tracks
+      end
+    end
+  end
+end

data/lib/spotify_to_mp3/spotify/track.rb

@@ -1,11 +1,11 @@
 module SpotifyToMp3
   class Spotify
     class Track
-      attr_reader :name, :artist
+      attr_reader :artist, :name
 
-      def initialize(json)
-        @name = json['track']['name']
-        @artist = json['track']['artists'].first['name']
+      def initialize(artist, name)
+        @artist = artist
+        @name = name
       end
     end
   end

data/spec/app/{file_track_ids_spec.rb → stream_queries_spec.rb}

@@ -1,8 +1,8 @@
-require 'spotify_to_mp3/app/file_track_ids'
+require 'spotify_to_mp3/app/stream_queries'
 require 'tempfile'
 
 module SpotifyToMp3
-  describe App::FileTrackIds do
+  describe App::StreamQueries do
     it "reads lines" do
       open_test_file("1\n2\n3") do |ids|
         ids.count.should == 3
@@ -25,7 +25,7 @@ module SpotifyToMp3
       Tempfile.open('tracks') do |file|
         file.write(content)
         file.rewind
-        yield App::FileTrackIds.new(file)
+        yield App::StreamQueries.new(file)
       end
     end
   end

data/spec/logger_spec.rb

@@ -0,0 +1,27 @@
+require 'spotify_to_mp3/logger'
+
+describe SpotifyToMp3::Logger do
+  let(:io_stream) { double }
+  let(:logger) { described_class.new(io_stream) }
+
+  describe '#info' do
+    it 'prints message to stream' do
+      message = 'Hello world'
+
+      expect(io_stream).to receive(:puts).with(message)
+
+      logger.info message
+    end
+  end
+
+  describe '#error' do
+    it 'prints colorized message to stream'  do
+      message = 'Hello world'
+      colorized_message = "\e[0;31;49m#{message}\e[0m" # red
+
+      expect(io_stream).to receive(:puts).with(colorized_message)
+
+      logger.error message
+    end
+  end
+end

data/spec/query_resolver_spec.rb

@@ -0,0 +1,41 @@
+require 'spotify_to_mp3/dependency_container'
+
+module SpotifyToMp3
+  describe QueryResolver do
+    before(:each) do
+      @resolver = DependencyContainer.new.query_resolver
+    end
+
+    it "resolves Spotify track HTTP URLs" do
+      tracks = @resolver.resolve('http://open.spotify.com/track/0qgiFuYhYuwtFXEwYakddE')
+      tracks.length.should == 1
+      tracks.first.to_s.should == "Cake - I Will Survive"
+    end
+
+    it "resolves Spotify track URIs" do
+      tracks = @resolver.resolve('spotify:track:0qgiFuYhYuwtFXEwYakddE')
+      tracks.length.should == 1
+      tracks.first.to_s.should == "Cake - I Will Survive"
+    end
+
+    it "resolves Spotify album HTTP URLs" do
+      tracks = @resolver.resolve('http://open.spotify.com/album/7wq5vhqramVPzjArlmr70k')
+      tracks.length.should == 2
+      tracks[0].to_s.should == "Arctic Monkeys - Suck It and See"
+      tracks[1].to_s.should == "Arctic Monkeys - Evil Twin"
+    end
+
+    it "resolves Spotify album URIs" do
+      tracks = @resolver.resolve('spotify:album:7wq5vhqramVPzjArlmr70k')
+      tracks.length.should == 2
+      tracks[0].to_s.should == "Arctic Monkeys - Suck It and See"
+      tracks[1].to_s.should == "Arctic Monkeys - Evil Twin"
+    end
+
+    it "resolves track titles" do
+      tracks = @resolver.resolve('Cake - I Will Survive')
+      tracks.length.should == 1
+      tracks.first.to_s.should == "Cake - I Will Survive"
+    end
+  end
+end

data/spec/spotify_spec.rb

@@ -24,17 +24,51 @@ module SpotifyToMp3
       end
     end
 
-    context "#resolvable_uri?" do
+    context '#get_album' do
+      it "resolves HTTP URLs" do
+        album = @spotify.get_album('http://open.spotify.com/album/7wq5vhqramVPzjArlmr70k')
+        album.tracks.length.should == 2
+        album.name.should == "Suck It and See"
+        album.artist.should == "Arctic Monkeys"
+      end
+
+      it "resolves Spotify URIs" do
+        album = @spotify.get_album('spotify:album:7wq5vhqramVPzjArlmr70k')
+        album.tracks.length.should == 2
+        album.name.should == "Suck It and See"
+        album.artist.should == "Arctic Monkeys"
+      end
+
+      it "fails on nonexistent URI" do
+        expect { @spotify.get_album('spotify:album:not-found') }.to raise_error
+      end
+    end
+    
+    context "#track_uri?" do
+      it "accepts HTTP URLs" do
+        @spotify.track_uri?('http://open.spotify.com/track/0qgiFuYhYuwtFXEwYakddE').should be_true
+      end
+
+      it "accepts Spotify URIs" do
+        @spotify.track_uri?('spotify:track:0qgiFuYhYuwtFXEwYakddE').should be_true
+      end
+
+      it "refuses other URIs" do
+        @spotify.track_uri?('123').should be_false
+      end
+    end
+
+    context "#album_uri?" do
       it "accepts HTTP URLs" do
-        @spotify.resolvable_uri?('http://open.spotify.com/track/0qgiFuYhYuwtFXEwYakddE').should be_true
+        @spotify.album_uri?('http://open.spotify.com/album/7wq5vhqramVPzjArlmr70k').should be_true
       end
 
       it "accepts Spotify URIs" do
-        @spotify.resolvable_uri?('spotify:track:0qgiFuYhYuwtFXEwYakddE').should be_true
+        @spotify.album_uri?('spotify:album:7wq5vhqramVPzjArlmr70k').should be_true
       end
 
       it "refuses other URIs" do
-        @spotify.resolvable_uri?('123').should be_false
+        @spotify.album_uri?('123').should be_false
       end
     end
   end

data/spotify-to-mp3.gemspec

@@ -2,17 +2,20 @@ Gem::Specification.new do |gem|
   gem.name = 'spotify-to-mp3'
   gem.summary = 'Spotify to MP3'
   gem.description = 'Download MP3 files of your Spotify tracks from Grooveshark'
-  gem.version = '0.6.1'
+  gem.version = '0.7.0'
   gem.author = 'Francesc Rosàs'
   gem.email = 'francescrosasbosque@gmail.com'
   gem.homepage = 'https://github.com/frosas/spotify-to-mp3'
 
+  gem.add_runtime_dependency 'rspotify'
   gem.add_runtime_dependency 'grooveshark'
   gem.add_runtime_dependency 'colorize'
   gem.add_runtime_dependency 'rest-client'
   gem.add_runtime_dependency 'json_pure'
+  gem.add_runtime_dependency 'ruby-progressbar'
 
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'pry'
 
   gem.files = `git ls-files`.split("\n")
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,94 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: spotify-to-mp3
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Francesc Rosàs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspotify
+  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: grooveshark
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Download MP3 files of your Spotify tracks from Grooveshark
@@ -98,48 +129,51 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .rspec
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - bin/spotify-to-mp3
 - lib/spotify_to_mp3/app.rb
-- lib/spotify_to_mp3/app/stream_track_ids.rb
+- lib/spotify_to_mp3/app/download_progress_bar.rb
+- lib/spotify_to_mp3/app/stream_queries.rb
 - lib/spotify_to_mp3/dependency_container.rb
 - lib/spotify_to_mp3/grooveshark.rb
 - lib/spotify_to_mp3/grooveshark/track.rb
+- lib/spotify_to_mp3/logger.rb
+- lib/spotify_to_mp3/query_resolver.rb
 - lib/spotify_to_mp3/spotify.rb
+- lib/spotify_to_mp3/spotify/album.rb
 - lib/spotify_to_mp3/spotify/track.rb
 - lib/spotify_to_mp3/track.rb
-- lib/spotify_to_mp3/track_id_resolver.rb
-- spec/app/file_track_ids_spec.rb
+- spec/app/stream_queries_spec.rb
 - spec/grooveshark_spec.rb
+- spec/logger_spec.rb
+- spec/query_resolver_spec.rb
 - spec/spotify_spec.rb
-- spec/track_id_resolver_spec.rb
 - spotify-to-mp3.gemspec
 homepage: https://github.com/frosas/spotify-to-mp3
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Spotify to MP3
 test_files: []

data/lib/spotify_to_mp3/track_id_resolver.rb

@@ -1,28 +0,0 @@
-require 'spotify_to_mp3/track'
-
-module SpotifyToMp3
-  class TrackIdResolver
-    def initialize(spotify)
-      @spotify = spotify
-    end
-
-    def resolve(track_id)
-      resolve_spotify_track(track_id) || resolve_plain_track(track_id)
-    end
-
-    private
-
-    def resolve_spotify_track(id)
-      if @spotify.resolvable_uri?(id)
-        spotify_track = @spotify.get_track(id)
-        description = "#{spotify_track.artist} - #{spotify_track.name}"
-        grooveshark_query = "artist:\"#{spotify_track.artist}\" title:\"#{spotify_track.name}\""
-        Track.new(description, grooveshark_query)
-      end
-    end
-
-    def resolve_plain_track(id)
-      Track.new(id)
-    end
-  end
-end

data/spec/track_id_resolver_spec.rb

@@ -1,24 +0,0 @@
-require 'spotify_to_mp3/dependency_container'
-
-module SpotifyToMp3
-  describe TrackIdResolver do
-    before(:each) do
-      @resolver = DependencyContainer.new.track_id_resolver
-    end
-
-    it "resolves Spotify HTTP URLs" do
-      track = @resolver.resolve('http://open.spotify.com/track/0qgiFuYhYuwtFXEwYakddE')
-      track.to_s.should == "Cake - I Will Survive"
-    end
-
-    it "resolves Spotify URIs" do
-      track = @resolver.resolve('spotify:track:0qgiFuYhYuwtFXEwYakddE')
-      track.to_s.should == "Cake - I Will Survive"
-    end
-
-    it "resolves track titles" do
-      track = @resolver.resolve('Cake - I Will Survive')
-      track.to_s.should == "Cake - I Will Survive"
-    end
-  end
-end