hearken 0.0.2 → 0.0.3

data/HISTORY.rdoc

@@ -0,0 +1,11 @@
+= next
+
+* Fixed bug in setup_scrobbling command
+
+= 0.0.2
+
+* First functioning version - combination of features from audio_library and songbirdsh
+
+= 0.0.1
+
+* Released empty gem (to claim the name before proceeding any further)

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Mark Ryall
+ 
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -20,6 +20,8 @@ Tags are currently extracted using ffmpeg.  On mac os x, this can be installed e
 
     brew install ffmpeg
 
+Growl notification (as new tracks are played) will work but only if 'growlnotify' is detected on the path.
+
 == Indexing tracks
 
     hearken index DIRECTORY

data/hearken.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "hearken/version"
+require 'hearken'
 
 Gem::Specification.new do |s|
   s.name        = "hearken"
@@ -29,6 +29,7 @@ EOF
   s.add_dependency 'shell_shock', '~>0'
   s.add_dependency 'simple_scrobbler', '~> 0'
   s.add_dependency 'rainbow', '~> 1'
+  s.add_dependency 'ruby-growl', '~> 3.0'
 
   s.add_development_dependency 'rake', '~>0'
   s.add_development_dependency 'rspec', '~>2'

data/lib/hearken.rb

@@ -1 +1,3 @@
-require 'hearken/version'
+module Hearken
+  VERSION = '0.0.3'
+end

data/lib/hearken/cli.rb

@@ -1,24 +1,22 @@
 require 'thor'
 
-require 'hearken/version'
+require 'hearken'
 require 'hearken/indexing'
 require 'hearken/console'
 
-module Hearken
-  class Cli < Thor
-    desc 'version', 'Prints the current version'
-    def version
-      puts "Current version is "+Hearken::VERSION
-    end
+class Hearken::Cli < Thor
+  desc 'version', 'Prints the current version'
+  def version
+    puts "Current version is "+Hearken::VERSION
+  end
 
-    desc 'index DIRECTORY', 'Reindexes a music collection'
-    def index directory
-      Hearken::Indexing::Indexer.new(directory).execute
-    end
+  desc 'index DIRECTORY', 'Reindexes a music collection'
+  def index directory
+    Hearken::Indexing::Indexer.new(directory).execute
+  end
 
-    desc 'console', 'Enters console for queuing and playing tracks'
-    def console
-      Hearken::Console.new.push
-    end
+  desc 'console', 'Enters console for queuing and playing tracks'
+  def console
+    Hearken::Console.new.push
   end
 end

data/lib/hearken/command/search.rb

@@ -20,6 +20,5 @@ EOF
     end
     puts "Found #{matches.size} matches (ids have been placed on clipboard)"
     matches.join(' ').to_clipboard
-    @player.matches = matches
   end
 end

data/lib/hearken/notification/growl_notifier.rb

@@ -0,0 +1,13 @@
+module Hearken::Notification
+end
+
+class Hearken::Notification::GrowlNotifier
+  def initialize preferences
+    @growlnotify = !`which growlnotify`.chomp.empty?
+    @image_path = File.expand_path File.dirname(__FILE__)+'/../../../media/ice_cream.png'
+  end
+
+  def started track
+    `growlnotify -t "Hearken" --image #{@image_path} -m '#{track.to_short_s}'` if @growlnotify
+  end
+end

data/lib/hearken/player.rb

@@ -2,17 +2,19 @@ require 'splat'
 
 require 'hearken/queue'
 require 'hearken/scrobbler'
+require 'hearken/notification/growl_notifier'
 require 'hearken/library'
 
 module Hearken
   class Player
     include Queue
     attr_reader :library, :scrobbler
-    attr_accessor :scrobbling, :matches
 
     def initialize preferences
       @scrobbler = Scrobbler.new preferences
-      @scrobbling = true
+      @scrobbler.enabled = true
+      @growl = Hearken::Notification::GrowlNotifier.new preferences
+      @notifiers = [@scrobbler, @growl]
       @library = Library.new preferences
       @library.reload
     end
@@ -41,11 +43,20 @@ module Hearken
       File.open('current_song', 'w') {|f| f.print track.to_yaml }
     end
 
