filerenamer 0.0.2 → 0.0.3

data/lib/filerenamer/optionparser.rb

@@ -0,0 +1,35 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "optparse"
+
+# FileRenamer 用のオプション解析器。
+# ユーザはこれに任意のオプションを追加できる。
+#
+# 通常の OptionParser と異なり、インスタンス変数 @options に情報を格納する。
+# @options は attr_reader に指定されているので、外部から読み取れる。
+# @options は Hash であるので、ユーザが on で追加するブロックで
+# そのまま鍵と値を追加できる。
+# また、@options に追加せずに自前で何か適当な処理をしても良い。
+module FileRenamer
+  class OptionParser < OptionParser
+
+    attr_reader :options
+
+    def initialize
+      @options = {}
+      super
+      on("-y", "--yes"     , "Yes for all questions."){@options[:yes]     = true}
+      on("-n", "--no"      , "No  for all questions."){@options[:no]      = true}
+      on("-c", "--copy"    , "Copy mode."            ){@options[:copy]    = true}
+      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("-q", "--quiet"   , "Quiet mode. Forced non-interactive."){
+        @options[:quiet] = true
+        #このオプションが設定されているときは強制的に --yes として扱われる。
+        #non_interactive_mode になる。
+      }
+    end
+  end
+end

data/test/{test_filerenamer.rb → test_commander.rb}

@@ -4,22 +4,24 @@
 require 'helper'
 
 require "test/unit"
-require "filerenamer/filerenamer.rb"
+require "filerenamer/commander.rb"
 require "stringio"
 require "rubygems"
 gem "capture_stdout"
 require "capture_stdout"
 
-class FileRenamer
-  public :check_new_names
-  public :ask_yes?
-  public :run
-  public :make_new_names
-  public :paths
-  attr_reader :options
+module FileRenamer
+  class Commander
+    public :check_new_names
+    public :ask_yes?
+    public :run
+    public :make_new_names
+    public :paths
+    attr_reader :options
+  end
 end
 
-class TC_FileRenamer < Test::Unit::TestCase
+class TC_Commander < Test::Unit::TestCase
   EXIST_FILE = "test/filerenamer/dummy.txt"
 
   A_0 = "test/filerenamer/a0.txt"
@@ -27,10 +29,10 @@ class TC_FileRenamer < Test::Unit::TestCase
 
   def setup
     options = {}
-    @fr00 = FileRenamer.new(options)
+    @fr00 = FileRenamer::Commander.new(options, [])
 
     options = {:copy => true, :yes => true}
-    @fr01 = FileRenamer.new(options)
+    @fr01 = FileRenamer::Commander.new(options, [])
   end
 
   def test_initialize
@@ -39,24 +41,24 @@ class TC_FileRenamer < Test::Unit::TestCase
       :yes => true,
       :no => true,
     }
-    assert_raise(FileRenamerOptionError){ FileRenamer.new(options) }
+    assert_raise(FileRenamer::Commander::OptionError){ FileRenamer::Commander.new(options, []) }
 
     # ファイル操作モードがどれか1つのみ true なら OK。
     options = { :copy => true, }
-    assert_nothing_raised{ FileRenamer.new(options) }
+    assert_nothing_raised{ FileRenamer::Commander.new(options, []) }
 
     options = { :move => true, }
-    assert_nothing_raised{ FileRenamer.new(options) }
+    assert_nothing_raised{ FileRenamer::Commander.new(options, []) }
 
     options = { :hardlink => true, }
-    assert_nothing_raised{ FileRenamer.new(options) }
+    assert_nothing_raised{ FileRenamer::Commander.new(options, []) }
 
     options = { :symlink => true, }
-    assert_nothing_raised{ FileRenamer.new(options) }
+    assert_nothing_raised{ FileRenamer::Commander.new(options, []) }
 
     # ファイル操作モードが空でも OK で、その場合は :move が true として扱われる。
     options = { }
-    fr00 = FileRenamer.new(options)
+    fr00 = FileRenamer::Commander.new(options, [])
     assert_equal( {:move => true}, fr00.options )
 
     # ファイル操作モードで矛盾する2つ以上が true なら例外。
@@ -64,33 +66,33 @@ class TC_FileRenamer < Test::Unit::TestCase
       :move => true,
       :copy => true,
     }
