geoffreywiseman-prune 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89c920f4af989a1bba3db2478a1237a3cc0603b2
-  data.tar.gz: a6ad83bb456149beafbea78df830742be3129b78
+  metadata.gz: 1cabe7b54d6be975a001aabb086928275d572c4f
+  data.tar.gz: 7e597d2bf76ccf5b0699783d8c8e3ff9cb9bc737
 SHA512:
-  metadata.gz: 00b0dfc00922b298475fc4e69e3c7c22c9a6ade2af0faffc8a24547888af4e3977003293ff4644034f7ef2b4b57a78c651c1db311907d0358e4f8fc7f08a5865
-  data.tar.gz: 44ed5f208033ba8c1fd4e070a264a633c2c126905ff163076389e342b42e53d621c53678d6f15a04cb6d9541499a95e5b0e6067d53017a8e86fae058409546ec
+  metadata.gz: 359b5317271207d42ad2b1353b46b158ad7bf75f946fb7e59e4b96bc48db0ee5ec49e278f3f2c869a23ccbbaf53f387cf6f4fc99618e84a65fd83ebd25ffe106
+  data.tar.gz: ee680bd731faff3f791b7d45826edd1699a04ec981ce27e03a2e73c909528729e371b18810d7344456b1a5250b6fded1426e35165f86d55b87e9b5406fa461d7

data/Rakefile

@@ -6,7 +6,7 @@ require 'rubygems'
 require 'rubygems/package_task'
 require 'prune'
 
-CLEAN.include( 'coverage', 'pkg' )
+CLEAN.include( 'pkg' )
 
 desc '"spec" (run RSpec)'
 task :default => :spec
@@ -14,12 +14,6 @@ task :default => :spec
 desc "Run RSpec on spec/*"
 RSpec::Core::RakeTask.new
 
-desc "Generate code coverage"
-RSpec::Core::RakeTask.new(:coverage) do |t|
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec,/gems/,/rubygems/', '--text-report']
-end
-
 spec = Gem::Specification.new do |spec|
   spec.name = 'geoffreywiseman-prune'
   spec.version = Prune::VERSION

data/lib/prune/meta.rb

@@ -5,7 +5,7 @@
 # @author Geoffrey Wiseman
 module Prune
   # The version of the prune gem and all the associated code.
-  VERSION = Gem::Version.new '1.3.0'
+  VERSION = Gem::Version.new '1.3.1'
 
   # The release date associated with the version
   RELEASE_DATE = '2016-06-24'

data/lib/prune/pruner.rb

@@ -95,9 +95,18 @@ module Prune
         paths = files.map { |file| File.join folder_name, file }
 
         begin
-          paths.each { |path| FileUtils.remove_entry( path, true ) }
-         
-          "#{files.size} file(s) deleted"
+          failed_paths = []
+          paths.each do |path|
+            if FileUtils.remove_entry( path, true ) == 0
+              failed_paths << path
+            end
+          end
+
+          if failed_paths.empty?
+            "#{files.size} file(s) deleted"
+          else
+            "#{files.size-failed_paths.size} file(s) deleted, #{failed_paths.size} file(s) could not be deleted."
+          end
         rescue
           raise IOError, "Could not remove file(s): #{$!}"
         end

data/spec/pruner_spec.rb

@@ -118,15 +118,22 @@ describe Prune::Pruner do
       end
       
       it "should delete file" do
-        FileUtils.should_receive( :remove_entry ).with( File.join( PRUNE_PATH, FILENAME ), true )
+        FileUtils.should_receive( :remove_entry ).with( File.join( PRUNE_PATH, FILENAME ), true ) { 1 }
         subject.prune PRUNE_PATH
       end
       
       it "should display file deleted message" do
-        FileUtils.should_receive( :remove_entry ).with( File.join( PRUNE_PATH, FILENAME ), true )
+        FileUtils.should_receive( :remove_entry ).with( File.join( PRUNE_PATH, FILENAME ), true ) { 1 }
         subject.prune PRUNE_PATH
-        @messages.should include_match( /file\(s\) deleted/ )
+        @messages.should include_match( /1 file\(s\) deleted/ )
       end
+
+      it "should display failed deletion mesage" do
+        FileUtils.should_receive( :remove_entry ).with( File.join( PRUNE_PATH, FILENAME ), true ) { 0 }
+        subject.prune PRUNE_PATH
+        @messages.should include_match( /0 file\(s\) deleted, 1 file\(s\) could not be deleted/ )
+      end
+
     end
       
     context "with no files categorized as archive" do

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 def stub_messages
   @messages = []
   $stdout.stub( :write ) { |message| @messages << message  }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoffreywiseman-prune
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Geoffrey Wiseman
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Prunes files from a folder based on a retention policy, often time-based.