lastfm-m3u 0.2.5.1 → 0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: de09e3f4d00705ab33a9cb6b5d4abd3f2b8b2c01
+  data.tar.gz: 12c27431e6ed373a1c46b53f9aaa5f4a480a9fce
+SHA512:
+  metadata.gz: 52e2a0c7502745c51bb243d75cda886b8468858d9259b525e792cad549404b4bb86f8f889ec3df348ffbdee8528f669532f3c2cbdec38407b516a4740137b0e3
+  data.tar.gz: 27078025fb27b0e45389aa9db8ffa10a5999fbee453bb99061e7d07b9dc118b2567a5a04ebbb9d22a8173109642ea66ce25d2c881c567b05a4c89e92558fb55d

data/.ruby-gemset

@@ -0,0 +1 @@
+lastfm-m3u

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0-p353

data/.travis.yml

@@ -1,8 +1,5 @@
 language: ruby
 bundler_args: --without development
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
-  - jruby-19mode

data/Gemfile

@@ -5,7 +5,12 @@ gemspec
 gem 'rake'
 
 group :test do
-  gem 'rspec',      '~> 2.13.0'
-  gem 'simplecov',  '~> 0.7.1'
+  gem 'rspec',                   '~> 2.13.0'
+  gem 'simplecov',               '~> 0.7.1'
+  gem 'guard-rspec',             '~> 2.5'
+  gem 'guard-ctags-bundler',     '~> 0.1'
+  gem 'terminal-notifier-guard', '~> 1.5'
+  gem 'rb-fsevent',              '~> 0.9'
+  gem 'pry-debugger',            '~> 0.2'
   gem 'coveralls', require: false
 end

data/bin/lastfm-m3u

@@ -3,7 +3,6 @@ require 'rubygems'
 require 'optparse'
 require 'ostruct'
 require 'highline/import'
-require 'ruby-progressbar'
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'lastfm-m3u'
@@ -98,7 +97,12 @@ if options.init
 end
 
 unless options.artists
-  puts "Please provide at least one artist (-a Elvis).".color(:red) + "  See".color(:green) + " --help".color(:yellow) + " for usage or".color(:green) + " --init".color(:yellow) + " to get started".color(:green)
+  puts "Please provide at least one artist (-a Elvis).".color(:red) + 
+    "  See".color(:green) + 
+    " --help".color(:yellow) + 
+    " for usage or".color(:green) + 
+    " --init".color(:yellow) + 
+    " to get started".color(:green)
   exit
 end
 
@@ -108,16 +112,13 @@ end
 
 options.artists.each do |artist|
   not_found = []
-  lastfm = LastfmM3u::Lastfm.new(artist)
-  lastfm.root_dir = options.directory if options.directory
-  lastfm.limit = options.limit if options.limit
+  lastfm = LastfmM3u::Lastfm.new(artist, options)
 
   puts
   puts "Searching filesystem with method: ".color(:green) + options.type.to_s.capitalize.color(:yellow)
   puts
   num_tracks = (options.limit.nil? ? lastfm.tracks.size : options.limit)
-  progressbar = ProgressBar.create(starting_at: 0, total: num_tracks, format: "%a".color(:cyan) + "|".color(:magenta) + "%B".color(:green) + "|".color(:magenta) +  "%p%%".color(:cyan))
-  lastfm.find_tracks(options.type, progressbar).each do |track, track_set|
+  lastfm.find_tracks(options.type, false).each do |track, track_set|
     if track_set.empty?
       not_found << track
       next

data/lastfm-m3u.gemspec

@@ -15,17 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = LastfmM3u::VERSION
 
-  gem.add_development_dependency 'guard-rspec',             '~> 2.5'
-  gem.add_development_dependency 'guard-ctags-bundler',     '~> 0.1'
-  gem.add_development_dependency 'terminal-notifier-guard', '~> 1.5'
-  gem.add_development_dependency 'rb-fsevent',              '~> 0.9'
-  gem.add_development_dependency 'debugger',                '~> 1.5'
-  gem.add_development_dependency 'pry-debugger',            '~> 0.2'
-
   gem.add_dependency 'rockstar',          '~> 0.7'
   gem.add_dependency 'ruby-mp3info',      '~> 0.8'
   gem.add_dependency 'rainbow',           '~> 1.1'
