filerenamer 0.0.9 → 0.0.10

data/lib/filerenamer/optionparser.rb

@@ -25,9 +25,10 @@ module FileRenamer
       on("-m", "--move"    , "Move mode.(default)"   ){@options[:move]    = true}
       on("-h", "--hardlink", "Hardlink mode."        ){@options[:hardlink]= true}
       on("-s", "--symlink" , "Symlink mode."         ){@options[:symlink] = true}
-      on("-g", "--git"     , "Git-mv mode."          ){@options[:git] = true}
+      on("-g", "--git"     , "Git-mv mode."          ){@options[:git]     = true}
       on("-q", "--quiet"   , "Quiet mode. Forced non-interactive."){
         @options[:quiet] = true
+        @options[:yes]     = true
         #このオプションが設定されているときは強制的に --yes として扱われる。
         #non_interactive_mode になる。
       }

data/lib/filerenamer/renameorderer.rb

@@ -0,0 +1,153 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require 'tempfile'
+
+$DEBUG = false
+
+#
+#
+#
+class FileRenamer::RenameOrderer
+  attr_reader :rename_processes, # in order
+    :unable_processes
+  # example of 'processes'
+  #   [
+  #     [old0, new0],
+  #     [old1, new1],
+  #     ...
+  #   ]
+  def initialize(olds_news, dir = '.')
+    @dir = dir
+    #@all_processes = processes.to_h
+    @all_processes = olds_news
+    @unworked_processes = Marshal.load(Marshal.dump(@all_processes))
+    @rename_processes = []
+    @unable_processes = []
+
+    @post_processes = []
+    while ! @unworked_processes.empty?
+      key = @unworked_processes.keys[0]
+      @first_old = key
+      class_process(key)
+    end
+    @rename_processes += @post_processes unless @post_processes.empty?
+    @post_processes = []
+
+    @unable_processes.sort!
+  end
+
+  private
+
+  # 再帰的メソッド
+  # その process と、依存する全ての process を @rename_processes と @unable_processes に分類する。
+  # その process が実行可能であるか？ を返す。
+  def class_process(old)
+
+    new = @unworked_processes[old]
+
+    if $DEBUG
+      puts "=" * 60
+      pp self
+      print "old "
+      pp old
+      print "new "
+      pp new
+      puts
+    end
+
+    # old と new が一致していれば不可
+    if old == new
+      puts "old(#{old}) == new(#{new}). retrun false." if $DEBUG
+      add_unable(old, new)
+      return false
+    end
+    puts "old(#{old}) != new(#{new})" if $DEBUG
+
+    # old が存在しなければ不可
+    unless FileTest.exist?("#{@dir}/#{old}")
+      puts "old(#{old}) not exist in the file system. return false." if $DEBUG
+      add_unable(old, new)
+      return false
+    end
+    puts "old(#{old}) exist" if $DEBUG
+
+    # new がどれかの dst と重複ならば、不可
+    if @all_processes.values.select{|name| new == name}.size > 1
+      puts "new(#{new}) is dpulicated in #{@all_processes.values}. return false." if $DEBUG
+      add_unable(old, new)
+      return false
+    end
+    puts "new(#{new}) is only one in new of @all_processes( #{@all_processes})" if $DEBUG
+
+    unless File.exist?("#{@dir}/#{new}") # new がファイルとして存在しないならば、可能
+      puts "new(#{new}) does not exist in the filesystem. return true." if $DEBUG
+      add_rename(old, new)
+      return true
+    end
+    puts "new(#{new}) exist in the filesystem" if $DEBUG
+
+    # new がファイルとして存在する
+
+    # 可能リストに入っていたら、ここまでにリネームされているので可能
+    if @rename_processes.map{|o, n| o}.include?(new)
+      puts "new(#{new}) is included in old of @rename_processes(#{@rename_processeses}). return true." if $DEBUG
+      add_rename(old, new)
+      return true
+    end
+
+    # new が、他のいずれかの process の old で ない ならば、空かないので不可
+    unless @unworked_processes[new]
+      puts "@unworked_processes[new](#{@unworked_processes[new] }). return false." if $DEBUG
+      add_unable(old, new)
+      return false
+    end
+
+    # new が、他のいずれかの process の old で ある
+
+    # new が依存性チェーンの先頭と同じであれば、
+    # 先頭を一時ファイルにリネームして、その上でリネーム可能とし、
+    # 最後に一時ファイルからリネームする処理を追加。
+    if new == @first_old
+      puts "new #{new} == first_old #{@first_old}. use tmp file and return true." if $DEBUG
+      #tmp = Tempfile.new("#{@first_old}-", @dir).path
+      tmp = Tempfile.new("#{@all_processes[@first_old]}-#{@first_old}-", @dir).path
+      add_rename(@first_old, tmp)
+      @post_processes << [tmp, @all_processes[@first_old]]
+      pp self if $DEBUG
+      return true
+    end
+    puts "new(#{new}) != first_old(#{@first_old})" if $DEBUG
+
+    puts "class_process(new)" if $DEBUG
+    pp self if $DEBUG
+    #ここでの new からリネームするプロセスについて、再帰的に実行
+    if class_process(new)
+      pp self if $DEBUG
+      puts "depending process can be executed. return true." if $DEBUG
+      #add_rename(old, new) unless @rename_processes.map{|o, n| o}.include?(old)
+      #add_rename(old, new)
+      return true
+    else
+      puts "depending process cannot be executed. return false." if $DEBUG
+      add_unable(old, new)
+      return false
+    end
+  end
+
+  private
+  
+  def add_rename(old, new)
+    @rename_processes << [old, new]
+    @unworked_processes.delete(old)
+    return true
+  end
+
+  def add_unable(old, new)
+    @unable_processes << [old, new]
+    @unworked_processes.delete(old)
+    return false
+  end
+
+end
+

data/test/test_commander.rb

@@ -13,17 +13,18 @@ require "capture_stdout"
 
 module FileRenamer
   class Commander
-    public :check_new_names
+    #public :check_new_names
     public :ask_yes?
-    public :run
     public :make_new_names
     public :paths
+    public :transplant
+    public :rmdir_p
+    public :convert
     attr_reader :options
   end
 end
 
 class TC_Commander < Test::Unit::TestCase
-  EXIST_FILE = "test/filerenamer/dummy.txt"
 
   A_0 = "test/filerenamer/a0.txt"
   A_1 = "test/filerenamer/a1.txt"
@@ -144,7 +145,6 @@ class TC_Commander < Test::Unit::TestCase
 
     #:quiet
     FileUtils.rm(A_1) if FileTest.exist?(A_1)
-    io = StringIO.new
     #
     options = {:copy => true, :quiet => true}
     fr01 = FileRenamer::Commander.new(options, [A_0])
@@ -197,17 +197,17 @@ class TC_Commander < Test::Unit::TestCase
     assert_equal(false, FileTest.exist?(A_1))
     #
     correct = 
-      "Unable files:\n" +
-      "  cp -r #{A_0} #{A_0}\n" +
-      "  cp -r #{A_1} #{A_0}\n" +
-      "\n" +
+      #"Unable files:\n" +
+      #"  cp -r #{A_0} #{A_0}\n" +
+      #"  cp -r #{A_1} #{A_0}\n" +
+      #"\n" +
       "Done. No executable files.\n"
     t = str
     assert_equal(correct[0], t[0])
-    assert_equal(correct[1], t[1])
-    assert_equal(correct[2], t[2])
-    assert_equal(correct[3], t[3])
-    assert_equal(correct[4], t[4])
+    #assert_equal(correct[1], t[1])
+    #assert_equal(correct[2], t[2])
+    #assert_equal(correct[3], t[3])
+    #assert_equal(correct[4], t[4])
     $stdin = STDIN
 
     ## ファイルリストを与えないときはカレントディレクトリの全ファイルが対象。
@@ -233,7 +233,6 @@ class TC_Commander < Test::Unit::TestCase
 
   def test_make_new_names
     options = {}
-    #pp [A_0, A_1]; exit
     fr00 = FileRenamer::Commander.new(options, [A_0, A_1])
     assert_equal(
       {
@@ -247,32 +246,61 @@ class TC_Commander < Test::Unit::TestCase
   end
 
   def test_check_new_names
-    files = {
-      "alice.txt"   => EXIST_FILE,
-      "bcdefgh.txt" => EXIST_FILE,
-      "charly.txt"  => "C.txt",
-      "david.txt"   => "D.txt",
-      EXIST_FILE    => EXIST_FILE,
-      "eva.txt"     => "alice.txt",
-      "f.txt"       => "f.txt",
-      "g.txt"       => nil,
-    }
-    ok_list, ng_list = @fr00.check_new_names(files)
-    assert_equal(
-      { "charly.txt"  => "C.txt",
-        "david.txt"   => "D.txt",
-      },
-      ok_list
-    )
-    assert_equal(
-      { "alice.txt"   => EXIST_FILE,
-        "bcdefgh.txt" => EXIST_FILE,
-        EXIST_FILE    => EXIST_FILE,
-        "eva.txt"     => "alice.txt",
-      },
-      ng_list
-    )
-
+    #exist_file = "test/filerenamer/dummy.txt"
+    #files = {
+    #  "alice.txt"   => exist_file,
+    #  "bcdefgh.txt" => exist_file,
+    #  "charly.txt"  => "C.txt",
+    #  "david.txt"   => "D.txt",
+    #  exist_file    => exist_file,
+    #  "eva.txt"     => "alice.txt",
+    #  "f.txt"       => "f.txt",
+    #  "g.txt"       => nil,
+    #}
+    #ok_list, ng_list = @fr00.check_new_names(files)
+    #assert_equal(
+    #  { "charly.txt"  => "C.txt",
+    #    "david.txt"   => "D.txt",
+    #  },
+    #  ok_list
+    #)
+    #assert_equal(
+    #  { "alice.txt"   => exist_file,
+    #    "bcdefgh.txt" => exist_file,
+    #    exist_file    => exist_file,
+    #    "eva.txt"     => "alice.txt",
+    #  },
+    #  ng_list
+    #)
+
+    #a_file = "test/commander/a.file" #exist
+    #b_file = "test/commander/b.file" #exist
+    #c_file = "test/commander/c.file" #not exist
+    #d_file = "test/commander/d.file" #not exist
+
+    ## 変化なし
+    #files = { "a.file" => 'a.file', "b.file" => 'b.file', }
+    #ok_list, ng_list = @fr00.check_new_names(files)
+    #assert_equal( {}, ok_list)
+    #assert_equal( {}, ng_list)
+
+    ## 相互入れ替え
+    #files = { "a.file" => 'b.file', "b.file" => 'a.file', }
+    #ok_list, ng_list = @fr00.check_new_names(files)
+    #assert_equal( files, ok_list)
+    #assert_equal( {}   , ng_list)
+
+    ## 宛先が重複
+    #files = { "a.file" => 'c.file', "b.file" => 'c.file', }
+    #ok_list, ng_list = @fr00.check_new_names(files)
+    #assert_equal( {}   , ok_list)
+    #assert_equal( files, ng_list)
+
+    ## 玉突き
+    #files = { "a.file" => 'b.file', "b.file" => 'c.file', }
+    #ok_list, ng_list = @fr00.check_new_names(files)
+    #assert_equal( files, ok_list)
+    #assert_equal( {}   , ng_list)
   end
 
   def test_ask_yes?
@@ -321,39 +349,56 @@ class TC_Commander < Test::Unit::TestCase
     assert_equal(false, result)
   end
 
-  def test_run
-    # ディレクトリ消去が必要な場合
-    FileUtils.rm("tmp1/dir/a1.txt") if FileTest.exist?("tmp1/dir/a1.txt")
-    FileUtils.rm("tmp2/dir/a1.txt") if FileTest.exist?("tmp2/dir/a1.txt")
-    FileUtils.rmdir("tmp1/dir") if FileTest.exist?("tmp1")
-    FileUtils.rmdir("tmp2/dir") if FileTest.exist?("tmp2")
-    FileUtils.rmdir("tmp1") if FileTest.exist?("tmp1")
-    FileUtils.rmdir("tmp2") if FileTest.exist?("tmp2")
-    #
-    FileUtils.mkdir("tmp1")
-    FileUtils.mkdir("tmp1/dir")
-    FileUtils.cp(A_0, "tmp1/dir/a1.txt")
-    #
-    assert_equal(false, FileTest.exist?("tmp2/dir/a2")) #実行前に変換先が存在しないことを確認。
-    #@fr00.run("tmp1/dir/a1.txt", "tmp2/dir/a1.txt")
-    str = capture_stdout{ @fr00.run("tmp1/dir/a1.txt", "tmp2/dir/a1.txt") }
-    t = str
-    correct = "  make directory: tmp2\n" +
-      "  make directory: tmp2/dir\n" +
-      "  mv tmp1/dir/a1.txt tmp2/dir/a1.txt\n" +
-      "  remove directory: tmp1/dir\n" +
-      "  remove directory: tmp1\n"
-    assert_equal(correct, t)
-    #
-    assert_equal(false, FileTest.exist?("tmp1"))
-    assert_equal(true , FileTest.exist?("tmp2/dir/a1.txt")) #実行後に変換先が存在することを確認。
-    #
-    # あとかたづけ
-    FileUtils.rmdir("tmp1/dir")
-    FileUtils.rmdir("tmp1")
-    FileUtils.rm("tmp2/dir/a1.txt")
-    FileUtils.rmdir("tmp2/dir")
-    FileUtils.rmdir("tmp2")
+  def test_convert
+    root_dir = 'test/commander/convert'
+    FileUtils.rm_rf root_dir
+
+    a0 = "#{root_dir}/a0.file"
+    FileUtils.mkdir_p(File.dirname a0)
+    File.open(a0, 'w').close
+
+    a1 = "#{root_dir}/a1.file"
+    FileUtils.mkdir_p(File.dirname a1)
+    File.open(a1, 'w').close
+
+    assert_equal(true , FileTest.exist?(a0))
+    @fr00.convert({a0 => a1})
+    assert_equal(false, FileTest.exist?(a0))
+    assert_equal(true , FileTest.exist?(a1))
+
+    FileUtils.rm_rf root_dir
+  end
+
+  def test_transplant
+    src_root_dir = "test/commander/transplant"
+    src_dir   = "#{src_root_dir}/a/b/c"
+    src_file1 = "#{src_dir}/1.file"
+    src_file2 = "#{src_dir}/2.file"
+    tgt_dir = "test/commander/transplant/d"
+    tgt_file1 = "#{tgt_dir}/1.file"
+    tgt_file2 = "#{tgt_dir}/2.file"
+
+    FileUtils.rm_rf([src_root_dir, tgt_dir])
+
+    FileUtils.mkdir_p src_dir
+    File.open(src_file1, 'w').close
+    File.open(src_file2, 'w').close
+
+
+    @fr00.transplant(src_file1, tgt_file1)
+    assert_equal(false, FileTest.exist?(src_file1))
+    assert_equal(true , FileTest.exist?(src_file2))
+    assert_equal(true , FileTest.exist?(tgt_file1))
+    assert_equal(false, FileTest.exist?(tgt_file2))
+
+    @fr00.transplant(src_file2, tgt_file2)
+    assert_equal(false, FileTest.exist?(src_file1))
+    assert_equal(false, FileTest.exist?(src_file2))
+    assert_equal(true , FileTest.exist?(tgt_file1))
+    assert_equal(true , FileTest.exist?(tgt_file2))
+    assert_equal(false, FileTest.exist?(src_root_dir + '/a'))
+
+    FileUtils.rm_rf(src_root_dir)
   end
 
   def test_paths
@@ -361,5 +406,24 @@ class TC_Commander < Test::Unit::TestCase
     assert_equal([], @fr00.paths("baz.txt"))
     assert_equal(["/foo", "/foo/bar"], @fr00.paths("/foo/bar/baz.txt"))
   end
+
+  def test_rmdir_p
+    root_dir = 'test/commander/rmdir_p'
+    dir = root_dir + '/a/b/c'
+    FileUtils.rm_rf dir
+    FileUtils.mkdir_p dir
+    file = dir + '/file'
+    File.open(file, 'w').close
+
+    @fr00.rmdir_p(dir)
+    assert_equal(true, (FileTest.directory? dir))
+
+    FileUtils.rm(file)
+    @fr00.rmdir_p(dir)
+    assert_equal(false, (FileTest.directory? root_dir))
+
+    #teardown
+    FileUtils.rm_rf dir
+  end
 end