hearken 0.1.1 → 0.1.3

data/lib/hearken/indexing/indexer.rb

@@ -1,31 +1,39 @@
-require 'hearken/paths'
-require 'hearken/indexing/persistant_traverser'
+# frozen_string_literal: true
 
-class Hearken::Indexing::Indexer
-  include Hearken::Paths
+require "hearken/paths"
+require "hearken/indexing/persistant_traverser"
 
-  def initialize path
-    create_paths
-    @path = path
-  end
+module Hearken
+  module Indexing
+    class Indexer
+      include Hearken::Paths
 
-  def execute
-    start = Time.now
-    count = 0
-    traverser = Hearken::Indexing::PersistantTraverser.new @path, index_path
+      def initialize(path)
+        create_paths
+        @path = path
+      end
 
-    traverser.each do |audio_file|
-      count += 1
-      show_progress start, count if count % 1000 == 0
-    end
+      def execute
+        start = Time.now
+        count = 0
+        traverser = Hearken::Indexing::PersistantTraverser.new @path, index_path
 
-    show_progress start, count
+        traverser.each do |_audio_file|
+          count += 1
+          show_progress start, count if (count % 1000).zero?
+        end
 
-    system "play -q #{File.dirname(__FILE__)}/../../../media/applause.mp3"
-  end
-private
-  def show_progress start, count
-    elapsed = Time.now-start
-    $stderr.puts "Processed #{count} audio files in #{elapsed} seconds (#{elapsed/count} per file)"
+        show_progress start, count
+
+        system "afplay #{File.dirname(__FILE__)}/../../../media/applause.mp3"
+      end
+
+      private
+
+      def show_progress(start, count)
+        elapsed = Time.now - start
+        warn "Processed #{count} audio files in #{elapsed} seconds (#{elapsed / count} per file)"
+      end
+    end
   end
-end
+end

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,39 +1,53 @@
-require 'hearken/tagged'
-require 'rainbow'
-
-class Hearken::Track
-  include Hearken::Tagged
-  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
-    self.send(field).to_s.foreground(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.1'
-end
+  VERSION = '0.1.3'
+end

metadata

@@ -1,106 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: hearken
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Mark Ryall
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2012-12-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
-    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'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  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: rake
+  name: shell_shock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   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'
-  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.
-
-
-  This also extracts the tags from a collection of folders.
+description: |
+  A command line tool to enqueue and play music trackspec.
 
+  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).
-
-'
+  This replaces and combines the functionality from a couple of other gems (audio_library and songbirdsh).
 email:
 - mark@ryall.name
 executables:
@@ -109,41 +52,30 @@ 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
+- ".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"
+- ".rubocop.yml"
+- ".tool-versions"
 - Gemfile
-- HISTORY.rdoc
-- MIT-LICENSE
-- README.rdoc
+- Gemfile.lock
+- README.md
 - Rakefile
-- bin/hearken
-- bin/hearken_index
+- 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
@@ -157,62 +89,41 @@ 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
-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"
+licenses: []
+metadata:
+  rubygems_mfa_required: 'true'
+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 searching for and then queueing tracks.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.6.0
 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
-signing_key: 
-specification_version: 3
+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/*