-  gem.add_dependency 'ansi',              '~> 1.4' # color logging
   gem.add_dependency 'm3uzi',             '~> 0.5'
   gem.add_dependency 'highline',          '~> 1.6'
   gem.add_dependency 'ruby-progressbar',  '~> 1.1'

data/lib/lastfm-m3u.rb

@@ -6,7 +6,6 @@ require 'lastfm-m3u/version'
 require 'rockstar'
 require 'm3uzi'
 require 'rainbow'
-require 'ansi/logger'
 
 require 'lastfm-m3u/base'
 require 'lastfm-m3u/lastfm'
@@ -14,7 +13,7 @@ require 'lastfm-m3u/search/file_search'
 require 'lastfm-m3u/mp3_info_ext'
 
 module LastfmM3u
-  $logger = ANSI::Logger.new(STDOUT)
+  $logger = Logger.new(STDOUT)
   $logger.level = 3 # errors only
   SEARCH_TYPES = [:file, :id3, :both]
 end

data/lib/lastfm-m3u/lastfm.rb

@@ -1,42 +1,31 @@
 require 'fileutils'
+require 'ruby-progressbar'
 
 module LastfmM3u
   class Lastfm < Base
     attr_accessor :artist, :root_dir, :limit, :tracks
 
-    def initialize(artist, root_dir='/home/jon/music/trance')
+    def initialize(artist, options=OpenStruct.new)
       init_config
       set_artist(artist)
       set_top_tracks
-      @root_dir = root_dir
-      @limit = nil
+      @root_dir = options.directory
+      @limit = options.limit
+      @search_type = options.type || :file
       super()
     end
 
     def set_artist(artist)
-      @artist = Rockstar::Artist.new artist
+      @artist = Rockstar::Artist.new(artist)
     end
 
     def set_top_tracks
       @tracks = @artist.top_tracks
     end
 
-    def find_tracks(search_type = :file, progressbar = nil)
-      begin
-        raise InvalidSearchType unless SEARCH_TYPES.include?(search_type)
-      rescue InvalidSearchType
-        $logger.error("Invalid Search Type '#{search_type}', use one of #{SEARCH_TYPES.join(',')}")
-        exit
-      end
-      found_tracks = {}
-      search = LastfmM3u::FileSearch.new(root_dir)
-      self.limit ||= tracks.size
-      tracks[0..limit-1].each do |track|
-        track.name = CGI.unescapeHTML(track.name)
-        found_tracks[track.name] = search.find(track.name, {search_type: search_type})
-        progressbar.increment if progressbar
-      end
-      found_tracks
+    def find_tracks(search_type=@search_type, progressbar=false)
+      check_for_invalid_search_type(search_type)
+      found_tracks(tracks, search_type, progressbar)
     end
 
 
@@ -69,6 +58,39 @@ module LastfmM3u
     def invalid_config?(config_hash)
       config_hash.values.any? {|v| v==''}
     end
+
+    def search(search_type, track)
+      case search_type
+      when :file, :id3, :both
+        LastfmM3u::FileSearch.new(root_dir).find(track.name, {search_type: search_type})
+      end
+    end
+
+    def found_tracks(tracks, search_type, show_progressbar)
+      self.limit ||= tracks.size
+      progressbar = progressbar
+      tracks[0..limit-1].each_with_object({}) do |track, found_tracks|
+        track.name = CGI.unescapeHTML(track.name)
+        found_tracks[track.name] = search(search_type, track)
+        progressbar.increment if show_progressbar
+      end
+    end
+
+    def check_for_invalid_search_type(search_type=@search_type)
+      begin
+        raise InvalidSearchType unless SEARCH_TYPES.include?(search_type)
+      rescue InvalidSearchType
+        $logger.error("Invalid Search Type '#{search_type}', use one of #{SEARCH_TYPES.join(',')}")
+        exit
+      end
+    end
+  end
+
+  def progressbar
+    ProgressBar.create(
+      starting_at: 0,
+      total: num_tracks,
+      format: "%a".color(:cyan) + "|".color(:magenta) + "%B".color(:green) + "|".color(:magenta) +  "%p%%".color(:cyan))
   end
 
   class InvalidSearchType < Exception; end

data/lib/lastfm-m3u/search/file_search.rb

@@ -19,14 +19,13 @@ module LastfmM3u
       prefer_flac = options[:prefer_flac] || true
 
       files = find_unique_files(query, query_type, file_or_id3)
-      if prefer_flac && !(flac_files=trim_non_flac(files)).empty?
-        files = flac_files
+      if prefer_flac
+        files = flac_files(files) || files
       end
       $logger.debug "#{query} => #{files}"
       files
     end
 
-
     private
 
     def find_unique_files(query, query_type, file_or_id3)
@@ -93,6 +92,10 @@ module LastfmM3u
       pathname.basename.to_s.gsub('-', ' ').gsub('_', ' ').sub(/#{pathname.extname}$/, '')
     end
 
+    def flac_files(files)
+      !trim_non_flac(files).empty? && trim_non_flac(files)
+    end
+
     def trim_non_flac(pathnames)
       pathnames.select{|pn| pn.to_s =~ /\.flac$/}
     end

data/lib/lastfm-m3u/version.rb

@@ -1,3 +1,3 @@
 module LastfmM3u
-  VERSION = "0.2.5.1"
+  VERSION = "0.3"
 end

data/spec/lastfm_spec.rb

@@ -2,10 +2,12 @@ require 'spec_helper'
 require 'ostruct'
 
 describe LastfmM3u::Lastfm do
+  let(:options) { OpenStruct.new(directory: music_dir, search_type: :file) }
+
   it "should successfully run full circle" do
     YAML.stub(:load_file).and_return({api_key: 'key', api_secret: 'secret'})
     track = OpenStruct.new(name: 'Poa Alpina')
-    lf = LastfmM3u::Lastfm.new('Biosphere', music_dir)
+    lf = LastfmM3u::Lastfm.new('Biosphere', options)
     lf.send(:tracks=, [track])
     found = lf.find_tracks
     found.should == { track.name => ["#{music_dir}/biosphere/poa-alpina.mp3"] }

data/spec/search/file_search_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LastfmM3u::FileSearch do
-  before { ANSI::Logger.any_instance.stub(:warn => false, :info => false, :debug => false) } # quiet logging
+  before { Logger.any_instance.stub(:warn => false, :info => false, :debug => false) } # quiet logging
 
   let(:file_search) { LastfmM3u::FileSearch.new(music_dir) }
 
@@ -51,16 +51,16 @@ describe LastfmM3u::FileSearch do
       end
     end
 
+    context "prefer flac" do
+      it "should only return flac files if any found" do
+        file_search.find('flac song', {search_type: :file}).to_s.should match /flac_song.flac/
+      end
+
     context "artist or album" do
       it "should find an artist or album directory" do
         file_search.find('biosphere', {query_type: :artist, search_type: :file}).to_s.should match /biosphere/
       end
     end
-
-    context "prefer flac" do
-      it "should only return flac files if any found" do
-        pending
-      end
     end
   end
 

metadata

@@ -1,116 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: lastfm-m3u
 version: !ruby/object:Gem::Version
-  version: 0.2.5.1
-  prerelease: 
+  version: '0.3'
 platform: ruby
 authors:
 - Jon Austin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: guard-ctags-bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: pry-debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rockstar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,31 +48,13 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: ansi
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: m3uzi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -206,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -214,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,6 +105,8 @@ files:
 - .coveralls.yml
 - .gitignore
 - .rspec
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - Guardfile
@@ -253,39 +130,33 @@ files:
 - spec/spec_helper.rb
 - spec/support/fixtures/music/biosphere/poa-alpina.mp3
 - spec/support/fixtures/music/flac_song.flac
+- spec/support/fixtures/music/flac_song.mp3
 - spec/support/fixtures/music/id3v1.mp3
 - spec/support/fixtures/music/id3v2.mp3
 - spec/support/fixtures/music/sid_vicious/05._stepping_stone.mp3
 - spec/support/fixtures/music/sid_vicious/my_way.mp3
 homepage: https://github.com/jonaustin/lastfm-m3u
 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'
-      segments:
-      - 0
-      hash: -587761823380421897
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -587761823380421897
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: CLI tool to create m3u playlists of top artist tracks according to lastfm
 test_files:
 - spec/lastfm_spec.rb
@@ -293,6 +164,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/fixtures/music/biosphere/poa-alpina.mp3
 - spec/support/fixtures/music/flac_song.flac
+- spec/support/fixtures/music/flac_song.mp3
 - spec/support/fixtures/music/id3v1.mp3
 - spec/support/fixtures/music/id3v2.mp3
 - spec/support/fixtures/music/sid_vicious/05._stepping_stone.mp3