spotify-to-mp3 0.5.4 → 0.6.0

data/README.md

@@ -4,7 +4,7 @@ A simple command line utility to download MP3 files of Spotify tracks
 
 ## Installation
 
-### Mac OS X (Snow Leopard & Lion)
+### Mac OS X
 
 ```bash
 $ sudo gem install spotify-to-mp3
@@ -12,7 +12,7 @@ $ sudo gem install spotify-to-mp3
 
 Probably `sudo` can be ommited if using [rvm](http://beginrescueend.com/) or similar.
 
-### Linux (Ubuntu 12.10 / 13.10)
+### Linux (Ubuntu)
 
 Make sure you have rubygems installed and configured:
 
@@ -21,37 +21,47 @@ $ sudo apt-get install rubygems1.9 ruby1.9.1-dev
 $ echo 'PATH=$PATH:/var/lib/gems/1.9/bin' | sudo tee /etc/profile.d/rubygems1.9.sh >/dev/null
 ```
 
-<span></span>
-
 ```bash
 $ sudo gem install spotify-to-mp3
 ```
 
-### Windows (not tested)
-
-[Install Ruby](http://rubyinstaller.org/)
-
-```
-gem install spotify-to-mp3
-```
-
 ## Usage
 
-1. Create a file (like `songs.txt`) and copy the Spotify songs URLs to it. Plain song names are also 
+1. Create a file (like `songs.txt`) and copy the Spotify songs URLs to it. Plain song names are also
    accepted. It will look like this:
 
-        http://open.spotify.com/track/1JqTcOjOn7gEpeC0JcRVPa
-        spotify:track:1fE3ddAlmjJ99IIfLgZjTy
-        The Drums - Money
+   ```
+   http://open.spotify.com/track/1JqTcOjOn7gEpeC0JcRVPa
+   spotify:track:1fE3ddAlmjJ99IIfLgZjTy
+   The Drums - Money
+   ```
 
 2. Download songs. They are saved to the current directory. Errors will appear in red (like when a song is not found).
 
-    ```bash
-    $ spotify-to-mp3 songs.txt
-    ```
+   ```bash
+   $ spotify-to-mp3 songs.txt
+   ```
+
+Also, as it's common in Unix programs, you can pipe in the songs:
+
+```bash
+$ echo white knuckle ride | spotify-to-mp3
+```
+
+or simply:
+
+```bash
+$ spotify-to-mp3
+```
+
+and drag the songs from the Spotify app to the terminal.
 
 ## Changelog
 
+2014-05-05
+
+- Accept track IDs from stdin
+
 2012-08-20
 
 - Set filename artist and title from Grooveshark

data/bin/spotify-to-mp3

@@ -2,6 +2,6 @@
 
 # To run it in development: bundle exec bin/spotify-to-mp3
 
-require 'spotify_to_mp3'
+require 'spotify_to_mp3/dependency_container'
 
-SpotifyToMp3::DependencyInjection.new.app.run
+SpotifyToMp3::DependencyContainer.new.app.run

data/lib/spotify_to_mp3/app.rb

@@ -1,3 +1,7 @@
+require 'colorize'
+require 'fileutils'
+require 'spotify_to_mp3/app/stream_track_ids'
+
 module SpotifyToMp3
   class App
     def initialize(track_id_resolver, grooveshark)
@@ -6,8 +10,7 @@ module SpotifyToMp3
     end
 
     def run
-      file = ARGV.first or raise "No songs file specified. Usage: #{$0} file"
-      FileTrackIds.new(file).each do |track_id|
+      StreamTrackIds.new(ARGF).each do |track_id|
         begin
           puts "Resolving \"#{track_id}\""
           track = @track_id_resolver.resolve(track_id)
@@ -18,7 +21,7 @@ module SpotifyToMp3
           print "Found \"#{grooveshark_track}\""
           if File.exists?(grooveshark_track.filename)
             # To know about songs no longer in download list
-            FileUtils.touch grooveshark_track.filename 
+            FileUtils.touch grooveshark_track.filename
 
             puts ", already exists, skipping"
           else

data/lib/spotify_to_mp3/app/stream_track_ids.rb

@@ -0,0 +1,19 @@
+module SpotifyToMp3
+  class App
+    class StreamTrackIds
+      include Enumerable
+
+      def initialize(stream)
+        @stream = stream
+      end
+
+      def each
+        @stream.each do |track_id|
+          track_id.strip!
+          next if track_id.empty?
+          yield track_id
+        end
+      end
+    end
+  end
+end

data/lib/spotify_to_mp3/{dependency_injection.rb → dependency_container.rb}

@@ -1,5 +1,11 @@
+require 'grooveshark'
+require 'spotify_to_mp3/app'
+require 'spotify_to_mp3/grooveshark'
+require 'spotify_to_mp3/spotify'
+require 'spotify_to_mp3/track_id_resolver'
+
 module SpotifyToMp3
-  class DependencyInjection
+  class DependencyContainer
     def track_id_resolver
       @track_id_resolver ||= TrackIdResolver.new(Spotify.new)
     end

data/lib/spotify_to_mp3/grooveshark.rb

@@ -1,3 +1,7 @@
+require 'fileutils'
+require 'rest-client'
+require 'spotify_to_mp3/grooveshark/track'
+
 module SpotifyToMp3
   class Grooveshark
     def initialize(client)

data/lib/spotify_to_mp3/spotify.rb

@@ -1,3 +1,7 @@
+require 'cgi'
+require 'open-uri'
+require 'spotify_to_mp3/spotify/track'
+
 module SpotifyToMp3
   class Spotify
     def get_track(uri)

data/lib/spotify_to_mp3/track_id_resolver.rb

@@ -1,3 +1,5 @@
+require 'spotify_to_mp3/track'
+
 module SpotifyToMp3
   class TrackIdResolver
     def initialize(spotify)

data/spec/app/file_track_ids_spec.rb

@@ -1,4 +1,4 @@
-require 'spotify_to_mp3'
+require 'spotify_to_mp3/app/file_track_ids'
 require 'tempfile'
 
 module SpotifyToMp3

data/spec/grooveshark_spec.rb

@@ -1,10 +1,10 @@
-require 'spotify_to_mp3'
+require 'spotify_to_mp3/dependency_container'
 
 module SpotifyToMp3
   describe Grooveshark do
     context "#get_track" do
       before(:each) do
-        @grooveshark = DependencyInjection.new.grooveshark
+        @grooveshark = DependencyContainer.new.grooveshark
       end
 
       it "finds by plain query" do

data/spec/spotify_spec.rb

@@ -1,4 +1,4 @@
-require 'spotify_to_mp3'
+require 'spotify_to_mp3/spotify'
 
 module SpotifyToMp3
   describe Spotify do

data/spec/track_id_resolver_spec.rb

@@ -1,9 +1,9 @@
-require 'spotify_to_mp3'
+require 'spotify_to_mp3/dependency_container'
 
 module SpotifyToMp3
   describe TrackIdResolver do
     before(:each) do
-      @resolver = DependencyInjection.new.track_id_resolver
+      @resolver = DependencyContainer.new.track_id_resolver
     end
 
     it "resolves Spotify HTTP URLs" do

data/spotify-to-mp3.gemspec

@@ -2,7 +2,7 @@ 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.5.4'
+  gem.version = '0.6.0'
   gem.author = 'Francesc Rosàs'
   gem.email = 'francescrosasbosque@gmail.com'
   gem.homepage = 'https://github.com/frosas/spotify-to-mp3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotify-to-mp3
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grooveshark
@@ -104,10 +104,9 @@ files:
 - LICENSE
 - README.md
 - bin/spotify-to-mp3
-- lib/spotify_to_mp3.rb
 - lib/spotify_to_mp3/app.rb
-- lib/spotify_to_mp3/app/file_track_ids.rb
-- lib/spotify_to_mp3/dependency_injection.rb
+- lib/spotify_to_mp3/app/stream_track_ids.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/spotify.rb

data/lib/spotify_to_mp3.rb

@@ -1,16 +0,0 @@
-require 'grooveshark'
-require 'open-uri'
-require 'colorize'
-require 'rest-client'
-require 'fileutils'
-require 'cgi'
-
-require 'spotify_to_mp3/app'
-require 'spotify_to_mp3/app/file_track_ids'
-require 'spotify_to_mp3/dependency_injection'
-require 'spotify_to_mp3/spotify'
-require 'spotify_to_mp3/spotify/track'
-require 'spotify_to_mp3/track_id_resolver'
-require 'spotify_to_mp3/track'
-require 'spotify_to_mp3/grooveshark'
-require 'spotify_to_mp3/grooveshark/track'

data/lib/spotify_to_mp3/app/file_track_ids.rb

@@ -1,21 +0,0 @@
-module SpotifyToMp3
-  class App
-    class FileTrackIds
-      include Enumerable
-
-      def initialize(file)
-        @file = file
-      end
-
-      def each
-        File.open(@file) do |file|
-          file.each do |track_id|
-            track_id.strip!
-            next if track_id.empty?
-            yield track_id
-          end
-        end
-      end
-    end
-  end
-end