hearken 0.1.0 → 0.1.1

data/.cards/4d6da46f-8838-488f-997b-9ec873092d5d

@@ -0,0 +1,2 @@
+name
+named queues (a 'cd' command)

data/.cards/68695ed3-ef6c-4c65-939e-48695a4511c8

@@ -0,0 +1,2 @@
+name
+get working on linux

data/.cards/6ed72945-35a4-4372-97d8-13b357d8c7c0

@@ -0,0 +1,2 @@
+name
+make indexer create backup first (and perhaps keep a couple of old versions around)

data/.cards/91de072e-4427-48dc-89ad-0b03756eb689

@@ -0,0 +1,2 @@
+name
+save queue as a playlist ('save' and 'load' commands)

data/.cards/9242c879-a66f-4144-8f24-b05f7c5a49f3

@@ -0,0 +1,2 @@
+name
+sort order (to support old ipods or disorganised collections)

data/.cards/94f23de2-4e0c-417a-aa82-3147908e2481

@@ -0,0 +1,2 @@
+name
+get working on windows

data/.cards/a5be50c4-2117-4ecf-bc64-e9977f4d52c1

@@ -0,0 +1,2 @@
+name
+fix scrobble on/off bug

data/.cards/f742a9f4-36af-43e5-a7cb-480049a43821

@@ -0,0 +1,2 @@
+name
+support multiple libraries (some possibly unavailable such as external discs)

data/HISTORY.rdoc

@@ -1,3 +1,10 @@
+= 0.1.1
+
+* added use of sox to play more audio file formats (now m4a and mp3 with afplay and sox for everything else)
+* fixed some issues with the parsing of ffmpeg output to get correct tag information
+* added logging of played tracks to history file
+* removed splat dependency (because it is just silly)
+
 = 0.1.0
 
 * removed several dependencies - simple_scrobbler and thor

data/README.rdoc

@@ -4,7 +4,7 @@ This is a command line shell for queuing and playing music tracks.
 
 It also extracts id3 tags from audio files for faster search.
 
-This will eventually be platform independent but at this stage has only been used on mac os x
+This may may be platform independent but at this stage has only been used on mac os x
 
 = Usage
 
@@ -20,6 +20,10 @@ Tags are currently extracted using ffmpeg.  On mac os x, this can be installed e
 
     brew install ffmpeg
 
+Tracks are played using sox (afplay is preinstalled on a mac but does not support as many audio formats) which can also be installed with brew:
+
+    brew install sox
+
 Growl notification (as new tracks are played) will work but only if 'growlnotify' is detected on the path.
 
 == Indexing tracks
@@ -94,9 +98,4 @@ Turns scrobbling on (has no effect if scrobbling has not been configured)
 
     scrobbling off
 
-Turns scrobbling off
-
-= Future plans for world domination
-
-* Get working on linux
-* Get working on windows
+Turns scrobbling off

data/hearken.gemspec

@@ -17,6 +17,19 @@ This also extracts the tags from a collection of folders.
 This replaces and combines the functionality from a couple of other gems (audio_library and songbirdsh).
 EOF
 
+  s.post_install_message = <<EOF
+Hey - thanks for installing hearken.
+
+Before doing anything else, you should index your music collection by running:
+
+  hearken_index path_to_your_music_collection
+
+This could take a while if you have a large collection - you should hear some applause when it's done
+
+After that just run hearken to start playing, queueing and rocking out.
+EOF
+
+  s.license = 'MIT'
   s.rubyforge_project = "hearken"
 
   s.files         = `git ls-files`.split("\n")
@@ -24,7 +37,8 @@ EOF
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'splat', '~>0'
+  s.required_ruby_version = '>= 1.9.2'
+
   s.add_dependency 'shell_shock', '~>0'
   s.add_dependency 'rainbow', '~> 1'
   s.add_dependency 'nokogiri', '~> 1'

data/lib/hearken.rb

@@ -1,3 +1,3 @@
 module Hearken
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/hearken/command/search.rb

@@ -19,6 +19,6 @@ EOF
       end
     end
     puts "Found #{matches.size} matches (ids have been placed on clipboard)"