+    def notify_started track
+      @notifiers.each {|notifier| notifier.started track if notifier.respond_to? :started}
+    end
+
+    def notify_finished track
+      @notifiers.each {|notifier| notifier.finished track if notifier.respond_to? :finished}
+    end
+
+    def scrobbling tf
+      @scrobbler.enabled = tf
+    end
+
     def start
-      if @pid
-        puts "Already started (pid #{@pid})"
-        return
-      end
+      return if @pid
       @pid = fork do
         player_pid = nil
         Signal.trap('TERM') do
@@ -66,15 +77,14 @@ module Hearken
             next
           end
           @library.with_track(id) do |track|
-            @scrobbler.update track if @scrobbling
+            notify_started track
             register track
             player_pid = path.to_player
             Process.wait player_pid
-            @scrobbler.scrobble track if @scrobbling
+            notify_finished track
           end
         end
       end
-      puts "Started (pid #{@pid})"
     end
 
     def stop

data/lib/hearken/scrobbler.rb

@@ -8,19 +8,23 @@ module Hearken
 
     def initialize preferences
       @preferences = preferences
-      if preferences['lastfm']
-        debug "Configuring scrobbler with #{preferences['lastfm'].inspect}"
-        @scrobbler = SimpleScrobbler.new *%w{api_key secret user session_key}.map{|k| preferences['lastfm'][k]}
+    end
+
+    def enabled= tf
+      @scrobbler = nil
+      if @preferences['lastfm'] and tf
+        debug "Configuring scrobbler with #{@preferences['lastfm'].inspect}"
+        @scrobbler = SimpleScrobbler.new *%w{api_key secret user session_key}.map{|k| @preferences['lastfm'][k]}
       end
     end
 
-    def scrobble track
+    def finished track
       return unless @scrobbler
       debug "Scrobbling to last fm: #{track}"
       send_to_scrobbler :submit, track
     end
 
-    def update track
+    def started track
       return unless @scrobbler
       debug "Updating now listening with last fm: #{track}"
       send_to_scrobbler :now_playing, track
@@ -28,7 +32,7 @@ module Hearken
 
     def ask question
       print question
-      gets.chomp
+      $stdin.gets.chomp
     end
 
     def setup

data/lib/hearken/track.rb

@@ -21,9 +21,6 @@ class Hearken::Track
     id.to_s 36
   end
 
-  def duration
-  end
-
   def search_string
     "#{self.artist.to_s.downcase}#{self.album.to_s.downcase}#{self.title.to_s.downcase}"
   end
@@ -32,6 +29,10 @@ class Hearken::Track
     "#{my(:search_id,:white)}: #{my(:artist, :yellow)} - #{my(:album,:cyan)} - #{my(:track,:magenta)} #{my(:title,:green)} (#{my(:time,:white)})"
   end
 
+  def to_short_s
+    "#{track} #{title}\n#{artist}\n#{album}"
+  end
+
   def my field, colour
     self.send(field).to_s.foreground(colour)
   end

metadata

@@ -2,7 +2,7 @@
 name: hearken
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mark Ryall
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 +10:00
+date: 2011-07-06 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,27 +69,38 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: ruby-growl
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: |
   A command line tool to enqueue and play music tracks.
   
@@ -109,6 +120,8 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
+- HISTORY.rdoc
+- MIT-LICENSE
 - README.rdoc
 - Rakefile
 - bin/hearken
@@ -142,6 +155,7 @@ files:
 - lib/hearken/indexing/persistant_traverser.rb
 - lib/hearken/indexing/persisted_traverser.rb
 - lib/hearken/library.rb
+- lib/hearken/notification/growl_notifier.rb
 - lib/hearken/player.rb
 - lib/hearken/preferences.rb
 - lib/hearken/queue.rb
@@ -149,8 +163,8 @@ files:
 - lib/hearken/scrobbler.rb
 - lib/hearken/tagged.rb
 - lib/hearken/track.rb
-- lib/hearken/version.rb
 - media/applause.mp3
+- media/ice_cream.png
 - spec/hearken/command/enqueue_spec.rb
 - spec/hearken/command/list_spec.rb
 - spec/hearken/command/reload_spec.rb

data/lib/hearken/version.rb

@@ -1,3 +0,0 @@
-module Hearken
-  VERSION = '0.0.2'
-end