hearken 0.1.2 → 0.1.3

data/lib/hearken/library.rb

@@ -1,43 +1,51 @@
-require 'hearken/track'
-require 'hearken/paths'
-
-class Hearken::Library
-  include Hearken::Paths
-
-  FILE_FIELDS = %w{path timestamp}
-  TAG_FIELDS = %w{album track title artist time date albumartist puid mbartistid mbalbumid mbalbumartistid asin}
-  FIELDS = FILE_FIELDS + TAG_FIELDS
-
-  include Hearken::Debug
-  attr_reader :tracks
-
-  def initialize preferences
-    create_paths
-  end
-
-  def count
-    @tracks.count
-  end
-
-  def row id
-    @tracks[id]
-  end
-
-  def with_track id
-    yield @tracks[id]
-  end
-
-  def reload
-    @tracks = []
-    File.open index_path do |file|
-      id = 0
-      while line = file.gets
-        row = line.chomp.split '<->'
-        track = Hearken::Track.new id
-        FIELDS.each {|field| track.send "#{field}=", row.shift }
-        @tracks << track
-        id += 1
+# frozen_string_literal: true
+
+require "hearken/debug"
+require "hearken/paths"
+require "hearken/track"
+
+module Hearken
+  class Library
+    include Hearken::Paths
+
+    FILE_FIELDS = %w[path timestamp].freeze
+    TAG_FIELDS = %w[album track title artist time date albumartist puid mbartistid mbalbumid mbalbumartistid asin].freeze
+    FIELDS = FILE_FIELDS + TAG_FIELDS
+
+    include Hearken::Debug
+    attr_reader :tracks
+
+    def initialize
+      @tracks = []
+      create_paths
+      reload
+    end
+
+    def count
+      @tracks.count
+    end
+
+    def row(id)
+      @tracks[id]
+    end
+
+    def with_track(id)
+      yield @tracks[id]
+    end
+
+    def reload
+      return unless File.exist?(index_path)
+
+      File.open index_path do |file|
+        id = 0
+        while (line = file.gets)
+          row = line.chomp.split "<->"
+          track = Hearken::Track.new id
+          FIELDS.each { |field| track.send "#{field}=", row.shift }
+          @tracks << track
+          id += 1
+        end
       end
-    end if File.exist? index_path
+    end
   end
-end
+end

data/lib/hearken/monkey_violence.rb

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 class String
   def from_home
-    File.expand_path('~')+'/'+self
+    "#{File.expand_path("~")}/#{self}"
   end
 
-  def escape char
+  def escape(char)
     gsub(char) { "\\#{char}" }
   end
 
-  def escape_all chars
-    chars.inject(self) {|s,t| s.escape t }
+  def escape_all(chars)
+    chars.inject(self) { |s, t| s.escape t }
   end
 
   def escape_for_sh
-    self.escape_all " `';&!()$".scan(/./)
+    escape_all " `';&!()$".scan(/./)
   end
 
   def escape_for_sh_quoted
-    self.escape '`'
+    escape "`"
   end
-end
+end

data/lib/hearken/paths.rb

@@ -1,24 +1,18 @@
-require 'fileutils'
+# frozen_string_literal: true
 
-module Hearken::Paths
-  attr_reader :base_path, :preferences_path, :queue_path, :index_path
+require "fileutils"
 
-  def create_paths
-    @base_path = '.hearken'.from_home
-    @preferences_path = '.hearken/config'.from_home
-    @queue_path = '.hearken/queue'.from_home
-    @index_path = '.hearken/music'.from_home
-    FileUtils.mv '.hearken'.from_home, '.hearken.tmp'.from_home if File.exist?('.hearken'.from_home) && File.file?('.hearken'.from_home)
-    FileUtils.mkdir_p '.hearken/queue'.from_home
-    FileUtils.mv '.hearken.tmp'.from_home, @preferences_path if File.exist? '.hearken.tmp'.from_home
-    FileUtils.mv '.music'.from_home, @index_path if File.exist? '.music'.from_home
-  end
+module Hearken
+  module Paths
+    attr_reader :base_path, :index_path
 
-  def in_queue_dir
-    Dir.chdir(queue_path) { yield }
-  end
+    def create_paths
+      @base_path = ".hearken".from_home
+      @index_path = ".hearken/music".from_home
+    end
 
-  def in_base_dir
-    Dir.chdir(base_path) { yield }
+    def in_base_dir(&block)
+      Dir.chdir(base_path, &block)
+    end
   end
-end
+end

data/lib/hearken/range_expander.rb

@@ -1,30 +1,35 @@
+# frozen_string_literal: true
+
 module Hearken
   class RangeExpander
-    def expand text
-      text.split(/[^0-9a-z-]/).inject([]) {|acc, term| acc + expand_term(term) }
+    def expand(text)
+      text.split(/[^0-9a-z-]/).inject([]) { |acc, term| acc + expand_term(term) }
     end
 
-    def expand_to_ids text
-      expand(text).map {|number| from_number number }
+    def expand_to_ids(text)
+      expand(text).map { |number| from_number number }
     end
-  private
-    def expand_term term
-      words = term.split '-'
+
+    private
+
+    def expand_term(term)
+      words = term.split "-"
       words.empty? ? [] : range(words.first, words.last)
     end
 
-    def range from, to
-      f, t = to_number(from), to_number(to)
-      t = to_number(from.slice(0...from.size-to.size)+to) if t < f
+    def range(from, to)
+      f = to_number(from)
+      t = to_number(to)
+      t = to_number(from.slice(0...from.size - to.size) + to) if t < f
       (f..t).to_a
     end
 
-    def from_number term
+    def from_number(term)
       term.to_s 36
     end
 
-    def to_number term
+    def to_number(term)
       term.to_i 36
     end
   end
-end
+end

data/lib/hearken/tagged.rb

@@ -1,15 +1,19 @@
-module Hearken::Tagged
-  FILE_FIELDS = %w{path timestamp}
-  TAG_FIELDS = %w{album track title artist time date albumartist puid mbartistid mbalbumid mbalbumartistid asin}
-  FIELDS = FILE_FIELDS + TAG_FIELDS
+# frozen_string_literal: true
 
-  attr_accessor *FIELDS.map {|field| field.to_sym }
+module Hearken
+  module Tagged
+    FILE_FIELDS = %w[path timestamp].freeze
+    TAG_FIELDS = %w[album track title artist time date albumartist puid mbartistid mbalbumid mbalbumartistid asin].freeze
+    FIELDS = FILE_FIELDS + TAG_FIELDS
 
-  def no_tag_fields?
-    TAG_FIELDS.select {|field| send field }.empty?
-  end
+    attr_accessor(*FIELDS.map(&:to_sym))
+
+    def no_tag_fields?
+      TAG_FIELDS.select { |field| send field }.empty?
+    end
 
-  def to_a
-    FIELDS.map { |field| send field }
+    def to_a
+      FIELDS.map { |field| send field }
+    end
   end
-end
+end

data/lib/hearken/track.rb

@@ -1,41 +1,53 @@
-require 'hearken/tagged'
-require 'hearken/colour'
-
-class Hearken::Track
-  include Hearken::Tagged
-  include Hearken::Colour
-
-  attr_accessor :id, :started
-
-  def initialize id=nil
-    @id = id
-  end
-
-  def [] key
-    self.send key
-  end
-
-  def valid?
-    @track
-  end
-
-  def search_id
-    id.to_s 36
-  end
-
-  def search_string
-    "#{self.artist.to_s.downcase}#{self.album.to_s.downcase}#{self.title.to_s.downcase}"
-  end
-
-  def to_s
-    "[#{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
-    c self.send(field).to_s, colour
-  end
-end
+# frozen_string_literal: true
+
+require "hearken/tagged"
+require "hearken/colour"
+
+module Hearken
+  class Track
+    include Hearken::Tagged
+    include Hearken::Colour
+
+    attr_accessor :id, :started
+
+    def initialize(id = nil)
+      @id = id
+    end
+
+    def [](key)
+      send key
+    end
+
+    def valid?
+      @track
+    end
+
+    def search_id
+      id.to_s 36
+    end
+
+    def search_string
+      "#{artist.to_s.downcase}#{album.to_s.downcase}#{title.to_s.downcase}#{date}"
+    end
+
+    def to_s
+      [
+        "[#{my(:search_id, :white)}]",
+        my(:artist, :yellow),
+        my(:album, :cyan),
+        my(:track, :magenta),
+        my(:title, :green),
+        my(:date, :white),
+        my(:time, :white)
+      ].join(" ")
+    end
+
+    def to_short_s
+      "#{track} #{title}\n#{artist}\n#{album}"
+    end
+
+    def my(field, colour)
+      c send(field).to_s, colour
+    end
+  end
+end

data/lib/hearken.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hearken
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Mark Ryall
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: shell_shock
-  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'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -39,51 +25,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: shell_shock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
 description: |
-  A command line tool to enqueue and play music tracks.
+  A command line tool to enqueue and play music trackspec.
 
-  This also extracts the tags from a collection of folders.
+  This also extracts the tags from a collection of folderspec.
 
   This replaces and combines the functionality from a couple of other gems (audio_library and songbirdsh).
 email:
@@ -91,8 +49,6 @@ email:
 executables:
 - hearken
 - hearken_index
-- hearken_scrobble
-- hearken_tags
 extensions: []
 extra_rdoc_files: []
 files:
@@ -104,35 +60,22 @@ files:
 - ".cards/94f23de2-4e0c-417a-aa82-3147908e2481"
 - ".cards/a5be50c4-2117-4ecf-bc64-e9977f4d52c1"
 - ".cards/f742a9f4-36af-43e5-a7cb-480049a43821"
-- ".gitignore"
+- ".rubocop.yml"
+- ".tool-versions"
 - Gemfile
-- HISTORY.rdoc
-- MIT-LICENSE
-- README.rdoc
+- Gemfile.lock
+- README.md
 - Rakefile
-- bin/hearken
-- bin/hearken_index
-- bin/hearken_scrobble
-- bin/hearken_tags
+- bin/console
+- bin/setup
+- exe/hearken
+- exe/hearken_index
 - hearken.gemspec
 - lib/hearken.rb
 - lib/hearken/colour.rb
-- lib/hearken/command.rb
 - lib/hearken/command/enqueue.rb
-- lib/hearken/command/list.rb
-- lib/hearken/command/love.rb
-- lib/hearken/command/profile.rb
-- lib/hearken/command/recent.rb
 - lib/hearken/command/reload.rb
-- lib/hearken/command/remove.rb
-- lib/hearken/command/restart.rb
-- lib/hearken/command/scrobbling.rb
 - lib/hearken/command/search.rb
-- lib/hearken/command/setup_scrobbling.rb
-- lib/hearken/command/shuffle.rb
-- lib/hearken/command/start.rb
-- lib/hearken/command/status.rb
-- lib/hearken/command/stop.rb
 - lib/hearken/console.rb
 - lib/hearken/debug.rb
 - lib/hearken/indexing.rb
@@ -146,29 +89,15 @@ files:
 - lib/hearken/indexing/persisted_traverser.rb
 - lib/hearken/library.rb
 - lib/hearken/monkey_violence.rb
-- lib/hearken/notification/growl_notifier.rb
 - lib/hearken/paths.rb
-- lib/hearken/player.rb
-- lib/hearken/preferences.rb
-- lib/hearken/queue.rb
 - lib/hearken/range_expander.rb
-- lib/hearken/scrobbler.rb
-- lib/hearken/simple_scrobbler.rb
 - lib/hearken/tagged.rb
 - lib/hearken/track.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
-- spec/hearken/command/shuffle_spec.rb
-- spec/hearken/player_spec.rb
-- spec/hearken/range_expander_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/markryall/hearken
-licenses:
-- MIT
-metadata: {}
+licenses: []
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: |
   Hey - thanks for installing hearken.
 
@@ -178,7 +107,7 @@ post_install_message: |
 
   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.
+  After that just run hearken to start searching for and then queueing tracks.
 rdoc_options: []
 require_paths:
 - lib
@@ -186,23 +115,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: hearken
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: command line music player
-test_files:
-- spec/hearken/command/enqueue_spec.rb
-- spec/hearken/command/list_spec.rb
-- spec/hearken/command/reload_spec.rb
-- spec/hearken/command/shuffle_spec.rb
-- spec/hearken/player_spec.rb
-- spec/hearken/range_expander_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-*song
-.bundle
-Gemfile.lock
-pkg/*

data/HISTORY.rdoc

@@ -1,38 +0,0 @@
-= 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
-* split hearken command into two
-* added 'love' command (to mark current track as loved)
-* added 'profile' command (to launch last.fm profile to see track history)
-* replaced 'flush' with an 'rm' command that can remove tracks matches criteria
-
-= 0.0.5
-
-* fixed 'recent' command - the library is sorted on file modification date
-* moved 'current_song' from working directory to .hearken directory
-* Changed dequeue to return track instead of id - this fixed a bug where reindexing would cause player to start playing the wrong files.
-
-= 0.0.4
-
-* Partially fixed bug with growl (correctly escaping characters in message)
-* moved all configuration, queues and index to a .hearken directory
-
-= 0.0.3
-
-* Fixed bug in setup_scrobbling command (using $stdin directly - 'gets' seems to have been aliased by thor)
-* Added growl notification
-
-= 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

@@ -1,20 +0,0 @@
-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/bin/hearken

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << File.dirname(__FILE__)+'/../lib'
-
-require 'hearken/console'
-
-Hearken::Console.new.push

data/bin/hearken_index

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << File.dirname(__FILE__)+'/../lib'
-
-require 'hearken/indexing'
-
-unless ARGV.size == 1
-  puts "usage: hearken_index path_to_directory_containing_music_collection"
-  exit
-end
-
-Hearken::Indexing::Indexer.new(ARGV.shift).execute