gomiko 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4226809c289bd119c0709dd3bbaf6567f073090
-  data.tar.gz: e7ba437969fa6110f09e81b0a6434fe5c84a9eee
+  metadata.gz: f8b7fe5fb79a9bb5367443536a87b5921a40418e
+  data.tar.gz: 82d3c68c49147dc2fc47424e931beb28be0288b2
 SHA512:
-  metadata.gz: 9951ba37e62caec09a4856fe704b9eb62edcd7e8523fed13c3d5b37ad3faee61030f45527f3148271a566b1ea58e1b006b68cba82e17500bbad74e7b9bdfa187
-  data.tar.gz: fb742c25708beb55d4e821171f34a85fad18cadb353c9c6ab13e1d44c2a05f812388b2ba8229995364cac3212ff281b86730fef81adc80a1454b428909194e3a
+  metadata.gz: 0a35f1a4f92507c422c6ef3b25194c15352e998803b6517b5f0ce0d0f54998e64d3f5af371f73366fb9f48cff99a5033872e49bab9cebc0a8ca63340c4b56bd2
+  data.tar.gz: a9fb7dac36de0007a651033542f0645b981c0626dbe7be10fde69372ad70b1826142062a03ca64df0e1e97f33cc7b4c90be5866adaae089dddaa86fff9b4ca8d

data/CHANGES

@@ -1,5 +1,9 @@
 = Gomiko changelog
 
+== Version 0.0.2 [2018-02-20] released
+
+* small bugfix
+
 == Version 0.0.1 [2017-06-29] released
 
 * Bugfix a problem: enable to remove deadlink.

data/README.md

@@ -1,13 +1,4 @@
-% Gomiko
-% Ippei Kishida
-% Last-modified:2017/06/29 11:08:02.
-<!-- vim:syntax=markdown
-<u> ■■■■ HERE ■■■■ </u>
-
-TODO 用語統一
--->
-
-(→ [Japanese version](index-ja.html))
+(→ [Japanese version](http://www.q-eng.imat.eng.osaka-cu.ac.jp/~ippei/html/gomiko/index-ja.html))
 
 # Overview
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/gomiko

@@ -15,15 +15,11 @@ class MyCommand < Thor
   #  type: :boolean,
   #  default: false
   def rm(* paths)
-    #paths.select do |path|
-    #  File.exist? path
-    #end
     Gomiko.new.throw(paths: paths)
   end
 
   desc :empty, 'Remove files in trash directory'
   option "mtime",
-    #type: :numeric,
     type: :string,
     desc: 'Data was last modified n*24 hours ago.',
     default: '0'
@@ -39,12 +35,12 @@ class MyCommand < Thor
   def undo(* dirs)
     g = Gomiko.new
 
-    if Dir.glob("#{@trashdir}/*").empty?
-      puts "Nothing to undo in #{@trashdir}"
+    if g.dir_list.empty?
+      puts "Nothing to undo in #{g.trashdir}"
       exit
     end
 
-    dirs = [g.list[-1]] if dirs.empty?
+    dirs = [g.dir_list[-1]] if dirs.empty?
     dirs.each do |dir|
       begin
         g.undo(dir)
@@ -52,29 +48,32 @@ class MyCommand < Thor
         puts "Permission denined: #{dir}"
       end
     end
-
   end
 
   ## list
   desc :ls, 'Show trash directory'
   option "long", type: :boolean,
+    desc: "use a long format",
     default: false,
     aliases: 'l'
+  option "all", type: :boolean,
+    desc: "show all history including after undo",
+    default: false,
+    aliases: 'a'
   def ls(* ids)
     g = Gomiko.new
-    if g.list.empty?
+    if g.dir_list.empty?
       puts "Nothing in ~/.trash"
       exit
     end
-    ids = g.list if ids.empty?
+    ids = g.dir_list if ids.empty?
     if options[:long]
       ids.each do |id|
         puts '-' * 60
         results = g.info(id)
         printf("%-10s: %s\n", 'size', results[0])
         printf("%-10s: %s\n", 'id', results[1])
-        printf("%-10s: %s\n", 'guess path', results[2])
-        #pp results[3]
+        printf("%-10s: %s\n", 'path(s)', results[2])
         puts '+----- filetype in trash'
         puts '| +--- filetype in original path'
         puts '| | +- original path'
@@ -89,6 +88,13 @@ class MyCommand < Thor
       end
       Tefil::ColumnFormer.new.form(results)
     end
+    if options[:all]
+      g.yaml_list.each do |file|
+        id = file.sub(".yaml", "")
+        next if g.dir_list.include?(id)
+        puts "undo #{id}"
+      end
+    end
   end
 end
 

data/gomiko.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: gomiko 0.0.1 ruby lib
+# stub: gomiko 0.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "gomiko"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["ippei94da"]
-  s.date = "2017-06-29"
+  s.date = "2018-02-20"
   s.description = "\n    This Gem provides functionality similar to the Trash box in Windows OS.\n    The name 'gomiko' was originated from Japanese \"gomibako\".\n    If you think that it is \"a shrine maiden(miko-san) who plays go\", is it cute?\n    Gomiko provides the gomiko command;\n    it moves the file to ~/.trash with a change of rm.\n    And the command also can display the history of deletion and can execute undo.\n    Gomiko provides the Gomiko library.\n    It is designed so that the trash box can be handled from the Ruby program as well.\n   "
   s.email = "ippei94da@gmail.com"
   s.executables = ["gomiko"]

data/lib/gomiko.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 require 'pathname'
 require 'tefil'
 require 'find'
+require 'yaml'
 
 #
 #
@@ -30,13 +31,12 @@ class Gomiko
 
   # If paths includes exist and not exist files,
   # throw all exist file and report not exist files.
-  def throw(paths: , time: Time.new, verbose: true)
+  def throw(paths: , time: Time.new, verbose: true, io: $stdout)
     paths = paths.select do |path|
       flag = FileTest.symlink?(path) || FileTest.exist?(path) # for deadlink
-      #flag = FileTest.exist?(path) # for deadlink
       unless flag
         if verbose
-          puts "gomiko rm: cannot remove '#{path}': No such file or directory"
+          io.puts "gomiko rm: cannot remove '#{path}': No such file or directory"
         end
       end
       flag
@@ -44,40 +44,51 @@ class Gomiko
     return if paths.empty?
 
     trash_subdir = mkdir_time(time)
+    File.open(trash_subdir + ".yaml", "w") do |yaml_io|
+      YAML.dump( { 'pwd' => ENV["PWD"], 'paths' => paths }, yaml_io)
+    end
+
     paths.each do |path|
       dst = trash_subdir + File.expand_path(path)
       dst_dir = File.dirname dst
       FileUtils.mkdir_p(dst_dir)
       if path == '.'
-        puts "gomiko rm: failed to remove '.': Invalid argument" if verbose
+        io.puts "gomiko rm: failed to remove '.': Invalid argument" if verbose
         next
       else
-        FileUtils.mv(path, dst_dir + '/', :verbose => verbose)
+        FileUtils.mv(path, dst_dir + '/')
+        io.puts "mv #{path} #{dst_dir}" if verbose
         File.utime(time, time, trash_subdir)
       end
     end
   end
 
-  def empty(ids: [], mtime: 0, time: Time.now, verbose: true)
-    ids.map! {|v| path2id v}
-    ids = list if ids.empty?
-    dirs = ids.map {|v| @trashdir + '/' + v}
-    dirs = dirs.select { |v|
+  def empty(ids: [], mtime: 0, time: Time.now, verbose: true, io: $stdout)
+    if ids.empty?
+      tgts = (dir_list + yaml_list.map{|v| v.sub(".yaml", "")}).sort.uniq
+    else
+      tgts = ids.map {|v|  path2id(v.sub(".yaml", ""))}
+    end
+    tgts = tgts.select { |v|
       begin
-        File.mtime("#{v}") - time < 86400 * mtime
+        str2datetime(v) - time < 86400 * mtime
       rescue Errno::ENOENT
-        puts "Not found: #{v}"
+        io.puts "Not found: #{v}"
       end
     }
-    if dirs.empty?
-      puts "No directory was emptied."
+    tgts.map! {|v|  @trashdir + '/' + v}
+    if tgts.empty?
+      io.puts "No directory was emptied."
     else
-      dirs.each {|path| FileUtils.rm_rf(path, :verbose => verbose)}
+      tgts.each do |path|
+        ["", ".yaml"].each do |ext|
+          new_path = path + ext
+          FileUtils.rm_rf(new_path, :verbose => verbose) if File.exist? new_path
+        end
+      end
     end
   end
 
-  #def latest
-
   def undo(id, verbose: true, io: $stdout)
     id = path2id id
     fullpath = Pathname.new(@trashdir) + id
@@ -92,7 +103,11 @@ class Gomiko
   end
 
   # Example of return data:
-  #236K 20170623-021233/home/ippei/private/ero/inbox/20170623-015917 ...
+  # [
+  #   236K,
+  #   20170623-021233,
+  #   [/home/ippei/tmp/a.txt, /home/ippei/tmp/b.txt ]
+  # ]
   def info(id)
     id = path2id id
     cur_trash_dir = Pathname.new(@trashdir) + id
@@ -109,10 +124,8 @@ class Gomiko
     #flag_conflict = false
     flag_include_file = false
     trash_paths.each do |trash_path|
-      #pp trash_path
       orig_path = trash_path.sub(/^#{cur_trash_dir}/, '')
       trash_type = ftype_str(trash_path)
-
       flag_include_file = true unless File.directory? trash_path
       if FileTest.exist? orig_path
         orig_type = ftype_str(orig_path)
@@ -128,30 +141,24 @@ class Gomiko
       results_long << [ trash_type, orig_type,
                         trash_path.sub(/^#{cur_trash_dir}/, '') ]
     end
-
-
-    #pp flag_include_file
     unless flag_include_file
-      pp 'a'
       additions << 'only directory'
       candidates << trash_paths[-1]
     end
 
+    results <<  YAML.load_file(cur_trash_dir.to_s + ".yaml")['paths'][0]
     ## if no candidate, last file is adopted.
-    #pp candidates
-    #pp trash_paths
     if trash_paths.empty?
-      results << '(empty)'
+      #results << '(empty)'
       results << []
     else
-      #flag_conflict = true if candidates.empty?
       additions << 'conflict' if candidates.empty?
-      candidates = candidates.map    {|path|
-        tmp = path.sub(/^#{cur_trash_dir}/, '')
-        tmp += '/' if FileTest.directory? path
-        tmp
-      }
-      results << candidates[0]
+      #candidates = candidates.map    {|path|
+      #  tmp = path.sub(/^#{cur_trash_dir}/, '')
+      #  tmp += '/' if FileTest.directory? path
+      #  tmp
+      #}
+      #results << candidates[0]
 
       ## output '...' when multiple.
       candidates = candidates.select{|pa| ! pa.include? candidates[0]}
@@ -163,15 +170,31 @@ class Gomiko
     results
   end
 
-  # ls, list
-  def list
-    Dir.glob("#{@trashdir}/*").map do |path|
+  # ls, yaml_list
+  # return stocked yaml.
+  def yaml_list
+    Dir.glob("#{@trashdir}/*.yaml").map { |path|
       path.sub(/^#{@trashdir}\//, '').split[0]
-    end . sort
+    } . sort
+  end
+
+  # ls, dir_list
+  # return stocked directories.
+  def dir_list
+    Dir.glob("#{@trashdir}/*").select { |path|
+      FileTest.directory? path
+    } .map { |path|
+      path.sub(/^#{@trashdir}\//, '').split[0]
+    } . sort
   end
 
   private
 
+  def str2datetime(str)
+    /(\d{4})(\d{2})(\d{2})-(\d{2})(\d{2})(\d{2})/ =~ str
+    Time.new( $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i)
+  end
+
   # e.g., root_path = ~/.trash/20170123-012345
   #       path      = home/ippei/foo
   def graft(src_root, path, dst_root: '/', verbose: true)
@@ -187,8 +210,6 @@ class Gomiko
     elsif FileTest.exist? (dst_path)
       puts "normal file already exist: #{dst_path}" if verbose
     else
-      #pp src_root + path
-      #pp dst_path
       FileUtils.mv(src_root + path, dst_path, noop: false, verbose: verbose )
     end
     return
@@ -205,7 +226,6 @@ class Gomiko
         #self.ls
         try_name = @trashdir + "#{time_str}"
         try_name += "-#{i}" if 1 <= i
-        #pp try_name
         FileUtils.mkdir(try_name)
         dirname = try_name
       rescue Errno::EEXIST

data/test/test_gomiko.rb

@@ -14,7 +14,6 @@ class TC_Gomiko < Test::Unit::TestCase
   WORKDIR  = "#{TMPDIR}/work"
   TRASHDIR = "#{TMPDIR}/trash"
 
-  #pp WORKDIR; exit
   def setup
     FileUtils.rm_rf TMPDIR
     FileUtils.mkdir_p WORKDIR
@@ -44,6 +43,12 @@ class TC_Gomiko < Test::Unit::TestCase
     assert(FileTest.exist? ("#{TRASHDIR}/20170123-123456#{a_fullpath_dirname}"))
     assert_equal( Time.new(2017, 1, 23, 12, 34, 56), 
            File.mtime("#{TRASHDIR}/20170123-123456"))
+    assert(FileTest.exist? "#{TRASHDIR}/20170123-123456.yaml")
+    yaml = YAML.load_file "#{TRASHDIR}/20170123-123456.yaml"
+    assert_equal(
+      {"pwd"=>"/home/ippei/git/gomiko", "paths"=>["test/tmp/a.txt"]},
+      yaml
+    )
   end
 
   def test_throw2
@@ -71,13 +76,9 @@ class TC_Gomiko < Test::Unit::TestCase
     a_fullpath = File.expand_path 'test/a.txt'
     a_fullpath_dirname = File.dirname a_fullpath
     FileUtils.ln_s(b_relpath, a_relpath)
-    #FileUtils.rm b_relpath
-    #@g00.throw(paths: [a_relpath], time: Time.new(2017, 1, 23, 12, 34, 56), verbose: false)
-    @g00.throw(paths: [a_relpath], time: Time.new(2017, 1, 23, 12, 34, 56), verbose: true)
+    @g00.throw(paths: [a_relpath], time: Time.new(2017, 1, 23, 12, 34, 56), verbose: true, io: StringIO.new)
     assert_false(FileTest.exist? a_relpath)
     assert_false(FileTest.symlink? a_relpath)
-    pp "#{TRASHDIR}/20170123-123456#{a_fullpath_dirname}"
-    #sleep 60
 
     t = "#{TRASHDIR}/20170123-123456#{a_fullpath_dirname}"
     assert(FileTest.directory? t)
@@ -107,7 +108,9 @@ class TC_Gomiko < Test::Unit::TestCase
     assert(File.exist? "#{TRASHDIR}/20170123-123457#{b_fullpath}")
     @g00.empty(ids: ['20170123-123456'], verbose: false)
     assert_false(File.exist? "#{TRASHDIR}/20170123-123456#{a_fullpath}")
+    assert_false(File.exist? "#{TRASHDIR}/20170123-123456.yaml")
     assert      (File.exist? "#{TRASHDIR}/20170123-123457#{b_fullpath}")
+    assert      (File.exist? "#{TRASHDIR}/20170123-123457.yaml")
   end
 
   def test_empty3 #mtime
@@ -122,11 +125,13 @@ class TC_Gomiko < Test::Unit::TestCase
     assert(File.exist? "#{TRASHDIR}/20170615-000000#{a_fullpath}")
     @g00.empty(mtime: -10,
                time: Time.new(2017, 6, 24, 23, 59, 59),
-               verbose: false)
+               verbose: false,
+               io: StringIO.new)
     assert(File.exist? "#{TRASHDIR}/20170615-000000#{a_fullpath}")
     @g00.empty(mtime: -10,
                time: Time.new(2017, 6, 25, 00, 00, 00),
-               verbose: false)
+               verbose: false,
+               io: StringIO.new)
     assert_false(File.exist? "#{TRASHDIR}/20170123-123456#{a_fullpath}")
   end
 
@@ -165,7 +170,8 @@ class TC_Gomiko < Test::Unit::TestCase
     @g00.empty(ids: %w(20170615-000000 20170715-000000),
                mtime: -3,
                time: Time.new(2017, 7, 16, 01, 00, 00),
-               verbose: false)
+               verbose: false,
+               io: File::NULL)
     assert_false(File.exist? "#{TRASHDIR}/20170615-000000#{a_fullpath}")
     assert      (File.exist? "#{TRASHDIR}/20170615-120000#{b_fullpath}")
     assert      (File.exist? "#{TRASHDIR}/20170715-000000#{c_fullpath}")
@@ -208,8 +214,9 @@ class TC_Gomiko < Test::Unit::TestCase
     assert      (File.exist? "#{WORKDIR}/a/b/c.txt")
   end
 
-  # ls, list
-  def test_list1
+
+  # ls, dir_list
+  def test_dir_list1
     a_relpath = 'test/tmp/a.txt'
     FileUtils.touch a_relpath
     @g00.throw(paths: [a_relpath],
@@ -220,14 +227,12 @@ class TC_Gomiko < Test::Unit::TestCase
     @g00.throw(paths: [a_relpath],
                time: Time.new(2017, 1, 23, 12, 34, 57),
                verbose: false)
-    corrects = ["20170123-123456", "20170123-123457" ]
-    assert_equal(corrects, @g00.list)
+    corrects = [ "20170123-123456", "20170123-123457" ]
+    assert_equal(corrects, @g00.dir_list)
   end
 
-  def test_list2
+  def test_dir_list2
     FileUtils.mkdir_p @g00.trashdir + '20170628-000000'
-    #pp @g00.list
-    #assert_equal(corrects, @g00.list)
   end
 
   def test_info1
@@ -240,7 +245,6 @@ class TC_Gomiko < Test::Unit::TestCase
     results = @g00.info("20170123-123456")
     assert_equal('20170123-123456', results[1])
     assert_equal(path,              results[2])
-    #pp results[3]
     corrects = [
       ["/", "/", "/home"],
       ["/", "/", "/home/ippei"],
@@ -276,7 +280,7 @@ class TC_Gomiko < Test::Unit::TestCase
     #size is dependent on system
     results = @g00.info("20170123-123456")
     assert_equal('20170123-123456', results[1])
-    assert_equal("#{WORKDIR}/a/", results[2])
+    assert_equal("#{WORKDIR}/a", results[2])
   end
 
   def test_info4
@@ -290,7 +294,7 @@ class TC_Gomiko < Test::Unit::TestCase
     #size is dependent on system
     results = @g00.info("20170123-123456")
     assert_equal('20170123-123456', results[1])
-    assert_equal("#{WORKDIR}/a/ ...", results[2])
+    assert_equal("#{WORKDIR}/a ...", results[2])
   end
 
   def test_info5 # symlink
@@ -300,9 +304,8 @@ class TC_Gomiko < Test::Unit::TestCase
                verbose: false)
     FileUtils.mkdir_p "#{WORKDIR}/a/b"
     results = @g00.info("20170123-123456")
-    #pp results
     assert_equal('20170123-123456', results[1])
-    assert_equal("#{WORKDIR}/a/b/ (only directory)", results[2])
+    assert_equal("#{WORKDIR}/a (only directory)", results[2])
   end
 
   def test_info6
@@ -313,7 +316,6 @@ class TC_Gomiko < Test::Unit::TestCase
                verbose: false)
     FileUtils.touch("#{WORKDIR}/a")
     results = @g00.info("20170123-123456")
-    #pp results
     assert_equal('20170123-123456', results[1])
     assert_equal("#{WORKDIR}/a (conflict)", results[2])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gomiko
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ippei94da
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc