druid-tools 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWYwNmM0OTExYjMwZDEyZTI4OTlmMGIzMGE5NzQ2NWY0NTlmNGVlOQ==
-  data.tar.gz: !binary |-
-    MDllNDUwYWUzMzJiZDUzZDUxZTA3NmQyYjFkMDQ1Y2FkMDQ3OWFhNg==
+SHA1:
+  metadata.gz: ff667823f90ed97f46171b13552720e11baf161b
+  data.tar.gz: e49db2f65f8a5734d67d7619d42477f56361cc9b
 SHA512:
-  metadata.gz: !binary |-
-    YWQ4NzY4ODNiYWI3NjZmZTQ0MDE3NDQzYTE5OWNiMjJhZTk3N2Y0ZTlhM2U5
-    ZDI3NDc2NTU4NDNlOTBiMWRmOWFiNjM5NDAzNzBlOWY3NGU5MDI5NTU3ZmJk
-    NTgxMThjYTlmODU0NTJhYTBhNDYzZDk5NTg4ODU2NmNlNTZlZWU=
-  data.tar.gz: !binary |-
-    N2E4ODdiZGEwMzI1YTU5ODE5ZDA1MjIxMmVjNmNhODZmZmQ0YTE1ZGY4Yzhl
-    ODYwOTY3NWEwOTU1ZWE4NDcwYzdhODcwYTI1YzliMmRkZTNkNDFjMjE1ZmI2
-    YzAwYTdlZjJkNTA3NDQxM2QyMzRmZWJkNGEyYjUzNTRjNDZhNzA=
+  metadata.gz: c95447c9d7b356c96894ea5de798d4292786e8fa2a9c86d696cf3cc87e764ec29c3e97b4ff0aec8007a528ebe6c9d0fefba825bcd63c4f7508c104e74e8b9a2a
+  data.tar.gz: 222ec27e234269a5606092d3889dbf40b68f22bc6a37e3b5e7791e9a8cfd3255addf873fdfe7ada1656be71e6e0203b03aa0b5e2cd9eb235ddf78112a44fe6c1

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,8 @@
+notifications:
+  email: false
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.2
+

data/README.md

@@ -6,85 +6,99 @@ Tools to manipulate DRUID trees and content directories
 
 ### Get attributes and paths
 
-    d = DruidTools::Druid.new('druid:ab123cd4567', '/dor/workspace')
-    d.druid
-    => "druid:ab123cd4567"
-    d.id
-    => "ab123cd4567"
-    d.path
-    => "/dor/workspace/ab/123/cd/4567/ab123cd4567"
-    d.content_dir
-    => "/dor/workspace/ab/123/cd/4567/ab123cd4567/content"
-    d.path('content/my_file.jpg')
-    => "/dor/workspace/ab/123/cd/4567/ab123cd4567/content/my_file.jpg"
+```ruby
+d = DruidTools::Druid.new('druid:ab123cd4567', '/dor/workspace')
+d.druid
+=> "druid:ab123cd4567"
+d.id
+=> "ab123cd4567"
+d.path
+=> "/dor/workspace/ab/123/cd/4567/ab123cd4567"
+d.content_dir
+=> "/dor/workspace/ab/123/cd/4567/ab123cd4567/content"
+d.path('content/my_file.jpg')
+=> "/dor/workspace/ab/123/cd/4567/ab123cd4567/content/my_file.jpg"
+```
 
 ### Check whether a druid is valid
 
-    d = DruidTools::Druid.valid?('druid:ab123cd4567')
-    => true
-    d = DruidTools::Druid.valid?('blah')
-    => false
+```ruby
+d = DruidTools::Druid.valid?('druid:ab123cd4567')
+=> true
+d = DruidTools::Druid.valid?('blah')
+=> false
+```
 
 ### Manipulate directories and symlinks
 
-    # Make the druid tree
-    d.mkdir
-    # Make a directory within the druid triee
-    d.mkdir('temp')
-    # Remove a druid tree, but only up to the last shared branch directory
-    d.rmdir
-    # Link content from another source into a druid tree
-    d.mkdir_with_final_link('/some/other/content/location')
+```ruby
+# Make the druid tree
+d.mkdir
+# Make a directory within the druid triee
+d.mkdir('temp')
+# Remove a druid tree, but only up to the last shared branch directory
+d.rmdir
+# Link content from another source into a druid tree
+d.mkdir_with_final_link('/some/other/content/location')
+```
 
 ### Content-specific methods create the relevant directories if they don't exist
 
 Pass `false` as a parameter to prevent directory creation, or `true` (default) to create directories.
 
-    d.content_dir(false)
-    => "/dor/workspace/ab/123/cd/4567/ab123cd4567/content"
-    File.directory?(d.content_dir(false))
-    => false
-    File.directory?(d.content_dir)
-    => true
-    d.metadata_dir(false)
-    => "/dor/workspace/ab/123/cd/4567/ab123cd4567/metadata"
-    d.temp_dir(false)
-    => "/dor/workspace/ab/123/cd/4567/ab123cd4567/temp"
+```ruby
+d.content_dir(false)
+=> "/dor/workspace/ab/123/cd/4567/ab123cd4567/content"
+File.directory?(d.content_dir(false))
+=> false
+File.directory?(d.content_dir)
+=> true
+d.metadata_dir(false)
+=> "/dor/workspace/ab/123/cd/4567/ab123cd4567/metadata"
+d.temp_dir(false)
+=> "/dor/workspace/ab/123/cd/4567/ab123cd4567/temp"
+```
 
 ### Locate existing content within the druid tree
 
-    # In the correct directory
-    d.find_metadata('contentMetadata.xml')
-    => "/dor/workspace/ab/123/cd/4567/ab123cd4567/metadata/contentMetadata.xml"
+```ruby
+# In the correct directory
+d.find_metadata('contentMetadata.xml')
+=> "/dor/workspace/ab/123/cd/4567/ab123cd4567/metadata/contentMetadata.xml"
 
-    # In other known previous locations, for backward compatibility
-    d.find_metadata('contentMetadata.xml')
-    => "/dor/workspace/ab/123/cd/4567/ab123cd4567/contentMetadata.xml"
+# In other known previous locations, for backward compatibility
+d.find_metadata('contentMetadata.xml')
+=> "/dor/workspace/ab/123/cd/4567/ab123cd4567/contentMetadata.xml"
 
-    d.find_metadata('contentMetadata.xml')
-    => "/dor/workspace/ab/123/cd/4567/contentMetadata.xml"
+d.find_metadata('contentMetadata.xml')
+=> "/dor/workspace/ab/123/cd/4567/contentMetadata.xml"
 
-    d.find_content('this/file/does/not/exist.jpg')
-    => nil
+d.find_content('this/file/does/not/exist.jpg')
+=> nil
+```
 
 ### Pruning: removes leaves of tree up to non-empty branches
 
-    d1 = DruidTools::Druid.new 'druid:cd456ef7890', '/workspace'
-    d1.mkdir
-    d2 = DruidTools::Druid.new 'druid:cd456gh1234', '/workspace'
-    d2.mkdir
+```ruby
+d1 = DruidTools::Druid.new 'druid:cd456ef7890', '/workspace'
+d1.mkdir
+d2 = DruidTools::Druid.new 'druid:cd456gh1234', '/workspace'
+d2.mkdir
 
-    # /workspace/cd/456/gh/1234/cd456gh1234 pruned down to /workspace/cd/456
-    # /workspace/cd/456/ef/7890/cd456ef7890 left intact
-    d2.prune!
+# /workspace/cd/456/gh/1234/cd456gh1234 pruned down to /workspace/cd/456
+# /workspace/cd/456/ef/7890/cd456ef7890 left intact
+d2.prune!
+```
 
 ### Stacks and Purl compatible Druid.  All files at the leaf directories
 
-    pd = DruidTools::PurlDruid.new 'druid:ab123cd4567', '/purl'
-    pd.path
-    => "/purl/ab/123/cd/4567"
-    pd.content_dir
-    => "/purl/ab/123/cd/4567"
+```ruby
+pd = DruidTools::PurlDruid.new 'druid:ab123cd4567', '/purl'
+pd.path
+=> "/purl/ab/123/cd/4567"
+pd.content_dir
+=> "/purl/ab/123/cd/4567"
+```
 
 ### History
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/druid_tools/druid.rb

@@ -138,47 +138,47 @@ module DruidTools
       parent = this_path.parent
       parent.rmtree if parent.exist? && parent != base_pathname
       prune_ancestors parent.parent
-      creates_delete_record 
+      creates_delete_record
     end
-    
-    #This function checks for existance of a .deletes dir one level into the path (ex: stacks/.deletes or purl/.deletes).  
+
+    #This function checks for existance of a .deletes dir one level into the path (ex: stacks/.deletes or purl/.deletes).
     #If the directory does not exist, it is created.  If the directory exists, check to see if the current druid has an entry there, if it does delete it.
-    #This is done because a file might be deleted, then republishing, then deleted we again, and we want to log the most recent delete.  
+    #This is done because a file might be deleted, then republishing, then deleted we again, and we want to log the most recent delete.
     #
     #@raises [Errno::EACCES] If write priveleges are denied
     #
-    #@return [void] 
+    #@return [void]
     def prep_deletes_dir
-      #Check for existences of deletes dir 
+      #Check for existences of deletes dir
       create_deletes_dir if !deletes_dir_exists?
       #In theory we could return true after this step (if it fires), since if there was no deletes dir then the file can't be present in the dir
 
-      #Check to see if this druid has been deleted before, meaning file currently exists 
+      #Check to see if this druid has been deleted before, meaning file currently exists
       deletes_delete_record if deletes_record_exists?
     end
-    
+
     #Provide the location for the .deletes directory in the tree
     #
     #@return [Pathname] the path to the directory, ex: "stacks/.deletes"
     def deletes_dir_pathname
       return Pathname(self.base.to_s + (File::SEPARATOR+@@deletes_directory_name))
     end
-    
+
     def deletes_record_pathname
       return Pathname(deletes_dir_pathname.to_s + File::SEPARATOR + self.id)
     end
-    
-    #Using the deletes directory path supplied by deletes_dir_pathname, this function determines if this directory exists 
+
+    #Using the deletes directory path supplied by deletes_dir_pathname, this function determines if this directory exists
     #
     #@return [Boolean] true if if exists, false if it does not
     def deletes_dir_exists?
-      return File.directory?(deletes_dir_pathname) 
+      return File.directory?(deletes_dir_pathname)
     end
-    
+
     def deletes_record_exists?
       return File.exists?(deletes_dir_pathname.to_s + File::SEPARATOR + self.id)
     end
-    
+
     #Creates the deletes dir using the path supplied by deletes_dir_pathname
     #
     #@raises [Errno::EACCES] If write priveleges are denied
@@ -187,7 +187,7 @@ module DruidTools
     def create_deletes_dir
       FileUtils::mkdir_p deletes_dir_pathname
     end
-    
+
     #Deletes the delete record if it currently exists.  This is done to change the filed created, not just last modified time, on the system
     #
     #@raises [Errno::EACCES] If write priveleges are denied
@@ -196,7 +196,7 @@ module DruidTools
     def deletes_delete_record
       FileUtils.rm(deletes_record_pathname) if deletes_record_exists? #thrown in to prevent an  Errno::ENOENT if you call this on something without a delete record
     end
-    
+
     #Creates an empty (pointer) file using the object's id in the .deletes dir
     #
     #@raises [Errno::EACCES] If write priveleges are denied
@@ -206,16 +206,15 @@ module DruidTools
       prep_deletes_dir
       FileUtils.touch(deletes_record_pathname)
     end
-    
+
     # @param [Pathname] outermost_branch The branch at which pruning begins
     # @return [void] Ascend the druid tree and prune empty branches
     def prune_ancestors(outermost_branch)
-      while outermost_branch.children.size == 0
+      while outermost_branch.exist? && outermost_branch.children.size == 0
         outermost_branch.rmdir
         outermost_branch = outermost_branch.parent
         break if  outermost_branch == base_pathname
       end
-    rescue
     end
 
   end

data/spec/druid_tools_spec.rb

@@ -40,54 +40,54 @@ describe DruidTools::Druid do
       [true,         'druid:zz943vx1492']
     ]
     tests.each do |exp, dru|
-      DruidTools::Druid.valid?(dru).should == exp
+      expect(DruidTools::Druid.valid?(dru)).to eq(exp)
     end
   end
 
   it "provides the full druid including the prefix" do
-    DruidTools::Druid.new('druid:cd456ef7890',@fixture_dir).druid.should == 'druid:cd456ef7890'
-    DruidTools::Druid.new('cd456ef7890',@fixture_dir).druid.should == 'druid:cd456ef7890'
+    expect(DruidTools::Druid.new('druid:cd456ef7890',@fixture_dir).druid).to eq('druid:cd456ef7890')
+    expect(DruidTools::Druid.new('cd456ef7890',@fixture_dir).druid).to eq('druid:cd456ef7890')
   end
 
   it "extracts the ID from the stem" do