-    matches.join(' ').to_clipboard
+    IO.popen('pbcopy','w') { |clipboard| clipboard.print matches.join ' ' }
   end
 end

data/lib/hearken/indexing/audio_traverser.rb

@@ -3,7 +3,7 @@ require 'hearken/indexing/file'
 
 class Hearken::Indexing::AudioTraverser
   attr_reader :current
-  EXTS = %w{m4a mp3 ogg wma}.map {|e| '.'+e }
+  EXTS = %w{m4a mp3 ogg wma flac aac}.map {|e| '.'+e }
 
   def initialize path
     @path = Pathname.new path

data/lib/hearken/indexing/ffmpeg_file.rb

@@ -18,25 +18,34 @@ class Hearken::Indexing::FfmpegFile
           if state == :metadata
             begin
               m = / *: */.match l
-              @meta[m.pre_match.strip] = m.post_match.strip if m
+              add_meta m.pre_match.strip.downcase.to_sym, m.post_match.strip if m
             rescue ArgumentError => e
             end
           end
       end
     end
 
-    @title = @meta['TIT2'] || @meta['title']
-    @album = @meta['TALB'] || @meta ['album']
-    @artist = @meta['TPE1'] || @meta['TPE2'] || @meta['artist']
-    @albumartist = @meta['TSO2'] || @meta['album_artist']
-    @time = to_duration @meta['Duration']
-    @date = @meta['TDRC'] || @meta['TYER'] || @meta['date']
-    @track = @meta['TRCK'] || @meta['track']
-    @puid = @meta['MusicIP PUID']
-    @mbartistid = @meta['MusicBrainz Artist Id']
-    @mbalbumid = @meta['MusicBrainz Album Id']
-    @mbalbumartistid = @meta['MusicBrainz Album Artist Id']
-    @asin = @meta['ASIN']
+    @title = tag :title, :tit2
+    @album = tag :album, :talb
+    @artist = tag :artist, :tpe1, :tpe2
+    @albumartist = tag :album_artist, :tso2
+    @time = to_duration tag :duration
+    @date = tag :date, :tdrc, :tyer
+    @track = tag :track, :trck
+    @puid = tag :"musicip puid"
+    @mbartistid = tag :musicbrainz_artistid, :"musicbrainz artist id"
+    @mbalbumid = tag :musicbrainz_albumid,:"musicbrainz album id"
+    @mbalbumartistid = tag :musicbrainz_albumartistid, :"musicbrainz album artist id"
+    @asin = tag :asin
+  end
+
+  def add_meta key, value
+    @meta[key] ||= value
+  end
+
+  def tag *names
+    names.each { |name| return @meta[name] if @meta[name] }
+    nil
   end
 
   def method_missing method

data/lib/hearken/indexing/indexer.rb

@@ -1,4 +1,3 @@
-require 'splat'
 require 'hearken/paths'
 require 'hearken/indexing/persistant_traverser'
 
@@ -22,7 +21,7 @@ class Hearken::Indexing::Indexer
 
     show_progress start, count
 
-    (File.dirname(__FILE__)+'/../../../media/applause.mp3').to_player
+    system "play -q #{File.dirname(__FILE__)}/../../../media/applause.mp3"
   end
 private
   def show_progress start, count

data/lib/hearken/monkey_violence.rb

@@ -4,18 +4,18 @@ class String
   end
 
   def escape char
-    gsub(char, "\\#{char}")
+    gsub(char) { "\\#{char}" }
   end
 
-  def escape2 char
-    split(char).join("\\#{char}")
+  def escape_all chars
+    chars.inject(self) {|s,t| s.escape t }
   end
 
   def escape_for_sh
-    self.escape2("\`").escape(" ").escape2("&").escape2(";").escape("!").escape("(").escape(")").escape2("'")
+    self.escape_all " `';&!()$".scan(/./)
   end
 
   def escape_for_sh_quoted
-    self.escape2("\`")
+    self.escape '`'
   end
 end

data/lib/hearken/player.rb

@@ -1,4 +1,3 @@
-require 'splat'
 require 'fileutils'
 
 require 'hearken/queue'
@@ -52,6 +51,7 @@ module Hearken
       track.started = Time.now.to_i
       in_base_dir do
         File.open('current_song', 'w') {|f| f.print track.to_yaml }
+        File.open('history', 'a') {|f| f.puts "#{track.started},#{track.path}"}
       end
     end
 
@@ -67,7 +67,7 @@ module Hearken
       @scrobbler.enabled = tf
     end
 
-    def random_track      
+    def random_track
       @library.row (rand * @library.count).to_i
     end
 
@@ -93,16 +93,28 @@ module Hearken
           end
           notify_started track
           register track
-          player_pid = track.path.escape2("\`").to_player
+          player_pid = spawn play_command track.path
           Process.wait player_pid
           notify_finished track
         end
       end
     end
 
+    def play_command path
+      if %w{m4a mp3}.include? path.split('.').last
+        "afplay \"#{path.escape("\`")}\""
+      else
+        "play -q \"#{path.escape("\`")}\""
+      end.tap do |command|
+        in_base_dir do
+          File.open('player', 'a') {|f| f.puts command }
+        end
+      end
+    end
+
     def stop
       return unless @pid
-      Process.kill 'TERM', @pid 
+      Process.kill 'TERM', @pid
       @pid = nil
     end
 

data/lib/hearken/scrobbler.rb

@@ -1,4 +1,3 @@
-require 'splat'
 require 'hearken/simple_scrobbler'
 require 'hearken/debug'
 
@@ -42,7 +41,7 @@ module Hearken
 
     def profile
       return unless @scrobbler
-      @scrobbler.with_profile_url {|url| url.to_launcher }
+      @scrobbler.with_profile_url {|url| system "open #{url}" }
     end
 
     def ask question
@@ -55,7 +54,7 @@ module Hearken
       preferences['user'] = ask 'What is your lastfm user name ? '
       @scrobbler = SimpleScrobbler.new API_KEY, SECRET, preferences['user']
       preferences['session_key'] = @scrobbler.fetch_session_key do |url|
-        url.to_launcher
+        system "open '#{url}'"
         ask 'Please hit enter when you\'ve allowed this application access to your account'
       end
       @preferences['lastfm'] = preferences

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hearken
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-10 00:00:00.000000000Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: splat
-  requirement: &70202662970320 !ruby/object:Gem::Requirement
+  name: shell_shock
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70202662970320
-- !ruby/object:Gem::Dependency
-  name: shell_shock
-  requirement: &70202662969820 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70202662969820
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &70202662969360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +37,15 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *70202662969360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70202662968900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +53,15 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *70202662968900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70202662968440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202662968440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70202662967980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +85,12 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70202662967980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
 description: ! 'A command line tool to enqueue and play music tracks.
 
 
@@ -95,8 +109,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .cards/4d6da46f-8838-488f-997b-9ec873092d5d
+- .cards/68695ed3-ef6c-4c65-939e-48695a4511c8
+- .cards/6ed72945-35a4-4372-97d8-13b357d8c7c0
+- .cards/91de072e-4427-48dc-89ad-0b03756eb689
+- .cards/9242c879-a66f-4144-8f24-b05f7c5a49f3
+- .cards/94f23de2-4e0c-417a-aa82-3147908e2481
+- .cards/a5be50c4-2117-4ecf-bc64-e9977f4d52c1
+- .cards/f742a9f4-36af-43e5-a7cb-480049a43821
 - .gitignore
-- .rvmrc
 - Gemfile
 - HISTORY.rdoc
 - MIT-LICENSE
@@ -156,8 +177,13 @@ files:
 - spec/hearken/range_expander_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/markryall/hearken
-licenses: []
-post_install_message: 
+licenses:
+- MIT
+post_install_message: ! "Hey - thanks for installing hearken.\n\nBefore doing anything
+  else, you should index your music collection by running:\n\n  hearken_index path_to_your_music_collection\n\nThis
+  could take a while if you have a large collection - you should hear some applause
+  when it's done\n\nAfter that just run hearken to start playing, queueing and rocking
+  out.\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -166,16 +192,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2801778265441540950
 requirements: []
 rubyforge_project: hearken
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: command line music player

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.2@hearken --create