-    assert_raise(FileRenamerOptionError){ FileRenamer.new(options) }
+    assert_raise(FileRenamer::Commander::OptionError){ FileRenamer::Commander.new(options, []) }
 
     options = {
       :move => true,
       :hardlink => true,
     }
-    assert_raise(FileRenamerOptionError){ FileRenamer.new(options) }
+    assert_raise(FileRenamer::Commander::OptionError){ FileRenamer::Commander.new(options, []) }
 
     options = {
       :move => true,
       :symlink => true,
     }
-    assert_raise(FileRenamerOptionError){ FileRenamer.new(options) }
+    assert_raise(FileRenamer::Commander::OptionError){ FileRenamer::Commander.new(options, []) }
 
     # :quiet が立てられれば、自動的に :yes も true になる。
     options = {:quiet => true}
-    fr00 = FileRenamer.new(options)
+    fr00 = FileRenamer::Commander.new(options, [])
     assert_equal( {:quiet => true, :yes => true, :move => true}, fr00.options )
 
     # :quiet が立てられれば、:yes が明示的に立っていても問題なし。
     options = {:quiet => true, :yes => true}
-    fr00 = FileRenamer.new(options)
+    fr00 = FileRenamer::Commander.new(options, [])
     assert_equal( {:quiet => true, :yes => true, :move => true}, fr00.options )
 
     # :quiet が立てられれば、:no が立っていれば例外。
     options = {:quiet => true, :no => true}
-    assert_raise(FileRenamerOptionError){ FileRenamer.new(options) }
+    assert_raise(FileRenamer::Commander::OptionError){ FileRenamer::Commander.new(options, []) }
   end
 
   def test_execute
@@ -99,8 +101,8 @@ class TC_FileRenamer < Test::Unit::TestCase
     FileUtils.rm(A_1) if FileTest.exist?(A_1)
     #
     options = {:copy => true, :yes => true}
-    fr01 = FileRenamer.new(options)
-    str = capture_stdout{fr01.execute([A_0]){ A_1 }}
+    fr01 = FileRenamer::Commander.new(options, [A_0])
+    str = capture_stdout{fr01.execute{ A_1 }}
     assert_equal(true, FileTest.exist?(A_0))
     assert_equal(true, FileTest.exist?(A_1))
     FileUtils.rm(A_1)
@@ -121,8 +123,8 @@ class TC_FileRenamer < Test::Unit::TestCase
     FileUtils.rm(A_1) if FileTest.exist?(A_1)
     #
     options = {:copy => true, :no => true}
-    fr01 = FileRenamer.new(options)
-    str = capture_stdout{ fr01.execute([A_0]){ A_1 }}
+    fr01 = FileRenamer::Commander.new(options, [A_0])
+    str = capture_stdout{ fr01.execute{ A_1 }}
     assert_equal(true , FileTest.exist?(A_0))
     assert_equal(false, FileTest.exist?(A_1))
     #
@@ -140,8 +142,8 @@ class TC_FileRenamer < Test::Unit::TestCase
     io = StringIO.new
     #
     options = {:copy => true, :quiet => true}
-    fr01 = FileRenamer.new(options)
-    str = capture_stdout{fr01.execute([A_0]){ A_1 }}
+    fr01 = FileRenamer::Commander.new(options, [A_0])
+    str = capture_stdout{fr01.execute{ A_1 }}
     assert_equal(true, FileTest.exist?(A_0))
     assert_equal(true, FileTest.exist?(A_1))
     FileUtils.rm(A_1)
@@ -156,8 +158,8 @@ class TC_FileRenamer < Test::Unit::TestCase
     output = StringIO.new
     #
     options = {:copy => true}
-    fr01 = FileRenamer.new(options)
-    str = capture_stdout{fr01.execute([A_0]){ A_1 }}
+    fr01 = FileRenamer::Commander.new(options, [A_0])
+    str = capture_stdout{fr01.execute{ A_1 }}
     assert_equal(true, FileTest.exist?(A_0))
     assert_equal(true, FileTest.exist?(A_1))
     FileUtils.rm(A_1)
@@ -184,8 +186,8 @@ class TC_FileRenamer < Test::Unit::TestCase
     output = StringIO.new
     #
     options = {:copy => true}
