trash 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/trash.rb

@@ -2,23 +2,23 @@ require 'fileutils'
 
 class Trash
   attr_reader :errors
-  attr_accessor :trashcan
+  attr_accessor :trash_can
   
   def initialize(options = {})
-    @trashcan = options[:trashcan].nil? ? "#{ENV['HOME']}/.Trash" : options[:trashcan]
-    create_trashcan_if_absent
+    @trash_can = options[:trash_can].nil? ? "#{ENV['HOME']}/.Trash" : options[:trash_can]
+    create_trash_can_if_absent
     @errors = []
   end
 
-  def has_trashcan?
-    File.directory? @trashcan 
+  def has_trash_can?
+    File.directory? @trash_can 
   end
   
   def throw_out(*paths)
     paths.each do |path|
       path = File.expand_path(path)
       if File.exist? path
-        FileUtils.mv(path, "#{ENV['HOME']}/.Trash/#{unique_file_name(path)}")
+        FileUtils.mv(path, "#{@trash_can}/#{unique_file_name(path)}")
       else
         add_error "#{path} does not exist.  Please check the file path."
         return 1
@@ -34,20 +34,29 @@ class Trash
   
   private
   
-  def create_trashcan_if_absent
-    FileUtils.mkdir_p @trashcan unless has_trashcan?
+  def create_trash_can_if_absent
+    FileUtils.mkdir_p(@trash_can) unless has_trash_can?
   end
   
   def unique_file_name(path)
-    path_name = File.basename(path)
-    path_extension = File.extname(path)
-    if (File.exists?("#{ENV['HOME']}/.Trash/#{path_name}"))
-      count = 1
-      while File.exists?("#{ENV['HOME']}/.Trash/#{path_name.gsub(path_extension, "0#{count}#{path_extension}")}")
-        count += 1
-      end
-      new_path_name = path_name.gsub(path_extension, "0#{count}#{path_extension}")
+    file_name      = File.split(path).last
+    file_extension = File.extname(path)
+
+    return file_name unless File.exists?("#{@trash_can}/#{file_name}")
+
+    if File.directory? path
+      unique_file_name_finder { |c| "#{file_name}#{"%02d" % c}" }
+    else
+      unique_file_name_finder { |c| "#{file_name.gsub(file_extension, "#{"%02d" % c}#{file_extension}")}" }
     end
-    return new_path_name
   end
+  
+  def unique_file_name_finder
+    count = 1
+    while File.exists?("#{@trash_can}/#{yield(count)}")
+      count += 1
+    end
+    return yield(count)
+  end
+  
 end

data/spec/trash_spec.rb

@@ -42,7 +42,7 @@ describe "Trash" do
     delete_from_trash "testing2.txt"
   end
 
-  it "should handle spaces in the file/folder name" do
+  it "should handle spaces in the file/directory name" do
     create_file = `echo "Test with spaces..." > "/tmp/test with spaces.txt"`
     Trash.new.throw_out("/tmp/test with spaces.txt")
     tmp_should_not_contain "test with spaces.txt"
@@ -110,17 +110,60 @@ describe "Trash" do
     delete_from_trash "testdir01"
     delete_from_trash "testdir02"
   end
+  
+  it "handles dots in a directory name" do
+    `mkdir -p /tmp/testdir.2010`
+    Trash.new.throw_out("/tmp/testdir.2010")
+    tmp_should_not_contain "testdir.2010"
+    trash_should_contain_directory "testdir.2010"
+
+    `mkdir -p /tmp/testdir.2010`
+    Trash.new.throw_out("/tmp/testdir.2010")
+    tmp_should_not_contain "testdir.2010"
+    trash_should_contain_directory "testdir.201001"
+    
+    delete_from_trash "testdir.2010"
+    delete_from_trash "testdir.201001"
+  end
+
+
+  it "appends a number to the directory name if a directory with same name already exisits in trash" do
+    `mkdir -p /tmp/testing`
+    Trash.new.throw_out("/tmp/testing")
+    tmp_should_not_contain "testing"
+    trash_should_contain_directory "testing"
+    
+    `mkdir -p /tmp/testing`
+    Trash.new.throw_out("/tmp/testing")
+    tmp_should_not_contain "testing"
+    trash_should_contain_directory "testing01" 
+  
+    `mkdir -p /tmp/testing`
+    Trash.new.throw_out("/tmp/testing")
+    tmp_should_not_contain "testing"
+    trash_should_contain_directory "testing02" 
+
+    `mkdir -p /tmp/testing`
+    Trash.new.throw_out("/tmp/testing")
+    tmp_should_not_contain "testing"
+    trash_should_contain_directory "testing03" 
+    
+    delete_from_trash "testing"
+    delete_from_trash "testing01"
+    delete_from_trash "testing02"
+    delete_from_trash "testing03"
+  end
 
-  describe "trashcan" do
-    it "finds the trashcan" do
+  describe "trash_can" do
+    it "finds the trash can" do
       FileUtils.mkdir_p "#{ENV['HOME']}/.Trash"
-      Trash.new.has_trashcan?.should == true
+      Trash.new.has_trash_can?.should == true
     end
 
-    it "creates a trashcan if one does not exist" do
+    it "creates a trash can if one does not exist" do
       delete("/tmp/test_trash_can")
       File.exist?("/tmp/test_trash_can").should == false
-      oscar = Trash.new({:trashcan => "/tmp/test_trash_can"})
+      oscar = Trash.new({:trash_can => "/tmp/test_trash_can"})
       File.exist?("/tmp/test_trash_can").should == true
       File.directory?("/tmp/test_trash_can").should == true
       delete("/tmp/test_trash_can")

data/trash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trash}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lee Jones"]
-  s.date = %q{2010-03-25}
+  s.date = %q{2010-03-26}
   s.default_executable = %q{trash}
   s.description = %q{when its hard to say goodbye, and rm is just too much... use trash instead.}
   s.email = %q{scribblethink@gmail.com}

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Lee Jones
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -04:00
+date: 2010-03-26 00:00:00 -04:00
 default_executable: trash
 dependencies: 
 - !ruby/object:Gem::Dependency