hearken 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 15943a5107f579fc0766e685b8d792414e7a9c0e
+  data.tar.gz: 434056523b9daed4ff637fba7c47dc111eb88761
+SHA512:
+  metadata.gz: 7bd1fe7362205feee7edec57999a948cd9b1cff4c43a38f1a75fbf76e9cff33fb413a80cce4b3f5bc56db117d9ba90ff60c7f00b59353a65e61f29d3db6bb9d6
+  data.tar.gz: bc4a16fe354735aff6645b75a07a9c9d33a2c286c62a6ddb7e21d14c1aa773116ee6edd0d67b3b89076d6f5ac0f42deb7060ab8384ad6241fbe0a4a773ac412b

data/bin/hearken_scrobble

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+$: << File.dirname(__FILE__)+'/../lib'
+
+command = ARGV.shift
+
+unless %w{setup start finish}.include? command
+  puts 'usage:'
+  puts '  hearken_scrobble setup'
+  puts '  hearken_scrobble start PATH_TO_AUDIO_FILE'
+  puts '  hearken_scrobble finish PATH_TO_AUDIO_FILE'
+  exit 0
+end
+
+require 'hearken/indexing/ffmpeg_file'
+require 'hearken/scrobbler'
+
+scrobbler = Hearken::Scrobbler.new
+scrobbler.enabled = true
+
+if command == 'setup'
+  scrobbler.setup
+  exit 0
+end
+
+file = ARGV.shift
+track = Hearken::Indexing::FfmpegFile.from_file file
+
+if command == 'start'
+  scrobbler.started track
+elsif command == 'finish'
+  scrobbler.finished track
+else
+  puts 'unknown command'
+end

data/bin/hearken_tags

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+$: << File.dirname(__FILE__)+'/../lib'
+
+
+require 'pp'
+require 'hearken/indexing/ffmpeg_file'
+
+ARGV.each do |path|
+  pp Hearken::Indexing::FfmpegFile.from_file path
+end

data/hearken.gemspec

@@ -40,9 +40,9 @@ EOF
   s.required_ruby_version = '>= 1.9.2'
 
   s.add_dependency 'shell_shock', '~>0'
-  s.add_dependency 'rainbow', '~> 1'
+  s.add_dependency 'rainbow', '~> 2'
   s.add_dependency 'nokogiri', '~> 1'
 
   s.add_development_dependency 'rake', '~>0'
-  s.add_development_dependency 'rspec', '~>2'
+  s.add_development_dependency 'rspec', '~>3'
 end

data/lib/hearken.rb

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

data/lib/hearken/colour.rb

@@ -1,5 +1,7 @@
+require 'rainbow'
+
 module Hearken::Colour
   def c text,colour
-    text.to_s.foreground colour
+    Rainbow(text.to_s).color colour
   end
 end

data/lib/hearken/console.rb

@@ -26,12 +26,13 @@ module Hearken
       at_exit { @player.stop }
       @prompt = "hearken > "
       with :status, "'"
-      with :restart, 'next'
+      with :restart, 'next', 'k'
       with :list, 'ls'
-      with :enqueue, 'add'
-      with :remove, 'rm'
-      with :start, 'play'
-      with_all *%w{reload search stop scrobbling shuffle setup_scrobbling recent love profile}
+      with :enqueue, 'add', '+'
+      with :remove, 'rm', '-'
+      with :start, 'play', 'go'
+      with :search, 'find'
+      with_all *%w{reload stop scrobbling shuffle setup_scrobbling recent love profile}
     end
   end
 end

data/lib/hearken/indexing/ffmpeg_file.rb

@@ -1,9 +1,16 @@
+require 'hearken/indexing/file'
 require 'hearken/indexing/executor'
 require 'hearken/monkey_violence'
+require 'pathname'
 
 class Hearken::Indexing::FfmpegFile
   include Hearken::Indexing::Executor
 
+  def self.from_file path
+    file = Hearken::Indexing::File.new Pathname.new path
+    Hearken::Indexing::FfmpegFile.new file
+  end
+
   def initialize path
     extract_file_attributes path
     content = execute "ffmpeg -i #{@path.escape_for_sh}"

data/lib/hearken/indexing/file.rb

@@ -1,5 +1,7 @@
+module Hearken; module Indexing; end; end
+
 class Hearken::Indexing::File
-  def initialize path, root
+  def initialize path, root=nil
     @path, @root = path, root
   end
 

data/lib/hearken/player.rb

@@ -29,7 +29,7 @@ module Hearken
         timing = "(#{c track.time.to_i-played, :yellow} remaining)" if track.time
         puts "#{c Time.at(track.started).strftime("%H:%M:%S %d/%m/%Y"), :blue}: #{track} #{timing}"
       else
-        puts 'not playing'.foreground(:yellow)
+        puts c 'not playing', :yellow
       end
     end
 
@@ -63,7 +63,11 @@ module Hearken
       @notifiers.each {|notifier| notifier.finished track if notifier.respond_to? :finished}
     end
 
-    def scrobbling tf
+    def scrobbling
+      @scrobbler.enabled
+    end
+
+    def scrobbling= tf
       @scrobbler.enabled = tf
     end
 

data/lib/hearken/preferences.rb

@@ -1,6 +1,9 @@
+require 'yaml'
 require 'hearken/paths'
 require 'hearken/monkey_violence'
 
+module Hearken; end
+
 module Hearken
   class Preferences
     include Hearken::Paths

data/lib/hearken/scrobbler.rb

@@ -1,3 +1,4 @@
+require 'hearken/preferences'
 require 'hearken/simple_scrobbler'
 require 'hearken/debug'
 
@@ -8,10 +9,14 @@ module Hearken
     SECRET = 'ab77019c84eef8bc16bcfd5ba8db0c5d'
     include Debug
 
-    def initialize preferences
+    def initialize preferences=Hearken::Preferences.new
       @preferences = preferences
     end
 
+    def enabled
+      !!@scrobbler
+    end
+
     def enabled= tf
       @scrobbler = nil
       if @preferences['lastfm'] and tf

data/lib/hearken/track.rb

@@ -1,8 +1,10 @@
 require 'hearken/tagged'
-require 'rainbow'
+require 'hearken/colour'
 
 class Hearken::Track
   include Hearken::Tagged
+  include Hearken::Colour
+
   attr_accessor :id, :started
 
   def initialize id=nil
@@ -34,6 +36,6 @@ class Hearken::Track
   end
 
   def my field, colour
-    self.send(field).to_s.foreground(colour)
+    c self.send(field).to_s, colour
   end
 end

data/spec/hearken/command/enqueue_spec.rb

@@ -8,16 +8,16 @@ describe Hearken::Command::Enqueue do
   with_help 'enqueues the list of songs with the specified ids'
 
   before do
-    @player = stub('player')
+    @player = double 'player'
     @command = Hearken::Command::Enqueue.new @player
   end
 
   it 'should enqueue whatever is returned from the expander' do
-    expander = stub('expander')
-    Hearken::RangeExpander.should_receive(:new).and_return(expander)
-    expander.should_receive(:expand).with('some text').and_return([1,2,3])
+    expander = double 'expander'
+    allow(Hearken::RangeExpander).to receive(:new) { expander }
+    allow(expander).to receive(:expand).with('some text') { [1,2,3] }
 
-    [1,2,3].each {|id| @player.should_receive(:enqueue).with id}
+    [1,2,3].each {|id| expect(@player).to receive(:enqueue).with(id) }
 
     @command.execute "some text"
   end

data/spec/hearken/command/list_spec.rb

@@ -11,21 +11,21 @@ when playing, approximate times for each track will be displayed
 EOF
 
   before do
-    @player = stub('player')
+    @player = double 'player'
     @command = Hearken::Command::List.new @player
   end
 
   it 'should display nothing when there is no current track and nothing enqueued' do
-    @player.stub!(:current).and_return nil
-    @player.stub! :each
+    allow(@player).to receive(:current) { nil }
+    allow(@player).to receive(:each)
     @command.execute ''
   end
 
   it 'should display queue contents with no times when there is no current track' do
-    track = stub 'track'
-    @player.stub!(:current).and_return nil
-    @player.stub!(:each).and_yield track
-    @command.should_receive(:puts).with track
+    track = double 'track'
+    allow(@player).to receive(:current) { nil }
+    allow(@player).to receive(:each).and_yield track
+    expect(@command).to receive(:puts).with(track)
     @command.execute ''
   end
 end

data/spec/hearken/command/reload_spec.rb

@@ -8,13 +8,14 @@ describe Hearken::Command::Reload do
   with_help 'reloads the contents of the music library for fast searching'
 
   before do
-    @library = stub('library')
-    @player = stub('player', :library => @library)
+    @library = double 'library'
+    @player = double 'player'
+    allow(@player).to receive(:library) { @library }
     @command = Hearken::Command::Reload.new @player
   end
 
   it 'should reload the library' do
-    @library.should_receive(:reload)
+    expect(@library).to receive(:reload)
     @command.execute '123'
   end
 end

data/spec/hearken/command/shuffle_spec.rb

@@ -8,23 +8,25 @@ describe Hearken::Command::Shuffle do
   with_help 'shuffles the current queue'
 
   before do
-    @player = stub 'player'
+    @player = double 'player'
     @command = Hearken::Command::Shuffle.new @player
   end
 
   it 'should dequeue all tracks, shuffle then enqueue them' do
-    track = stub 'track'
-    track.should_receive(:id).and_return 1
-    track.should_receive(:id).and_return 2
-    track.should_receive(:id).and_return 3
-    @player.should_receive(:dequeue).and_return track
-    @player.should_receive(:dequeue).and_return track
-    @player.should_receive(:dequeue).and_return track
-    @player.should_receive(:dequeue).and_return nil
-
-    @player.should_receive(:enqueue).with 3
-    @player.should_receive(:enqueue).with 2
-    @player.should_receive(:enqueue).with 1
+    track = double 'track'
+
+    expect(track).to receive(:id) { 1 }
+    expect(track).to receive(:id) { 2 }
+    expect(track).to receive(:id) { 3 }
+
+    expect(@player).to receive(:dequeue) { track }
+    expect(@player).to receive(:dequeue) { track }
+    expect(@player).to receive(:dequeue) { track }
+    expect(@player).to receive(:dequeue) { nil }
+
+    expect(@player).to receive(:enqueue) { 1 }
+    expect(@player).to receive(:enqueue) { 2 }
+    expect(@player).to receive(:enqueue) { 3 }
 
     @command.execute
   end

data/spec/hearken/player_spec.rb

@@ -6,33 +6,33 @@ describe Hearken::Player do
   let(:player) { Hearken::Player.new preferences }
 
   before do
-    scrobbler = mock 'scrobbler'
-    library = mock 'library'
-    Hearken::Scrobbler.stub!(:new).and_return scrobbler
-    Hearken::Library.stub!(:new).and_return library
-    library.stub! :reload
-    scrobbler.stub! :enabled=
+    scrobbler = double 'scrobbler'
+    library = double 'library'
+    allow(Hearken::Scrobbler).to receive(:new) { scrobbler }
+    allow(Hearken::Library).to receive(:new) { library }
+    allow(library).to receive(:reload)
+    allow(scrobbler).to receive(:enabled=)
   end
 
   describe '#current' do
     it 'should return current_track when player has pid and file is present' do
       player.instance_eval { @pid = 1 }
-      hash = stub 'hash'
-      File.stub!(:exist?).with('current_song').and_return true
-      YAML.stub!(:load_file).with('current_song').and_return hash
-      player.current.should == hash
+      hash = double 'hash'
+      allow(File).to receive(:exist?).with('current_song') { true }
+      allow(YAML).to receive(:load_file).with('current_song') { hash }
+      expect(player.current).to eq(hash)
     end
 
     it 'should return nil when player has no pid and file is present' do
       player.instance_eval { @pid = nil }
-      File.stub!(:exist?).with('current_song').and_return true
-      player.current.should == nil
+      allow(File).to receive(:exist?).with('current_song') { true }
+      expect(player.current).to be_nil
     end
 
     it 'should return nil when has pid and file is not present' do
       player.instance_eval { @pid = 1 }
-      File.stub!(:exist?).with('current_song').and_return false
-      player.current.should == nil
+      allow(File).to receive(:exist?).with('current_song') { false }
+      expect(player.current).to be_nil
     end
   end
 end

data/spec/hearken/range_expander_spec.rb

@@ -7,22 +7,22 @@ describe Hearken::RangeExpander do
   end
 
   it 'should expand single values' do
-    @expander.expand('123').should == [1371]
+    expect(@expander.expand('123')).to eq([1371])
   end
 
   it 'should expand multiple values separated by any non digit' do
-    @expander.expand("123 \t 456  , 789 ").should == [1371, 5370, 9369]
+    expect(@expander.expand("123 \t 456  , 789 ")).to eq([1371, 5370, 9369])
   end
 
   it 'should expand a fully specified range' do
-    @expander.expand(" 456-45i ").should == (5370..5382).to_a
+    expect(@expander.expand(" 456-45i ")).to eq((5370..5382).to_a)
   end
 
   it 'should expand an abbreviated range' do
-    @expander.expand(" 456-i ").should == (5370..5382).to_a
+    expect(@expander.expand(" 456-i ")).to eq((5370..5382).to_a)
   end
 
   it 'should expand ids for a range' do
-    @expander.expand_to_ids(" s-z ").should == %w{s t u v w x y z}
+    expect(@expander.expand_to_ids(" s-z ")).to eq(%w{s t u v w x y z})
   end
 end

data/spec/spec_helper.rb

@@ -2,4 +2,15 @@ $: << File.expand_path('../../lib', __FILE__)
 
 require 'bundler/setup'
 require 'rspec'
-require 'shell_shock/command_spec'
+
+module ShellShock
+  module CommandSpec
+    def with_usage text
+      it('should display usage') { expect(@command.usage).to eq(text) }
+    end
+
+    def with_help text
+      it('should display help') { expect(@command.help).to eq(text) }
+    end
+  end
+end

metadata

@@ -1,123 +1,110 @@
 --- !ruby/object:Gem::Specification
 name: hearken
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Mark Ryall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shell_shock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   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.
-
+        version: '3'
+description: |
+  A command line tool to enqueue and play music tracks.
 
   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).
-
-'
+  This replaces and combines the functionality from a couple of other gems (audio_library and songbirdsh).
 email:
 - mark@ryall.name
 executables:
 - hearken
 - hearken_index
+- hearken_scrobble
+- hearken_tags
 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
+- ".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"
 - Gemfile
 - HISTORY.rdoc
 - MIT-LICENSE
@@ -125,6 +112,8 @@ files:
 - Rakefile
 - bin/hearken
 - bin/hearken_index
+- bin/hearken_scrobble
+- bin/hearken_tags
 - hearken.gemspec
 - lib/hearken.rb
 - lib/hearken/colour.rb
@@ -179,34 +168,35 @@ files:
 homepage: http://github.com/markryall/hearken
 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"
+metadata: {}
+post_install_message: |
+  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.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       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.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: command line music player
 test_files:
 - spec/hearken/command/enqueue_spec.rb