druid-tools 2.0.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f669f7b8429c7d0d95c9b7e8715afc362924911005504f75e8c9c6e9addee306
-  data.tar.gz: dedef2151df6f1e7ca40ea664834218634e61a44190a17069a6d62973bc9f03d
+  metadata.gz: ae5225239dbe4cabc2b4380a386d476b73d9ae21af9f3791df9b1d44cb90f04e
+  data.tar.gz: 1a3274f2ba03e506cc1289715df194cbf8f6cf16b0d23a0367ee13ed0cae9e11
 SHA512:
-  metadata.gz: a288b3e8ba6a1db699ce7737c196d65859c28f7e52513d0d32a421e39ca30702184e2c2b38eefc5a2d34665dffcc0ea75d85a88d7115989bb9689e865c1c6335
-  data.tar.gz: 64ac1bdaa0b1c7bfc3a85f0480dca6b1387c76d47635f4a3823be95595303373d0d1d8e4bfd00f95c04ab4186ba7bc24f20fa7464b41f0c91f4f9e0f47facb3a
+  metadata.gz: 25274f7e81d1694cbbef1419165dc517ca40ada672a9d4a76f9c8c38781a3782520992050ce2f056f6d954a9fd74adea1c5483b3f4297d7918c512697ab1148a
+  data.tar.gz: 259575663aa19d712b31aa5f62f4204b6779dae6deec8512a0fba5dcb98df50af8f44d7a51b2b5b88573fd51acf9716d46e2a9bdb2a354b50f379406166e609e

data/.circleci/config.yml

@@ -0,0 +1,10 @@
+version: 2.1
+orbs:
+  ruby-rails: sul-dlss/ruby-rails@3.0.1
+workflows:
+  build:
+    jobs:
+      - ruby-rails/lint-gem:
+          name: lint
+      - ruby-rails/test-gem:
+          name: test

data/.github/pull_request_template.md

@@ -0,0 +1,9 @@
+## Why was this change made? 🤔
+
+
+
+## How was this change tested? 🤨
+
+⚡ ⚠ If this change has cross service impact, ***run [integration tests](https://github.com/sul-dlss/infrastructure-integration-test)*** that exercise the code and/or test in [stage|qa] environment, in addition to specs. ⚡
+
+

data/.rubocop.yml

@@ -1,41 +1,138 @@
 inherit_from: .rubocop_todo.yml
 
-# Turn on RSpec cops
 require: rubocop-rspec
 
 AllCops:
+  TargetRubyVersion: 2.7
   DisplayCopNames: true
-#  Include:
-#    - 'Rakefile'
   Exclude:
     - 'Gemfile.lock'
     - '**/*.md'
-    - 'vendor/**/*' # avoid running rubocop on travis cached bundler
-
-# --- Layout ---
-
-# --- Lint ---
-
-# --- Metrics ---
-
-# because this isn't 1994
-Metrics/LineLength:
-  Max: 167 # would like to reduce this to 120
+    - 'vendor/**/*' # avoid running rubocop on cached bundler
 
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*_spec.rb'
 
-# --- Naming ---
-
 Naming/FileName:
   Exclude:
     - Gemfile
     - druid-tools.gemspec
     - lib/druid-tools.rb
 
-# -- Performance ---
-
-# --- RSpec ---
-
-# --- Style ---
+Gemspec/DateAssignment: # new in 1.10
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Layout/SpaceBeforeBrackets: # new in 1.7
+  Enabled: true
+Lint/AmbiguousAssignment: # new in 1.7
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: true
+Lint/DeprecatedConstants: # new in 1.8
+  Enabled: true
+Lint/DuplicateBranch: # new in 1.3
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
+  Enabled: true
+Lint/EmptyBlock: # new in 1.1
+  Enabled: true
+Lint/EmptyClass: # new in 1.3
+  Enabled: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # new in 1.8
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # new in 1.2
+  Enabled: true
+Lint/NumberedParameterAssignment: # new in 1.9
+  Enabled: true
+Lint/OrAssignmentToConstant: # new in 1.9
+  Enabled: true
+Lint/RedundantDirGlobSort: # new in 1.8
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/SymbolConversion: # new in 1.9
+  Enabled: true
+Lint/ToEnumArguments: # new in 1.1
+  Enabled: true
+Lint/TripleQuotes: # new in 1.9
+  Enabled: true
+Lint/UnexpectedBlockArity: # new in 1.5
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # new in 1.1
+  Enabled: true
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  Enabled: true
+Style/ArgumentsForwarding: # new in 1.1
+  Enabled: true
+Style/CollectionCompact: # new in 1.2
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # new in 1.1
+  Enabled: true
+Style/EndlessMethod: # new in 1.8
+  Enabled: true
+Style/FileRead: # new in 1.24
+  Enabled: true
+Style/FileWrite: # new in 1.24
+  Enabled: true
+Style/HashConversion: # new in 1.10
+  Enabled: true
+Style/HashExcept: # new in 1.7
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # new in 1.9
+  Enabled: true
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/MapToHash: # new in 1.24
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NegatedIfElseCondition: # new in 1.2
+  Enabled: true
+Style/NilLambda: # new in 1.3
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantArgument: # new in 1.4
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true
+Style/SwapValues: # new in 1.1
+  Enabled: true
+RSpec/BeEq: # new in 2.9.0
+  Enabled: true
+RSpec/BeNil: # new in 2.9.0
+  Enabled: true
+RSpec/ExcessiveDocstringSpacing: # new in 2.5
+  Enabled: true
+RSpec/IdenticalEqualityAssertion: # new in 2.4
+  Enabled: true
+RSpec/SubjectDeclaration: # new in 2.5
+  Enabled: true
+RSpec/FactoryBot/SyntaxMethods: # new in 2.7
+  Enabled: true
+RSpec/Rails/AvoidSetupHook: # new in 2.4
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,29 +1,32 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2019-05-24 07:28:47 -0400 using RuboCop version 0.70.0.
+# `rubocop --auto-gen-config --auto-gen-only-exclude`
+# on 2022-04-01 18:08:00 UTC using RuboCop version 1.26.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
-  Max: 21
+  Exclude:
+    - 'lib/druid_tools/druid.rb'
 
 # Offense count: 1
-# Configuration parameters: CountComments.
+# Configuration parameters: CountComments, Max, CountAsOne.
 Metrics/ClassLength:
-  Max: 140
+  Exclude:
+    - 'lib/druid_tools/druid.rb'
 
 # Offense count: 1
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/MethodLength:
-  Max: 12
+# Configuration parameters: IgnoredMethods, Max.
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - 'lib/druid_tools/druid.rb'
 
 # Offense count: 1
-# Configuration parameters: Blacklist.
-# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
-Naming/HeredocDelimiterNaming:
+# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, IgnoredMethods.
+Metrics/MethodLength:
   Exclude:
     - 'lib/druid_tools/druid.rb'
 
@@ -35,22 +38,30 @@ RSpec/BeforeAfterAll:
     - 'spec/support/**/*.rb'
     - 'spec/druid_tools_spec.rb'
 
-# Offense count: 10
-# Configuration parameters: Max.
+# Offense count: 8
+# Configuration parameters: Max, CountAsOne.
 RSpec/ExampleLength:
   Exclude:
     - 'spec/druid_tools_spec.rb'
 
 # Offense count: 1
-# Configuration parameters: CustomTransform, IgnoreMethods.
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
 RSpec/FilePath:
   Exclude:
     - 'spec/druid_tools_spec.rb'
 
-# Offense count: 22
-# Configuration parameters: AggregateFailuresByDefault.
+# Offense count: 16
+# Configuration parameters: Max.
 RSpec/MultipleExpectations:
-  Max: 11
+  Exclude:
+    - 'spec/druid_tools_spec.rb'
+
+# Offense count: 4
+# Configuration parameters: AllowSubject, Max.
+RSpec/MultipleMemoizedHelpers:
+  Exclude:
+    - 'spec/druid_tools_spec.rb'
 
 # Offense count: 2
 RSpec/RepeatedExample:
@@ -58,19 +69,32 @@ RSpec/RepeatedExample:
     - 'spec/druid_tools_spec.rb'
 
 # Offense count: 1
-Style/ClassVars:
-  Exclude:
-    - 'lib/druid_tools/druid.rb'
-
-# Offense count: 2
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
-    - 'lib/druid_tools.rb'
     - 'lib/druid_tools/druid.rb'
 
 # Offense count: 1
-Style/EvalWithLocation:
+# This cop supports safe auto-correction (--auto-correct).
+Style/IfUnlessModifier:
   Exclude:
     - 'lib/druid_tools/druid.rb'
+
+# Offense count: 8
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: respond_to_missing?
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'lib/druid_tools/access_druid.rb'
+    - 'lib/druid_tools/druid.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'lib/druid_tools/druid.rb'
+    - 'spec/druid_tools_spec.rb'

data/Gemfile

@@ -3,11 +3,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'debugger', platform: :ruby_19
-  gem 'pry-debugger', platform: :ruby_19
-  gem 'rcov', platform: :ruby_18
-  gem 'ruby-debug', platform: :ruby_18
-  gem 'simplecov', platform: %i[ruby_19 ruby_20]
+  gem 'byebug'
 end
 
 gemspec

data/README.md

@@ -1,6 +1,7 @@
-[![Build Status](https://travis-ci.org/sul-dlss/druid-tools.svg?branch=delete-records)](https://travis-ci.org/sul-dlss/druid-tools)
-[![Coverage Status](https://coveralls.io/repos/github/sul-dlss/druid-tools/badge.svg?branch=master)](https://coveralls.io/github/sul-dlss/druid-tools?branch=master)
+[![CircleCI](https://circleci.com/gh/sul-dlss/druid-tools/tree/main.svg?style=svg)](https://circleci.com/gh/sul-dlss/druid-tools/tree/main)
 [![Gem Version](https://badge.fury.io/rb/druid-tools.svg)](https://badge.fury.io/rb/druid-tools)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/a21a8f4d0abae265638e/test_coverage)](https://codeclimate.com/github/sul-dlss/druid-tools/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/a21a8f4d0abae265638e/maintainability)](https://codeclimate.com/github/sul-dlss/druid-tools/maintainability)
 
 # Druid::Tools
 

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.2.1

data/druid-tools.gemspec

@@ -7,7 +7,9 @@ Gem::Specification.new do |gem|
   gem.summary       = 'Tools to manipulate DRUID trees and content directories'
   gem.homepage      = 'http://github.com/sul-dlss/druid-tools'
   gem.licenses      = ['ALv2', 'Stanford University Libraries']
-  gem.has_rdoc      = true
+  gem.metadata['rubygems_mfa_required'] = 'true'
+
+  gem.required_ruby_version = '>= 2.7'
 
   gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
@@ -16,9 +18,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = File.read('VERSION').strip
 
+  gem.add_dependency 'deprecation'
   gem.add_development_dependency 'coveralls'
   gem.add_development_dependency 'rake', '>= 10.1.0'
   gem.add_development_dependency 'rspec', '~> 3.0'
-  gem.add_development_dependency 'rubocop', '~> 0.70.0'
-  gem.add_development_dependency 'rubocop-rspec', '~> 1.33.0'
+  gem.add_development_dependency 'rubocop'
+  gem.add_development_dependency 'rubocop-rspec'
 end

data/lib/druid_tools/access_druid.rb

@@ -15,6 +15,10 @@ module DruidTools
       mkdir(extra) if create && !File.exist?(result)
       result
     end
+
+    def pruning_base
+      pathname
+    end
   end
 
   PurlDruid = AccessDruid

data/lib/druid_tools/druid.rb

@@ -2,9 +2,13 @@
 
 require 'pathname'
 require 'fileutils'
+require 'deprecation'
 
 module DruidTools
   class Druid
+    extend Deprecation
+    self.deprecation_horizon = 'druid-tools 3.0.0'
+
     attr_accessor :druid, :base
 
     # See https://consul.stanford.edu/pages/viewpage.action?title=SURI+2.0+Specification&spaceKey=chimera
@@ -41,16 +45,28 @@ module DruidTools
     end
     self.prefix = 'druid'
 
-    %i[content metadata temp].each do |dir_type|
-      class_eval <<-EOC
-        def #{dir_type}_dir(create=true)
-          path("#{dir_type}",create)
-        end
+    def content_dir(create = true)
+      path('content', create)
+    end
 
-        def find_#{dir_type}(path)
-          find(:#{dir_type},path)
-        end
-      EOC
+    def metadata_dir(create = true)
+      path('metadata', create)
+    end
+
+    def temp_dir(create = true)
+      path('temp', create)
+    end
+
+    def find_content(path)
+      find(:content, path)
+    end
+
+    def find_metadata(path)
+      find(:metadata, path)
+    end
+
+    def find_temp(path)
+      find(:temp, path)
     end
 
     # @param druid [String] A valid druid
@@ -66,7 +82,7 @@ module DruidTools
     end
 
     def id
-      @druid.scan(self.class.pattern).flatten.join('')
+      @druid.scan(self.class.pattern).flatten.join
     end
 
     def tree
@@ -122,6 +138,7 @@ module DruidTools
       FileUtils.mkdir_p(real_path)
       FileUtils.ln_s(source, new_path, force: true)
     end
+    deprecation_deprecate :mkdir_with_final_link
 
     def rmdir(extra = nil)
       parts = tree
@@ -137,6 +154,7 @@ module DruidTools
         parts.pop
       end
     end
+    deprecation_deprecate :rmdir
 
     def pathname
       Pathname path
@@ -146,12 +164,15 @@ module DruidTools
       Pathname base
     end
 
+    def pruning_base
+      pathname.parent
+    end
+
     def prune!
-      this_path = pathname
-      parent = this_path.parent
-      parent.rmtree if parent.exist? && parent != base_pathname
-      prune_ancestors parent.parent
+      pruning_base.rmtree if pruning_base.exist? && pruning_base != base_pathname
+      prune_ancestors pruning_base.parent
     end
+    deprecation_deprecate :prune!
 
     # @param [Pathname] outermost_branch The branch at which pruning begins
     # @return [void] Ascend the druid tree and prune empty branches
@@ -162,5 +183,6 @@ module DruidTools
         break if outermost_branch == base_pathname
       end
     end
+    deprecation_deprecate :prune_ancestors
   end
 end

data/spec/druid_tools/purl_druid_spec.rb

@@ -5,7 +5,8 @@ require 'spec_helper'
 RSpec.describe DruidTools::PurlDruid do
   let(:purl_root) { Dir.mktmpdir }
 
-  let(:druid) { described_class.new 'druid:cd456ef7890', purl_root }
+  let(:druid) { described_class.new druid_str, purl_root }
+  let(:druid_str) { 'druid:cd456ef7890' }
 
   after do
     FileUtils.remove_entry purl_root
@@ -15,6 +16,12 @@ RSpec.describe DruidTools::PurlDruid do
     expect(druid.tree).to eq(%w[cd 456 ef 7890])
   end
 
+  describe '#pruning_base' do
+    subject(:path) { described_class.new(druid_str).pruning_base }
+
+    it { is_expected.to eq(Pathname.new('./cd/456/ef/7890')) }
+  end
+
   describe '#content_dir' do
     it 'creates content directories at leaf of the druid tree' do
       expect(druid.content_dir).to match(%r{ef/7890$})

data/spec/druid_tools_spec.rb

@@ -6,6 +6,8 @@ RSpec.describe DruidTools::Druid do
   let(:tree1) { File.join(fixture_dir, 'cd/456/ef/7890/cd456ef7890') }
   let(:strictly_valid_druid_str) { 'druid:cd456gh1234' }
   let(:tree2) { File.join(fixture_dir, 'cd/456/gh/1234/cd456gh1234') }
+  let(:access_druid_str) { 'druid:cd456ef9999' }
+  let(:tree3) { File.join(fixture_dir, 'cd/456/ef/9999') }
 
   after do
     FileUtils.rm_rf(File.join(fixture_dir, 'cd'))
@@ -41,6 +43,7 @@ RSpec.describe DruidTools::Druid do
         expect(described_class.valid?(dru, false)).to eq(exp)
       end
     end
+
     context 'with strict validation' do
       it 'correctly validates druid strings' do
         tests = [
@@ -82,6 +85,12 @@ RSpec.describe DruidTools::Druid do
     end
   end
 
+  describe '#pruning_base' do
+    subject(:path) { described_class.new(druid_str).pruning_base }
+
+    it { is_expected.to eq(Pathname.new('./cd/456/ef/7890')) }
+  end
+
   it '#druid provides the full druid including the prefix' do
     expect(described_class.new('druid:cd456ef7890', fixture_dir).druid).to eq('druid:cd456ef7890')
     expect(described_class.new('cd456ef7890', fixture_dir).druid).to eq('druid:cd456ef7890')
@@ -97,6 +106,7 @@ RSpec.describe DruidTools::Druid do
       expect { described_class.new('nondruid:cd456ef7890', fixture_dir) }.to raise_error(ArgumentError)
       expect { described_class.new('druid:cd4567ef890', fixture_dir) }.to raise_error(ArgumentError)
     end
+
     it 'takes strict argument' do
       described_class.new(strictly_valid_druid_str, fixture_dir, true)
       expect { described_class.new(druid_str, fixture_dir, true) }.to raise_error(ArgumentError)
@@ -109,29 +119,46 @@ RSpec.describe DruidTools::Druid do
     expect(druid.path).to eq(tree1)
   end
 
-  it '#mkdir, #rmdir create and destroy druid directories' do
-    expect(File.exist?(tree1)).to eq false
-    expect(File.exist?(tree2)).to eq false
+  it '#mkdir creates, and #rmdir destroys, *only* the expected druid directory' do
+    allow(Deprecation).to receive(:warn)
+    expect(File.exist?(tree1)).to be false
+    expect(File.exist?(tree2)).to be false
+    expect(File.exist?(tree3)).to be false
 
     druid1 = described_class.new(druid_str, fixture_dir)
     druid2 = described_class.new(strictly_valid_druid_str, fixture_dir)
+    druid3 = DruidTools::AccessDruid.new(access_druid_str, fixture_dir)
 
     druid1.mkdir
-    expect(File.exist?(tree1)).to eq true
-    expect(File.exist?(tree2)).to eq false
+    expect(File.exist?(tree1)).to be true
+    expect(File.exist?(tree2)).to be false
+    expect(File.exist?(tree3)).to be false
 
     druid2.mkdir
-    expect(File.exist?(tree1)).to eq true
-    expect(File.exist?(tree2)).to eq true
+    expect(File.exist?(tree1)).to be true
+    expect(File.exist?(tree2)).to be true
+    expect(File.exist?(tree3)).to be false
+
+    druid3.mkdir
+    expect(File.exist?(tree1)).to be true
+    expect(File.exist?(tree2)).to be true
+    expect(File.exist?(tree3)).to be true
+
+    druid3.rmdir
+    expect(File.exist?(tree1)).to be true
+    expect(File.exist?(tree2)).to be true
+    expect(File.exist?(tree3)).to be false
 
     druid2.rmdir
-    expect(File.exist?(tree1)).to eq true
-    expect(File.exist?(tree2)).to eq false
+    expect(File.exist?(tree1)).to be true
+    expect(File.exist?(tree2)).to be false
+    expect(File.exist?(tree3)).to be false
 
     druid1.rmdir
-    expect(File.exist?(tree1)).to eq false
-    expect(File.exist?(tree2)).to eq false
-    expect(File.exist?(File.join(fixture_dir, 'cd'))).to eq false
+    expect(File.exist?(tree1)).to be false
+    expect(File.exist?(tree2)).to be false
+    expect(File.exist?(tree3)).to be false
+    expect(File.exist?(File.join(fixture_dir, 'cd'))).to be false
   end
 
   describe 'alternate prefixes' do
@@ -157,9 +184,9 @@ RSpec.describe DruidTools::Druid do
       expect(druid.metadata_dir(false)).to eq(File.join(tree1, 'metadata'))
       expect(druid.temp_dir(false)).to eq(File.join(tree1, 'temp'))
 
-      expect(File.exist?(File.join(tree1, 'content'))).to eq false
-      expect(File.exist?(File.join(tree1, 'metadata'))).to eq false
-      expect(File.exist?(File.join(tree1, 'temp'))).to eq false
+      expect(File.exist?(File.join(tree1, 'content'))).to be false
+      expect(File.exist?(File.join(tree1, 'metadata'))).to be false
+      expect(File.exist?(File.join(tree1, 'temp'))).to be false
     end
 
     it 'creates its content directories on the fly' do
@@ -168,9 +195,9 @@ RSpec.describe DruidTools::Druid do
       expect(druid.metadata_dir).to eq(File.join(tree1, 'metadata'))
       expect(druid.temp_dir).to eq(File.join(tree1, 'temp'))
 
-      expect(File.exist?(File.join(tree1, 'content'))).to eq true
-      expect(File.exist?(File.join(tree1, 'metadata'))).to eq true
-      expect(File.exist?(File.join(tree1, 'temp'))).to eq true
+      expect(File.exist?(File.join(tree1, 'content'))).to be true
+      expect(File.exist?(File.join(tree1, 'metadata'))).to be true
+      expect(File.exist?(File.join(tree1, 'temp'))).to be true
     end
 
     it 'matches glob' do
@@ -178,6 +205,7 @@ RSpec.describe DruidTools::Druid do
       druid.mkdir
       expect(Dir.glob(File.join(File.dirname(druid.path), described_class.glob)).size).to eq(1)
     end
+
     it 'matches strict_glob' do
       druid = described_class.new(druid_str, fixture_dir)
       druid.mkdir
@@ -194,31 +222,31 @@ RSpec.describe DruidTools::Druid do
 
     it 'finds content in content directories' do
       location = druid.content_dir
-      File.open(File.join(location, 'someContent'), 'w') { |f| f.write 'This is the content' }
+      File.write(File.join(location, 'someContent'), 'This is the content')
       expect(druid.find_content('someContent')).to eq(File.join(location, 'someContent'))
     end
 
     it 'finds content in the root directory' do
       location = druid.path(nil, true)
-      File.open(File.join(location, 'someContent'), 'w') { |f| f.write 'This is the content' }
+      File.write(File.join(location, 'someContent'), 'This is the content')
       expect(druid.find_content('someContent')).to eq(File.join(location, 'someContent'))
     end
 
     it 'finds content in the leaf directory' do
       location = File.expand_path('..', druid.path(nil, true))
-      File.open(File.join(location, 'someContent'), 'w') { |f| f.write 'This is the content' }
+      File.write(File.join(location, 'someContent'), 'This is the content')
       expect(druid.find_content('someContent')).to eq(File.join(location, 'someContent'))
     end
 
     it 'does not find content in the wrong content directory' do
       location = druid.metadata_dir
-      File.open(File.join(location, 'someContent'), 'w') { |f| f.write 'This is the content' }
+      File.write(File.join(location, 'someContent'), 'This is the content')
       expect(druid.find_content('someContent')).to be_nil
     end
 
     it 'does not find content in a higher-up directory' do
       location = File.expand_path('../..', druid.path(nil, true))
-      File.open(File.join(location, 'someContent'), 'w') { |f| f.write 'This is the content' }
+      File.write(File.join(location, 'someContent'), 'This is the content')
       expect(druid.find_content('someContent')).to be_nil
     end
 
@@ -269,7 +297,10 @@ RSpec.describe DruidTools::Druid do
       source_dir = '/tmp/content_dir'
       FileUtils.mkdir_p(source_dir)
       dr = described_class.new(strictly_valid_druid_str, fixture_dir)
-      dr.mkdir_with_final_link(source_dir)
+      new_path = dr.path
+      FileUtils.mkdir_p(File.expand_path('..', new_path))
+      FileUtils.ln_s(source_dir, new_path, force: true)
+
       expect { dr.mkdir }.to raise_error(DruidTools::DifferentContentExistsError)
     end
   end
@@ -279,6 +310,7 @@ RSpec.describe DruidTools::Druid do
     let(:druid_obj) { described_class.new(strictly_valid_druid_str, fixture_dir) }
 
     before do
+      allow(Deprecation).to receive(:warn)
       FileUtils.mkdir_p(source_dir)
     end
 
@@ -304,12 +336,43 @@ RSpec.describe DruidTools::Druid do
     let(:workspace) { Dir.mktmpdir }
     let(:dr1) { described_class.new(druid_str, workspace) }
     let(:dr2) { described_class.new(strictly_valid_druid_str, workspace) }
+    let(:dr3) { DruidTools::AccessDruid.new(access_druid_str, workspace) }
     let(:pathname1) { dr1.pathname }
 
+    before do
+      allow(Deprecation).to receive(:warn)
+    end
+
     after do
       FileUtils.remove_entry workspace
     end
 
+    context 'with an access druid sharing the first three path segments' do
+      before do
+        # Nil the create records for this context because we're in a known read only one
+        dr1.mkdir
+        dr2.mkdir
+        dr3.mkdir
+        dr3.prune!
+      end
+
+      it 'deletes the outermost directory' do
+        expect(File).not_to exist(dr3.pruning_base)
+      end
+
+      it 'does not delete unrelated ancestor directories' do
+        expect(File).to exist(dr1.pruning_base)
+        expect(File).to exist(dr1.pruning_base.parent)
+      end
+
+      it 'stops at ancestor directories that have children' do
+        # 'cd/456/ef' should still exist because of dr1
+        shared_ancestor = dr1.pruning_base.parent
+        expect(shared_ancestor.to_s).to match(%r{cd/456/ef$})
+        expect(File).to exist(shared_ancestor)
+      end
+    end
+
     context 'when there is a shared ancestor' do
       before do
         # Nil the create records for this context because we're in a known read only one

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: druid-tools
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Michael Klein
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: deprecation
+  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: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -57,30 +71,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.70.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.70.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.33.0
+        version: '0'
 description: Tools to manipulate DRUID trees and content directories
 email:
 - mbklein@stanford.edu
@@ -88,11 +102,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".github/pull_request_template.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -112,7 +127,8 @@ homepage: http://github.com/sul-dlss/druid-tools
 licenses:
 - ALv2
 - Stanford University Libraries
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -121,15 +137,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Tools to manipulate DRUID trees and content directories

data/.travis.yml

@@ -1,16 +0,0 @@
-notifications:
-  email: false
-
-rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-
-# script, expressed as an array, is necessary for 'bundle exec coveralls push' to work locally
-script:
-  - bundle exec rake
-
-cache: bundler
-
-before_install:
-  - gem install bundler # the default version of bundler for ruby 2.1 is out of date.