-    fr01 = FileRenamer.new(options)
-    str = capture_stdout{fr01.execute([A_1]){ A_0 }}
+    fr01 = FileRenamer::Commander.new(options, [A_1])
+    str = capture_stdout{fr01.execute{ A_0 }}
     assert_equal(true , FileTest.exist?(A_0))
     assert_equal(false, FileTest.exist?(A_1))
     #
@@ -207,7 +209,7 @@ class TC_FileRenamer < Test::Unit::TestCase
     #FileUtils.rm(A_1) if FileTest.exist?(A_1)
     ##
     #options = {:copy => true, :no => true}
-    #fr01 = FileRenamer.new(options)
+    #fr01 = FileRenamer::Commander.new(options)
     #str = capture_stdout{ fr01.execute([]){|name| name + ".00"}}
     ##
     #correct = 
@@ -225,12 +227,15 @@ class TC_FileRenamer < Test::Unit::TestCase
   end
 
   def test_make_new_names
+    options = {}
+    #pp [A_0, A_1]; exit
+    fr00 = FileRenamer::Commander.new(options, [A_0, A_1])
     assert_equal(
       {
         A_0 => A_0 + "00",
         A_1 => A_1 + "00",
       },
-      @fr00.make_new_names([A_0, A_1]){ |old|
+      fr00.make_new_names{ |old|
         old.sub(/$/, "00")
       }
     )
@@ -312,47 +317,6 @@ class TC_FileRenamer < Test::Unit::TestCase
   end
 
   def test_run
-#		# ディレクトリ管理不要の場合
-#		FileUtils.rm(A_1) if FileTest.exist?(A_1)
-#		#
-#		@fr01.run(A_0, A_1)
-#		io = capture_stdout{ @fr01.run(A_0, A_1) }
-#		io.rewind
-#		assert_equal(["  cp -r #{A_0} #{A_1}\n"], io.readlines)
-#		#
-#		assert_equal(true, FileTest.exist?(A_0))
-#		assert_equal(true, FileTest.exist?(A_1))
-#		#
-#		# あとかたづけ
-#		FileUtils.rm(A_1)
-#
-#		# ディレクトリ生成が必要な場合
-#		FileUtils.rm("tmp/#{A_1}") if FileTest.exist?("tmp/#{A_1}")
-#		FileUtils.rmdir("tmp/test/FileRenamer") if FileTest.exist?("tmp/test/FileRenamer")
-#		FileUtils.rmdir("tmp/test") if FileTest.exist?("tmp/test")
-#		FileUtils.rmdir("tmp") if FileTest.exist?("tmp")
-#		#
-#		io = capture_stdout{ @fr01.run(A_0, "tmp/"+A_1) }
-#		io.rewind
-#		t = io.readlines
-#		assert_equal("  make directory: tmp\n", t[0])
-#		assert_equal("  make directory: tmp/test\n", t[1])
-#		assert_equal("  make directory: tmp/test/FileRenamer\n", t[2])
-#		assert_equal("  cp -r #{A_0} tmp/#{A_1}\n", t[3])
-#		assert_equal(4, t.size)
-#		#
-#		assert_equal(true, FileTest.exist?(A_0))
-#		assert_equal(true, FileTest.exist?("tmp/#{A_1}"))
-#		assert_equal(true, FileTest.exist?("tmp/test/FileRenamer"))
-#		assert_equal(true, FileTest.exist?("tmp/test"            ))
-#		assert_equal(true, FileTest.exist?("tmp"                 ))
-#		#
-#		# あとかたづけ
-#		FileUtils.rm("tmp/#{A_1}")
-#		FileUtils.rmdir("tmp/test/FileRenamer")
-#		FileUtils.rmdir("tmp/test"            )
-#		FileUtils.rmdir("tmp"                 )
-
     # ディレクトリ消去が必要な場合
     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")

data/test/test_optionparser.rb

@@ -0,0 +1,53 @@
+#! /usr/bin/env ruby
+# coding: utf-8
+
+require "test/unit"
+require "filerenamer/optionparser.rb"
+
+class TC_OptionParser < Test::Unit::TestCase
+  #def setup
+  # @frop00 = FileRenamerOptionParser.new
+  #end
+
+  def test_sanity_check
+    frop01 = FileRenamer::OptionParser.new
+    ary = %w(-y --copy)
+    frop01.parse(ary)
+    assert_equal( { :yes => true, :copy => true }, frop01.options)
+
+    # このクラスではオプションの整合性チェックは行わない。
+    frop01 = FileRenamer::OptionParser.new
+    ary = %w(-y -n)
+    frop01.parse(ary)
+    assert_equal( { :yes => true, :no => true }, frop01.options)
+
+    frop01 = FileRenamer::OptionParser.new
+    ary = %w(-y -n -c -m -h -s -q)
+    frop01.parse(ary)
+    corrects = {
+      :yes => true,
+      :no => true,
+      :copy => true,
+      :move => true,
+      :hardlink => true,
+      :symlink => true,
+      :quiet => true
+    }
+    assert_equal(corrects, frop01.options)
+
+    frop01 = FileRenamer::OptionParser.new
+    ary = %w(--yes --no --copy --move --hardlink --symlink --quiet)
+    frop01.parse(ary)
+    corrects = {
+      :yes => true,
+      :no => true,
+      :copy => true,
+      :move => true,
+      :hardlink => true,
+      :symlink => true,
+      :quiet => true
+    }
+    assert_equal(corrects, frop01.options)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filerenamer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81806920 !ruby/object:Gem::Requirement
+  requirement: &75168420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *81806920
+  version_requirements: *75168420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81806550 !ruby/object:Gem::Requirement
+  requirement: &75167750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.4
   type: :development
   prerelease: false
-  version_requirements: *81806550
+  version_requirements: *75167750
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81805950 !ruby/object:Gem::Requirement
+  requirement: &75167430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *81805950
+  version_requirements: *75167430
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &81805270 !ruby/object:Gem::Requirement
+  requirement: &75167080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81805270
+  version_requirements: *75167080
 - !ruby/object:Gem::Dependency
   name: builtinextension
-  requirement: &81804560 !ruby/object:Gem::Requirement
+  requirement: &75166720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *81804560
+  version_requirements: *75166720
 - !ruby/object:Gem::Dependency
   name: capture_stdout
-  requirement: &81804050 !ruby/object:Gem::Requirement
+  requirement: &75166430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,13 +76,14 @@ dependencies:
         version: '0.0'
   type: :development
   prerelease: false
-  version_requirements: *81804050
+  version_requirements: *75166430
 description: This library provide common dealing to rename many files with safe method.
   Automatically mkdir if need and rmdir when empty.
 email: ippei94da@gmail.com
 executables:
 - classify1stchar
 - rennum
+- renpad
 - renpar
 - renreg
 - rensub
@@ -100,22 +101,49 @@ files:
 - VERSION
 - bin/classify1stchar
 - bin/rennum
+- bin/renpad
 - bin/renpar
 - bin/renreg
 - bin/rensub
 - filerenamer.gemspec
 - lib/filerenamer.rb
-- lib/filerenamer/filerenamer.rb
-- lib/filerenamer/filerenameroptionparser.rb
+- lib/filerenamer/commander.rb
+- lib/filerenamer/optionparser.rb
+- test/classify1stchar/123
+- test/classify1stchar/abc
+- test/classify1stchar/def
 - test/filerenamer/a0.txt
 - test/filerenamer/dummy.txt
 - test/helper.rb
+- test/rennum/a
+- test/rennum/b
+- test/rennum/c
+- test/rennum/d
+- test/renpad/1
+- test/renpad/10
+- test/renpad/100
+- test/renpad/100b
+- test/renpad/10b
+- test/renpad/1b
+- test/renpad/a1
+- test/renpad/a10
+- test/renpad/a100
+- test/renpad/a100b
+- test/renpad/a10b
+- test/renpad/a1b
 - test/renpar/((ab)(cd(ef))gh(ij)kl(mn).txt
 - test/renpar/(ab)(cd(ef)))gh(ij)kl(mn).txt
 - test/renpar/(ab)(cd(ef))gh(ij)kl(mn).txt
 - test/renpar/(ab)(cd).txt
-- test/test_filerenamer.rb
-- test/test_filerenameroptionparser.rb
+- test/renreg/a(b)
+- test/renreg/１
+- test/renreg/ａ
+- test/rensub/a0
+- test/rensub/a1
+- test/rensub/b0
+- test/rensub/b1
+- test/test_commander.rb
+- test/test_optionparser.rb
 homepage: http://github.com/ippei94da/filerenamer
 licenses:
 - MIT
@@ -131,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 453747699
+      hash: 810196591
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: