decimate 0.0.2 → 0.0.4

data/README.md

@@ -1,10 +1,10 @@
 # Decimate
 
-[![Build Status](https://api.travis-ci.org/justinwiley/decimate.png)](http://travis-ci.org/justinwiley/decimate)
+[![Build Status](http://api.travis-ci.org/justinwiley/decimate.png)](http://travis-ci.org/justinwiley/decimate)
 
 Discipline your file system by securely deleting some of its precious files or directories using shred.
 
-### Notable features:
+### Notable features
 
  - Uses shred utility to securely delete files, before removing
  - Allows additional sanity checking of paths
@@ -43,6 +43,11 @@ See RDoc for details.
 
 Code reviews, comments, violent reactions welcome.
 
+Thanks to tokland for suggestions.
+
+http://codereview.stackexchange.com/questions/28265/securely-deleting-files-while-attempting-to-protect-the-user-against-obviously
+
+
 ### Installation
 
 Add this line to your application's Gemfile:

data/lib/decimate.rb

@@ -1,4 +1,5 @@
 require "decimate/version"
+require 'shellwords'
 require 'fileutils'
 require 'open3'
 
@@ -10,15 +11,21 @@ module Decimate
   # 
   def self.run cmd
     stdout,stderr,status = Open3.capture3 cmd
-    raise "Domination failed executing #{cmd}: stdout: #{stdout}, stderr: #{stderr}, status #{status}" unless status.nil? || status == 0
+    raise "Failed executing #{cmd}: stdout: #{stdout}, stderr: #{stderr}, status #{status}" unless status.nil? || status == 0
     stdout
   end
 
+  # Check for shred, escape path, ensure path isn't root dir or fails regexp
+  def self.validate path, required_regex=nil
+    fail_unless_shred
+    escaped_path = Shellwords.escape path
+    validate_path escaped_path, required_regex
+  end
+
   def self.validate_path path, required_regex=nil
-    raise ArgumentError.new("expected Regexp, given #{required_regex.class}") if required_regex && !required_regex.is_a?(Regexp)
     File.expand_path(path).tap do |path|
-      raise ArgumentError.new("It looks like you're trying to remove root dir. :( Got #{path}") if path == '/'
-      raise ArgumentError.new("Path #{path} does not match #{required_regex}") if required_regex && !path.match(required_regex)
+      raise "Trying to remove root dir?  Path: #{path}" if path == '/'
+      raise "Path #{path} does not match #{required_regex}" if required_regex && !path.match(required_regex)
     end
   end
 
@@ -37,9 +44,8 @@ module Decimate
   #
   def self.file! path, opts={}
     return unless File.exist?(path)
-    fail_unless_shred
-    validate_path path, opts[:path_must_match]
- 
+    path = validate path, opts[:path_must_match]
+
     run "#{shred_cmd} #{path}"
   end
 
@@ -58,10 +64,9 @@ module Decimate
   #
   def self.dir! path, opts={}
     return unless Dir.exist?(path)
-    fail_unless_shred
-    validate_path path, opts[:path_must_match]
-    
-    stdout = run "find #{path} -type f -exec #{shred_cmd} '{}' ';'"
+    path = validate path, opts[:path_must_match]
+
+    stdout = run "find #{path} -type f -exec #{shred_cmd} {} +"
     FileUtils.rm_rf path
     stdout
   end

data/lib/decimate/version.rb

@@ -1,3 +1,3 @@
 module Decimate
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/lib/decimate_spec.rb

@@ -28,8 +28,8 @@ describe Decimate do
     end
 
     it 'should raise if expanded path matches /' do
-      expect{Decimate.validate_path('/')}.to raise_error(ArgumentError)
-      expect{Decimate.validate_path('/dir/../')}.to raise_error(ArgumentError)
+      expect{Decimate.validate_path('/')}.to raise_error
+      expect{Decimate.validate_path('/dir/../')}.to raise_error
     end
     context 'with required path match argument' do
       it 'should return path if expanded path matches given' do
@@ -37,7 +37,7 @@ describe Decimate do
       end
 
       it 'should raise if not' do
-        expect{Decimate.validate_path(file, /another_dir/)}.to raise_error(ArgumentError)
+        expect{Decimate.validate_path(file, /another_dir/)}.to raise_error
       end
     end
   end
@@ -84,7 +84,7 @@ describe Decimate do
     end
 
     it 'should securely delete all files under the given file' do
-      Open3.should_receive(:capture3).with("find #{dir} -type f -exec shred -uv '{}' ';'")
+      Open3.should_receive(:capture3).with("find #{dir} -type f -exec shred -uv {} +")
       Decimate.dir! dir
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decimate
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: