diff --git a/lib/datasets/configuration.rb b/lib/datasets/configuration.rb index c32addd..fe7a77c 100644 --- a/lib/datasets/configuration.rb +++ b/lib/datasets/configuration.rb @@ -5,7 +5,7 @@ module Datasets class Configuration < OpenStruct def initialize(hash = {}) - super hash.merge(logger: NullLogger.new) + super(hash.merge(logger: NullLogger.new)) end def self.from_yaml(path) diff --git a/lib/datasets/filter.rb b/lib/datasets/filter.rb index 6e55713..3370add 100644 --- a/lib/datasets/filter.rb +++ b/lib/datasets/filter.rb @@ -1,6 +1,4 @@ # Filters volumes based on criteria. -require "set" - module Datasets class Filter PD_RIGHTS = [:"cc-by-3.0", diff --git a/lib/datasets/repository/rights_volume_repo.rb b/lib/datasets/repository/rights_volume_repo.rb index 3a44df3..16454b7 100644 --- a/lib/datasets/repository/rights_volume_repo.rb +++ b/lib/datasets/repository/rights_volume_repo.rb @@ -1,6 +1,5 @@ require "datasets/volume_repo" require "datasets/volume" -require "set" require "sequel" module Datasets diff --git a/spec/cli_spec.rb b/spec/cli_spec.rb index bd20247..29c3a83 100644 --- a/spec/cli_spec.rb +++ b/spec/cli_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./spec_helper" +require_relative "spec_helper" require "cli" module Datasets diff --git a/spec/filesystem_spec.rb b/spec/filesystem_spec.rb index 17de8aa..62165a3 100644 --- a/spec/filesystem_spec.rb +++ b/spec/filesystem_spec.rb @@ -1,4 +1,4 @@ -require_relative "./spec_helper" +require_relative "spec_helper" require "filesystem" require "pathname" require "fileutils" diff --git a/spec/force_volume_creator_spec.rb b/spec/force_volume_creator_spec.rb index 2208b2a..1fb0683 100644 --- a/spec/force_volume_creator_spec.rb +++ b/spec/force_volume_creator_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./spec_helper" +require_relative "spec_helper" require "force_volume_creator" require "pathname" diff --git a/spec/pairtree_path_resolver_spec.rb b/spec/pairtree_path_resolver_spec.rb index ced601a..3431957 100644 --- a/spec/pairtree_path_resolver_spec.rb +++ b/spec/pairtree_path_resolver_spec.rb @@ -1,4 +1,4 @@ -require_relative "./spec_helper" +require_relative "spec_helper" require "pairtree_path_resolver" module Datasets diff --git a/spec/report_manager_spec.rb b/spec/report_manager_spec.rb index fb5b418..10b0c9c 100644 --- a/spec/report_manager_spec.rb +++ b/spec/report_manager_spec.rb @@ -1,4 +1,4 @@ -require_relative "./spec_helper" +require_relative "spec_helper" require "report_manager" require "filesystem" require "pathname" diff --git a/spec/report_spec.rb b/spec/report_spec.rb index 86767a3..1096516 100644 --- a/spec/report_spec.rb +++ b/spec/report_spec.rb @@ -1,4 +1,4 @@ -require_relative "./spec_helper" +require_relative "spec_helper" require "report" require "report_summary" require "pathname" diff --git a/spec/report_summary_spec.rb b/spec/report_summary_spec.rb index 616fb14..5aa201b 100644 --- a/spec/report_summary_spec.rb +++ b/spec/report_summary_spec.rb @@ -1,4 +1,4 @@ -require_relative "./spec_helper" +require_relative "spec_helper" require "report_summary" module Datasets diff --git a/spec/repository/rights_volume_repo_spec.rb b/spec/repository/rights_volume_repo_spec.rb index 3b11584..e245981 100644 --- a/spec/repository/rights_volume_repo_spec.rb +++ b/spec/repository/rights_volume_repo_spec.rb @@ -1,7 +1,6 @@ require "spec_helper" require "repository/rights_volume_repo" require "volume" -require "set" require "sequel" module Datasets diff --git a/spec/scheduler_spec.rb b/spec/scheduler_spec.rb index 8215dba..63323c2 100644 --- a/spec/scheduler_spec.rb +++ b/spec/scheduler_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./spec_helper" +require_relative "spec_helper" require "scheduler" module Datasets diff --git a/spec/volume_creator_spec.rb b/spec/volume_creator_spec.rb index 44873ab..5a1ec51 100644 --- a/spec/volume_creator_spec.rb +++ b/spec/volume_creator_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./spec_helper" +require_relative "spec_helper" require "volume_creator" require "pathname" diff --git a/spec/volume_linker_spec.rb b/spec/volume_linker_spec.rb index 0d86ffc..b1c5d5c 100644 --- a/spec/volume_linker_spec.rb +++ b/spec/volume_linker_spec.rb @@ -1,4 +1,4 @@ -require_relative "./spec_helper" +require_relative "spec_helper" require "volume_linker" require "pathname" diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index e19d3aa..1cebdc3 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative "./spec_helper" +require_relative "spec_helper" require "datasets/volume" module Datasets diff --git a/spec/zip_writer_spec.rb b/spec/zip_writer_spec.rb index 0a26eb8..089a402 100644 --- a/spec/zip_writer_spec.rb +++ b/spec/zip_writer_spec.rb @@ -1,4 +1,4 @@ -require_relative "./spec_helper" +require_relative "spec_helper" require "zip_writer" require "zip" require "pathname"