-    DruidTools::Druid.new('druid:cd456ef7890',@fixture_dir).id.should == 'cd456ef7890'
-    DruidTools::Druid.new('cd456ef7890',@fixture_dir).id.should == 'cd456ef7890'
+    expect(DruidTools::Druid.new('druid:cd456ef7890',@fixture_dir).id).to eq('cd456ef7890')
+    expect(DruidTools::Druid.new('cd456ef7890',@fixture_dir).id).to eq('cd456ef7890')
   end
 
   it "raises an exception if the druid is invalid" do
-    lambda { DruidTools::Druid.new('nondruid:cd456ef7890',@fixture_dir) }.should raise_error(ArgumentError)
-    lambda { DruidTools::Druid.new('druid:cd4567ef890',@fixture_dir) }.should raise_error(ArgumentError)
+    expect { DruidTools::Druid.new('nondruid:cd456ef7890',@fixture_dir) }.to raise_error(ArgumentError)
+    expect { DruidTools::Druid.new('druid:cd4567ef890',@fixture_dir) }.to raise_error(ArgumentError)
   end
 
   it "builds a druid tree from a druid" do
     druid = DruidTools::Druid.new(@druid_1,@fixture_dir)
-    druid.tree.should == ['cd','456','ef','7890','cd456ef7890']
-    druid.path.should == @tree_1
+    expect(druid.tree).to eq(['cd','456','ef','7890','cd456ef7890'])
+    expect(druid.path).to eq(@tree_1)
   end
 
   it "creates and destroys druid directories" do
-    File.exists?(@tree_1).should eq false
-    File.exists?(@tree_2).should eq false
+    expect(File.exists?(@tree_1)).to eq false
+    expect(File.exists?(@tree_2)).to eq false
 
     druid_1 = DruidTools::Druid.new(@druid_1,@fixture_dir)
     druid_2 = DruidTools::Druid.new(@druid_2,@fixture_dir)
 
     druid_1.mkdir
-    File.exists?(@tree_1).should eq true
-    File.exists?(@tree_2).should eq false
+    expect(File.exists?(@tree_1)).to eq true
+    expect(File.exists?(@tree_2)).to eq false
 
     druid_2.mkdir
-    File.exists?(@tree_1).should eq true
-    File.exists?(@tree_2).should eq true
+    expect(File.exists?(@tree_1)).to eq true
+    expect(File.exists?(@tree_2)).to eq true
 
     druid_2.rmdir
-    File.exists?(@tree_1).should eq true
-    File.exists?(@tree_2).should eq false
+    expect(File.exists?(@tree_1)).to eq true
+    expect(File.exists?(@tree_2)).to eq false
 
     druid_1.rmdir
-    File.exists?(@tree_1).should eq false
-    File.exists?(@tree_2).should eq false
-    File.exists?(File.join(@fixture_dir,'cd')).should eq false
+    expect(File.exists?(@tree_1)).to eq false
+    expect(File.exists?(@tree_2)).to eq false
+    expect(File.exists?(File.join(@fixture_dir,'cd'))).to eq false
   end
 
   describe "alternate prefixes" do
@@ -100,39 +100,39 @@ describe DruidTools::Druid do
     end
 
     it "handles alternate prefixes" do
-      lambda { DruidTools::Druid.new('druid:cd456ef7890',@fixture_dir) }.should raise_error(ArgumentError)
-      DruidTools::Druid.new('sulair:cd456ef7890',@fixture_dir).id.should == 'cd456ef7890'
-      DruidTools::Druid.new('cd456ef7890',@fixture_dir).druid.should == 'sulair:cd456ef7890'
+      expect { DruidTools::Druid.new('druid:cd456ef7890',@fixture_dir) }.to raise_error(ArgumentError)
+      expect(DruidTools::Druid.new('sulair:cd456ef7890',@fixture_dir).id).to eq('cd456ef7890')
+      expect(DruidTools::Druid.new('cd456ef7890',@fixture_dir).druid).to eq('sulair:cd456ef7890')
     end
   end
 
   describe "content directories" do
     it "knows where its content goes" do
       druid = DruidTools::Druid.new(@druid_1,@fixture_dir)
-      druid.content_dir(false).should  == File.join(@tree_1,'content')
-      druid.metadata_dir(false).should == File.join(@tree_1,'metadata')
-      druid.temp_dir(false).should     == File.join(@tree_1,'temp')
+      expect(druid.content_dir(false)).to  eq(File.join(@tree_1,'content'))
+      expect(druid.metadata_dir(false)).to eq(File.join(@tree_1,'metadata'))
+      expect(druid.temp_dir(false)).to     eq(File.join(@tree_1,'temp'))
 
-      File.exists?(File.join(@tree_1,'content')).should eq false
-      File.exists?(File.join(@tree_1,'metadata')).should eq false
-      File.exists?(File.join(@tree_1,'temp')).should eq false
+      expect(File.exists?(File.join(@tree_1,'content'))).to eq false
+      expect(File.exists?(File.join(@tree_1,'metadata'))).to eq false
+      expect(File.exists?(File.join(@tree_1,'temp'))).to eq false
     end
 
     it "creates its content directories on the fly" do
       druid = DruidTools::Druid.new(@druid_1,@fixture_dir)
-      druid.content_dir.should  == File.join(@tree_1,'content')
-      druid.metadata_dir.should == File.join(@tree_1,'metadata')
-      druid.temp_dir.should     == File.join(@tree_1,'temp')
+      expect(druid.content_dir).to  eq(File.join(@tree_1,'content'))
+      expect(druid.metadata_dir).to eq(File.join(@tree_1,'metadata'))
+      expect(druid.temp_dir).to     eq(File.join(@tree_1,'temp'))
 
-      File.exists?(File.join(@tree_1,'content')).should eq true
-      File.exists?(File.join(@tree_1,'metadata')).should eq true
-      File.exists?(File.join(@tree_1,'temp')).should eq true
+      expect(File.exists?(File.join(@tree_1,'content'))).to eq true
+      expect(File.exists?(File.join(@tree_1,'metadata'))).to eq true
+      expect(File.exists?(File.join(@tree_1,'temp'))).to eq true
     end
 
     it "matches glob" do
       druid = DruidTools::Druid.new(@druid_1,@fixture_dir)
       druid.mkdir
-      Dir.glob(File.join(File.dirname(druid.path), DruidTools::Druid::glob)).size.should == 1
+      expect(Dir.glob(File.join(File.dirname(druid.path), DruidTools::Druid::glob)).size).to eq(1)
     end
   end
 
@@ -145,31 +145,31 @@ 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' }
-      @druid.find_content('someContent').should == File.join(location,'someContent')
+      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' }
-      @druid.find_content('someContent').should == File.join(location,'someContent')
+      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' }
-      @druid.find_content('someContent').should == File.join(location,'someContent')
+      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' }
-      @druid.find_content('someContent').should be_nil
+      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' }
-      @druid.find_content('someContent').should be_nil
+      expect(@druid.find_content('someContent')).to be_nil
     end
 
     it "finds a filelist in the content directory" do
@@ -177,7 +177,7 @@ describe DruidTools::Druid do
       @filelist.each do |filename|
         location.join(filename).open('w') { |f| f.write "This is #{filename}" }
       end
-      @druid.find_filelist_parent('content',@filelist).should == location
+      expect(@druid.find_filelist_parent('content',@filelist)).to eq(location)
     end
 
     it "finds a filelist in the root directory" do
@@ -185,7 +185,7 @@ describe DruidTools::Druid do
       @filelist.each do |filename|
         location.join(filename).open('w') { |f| f.write "This is #{filename}" }
       end
-      @druid.find_filelist_parent('content',@filelist).should == location
+      expect(@druid.find_filelist_parent('content',@filelist)).to eq(location)
     end
 
     it "finds a filelist in the leaf directory" do
@@ -193,18 +193,18 @@ describe DruidTools::Druid do
       @filelist.each do |filename|
         location.join(filename).open('w') { |f| f.write "This is #{filename}" }
       end
-      @druid.find_filelist_parent('content',@filelist).should == location
+      expect(@druid.find_filelist_parent('content',@filelist)).to eq(location)
     end
 
     it "raises an exception if the first file in the filelist is not found" do
       location = Pathname(@druid.content_dir)
-      lambda{@druid.find_filelist_parent('content',@filelist)}.should raise_exception(/content dir not found for 'someFile1' when searching/)
+      expect{@druid.find_filelist_parent('content',@filelist)}.to raise_exception(/content dir not found for 'someFile1' when searching/)
     end
 
     it "raises an exception if any other file in the filelist is not found" do
       location = Pathname(@druid.content_dir)
       location.join(@filelist.first).open('w') { |f| f.write "This is #{@filelist.first}" }
-      lambda{@druid.find_filelist_parent('content',@filelist)}.should raise_exception(/File 'someFile2' not found/)
+      expect{@druid.find_filelist_parent('content',@filelist)}.to raise_exception(/File 'someFile2' not found/)
     end
 
   end
@@ -213,7 +213,7 @@ describe DruidTools::Druid do
     it "raises SameContentExistsError if the directory already exists" do
       druid_2 = DruidTools::Druid.new(@druid_2,@fixture_dir)
       druid_2.mkdir
-      lambda { druid_2.mkdir }.should raise_error(DruidTools::SameContentExistsError)
+      expect { druid_2.mkdir }.to raise_error(DruidTools::SameContentExistsError)
     end
 
     it "raises DifferentContentExistsError if a link already exists in the workspace for this druid" do
@@ -221,7 +221,7 @@ describe DruidTools::Druid do
       FileUtils.mkdir_p(source_dir)
       dr = DruidTools::Druid.new(@druid_2,@fixture_dir)
       dr.mkdir_with_final_link(source_dir)
-      lambda { dr.mkdir }.should raise_error(DruidTools::DifferentContentExistsError)
+      expect { dr.mkdir }.to raise_error(DruidTools::DifferentContentExistsError)
     end
   end
 
@@ -235,23 +235,21 @@ describe DruidTools::Druid do
 
     it "creates a druid tree in the workspace with the final directory being a link to the passed in source" do
       @dr.mkdir_with_final_link(@source_dir)
-
-      File.should be_symlink(@dr.path)
-      File.readlink(@tree_2).should == @source_dir
+      expect(File).to be_symlink(@dr.path)
+      expect(File.readlink(@tree_2)).to eq(@source_dir)
     end
 
     it "does not error out if the link to source already exists" do
       @dr.mkdir_with_final_link(@source_dir)
-      File.should be_symlink(@dr.path)
-      File.readlink(@tree_2).should == @source_dir
+      expect(File).to be_symlink(@dr.path)
+      expect(File.readlink(@tree_2)).to eq(@source_dir)
     end
 
     it "raises DifferentContentExistsError if a directory already exists in the workspace for this druid" do
       @dr.mkdir(@fixture_dir)
-      lambda { @dr.mkdir_with_final_link(@source_di) }.should raise_error(DruidTools::DifferentContentExistsError)
+      expect { @dr.mkdir_with_final_link(@source_di) }.to raise_error(DruidTools::DifferentContentExistsError)
     end
-    
-    
+
   end
 
   describe "#prune!" do
@@ -261,17 +259,29 @@ describe DruidTools::Druid do
     let(:dr1) { DruidTools::Druid.new @druid_1, workspace }
     let(:dr2) { DruidTools::Druid.new @druid_2, workspace }
     let(:pathname1) { dr1.pathname }
-    
-    
+
     after(:each) do
       FileUtils.remove_entry workspace
     end
 
+    it "throws error on misconfig when base dir cannot be created" do
+      dir = '/some/dir/that/does/not/exist' # we don't have permissions to create
+      dr0 = DruidTools::Druid.new @druid_1, dir
+      expect {dr0.prune!}.to raise_error()
+      expect(File).to_not exist(dir)
+    end
+
+    it "does not throw error when base can be created" do
+      subdir = File.join(Dir.mktmpdir, 'some', 'nonexistant', 'subdir')      # but this one *can* be created
+      dr2 = DruidTools::Druid.new @druid_2, subdir
+      expect {dr2.prune!}.not_to raise_error()
+      expect(File).to exist(subdir)
+    end
+
     context "shared ancestor" do
 
       before(:each) do
         #Nil the create records for this context because we're in a known read only one
-        
         dr1.mkdir
         dr2.mkdir
         dr1.prune!
@@ -297,13 +307,13 @@ describe DruidTools::Druid do
     it "removes all directories up to the base path when there are no common ancestors" do
       #Make sure a delete record is not present
       expect(dr1.deletes_record_exists?).to be_falsey
-      
-      #Nil the create records for this test 
+
+      #Nil the create records for this test
       dr1.mkdir
       dr1.prune!
       expect(File).to_not exist(File.join(workspace, 'cd'))
       expect(File).to exist(workspace)
-      
+
       #Make sure a delete record was created
       expect(dr1.deletes_dir_exists?).to be_truthy
       expect(dr1.deletes_record_exists?).to be_truthy
@@ -312,106 +322,105 @@ describe DruidTools::Druid do
     it "removes directories with symlinks" do
       #Make sure a delete record is not present
       expect(dr2.deletes_record_exists?).to be_falsey
-      
-      #Nil the create records for this test 
+
+      #Nil the create records for this test
       source_dir = File.join workspace, 'src_dir'
       FileUtils.mkdir_p(source_dir)
       dr2.mkdir_with_final_link(source_dir)
       dr2.prune!
       expect(File).to_not exist(dr2.path)
       expect(File).to_not exist(File.join(workspace, 'cd'))
-      
+
       #Make sure a delete record was created
       expect(dr2.deletes_dir_exists?).to be_truthy
       expect(dr2.deletes_record_exists?).to be_truthy
     end
-    
+
     describe "logging deleted druids" do
-      
-            #Purge any paths or delete records created in the test
-            after :each do
-              #Remove the .deletes dir to clean up
-              dr2.deletes_delete_record if dr2.deletes_record_exists?
-              FileUtils.rm_rf dr2.deletes_dir_pathname
-              
-            end
-      
-            it "returns the path to the .deletes directory as a Pathname" do
-              expect(dr2.deletes_dir_pathname.class).to eq(Pathname)
-            end
-            
-            it "returns the path to the delete record for a druid as a Pathname" do
-              expect(dr2.deletes_record_pathname.class).to eq(Pathname)
-            end
-            
-            it "returns the path to the delete record for a druid as top_level/.deletes/druid" do
-               expect(dr2.deletes_record_pathname.to_s).to eq("#{dr2.base}/.deletes/#{dr2.id}")
-            end
-      
-            it "returns false when the .deletes dir is not present on the file system" do
-              expect(dr2.deletes_dir_exists?).to be_falsey 
-            end
-      
-            it "creates the .deletes dir and detect it exists" do
-      
-              #Clean the .deletes dir if present
-              FileUtils.rm_rf dr2.deletes_dir_pathname
-        
-              #Test for exists? and create
-              expect(dr2.deletes_dir_exists?).to be_falsey 
-              dr2.create_deletes_dir
-              expect(dr2.deletes_dir_exists?).to be_truthy
-            end
-      
-            it "returns false when the .deletes dir does not have a deleted record for a druid" do
-              expect(dr2.deletes_record_exists?).to be_falsey
-            end
-            
-            it "creates a deleted record with a parent directory that has no .deletes directory and no deleted for the file and successfully create a delete record there" do
-              #Expect there not to be a .deletes dir or file (the file expectation is redundant I know)
-              expect(dr2.deletes_dir_exists?).to be_falsey 
-              expect(dr2.deletes_record_exists?).to be_falsey
-              
-              #Create the delete record
-              dr2.creates_delete_record
-              
-              #Check to ensure items were created
-              expect(dr2.deletes_dir_exists?).to be_truthy
-              expect(dr2.deletes_record_exists?).to be_truthy
-            end
-            
-            it "creates a delete record with a parent directory that has a .deletes directory that does not contain a delete record for this druid" do
-              #Expect there not to be a .deletes dir or file (the file expectation is redundant I know)
-              expect(dr2.deletes_dir_exists?).to be_falsey 
-              expect(dr2.deletes_record_exists?).to be_falsey
-              
-              #Creates the deletes dir and check
-              dr2.create_deletes_dir
-              expect(dr2.deletes_dir_exists?).to be_truthy
-              expect(dr2.deletes_record_exists?).to be_falsey
-              
-              #Create the delete record
-              dr2.creates_delete_record
-              
-              #Check to ensure items were created
-              expect(dr2.deletes_dir_exists?).to be_truthy
-              expect(dr2.deletes_record_exists?).to be_truthy
-            end
-            
-            it "creates a delete record with a parent directory that does not have a .deletes directory and contains an older delete record" do
-              #Expect there not to be a .deletes dir or file (the file expectation is redundant I know)
-              expect(dr2.deletes_dir_exists?).to be_falsey 
-              expect(dr2.deletes_record_exists?).to be_falsey
-              
-              dr2.creates_delete_record
-              time = Time.now
-              expect(File.mtime(dr2.deletes_record_pathname)).to be <= time
-              sleep(1) #force a one second pause in case the machine is fast (as in not some old Commodore64), since mtime only goes down to the second
-              
-              dr2.creates_delete_record
-              #Should have a new newer deleted record
-              expect(File.mtime(dr2.deletes_record_pathname)).to be > time
-            end
+
+      #Purge any paths or delete records created in the test
+      after :each do
+        #Remove the .deletes dir to clean up
+        dr2.deletes_delete_record if dr2.deletes_record_exists?
+        FileUtils.rm_rf dr2.deletes_dir_pathname
+      end
+
+      it "returns the path to the .deletes directory as a Pathname" do
+        expect(dr2.deletes_dir_pathname.class).to eq(Pathname)
+      end
+
+      it "returns the path to the delete record for a druid as a Pathname" do
+        expect(dr2.deletes_record_pathname.class).to eq(Pathname)
+      end
+
+      it "returns the path to the delete record for a druid as top_level/.deletes/druid" do
+        expect(dr2.deletes_record_pathname.to_s).to eq("#{dr2.base}/.deletes/#{dr2.id}")
+      end
+
+      it "returns false when the .deletes dir is not present on the file system" do
+        expect(dr2.deletes_dir_exists?).to be_falsey
+      end
+
+      it "creates the .deletes dir and detect it exists" do
+
+        #Clean the .deletes dir if present
+        FileUtils.rm_rf dr2.deletes_dir_pathname
+
+        #Test for exists? and create
+        expect(dr2.deletes_dir_exists?).to be_falsey
+        dr2.create_deletes_dir
+        expect(dr2.deletes_dir_exists?).to be_truthy
+      end
+
+      it "returns false when the .deletes dir does not have a deleted record for a druid" do
+        expect(dr2.deletes_record_exists?).to be_falsey
+      end
+
+      it "creates a deleted record with a parent directory that has no .deletes directory and no deleted for the file and successfully create a delete record there" do
+        #Expect there not to be a .deletes dir or file (the file expectation is redundant I know)
+        expect(dr2.deletes_dir_exists?).to be_falsey
+        expect(dr2.deletes_record_exists?).to be_falsey
+
+        #Create the delete record
+        dr2.creates_delete_record
+
+        #Check to ensure items were created
+        expect(dr2.deletes_dir_exists?).to be_truthy
+        expect(dr2.deletes_record_exists?).to be_truthy
+      end
+
+      it "creates a delete record with a parent directory that has a .deletes directory that does not contain a delete record for this druid" do
+        #Expect there not to be a .deletes dir or file (the file expectation is redundant I know)
+        expect(dr2.deletes_dir_exists?).to be_falsey
+        expect(dr2.deletes_record_exists?).to be_falsey
+
+        #Creates the deletes dir and check
+        dr2.create_deletes_dir
+        expect(dr2.deletes_dir_exists?).to be_truthy
+        expect(dr2.deletes_record_exists?).to be_falsey
+
+        #Create the delete record
+        dr2.creates_delete_record
+
+        #Check to ensure items were created
+        expect(dr2.deletes_dir_exists?).to be_truthy
+        expect(dr2.deletes_record_exists?).to be_truthy
+      end
+
+      it "creates a delete record with a parent directory that does not have a .deletes directory and contains an older delete record" do
+        #Expect there not to be a .deletes dir or file (the file expectation is redundant I know)
+        expect(dr2.deletes_dir_exists?).to be_falsey
+        expect(dr2.deletes_record_exists?).to be_falsey
+
+        dr2.creates_delete_record
+        time = Time.now
+        expect(File.mtime(dr2.deletes_record_pathname)).to be <= time
+        sleep(1) #force a one second pause in case the machine is fast (as in not some old Commodore64), since mtime only goes down to the second
+
+        dr2.creates_delete_record
+        #Should have a new newer deleted record
+        expect(File.mtime(dr2.deletes_record_pathname)).to be > time
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: druid-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Michael Klein
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Tools to manipulate DRUID trees and content directories
@@ -46,7 +46,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -103,17 +105,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Tools to manipulate DRUID trees and content directories