trash 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: c569fe2513ff956c4f27f7e49d14175551b1ed4e09b84592fce39ae371927829
+  data.tar.gz: 03c6f4550193716c5b4b43ae8d0baaece5a4e4cf86ec014c428d3e90784b6a83
+SHA512:
+  metadata.gz: 434b0d0f77a28c1ace6637cea8bd1494e20a9c2dedde307ca0fdc612d34ec79053c41751ac65e105dcda3b109e43d5cf85a9b89fb7c7dd396f4eb76c5bd9a0b2
+  data.tar.gz: 0503f43edcf3d9cca36d1343a474f5e355cbbcfee3963eea5ad0ef21d91e8565714f7cc090bad1d95873bedca4779eede398e3d2017e0fdb37385a5899a559e7

data/.document

@@ -1,5 +1,4 @@
 README.rdoc
 lib/**/*.rb
 bin/*
-features/**/*.feature
 LICENSE

data/Gemfile

@@ -1,3 +1,12 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
 
-gemspec
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 3.12.0"
+  gem "rake", "~> 13.0.6"
+  gem "rdoc", "~> 6.5.0"
+end

data/README.rdoc

@@ -11,13 +11,13 @@ From the command line:
   # example:
   trash potentially-important-file.txt
   trash this-folder that-folder some-random-file.txt
-  
+
 Handles multiple files with the same name
 
   trash ~/Documents/Groceries/shopping-list.txt
   trash ~/Documents/Christmas/shopping-list.txt
   trash ~/Documents/AutoParts/shopping-list.txt
-  
+
 The trash will contain:
 * shopping-list.txt     # originally ~/Documents/Groceries/shopping-list.txt
 * shopping-list01.txt   # originally ~/Documents/Christmas/shopping-list.txt
@@ -32,9 +32,10 @@ You will find the files that you've trashed in ~/.Trash
 == Contributors
 
 * ericmathison[https://github.com/ericmathison] (Eric Mathison)
+* brian-davis[https://github.com/brian-davis] (Brian Davis)
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -43,6 +44,17 @@ You will find the files that you've trashed in ~/.Trash
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+== Releasing a new version
+
+* Start a Docker container: `docker run --rm -it --volume=$PWD:/app --workdir /app ruby:2.7 bash`
+* Install dependencies: `bundle install`
+* Bump the version in the `VERSION` file.
+* Build the gem: `gem build trash.gemspec`.
+* Check that it's valid by installing it locally: `gem install ./trash-X.Y.Z.gem`.
+* Commit the changes in Git.
+* Tag it: `git tag vX.Y.Z && git push origin vX.Y.Z`.
+* Publish it: `GEM_HOST_API_KEY=TODO gem push trash-X.Y.Z.gem`. (requires RubyGems >= 3.0.5 to use the ENV var)
+
 == Copyright
 
 Copyright (c) 2010 Lee Jones. See LICENSE for details.

data/Rakefile

@@ -1,42 +1,30 @@
-require 'rubygems'
-require 'rake'
+# encoding: utf-8
 
+require 'rubygems'
+require 'bundler'
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "trash"
-    gem.summary = %Q{trash can for the command line}
-    gem.description = %Q{when it's hard to say goodbye, and rm is just too much... use trash instead.}
-    gem.email = "scribblethink@gmail.com"
-    gem.homepage = "http://github.com/leejones/trash"
-    gem.authors = ["Lee Jones"]
-    gem.add_development_dependency "rspec", "~> 1.2.9"
-    gem.add_development_dependency "rake", "~> 0.8.7"
-    gem.add_development_dependency "jeweler", "~> 1.4.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
 end
+require 'rake'
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/trash.rb

@@ -3,60 +3,63 @@ require 'fileutils'
 class Trash
   attr_reader :errors
   attr_accessor :trash_can
-  
-  def initialize(options = {})
-    @trash_can = options[:trash_can].nil? ? "#{ENV['HOME']}/.Trash" : options[:trash_can]
+  def initialize(options = {:trash_can => File.join(ENV['HOME'], ".Trash")})
+    @trash_can = options[:trash_can]
     create_trash_can_if_absent
     @errors = []
   end
 
   def has_trash_can?
-    File.directory? @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, "#{@trash_can}/#{unique_file_name(path)}")
+        FileUtils.mv(path, File.join(@trash_can, unique_file_name(path)))
       else
         add_error "#{path} does not exist.  Please check the file path."
         return 1
       end
     end
-    
+
     return 0
   end
-  
+
   def add_error(error)
     @errors << error
   end
-  
+
   private
-  
+
   def create_trash_can_if_absent
     FileUtils.mkdir_p(@trash_can) unless has_trash_can?
   end
-  
+
   def unique_file_name(path)
-    file_name      = File.split(path).last
+    file_name      = File.basename(path)
     file_extension = File.extname(path)
+    file_name_without_extension = File.basename(path, ".*")
 
-    return file_name unless File.exists?("#{@trash_can}/#{file_name}")
+    return file_name unless file_in_trash?(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}")}" }
+      unique_file_name_finder { |c| "#{file_name_without_extension}#{"%02d" % c}#{file_extension}" }
     end
   end
-  
+
   def unique_file_name_finder
     count = 1
-    while File.exists?("#{@trash_can}/#{yield(count)}")
+    while file_in_trash?(yield(count))
       count += 1
     end
     return yield(count)
   end
   
-end
+  def file_in_trash?(name)
+    File.exist?(File.join(@trash_can, name))
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,6 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'trash'
-require 'spec'
-require 'spec/autorun'
+require 'rspec/autorun'
 
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+  config.order = "random"
 end

data/spec/trash_spec.rb

@@ -2,15 +2,15 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Trash" do
   def delete(file)
-    `if [ -e #{file} ]; then rm -rf #{file}; fi;`
+    FileUtils.rm_rf(file)
   end
   
   def delete_from_trash(file)
-    delete("#{ENV['HOME']}/.Trash/#{file}")
+    delete("#{trash_dir}/#{file}")
   end
 
   def trash_should_contain(file_name)
-    File.exist?("#{ENV['HOME']}/.Trash/#{file_name}").should == true    
+    File.exist?("#{trash_dir}/#{file_name}").should == true
   end
 
   def trash_should_contain_directory(directory_name)
@@ -22,6 +22,10 @@ describe "Trash" do
     File.exist?("/tmp/#{file_name}").should == false
   end
 
+  def trash_dir
+    "#{ENV['HOME']}/.Trash"
+  end
+
   it "moves a file to the trash" do
     `echo 'default text' > /tmp/testing.txt`
     Trash.new.throw_out("/tmp/testing.txt")
@@ -55,29 +59,29 @@ describe "Trash" do
     Trash.new.throw_out("/tmp/testing.txt")
     tmp_should_not_contain "testing.txt"
     trash_should_contain "testing.txt"
-    original = File.new("#{ENV['HOME']}/.Trash/testing.txt", "r")
-    original.read.should == "default text\n"
+    File.read("#{trash_dir}/testing.txt").should ==
+      "default text\n"
     
     `echo 'testing different file with same name' > /tmp/testing.txt`
     Trash.new.throw_out("/tmp/testing.txt")
     tmp_should_not_contain "testing.txt"
     trash_should_contain "testing01.txt" 
-    third = File.new("#{ENV['HOME']}/.Trash/testing01.txt", "r")
-    third.read.should == "testing different file with same name\n"
+    File.read("#{trash_dir}/testing01.txt").should ==
+      "testing different file with same name\n"
   
     `echo 'testing different file 2 with same name' > /tmp/testing.txt`
     Trash.new.throw_out("/tmp/testing.txt")
     tmp_should_not_contain "testing.txt"
     trash_should_contain "testing02.txt"
-    fourth = File.new("#{ENV['HOME']}/.Trash/testing02.txt", "r")
-    fourth.read.should == "testing different file 2 with same name\n"
+    File.read("#{trash_dir}/testing02.txt").should ==
+      "testing different file 2 with same name\n"
 
     `echo 'testing different file 3 with same name' > /tmp/testing.txt`
     Trash.new.throw_out("/tmp/testing.txt")
     tmp_should_not_contain "testing.txt"
     trash_should_contain "testing03.txt"
-    fifth = File.new("#{ENV['HOME']}/.Trash/testing03.txt", "r")
-    fifth.read.should == "testing different file 3 with same name\n"
+    File.read("#{trash_dir}/testing03.txt").should ==
+      "testing different file 3 with same name\n"
     
     delete_from_trash "testing.txt"
     delete_from_trash "testing01.txt"
@@ -85,6 +89,23 @@ describe "Trash" do
     delete_from_trash "testing03.txt"
   end
   
+  it 'appends a number to duplicate filename even when it has no extension' do
+    text1 = "text content"
+    text2 = "different content"
+    `echo '#{text1}' > /tmp/testing`
+    Trash.new.throw_out("/tmp/testing")
+    `echo '#{text2}' > /tmp/testing`
+    Trash.new.throw_out("/tmp/testing")
+
+    trash_should_contain "testing"
+    File.read("#{trash_dir}/testing").should == "#{text1}\n"
+    trash_should_contain "testing01"
+    File.read("#{trash_dir}/testing01").should == "#{text2}\n"
+
+    delete_from_trash "testing"
+    delete_from_trash "testing01"
+  end
+
   it "should throw an error when file does not exist" do
     tmp_should_not_contain "not_a_file.txt"
     trash = Trash.new
@@ -93,7 +114,7 @@ describe "Trash" do
   end
   
   it "moves a directory to the trash" do
-    dir = `mkdir -p /tmp/testdir01`
+    FileUtils.mkdir_p("/tmp/testdir01")
     Trash.new.throw_out("/tmp/testdir01")
     tmp_should_not_contain "testdir01"
     trash_should_contain_directory "testdir01"
@@ -101,7 +122,7 @@ describe "Trash" do
   end
 
   it "moves multiple directories to the trash" do
-    dirs = `mkdir -p /tmp/testdir01 /tmp/testdir02`
+    FileUtils.mkdir_p %w(/tmp/testdir01 /tmp/testdir02)
     Trash.new.throw_out(*["/tmp/testdir01", "/tmp/testdir02"])
     tmp_should_not_contain "testdir01"
     tmp_should_not_contain "testdir02"
@@ -112,12 +133,12 @@ describe "Trash" do
   end
   
   it "handles dots in a directory name" do
-    `mkdir -p /tmp/testdir.2010`
+    FileUtils.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`
+    FileUtils.mkdir_p("/tmp/testdir.2010")
     Trash.new.throw_out("/tmp/testdir.2010")
     tmp_should_not_contain "testdir.2010"
     trash_should_contain_directory "testdir.201001"
@@ -128,22 +149,22 @@ describe "Trash" do
 
 
   it "appends a number to the directory name if a directory with same name already exisits in trash" do
-    `mkdir -p /tmp/testing`
+    FileUtils.mkdir_p("/tmp/testing")
     Trash.new.throw_out("/tmp/testing")
     tmp_should_not_contain "testing"
     trash_should_contain_directory "testing"
     
-    `mkdir -p /tmp/testing`
+    FileUtils.mkdir_p("/tmp/testing")
     Trash.new.throw_out("/tmp/testing")
     tmp_should_not_contain "testing"
     trash_should_contain_directory "testing01" 
   
-    `mkdir -p /tmp/testing`
+    FileUtils.mkdir_p("/tmp/testing")
     Trash.new.throw_out("/tmp/testing")
     tmp_should_not_contain "testing"
     trash_should_contain_directory "testing02" 
 
-    `mkdir -p /tmp/testing`
+    FileUtils.mkdir_p("/tmp/testing")
     Trash.new.throw_out("/tmp/testing")
     tmp_should_not_contain "testing"
     trash_should_contain_directory "testing03" 
@@ -156,7 +177,7 @@ describe "Trash" do
 
   describe "trash_can" do
     it "finds the trash can" do
-      FileUtils.mkdir_p "#{ENV['HOME']}/.Trash"
+      FileUtils.mkdir_p trash_dir
       Trash.new.has_trash_can?.should == true
     end
 

data/trash.gemspec

@@ -1,67 +1,33 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{trash}
-  s.version = "0.2.1"
+  s.name = "trash".freeze
+  s.version = File.read("VERSION")
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Lee Jones"]
-  s.date = %q{2013-09-11}
-  s.default_executable = %q{trash}
-  s.description = %q{when it's hard to say goodbye, and rm is just too much... use trash instead.}
-  s.email = %q{scribblethink@gmail.com}
-  s.executables = ["trash"]
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Lee Jones".freeze]
+  s.date = "2017-01-24"
+  s.description = "when it's hard to say goodbye, and rm is just too much... use trash instead.".freeze
+  s.executables = ["trash".freeze]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc",
-     "TODO"
+    "README.rdoc",
+    "TODO"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "bin/trash",
-     "lib/trash.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/trash_spec.rb",
-     "trash.gemspec"
-  ]
-  s.homepage = %q{http://github.com/leejones/trash}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{trash can for the command line}
-  s.test_files = [
+    ".rspec",
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "bin/trash",
+    "lib/trash.rb",
     "spec/spec_helper.rb",
-     "spec/trash_spec.rb"
+    "spec/trash_spec.rb",
+    "trash.gemspec"
   ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.4.0"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
-  end
+  s.homepage = "http://github.com/leejones/trash".freeze
+  s.licenses = ["MIT".freeze]
+  s.summary = "trash can for the command line".freeze
 end
-

metadata

@@ -1,84 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trash
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Lee Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-11 00:00:00 -05:00
-default_executable: trash
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  requirement: *id001
-  name: rspec
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  requirement: *id002
-  name: rake
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  requirement: *id003
-  name: jeweler
-  prerelease: false
-  type: :development
+date: 2017-01-24 00:00:00.000000000 Z
+dependencies: []
 description: when it's hard to say goodbye, and rm is just too much... use trash instead.
-email: scribblethink@gmail.com
-executables: 
+email: 
+executables:
 - trash
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
 - TODO
-files: 
-- .document
-- .gitignore
+files:
+- ".document"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -87,44 +30,30 @@ files:
 - VERSION
 - bin/trash
 - lib/trash.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/trash_spec.rb
 - trash.gemspec
-has_rdoc: true
 homepage: http://github.com/leejones/trash
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 3.1.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: trash can for the command line
-test_files: 
-- spec/spec_helper.rb
-- spec/trash_spec.rb
+test_files: []

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-Gemfile.lock
-
-## PROJECT::SPECIFIC