spotify-music-importer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98a102cddebecaa8f9ca19531fd3c0841a7a1712
-  data.tar.gz: 0d36de17b933bee5e607ea4b138626b33df6eb31
+  metadata.gz: b515ce34364f422408aff7ba94df8d0baf87b652
+  data.tar.gz: 9c658d923536dbf56ca066e9bfa4266b7b885789
 SHA512:
-  metadata.gz: 0ad95c6fefbbe29dc4cd97da92d736d76c40a2df8305033d475b307deacdf54f88dfa063d55617c13344e277a6713a8fd1587b1b39516ac037675c5753d8404e
-  data.tar.gz: 89d7a08f557479f02570009549a45d8e0673b04410a18e167fc247ff4547361e0a9c31923063b9ad306187b6159f7795299e59a9e04a594cdecff60b223eca4f
+  metadata.gz: d1f3e6c13eb6cb2434bcd1bc6df9d69d54d91ddb85298e0ed0faf3a9b9bd81c734ad061d7fe56d594897d9388eddefa76ed92218f5867e2d942a8837d13c3c56
+  data.tar.gz: e644443e1da4970aa370ea4e90f78361e514508d7e774a0a648792cb7f8c24c8e31ef3c7f7d296e61ae77118e2329b3bad9d5cc1e19883c5e338bf9c3c35d6c4

data/.gitignore

@@ -33,3 +33,5 @@ Gemfile.lock
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+*.json

data/Gemfile

@@ -5,7 +5,3 @@ gemspec
 
 # Need to use this branch right now
 gem 'spotify-client', :github => 'X0nic/spotify-client', :branch => 'add-library'
-
-group :development do
-  gem 'pry'
-end

data/README.md

@@ -9,7 +9,7 @@ If you want to import your library of music into spotify, this will help. It use
 ## Usage
 
 ```sh
-bundle exec ./import.rb -f CSV_FILE -t SPOTIFY_ACCESS_TOKEN
+bundle exec spotify-music-importer import -f CSV_FILE -t SPOTIFY_ACCESS_TOKEN
 ```
 
 ## Contributing

data/Rakefile

@@ -1,3 +1,5 @@
 # encoding: utf-8
 
 require 'bundler/gem_tasks'
+
+task :default => :build

data/bin/spotify-music-importer

@@ -1,42 +1,19 @@
 #! /usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-
-require 'optparse'
+require 'thor'
 require 'spotify/music/importer'
 
-options = {}
-OptionParser.new do |opts|
-  opts.banner = "Usage: import.rb [options]"
-
-  opts.on("-f", "--file FILENAME", "The filename to import") do |filename|
-    options[:filename] = filename
-  end
-
-  opts.on("-m", "--missing MISSING.json", "The output filename of bad matches") do |missing|
-    options[:missing] = missing
-  end
-
-  opts.on("-l", "--limit LIMIT", "Limit the number of lines to import") do |limit|
-    options[:limit] = limit.to_i
-  end
-
-  opts.on("-s", "--skip SKIP", "Skip the first X lines of import") do |skip|
-    options[:skip] = skip.to_i
-  end
-
-  opts.on("-t", "--access-token ACCESS_TOKEN", "Your access token to access the Spotify API. Find one here: https://developer.spotify.com/web-api/console/") do |token|
-    options[:access_token] = token
-  end
-
-end.parse!
-
-importer = Spotify::Music::Importer::Cli.new
-importer.import(options[:filename], options)
-
-if options[:missing]
-  File.open(options[:missing], 'w') do |f|
-    puts "Writing to file #{options[:missing]}"
-    f.write(JSON.pretty_generate(importer.missing))
+class Spotify::Music::Importer::CLI < Thor
+  option :filename, :required => true, :aliases => :f, :desc => "The filename to import"
+  option :missing, :aliases => :m, :desc =>  'The output filename of bad matches'
+  option :limit, :aliases => :l, :desc => "Limit the number of lines to import"
+  option :skip, :aliases => :s, :default => 0, :desc => "Skip the first X lines of import"
+  option :access_token, :required => true, :aliases => :t, :desc => "Your access token to access the Spotify API. Find one here: https://developer.spotify.com/web-api/console/"
+  desc 'import', "Import your music library into spotify"
+  def import
+    importer = Spotify::Music::Importer::Processor.new
+    importer.import(options[:filename], options)
   end
 end
+
+Spotify::Music::Importer::CLI.start

data/lib/spotify/music/importer.rb

@@ -6,19 +6,16 @@ require 'colorize'
 require 'csv'
 require 'spotify-client'
 
-
 module Spotify
   module Music
     module Importer
-      class Cli
-        def initialize
-        end
-
+      class Processor
         def import(filename, options)
-          @options = options
+          @options = options.dup
           @library = SpotifyLibrary.new(client)
-          limit = options.delete(:limit) { nil }
-          skip  = options.delete(:skip) { 0 }
+          require 'pry' ; binding.pry
+          limit = options.fetch(:limit) { nil }
+          skip  = options.fetch(:skip) { 0 }
 
           collection = CSV.read(filename, :headers => true)
           collection.each_with_index do |row, index|
@@ -29,6 +26,13 @@ module Spotify
             results = SpotifyMatch.new(client.search(:track, format_query(record)), :clean_album => true, :clean_track => true)
             @library.find_and_add_to_library(record, results, index)
           end
+
+          if options[:missing]
+            File.open(options[:missing], 'w') do |f|
+              puts "Writing to file #{options[:missing]}"
+              f.write(JSON.pretty_generate(importer.missing))
+            end
+          end
         end
 
         def missing

data/lib/spotify/music/importer/version.rb

@@ -1,7 +1,7 @@
 module Spotify
   module Music
     module Importer
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/spotify-music-importer.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'spotify-client'
   spec.add_dependency 'colorize'
+  spec.add_dependency 'thor'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotify-music-importer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nathan Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  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'
 description: 
 email:
 - nathan@globalphobia.com