cmd_tools 0.1.3 → 0.2.0

data/bin/bak

@@ -1,49 +1,10 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-# bak is an abbreviation of backup.
-# Backup files and directories in the current directory into ./bak_since_ directory.
 
 if ARGV.empty?
-  puts <<-EOS
-#
-$ bak file1 file2 ...
-#
-  EOS
+  puts "bak file1 file2 ..."
 
   exit
 end
 
-require 'fileutils'
-require 'find'
-
-BAK_DIR_HEAD = "bak_since_"
-BAK_DIR_REG = /(\A|\/)#{BAK_DIR_HEAD}\d{12}\z/
-BAK_PREFIX = 'bak.'
-CURRENT_TIME = Time.now.strftime("%y%m%d%H%M%S")
-BAK_DIR\
-=  Dir.foreach('.')\
-    .select{|path| path =~ BAK_DIR_REG}\
-    .select{|path| File.directory?(path)}\
-    .first\
-|| BAK_DIR_HEAD + CURRENT_TIME
-BAK_DIR_IN_BAK_DIR_REG = /\A#{BAK_DIR}\/.*#{BAK_DIR_HEAD}\d{12}\z/
-
-FileUtils.mkdir_p(BAK_DIR)
-(ARGV.map{|path| path.chomp('/')} - ['.', '..', BAK_DIR])\
-  .select{|path| File.exist?(path)}\
-  .each{|path|
-  dest = File.join(BAK_DIR, "#{BAK_PREFIX}#{path}.#{CURRENT_TIME}#{File.extname(path)}")
-  $stdout.puts "Back up #{path}"
-  FileUtils.cp_r(path, dest)
-
-  Find.find(dest){|path_in_dest|
-    if path_in_dest =~ BAK_DIR_IN_BAK_DIR_REG && File.directory?(path_in_dest)
-      $stdout.puts "Delete #{path_in_dest}? [y/N]"
-      if $stdin.gets.strip =~ /\A[yY]/
-        $stdout.puts "Deleting: #{path_in_dest}"
-        FileUtils.rm_rf(path_in_dest)
-        Find.prune
-      end
-    end
-  }
-}
+require "cmd_tools"
+puts ::CmdTools::Bin::Bak.run(ARGV).join("\t")

data/bin/tsh

@@ -1,26 +1,10 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
-# tsh is an abbreviation of trash.
-# Move files and directories to ~/.myTrash directory.
-# Should be safer than direct rm.
 
 if ARGV.empty?
-  puts <<-EOS
-#
->tsh fileOrDir1 fileOrDir2 ...
-#
-  EOS
+  puts "tsh fileOrDir1 fileOrDir2 ..."
 
   exit
 end
 
-require 'fileutils'
-MY_TRASH_DIR = File.join(ENV['HOME'], '.myTrash')
-CURRENT_TIME = Time.now.strftime("%y%m%d%H%M%S.")
-PREFIX = File.join(MY_TRASH_DIR, CURRENT_TIME)
-
-FileUtils.mkdir_p(MY_TRASH_DIR)
-puts (ARGV - %w(. ..))\
-  .select{|path| File.exist?(path)}\
-  .each{|path| FileUtils.mv(path, PREFIX + File.basename(path))}\
-  .join("\t")
+require 'cmd_tools'
+puts ::CmdTools::Bin::Tsh.run(ARGV).join("\t")

data/lib/cmd_tools/bin/bak.rb

@@ -0,0 +1,66 @@
+module CmdTools
+  module Bin
+
+    # bak is an abbreviation of backup.
+    module Bak
+      require 'fileutils'
+      require 'find'
+      require 'ruby_patch'
+      extend ::RubyPatch::AutoLoad
+
+      BAK_DIR_HEAD = "bak_since_"
+      BAK_DIR_REG = /(\A|\/)#{BAK_DIR_HEAD}\d{12}\z/
+      BAK_PREFIX = 'bak.'
+
+      # Back up files and directories to <tt>bak_dir</tt>.
+      # @param [Array<String>] files Files and directories to be backed up.
+      def self.run(*files)
+        time_stamp = Time.now.ymdhms
+        bak_dir = get_bak_dir(time_stamp)
+        nested_bak_dir_reg = /\A#{bak_dir}\/.*#{BAK_DIR_HEAD}\d{12}\z/
+        FileUtils.mkdir_p(bak_dir)
+        (files.flatten.map{|f| f.chomp('/')} - ['.', '..', bak_dir])\
+          .select{|f| File.exist?(f)}\
+          .each{|f|
+          dest = get_dest(bak_dir, f, time_stamp)
+          begin
+            FileUtils.cp_r(f, dest)
+          rescue
+            warn "WARN: Failed to back up #{f}."
+          end
+
+          delete_nested_bak_dir(dest, nested_bak_dir_reg) if(File.directory?(dest))
+        }
+      end
+
+      private
+
+      def self.get_bak_dir(time_stamp)
+        Dir.foreach('.')\
+          .select{|f| File.directory?(f)}\
+          .select{|f| f =~ BAK_DIR_REG}\
+          .first\
+        or BAK_DIR_HEAD + time_stamp
+      end
+
+      def self.get_dest(bak_dir, file, time_stamp)
+        ext = File.extname(file)
+        File.join(bak_dir, [BAK_PREFIX, file, '.', time_stamp, ext].join)
+      end
+
+      def self.delete_nested_bak_dir(dest, nested_bak_dir_reg)
+        Find.find(dest){|f| # I did not used #select method chain style to use Find.prune.
+          next unless File.directory?(f)
+          next unless f =~ nested_bak_dir_reg
+
+          $stdout.puts "Delete #{f}? [y/N]"
+          if $stdin.gets.strip =~ /\Ay/i
+            $stdout.puts "Deleting: #{f}"
+            FileUtils.rm_rf(f)
+            Find.prune
+          end
+        }
+      end
+    end
+  end
+end

data/lib/cmd_tools/bin/tsh.rb

@@ -0,0 +1,30 @@
+module CmdTools
+  module Bin
+
+    # tsh is an abbreviation of trash.
+    module Tsh
+      require 'fileutils'
+      require 'ruby_patch'
+      extend ::RubyPatch::AutoLoad
+
+      TRASH_DIR = File.join(ENV['HOME'], '.myTrash')
+
+      # Move files and directories into <tt>TRASH_DIR</tt>.
+      # @param [Array<String>] files Files and directories to be moved into <tt>TRASH_DIR</tt>.
+      def self.run(*files)
+        FileUtils.mkdir_p(TRASH_DIR)
+        time = Time.now.ymdhms
+        prefix = File.join(TRASH_DIR, time) + '.'
+        (files.flatten - ['.', '..'])\
+          .select{|f| File.exist?(f)}\
+          .each{|f|
+          begin
+            FileUtils.mv(f, prefix + File.basename(f))
+          rescue
+            warn "WARN: Failed to discard #{f}."
+          end
+        }
+      end
+    end
+  end
+end

data/lib/cmd_tools/bin.rb

@@ -0,0 +1,6 @@
+module CmdTools
+  module Bin
+    require 'ruby_patch'
+    extend ::RubyPatch::AutoLoad
+  end
+end

data/lib/cmd_tools/version.rb

@@ -1,3 +1,3 @@
 module CmdTools
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/lib/cmd_tools.rb

@@ -1,3 +1,5 @@
 module CmdTools
   require 'cmd_tools/version'
+  require 'ruby_patch'
+  extend ::RubyPatch::AutoLoad
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmd_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_patch
-  requirement: &2155437300 !ruby/object:Gem::Requirement
+  requirement: &79803450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *2155437300
+  version_requirements: *79803450
 description: ! 'Command line tools. tsh: mv to ~/.myTrash. bak: bakup.'
 email: 
 executables:
@@ -37,6 +37,9 @@ files:
 - bin/tsh
 - cmd_tools.gemspec
 - lib/cmd_tools.rb
+- lib/cmd_tools/bin.rb
+- lib/cmd_tools/bin/bak.rb
+- lib/cmd_tools/bin/tsh.rb
 - lib/cmd_tools/version.rb
 homepage: 
 licenses: []
@@ -58,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Command line tools.