alexandria-book-collection-manager 0.7.9 → 0.7.11

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@
 require "rspec"
 require "alexandria"
 require "webmock/rspec"
-require "pry"
 
 LIBDIR = File.expand_path("data/libraries", __dir__)
 TESTDIR = File.join(LIBDIR, "test")
@@ -20,45 +19,38 @@ def an_artist_of_the_floating_world
                        "Paperback")
 end
 
-def assert_correct_search_result(provider, query,
-                                 search_type = Alexandria::BookProviders::SEARCH_BY_ISBN)
-  begin
-    results = provider.instance.search(query, search_type)
-  rescue SocketError
-    skip "Service is offline"
-  end
-
-  expect(results).to be_instance_of(Array), "Results are not an array for #{provider}"
-  expect(results).not_to be_empty, "Results are empty for #{provider}"
+RSpec::Matchers.define :have_correct_search_result_for do |query|
+  match(notify_expectation_failures: true) do |provider|
+    begin
+      results = provider.instance.search(query, Alexandria::BookProviders::SEARCH_BY_ISBN)
+    rescue SocketError
+      skip "Service is offline"
+    rescue Alexandria::BookProviders::ConnectionError
+      skip "Connection failed"
+    end
 
-  if search_type == Alexandria::BookProviders::SEARCH_BY_ISBN
-    expect(results.length).to be <= 2, "Results are greater than 2 for #{provider}"
+    expect(results).to be_instance_of(Array)
+    expect(results).not_to be_empty
+    expect(results.length).to be <= 2
 
-    book = results.first
+    book, cover_url = *results
 
-    expect(book).to be_instance_of(Alexandria::Book),
-                    "Result is not a Book for #{provider}"
+    expect(book).to be_instance_of(Alexandria::Book)
 
     canonical_query = Alexandria::Library.canonicalise_ean(query)
     canonical_result = Alexandria::Library.canonicalise_ean(book.isbn)
-    expect(canonical_query)
-      .to eq(canonical_result),
-          "Result's isbn #{book.isbn} is not equivalent" \
-          " to the requested isbn #{query} for #{provider}"
-
-    if results.length == 2
-      cover_url = results.last
-      if cover_url
-        expect(cover_url)
-          .to be_instance_of(String),
-              "Unexpected cover_url #{cover_url.inspect} for #{provider}"
-      end
-    end
-  else
-    expect(results.first.first)
-      .to be_instance_of(Alexandria::Book), "Result item is not a Book for #{provider}"
+    expect(canonical_result).to eq(canonical_query)
+
+    expect(cover_url).to be_instance_of(String) if cover_url
+
+    true
+  end
+end
+
+RSpec::Matchers.define :be_an_existing_file do
+  match do |filename|
+    File.exist? filename
   end
-  results
 end
 
 Alexandria::UI::Icons.init
@@ -71,6 +63,7 @@ RSpec.configure do |config|
 
   config.before do
     FileUtils.rm_rf(TESTDIR)
+    Alexandria.log.level = Logger::DEBUG if ENV["DEBUG"]
   end
 
   config.after do

data/tasks/setup.rb

@@ -28,5 +28,5 @@ require "rake/clean"
 
 # Load the other rake files in the tasks folder
 tasks_dir = __dir__
-rakefiles = Dir.glob(File.join(tasks_dir, "*.rake")).sort
+rakefiles = Dir.glob(File.join(tasks_dir, "*.rake"))
 import(*rakefiles)

data/util/rake/fileinstall.rb

@@ -29,7 +29,6 @@
 
 require "fileutils"
 require "pathname"
-require "set"
 require "rake/tasklib"
 
 # A file installer task, capable of installing into the system
@@ -77,10 +76,10 @@ class FileInstallTask < Rake::TaskLib
   # of the @file_groups list
   def make_tasks
     tasknames = {}
-    tasknames[:install] = "install_#{@taskname}".intern
-    tasknames[:uninstall] = "uninstall_#{@taskname}".intern
-    tasknames[:uninstall_files] = "uninstall_#{@taskname}_files".intern
-    tasknames[:uninstall_dirs] = "uninstall_#{@taskname}_dirs".intern
+    tasknames[:install] = :"install_#{@taskname}"
+    tasknames[:uninstall] = :"uninstall_#{@taskname}"
+    tasknames[:uninstall_files] = :"uninstall_#{@taskname}_files"
+    tasknames[:uninstall_dirs] = :"uninstall_#{@taskname}_dirs"
 
     # INSTALL TASK
 
@@ -171,14 +170,14 @@ class FileInstallTask < Rake::TaskLib
   def calculate_ruby_dir
     ruby_prefix = RbConfig::CONFIG["prefix"]
 
-    ruby_libdir = if @install_to_rubylibdir
-                    RbConfig::CONFIG["rubylibdir"]
-                  else
-                    RbConfig::CONFIG["sitelibdir"]
-                  end
-    ruby_libdir = ENV["RUBYLIBDIR"] if ENV.key?("RUBYLIBDIR")
+    ruby_libdir = ENV.fetch("RUBYLIBDIR", nil)
+    ruby_libdir ||= if @install_to_rubylibdir
+                      RbConfig::CONFIG["rubylibdir"]
+                    else
+                      RbConfig::CONFIG["sitelibdir"]
+                    end
 
-    @prefix = ENV["PREFIX"] || ruby_prefix
+    @prefix = ENV.fetch("PREFIX", ruby_prefix)
     if @prefix == ruby_prefix
       @rubylib = ruby_libdir
     elsif ruby_libdir.index(ruby_prefix).zero?
@@ -197,7 +196,7 @@ class FileInstallTask < Rake::TaskLib
       part.gsub!("*", "[^\\/]*")
       part.gsub!("?", "[^\\/]")
     end
-    pattern = real_parts.join("([^\/]+\/)*")
+    pattern = real_parts.join("([^/]+/)*")
     /(#{pattern})/
   end
 

data/util/rake/gettextgenerate.rb

@@ -54,7 +54,7 @@ class GettextGenerateTask < Rake::TaskLib
     # create MO files
     rule(/\.mo$/ => [->(dest) { source_file(dest) }]) do |t|
       dest_dir = File.dirname(t.name)
-      FileUtils.makedirs(dest_dir) unless FileTest.exists?(dest_dir)
+      FileUtils.makedirs(dest_dir)
       puts "Generating #{t.name}"
       result = system("msgfmt #{t.source} -o #{t.name}")
       raise "msgfmt failed for #{t.source}" unless result

data/util/rake/omfgenerate.rb

@@ -68,7 +68,7 @@ class OmfGenerateTask < Rake::TaskLib
       path = File.join(@gnome_helpfiles_dir, @projectname,
                        locale_for(t.name), "#{@projectname}.xml")
       data = File.read(t.source)
-      data.sub!(/PATH_TO_DOC_FILE/, path)
+      data.sub!("PATH_TO_DOC_FILE", path)
       puts "Generating #{t.name}..."
       File.open(t.name, "w") { |io| io.puts data }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexandria-book-collection-manager
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.11
 platform: ruby
 authors:
 - Alexander McCormmach
@@ -25,11 +25,38 @@ authors:
 - Takayuki Kusano
 - Timothy Malone
 - Zachary P. Landau
-autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: alexandria-zoom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: gettext
   requirement: !ruby/object:Gem::Requirement
@@ -50,28 +77,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -101,87 +128,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: marc
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: marc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: zoom
+  name: observer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: gnome_app_driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -216,70 +231,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.79'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.79'
 - !ruby/object:Gem::Dependency
   name: rubocop-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -294,7 +323,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
-description:
 email:
 - matijs@matijs.net
 executables:
@@ -323,7 +351,8 @@ files:
 - TODO.md
 - alexandria-book-collection-manager.gemspec
 - alexandria.desktop.in
-- bin/alexandria
+- bin/rake
+- bin/rspec
 - doc/AUTHORS
 - doc/BUGS
 - doc/FAQ
@@ -332,17 +361,17 @@ files:
 - doc/alexandria.1
 - doc/cuecat_support.rdoc
 - doc/dependency_decisions.yml
+- exe/alexandria
 - lib/alexandria.rb
 - lib/alexandria/about.rb
 - lib/alexandria/book_providers.rb
 - lib/alexandria/book_providers/bl_provider.rb
-- lib/alexandria/book_providers/douban.rb
+- lib/alexandria/book_providers/douban_provider.rb
 - lib/alexandria/book_providers/loc_provider.rb
-- lib/alexandria/book_providers/pseudomarc.rb
 - lib/alexandria/book_providers/sbn_provider.rb
 - lib/alexandria/book_providers/thalia_provider.rb
-- lib/alexandria/book_providers/web.rb
-- lib/alexandria/book_providers/worldcat.rb
+- lib/alexandria/book_providers/website_based_provider.rb
+- lib/alexandria/book_providers/world_cat_provider.rb
 - lib/alexandria/book_providers/z3950_provider.rb
 - lib/alexandria/config.rb
 - lib/alexandria/console.rb
@@ -361,9 +390,10 @@ files:
 - lib/alexandria/models/library.rb
 - lib/alexandria/net.rb
 - lib/alexandria/preferences.rb
+- lib/alexandria/pseudo_marc_parser.rb
 - lib/alexandria/scanners.rb
 - lib/alexandria/scanners/cue_cat.rb
-- lib/alexandria/scanners/keyboard.rb
+- lib/alexandria/scanners/keyboard_wedge.rb
 - lib/alexandria/smart_library.rb
 - lib/alexandria/ui.rb
 - lib/alexandria/ui/about_dialog.rb
@@ -383,8 +413,8 @@ files:
 - lib/alexandria/ui/dndable.rb
 - lib/alexandria/ui/error_dialog.rb
 - lib/alexandria/ui/export_dialog.rb
+- lib/alexandria/ui/icon_view_manager.rb
 - lib/alexandria/ui/icons.rb
-- lib/alexandria/ui/iconview.rb
 - lib/alexandria/ui/iconview_tooltips.rb
 - lib/alexandria/ui/import_dialog.rb
 - lib/alexandria/ui/init.rb
@@ -407,7 +437,7 @@ files:
 - lib/alexandria/ui/smart_library_properties_dialog.rb
 - lib/alexandria/ui/smart_library_properties_dialog_base.rb
 - lib/alexandria/ui/smart_library_rule_box.rb
-- lib/alexandria/ui/sound.rb
+- lib/alexandria/ui/sound_effects_player.rb
 - lib/alexandria/ui/ui_manager.rb
 - lib/alexandria/undo_manager.rb
 - lib/alexandria/version.rb
@@ -566,18 +596,23 @@ files:
 - share/sounds/alexandria/scanning.ogg
 - share/sounds/alexandria/scanning.wav
 - spec/alexandria/book_providers/bl_provider_spec.rb
+- spec/alexandria/book_providers/douban_provider_spec.rb
 - spec/alexandria/book_providers/loc_provider_spec.rb
 - spec/alexandria/book_providers/sbn_provider_spec.rb
 - spec/alexandria/book_providers/thalia_provider_spec.rb
 - spec/alexandria/book_providers/world_cat_provider_spec.rb
+- spec/alexandria/book_providers/z3950_provider_spec.rb
 - spec/alexandria/book_providers_spec.rb
 - spec/alexandria/book_spec.rb
 - spec/alexandria/console_spec.rb
 - spec/alexandria/export_library_spec.rb
+- spec/alexandria/library_collection_spec.rb
 - spec/alexandria/library_spec.rb
 - spec/alexandria/library_store_spec.rb
 - spec/alexandria/preferences_spec.rb
+- spec/alexandria/pseudo_marc_parser_spec.rb
 - spec/alexandria/scanners/cue_cat_spec.rb
+- spec/alexandria/scanners/keyboard_wedge_spec.rb
 - spec/alexandria/smart_library_spec.rb
 - spec/alexandria/ui/about_dialog_spec.rb
 - spec/alexandria/ui/acquire_dialog_spec.rb
@@ -588,8 +623,8 @@ files:
 - spec/alexandria/ui/conflict_while_copying_dialog_spec.rb
 - spec/alexandria/ui/error_dialog_spec.rb
 - spec/alexandria/ui/export_dialog_spec.rb
+- spec/alexandria/ui/icon_view_manager_spec.rb
 - spec/alexandria/ui/icons_spec.rb
-- spec/alexandria/ui/iconview_spec.rb
 - spec/alexandria/ui/import_dialog_spec.rb
 - spec/alexandria/ui/keep_bad_isbn_dialog_spec.rb
 - spec/alexandria/ui/main_app_spec.rb
@@ -603,7 +638,7 @@ files:
 - spec/alexandria/ui/sidepane_manager_spec.rb
 - spec/alexandria/ui/skip_entry_dialog_spec.rb
 - spec/alexandria/ui/smart_library_properties_dialog_spec.rb
-- spec/alexandria/ui/sound_spec.rb
+- spec/alexandria/ui/sound_effects_player_spec.rb
 - spec/alexandria/ui/ui_manager_spec.rb
 - spec/data/isbns.txt
 - spec/data/libraries/0.6.1-noisbn/My Library/0201398257.yaml
@@ -632,10 +667,9 @@ files:
 - util/rake/omfgenerate.rb
 homepage: http://www.github.com/mvz/alexandria-book-collection-manager
 licenses:
-- GPL-2.0+
+- GPL-2.0-or-later
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -645,15 +679,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: GNOME application for managing collections of books
 test_files: []