druid-tools 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f669f7b8429c7d0d95c9b7e8715afc362924911005504f75e8c9c6e9addee306
-  data.tar.gz: dedef2151df6f1e7ca40ea664834218634e61a44190a17069a6d62973bc9f03d
+  metadata.gz: 01fc970eff4953a9530606f133d2d91c2bebeda6b1d182d472f47dae1f54d67b
+  data.tar.gz: 7bb69909e6b552d2a5bb1f9cf1a4089e38b3696bcf250843d6754ed9dc238360
 SHA512:
-  metadata.gz: a288b3e8ba6a1db699ce7737c196d65859c28f7e52513d0d32a421e39ca30702184e2c2b38eefc5a2d34665dffcc0ea75d85a88d7115989bb9689e865c1c6335
-  data.tar.gz: 64ac1bdaa0b1c7bfc3a85f0480dca6b1387c76d47635f4a3823be95595303373d0d1d8e4bfd00f95c04ab4186ba7bc24f20fa7464b41f0c91f4f9e0f47facb3a
+  metadata.gz: 8b4d19d3d554ebe71afa477780265dccc1ee2bef4ccec0a683cae16df64bc2dd66a6c52b540b05390cd0d62b8aa569bb8f6162d0fa233180a0a938f6b33cb363
+  data.tar.gz: c6b7f6ba698164350a8704703d16dc1c5b8a8e6da36173b7c1944d7275a508d785fbaaf1938baa862c987a11c475987ff1d82bd55586e43fdf43ac908c7dfcc1

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/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/druid-tools.gemspec

@@ -16,6 +16,7 @@ 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'

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
@@ -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
@@ -152,6 +170,7 @@ module DruidTools
       parent.rmtree if parent.exist? && parent != base_pathname
       prune_ancestors parent.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 +181,6 @@ module DruidTools
         break if outermost_branch == base_pathname
       end
     end
+    deprecation_deprecate :prune_ancestors
   end
 end

data/spec/druid_tools_spec.rb

@@ -110,6 +110,7 @@ RSpec.describe DruidTools::Druid do
   end
 
   it '#mkdir, #rmdir create and destroy druid directories' do
+    allow(Deprecation).to receive(:warn)
     expect(File.exist?(tree1)).to eq false
     expect(File.exist?(tree2)).to eq false
 
@@ -269,7 +270,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 +283,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
 
@@ -306,6 +311,10 @@ RSpec.describe DruidTools::Druid do
     let(:dr2) { described_class.new(strictly_valid_druid_str, workspace) }
     let(:pathname1) { dr1.pathname }
 
+    before do
+      allow(Deprecation).to receive(:warn)
+    end
+
     after do
       FileUtils.remove_entry workspace
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: druid-tools
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 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: 2019-08-15 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