kagu 3.0.7 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08a61e583b7b18fcfb6861e475872806f51ca5e16fee613a9d6decf4a4654be5'
-  data.tar.gz: 1cd22e2339674a7f7583fde9542ed495dbce8b1cd0f9643a2f5fac9fdc202501
+  metadata.gz: e1c1858a37f00f8823ce4ebacf2b9bb96837da05c1e7be296fcbcd1461afe03f
+  data.tar.gz: f8d1d56f7e6e90a3afa12aeabf4f2804dda4d7e3bd4c0be9cfcb1b282a4078d3
 SHA512:
-  metadata.gz: e62e833e1a169c9032edeb75d20fb5d19ffbafc950e9ffe92dedf7817425c123f451ab9b15cc2852ceb899b119a72816a52695697e664336c778294cc9f873e3
-  data.tar.gz: c61a3dca90a31a308788a0aaa67b06c577ec97c039801cf9c4c1df8bd182d3700f662d12fbc86f37d97a737234b9b60854e73b623163e9421cf143084e1f0636
+  metadata.gz: 88e72ddf7e6960712558490d614f9e82aa78c6908f5300ac8d29ff587a2e40ee59a471ed9538b03155e0b130bfb15211b3b2baf6ce45e34e338c0f8a3cc1e909
+  data.tar.gz: 9d0fe80ce5dc1a8a857409f60425ff349a555a374893ba0c26cd5fea177c0774f4acb21cd0c920d5d0cf28701edbf024a3351e865a3ef80bb9a5129234682305

data/VERSION

@@ -1 +1 @@
-3.0.7
+3.2.0

data/kagu.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
 
   s.add_dependency 'activesupport', '>= 4.1.0', '< 7.0.0'
+  s.add_dependency 'addressable', '>= 2.7.0', '< 3.0.0'
   s.add_dependency 'applescript', '>= 1.0', '< 2.0'
 
   s.add_development_dependency 'byebug', '>= 3.2.0', '< 12.0.0'
   s.add_development_dependency 'rake', '>= 10.3.0', '< 14.0.0'
-  s.add_development_dependency 'rspec', '>= 3.1.0', '< 3.10.0'
+  s.add_development_dependency 'rspec', '>= 3.1.0', '< 3.11.0'
 end

data/lib/kagu.rb

@@ -1,5 +1,6 @@
 require 'active_support'
 require 'active_support/core_ext'
+require 'addressable/uri'
 require 'applescript'
 require 'byebug' if ENV['DEBUGGER']
 require 'logger'

data/lib/kagu/attributes_initializer.rb

@@ -7,7 +7,7 @@ module Kagu
         send("#{name}=", value) if respond_to?("#{name}=", true)
       end
       self.class.const_get(:MANDATORY_ATTRIBUTES).each do |attribute|
-        raise Error.new("#{self.class}##{attribute} is mandatory") if send(attribute).nil?
+        raise Error.new("#{self.class}##{attribute} is mandatory for #{inspect}") if send(attribute).nil?
       end
     end
 

data/lib/kagu/playlists.rb

@@ -28,11 +28,11 @@ module Kagu
           print("BEGIN_PLAYLIST")
           print(playlist.name)
           for track in playlist.items.filter({ $0.mediaKind == ITLibMediaItemMediaKind.kindSong }) {
-            print(String(format: "%02X", track.persistentID.intValue))
+            print(String(track.persistentID.uint64Value, radix: 16).uppercased())
           }
           print("END_PLAYLIST")
         }
-      }) do |line|
+      }).each do |line|
         if line == 'BEGIN_PLAYLIST'
           playlist_name = nil
           playlist_tracks = []
@@ -44,6 +44,7 @@ module Kagu
           playlist_tracks << tracks[line]
         end
       end
+      nil
     end
 
   end

data/lib/kagu/swift_helper.rb

@@ -2,7 +2,7 @@ module Kagu
 
   module SwiftHelper
 
-    def self.execute(code, &block)
+    def self.execute(code)
       tempfile = Tempfile.new
       begin
         tempfile << code
@@ -12,12 +12,7 @@ module Kagu
       begin
         stdout, stderr, result = Open3.capture3("swift #{tempfile.path.inspect}")
         raise(stderr.presence || "Swift command returned with code: #{result.exitstatus}") unless result.success?
-        if block_given?
-          stdout.lines.each { |line| yield(line.chomp) }
-          nil
-        else
-          stdout
-        end
+        stdout.lines.map(&:chomp)
       ensure
         tempfile.unlink
       end

data/lib/kagu/track.rb

@@ -5,7 +5,7 @@ module Kagu
     include AttributesInitializer
     include Comparable
 
-    MANDATORY_ATTRIBUTES = %w(added_at id length path)
+    MANDATORY_ATTRIBUTES = %w(added_at id length)
 
     attr_reader :added_at, :album, :artist, :bpm, :genre, :id, :length, :path, :title, :year
 
@@ -22,19 +22,14 @@ module Kagu
       super || self == other
     end
 
-    def exists?
-      path.file?
+    def exists_on_disk?
+      path.present? && path.file?
     end
 
     def hash
       [artist, title].hash
     end
 
-    def relative_path(directory)
-      directory = directory.to_s
-      directory.present? ? Pathname.new(path.to_s.gsub(/\A#{Regexp.escape(directory)}\//, '')) : path
-    end
-
     def to_s
       "#{artist} - #{title}"
     end
@@ -77,11 +72,9 @@ module Kagu
 
     def path=(value)
       value = value.to_s.presence
-      value = URI.unescape(URI.parse(value).path) if value.is_a?(String) && value.starts_with?('file://')
-      value = value.encode('UTF-8', 'UTF-8-MAC') if Kagu::IS_MAC_OS
-      @path = Pathname.new(value)
-      raise Error.new("No such file: #{path.to_s.inspect}") if path.exist? && !exists?
-      Kagu.logger.error('Kagu') { "No such track: #{path.inspect}" } unless exists?
+      value = Addressable::URI.unescape(Addressable::URI.parse(value).path).presence if value.is_a?(String) && value.starts_with?('file://')
+      value = value.encode('UTF-8', 'UTF-8-MAC') if value.present? && Kagu::IS_MAC_OS
+      @path = value.present? ? Pathname.new(value) : nil
     end
 
     def title=(value)

data/lib/kagu/tracks.rb

@@ -35,7 +35,7 @@ module Kagu
           printObjectProperty(name: "year", value: track.year)
           print("END_TRACK")
         }
-      }) do |line|
+      }).each do |line|
         if line == 'BEGIN_TRACK'
           attributes = {}
         elsif line == 'END_TRACK'
@@ -44,6 +44,7 @@ module Kagu
           attributes[match[1]] = JSON.parse(match[2])
         end
       end
+      nil
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kagu
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.2.0
 platform: ruby
 authors:
 - Alexis Toulotte
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: applescript
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +119,7 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +129,7 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 description: API to manage macOS Music tracks and playlists
 email: al@alweb.org
 executables: []
@@ -134,7 +154,7 @@ homepage: https://github.com/alexistoulotte/kagu
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -149,8 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: API for macOS Music
 test_files: []