rept 0.1.6 → 0.2.0

data/lib/init.yaml

@@ -1,4 +1,4 @@
 # �o�[�W�����ԍ�(�S�c�[���ŋ��ʂɂ��Ă���)
-version: "0.1.6"
+version: "0.2.0"
 
 # @insert

data/lib/lib.rb

@@ -1,5 +1,6 @@
 # ���ʃ��C�u����
 
+# String�N���X�ɋ@�\�g��
 class String
   def downcaseHead
     self[0, 1].downcase + self[1..-1]

data/lib/rept.rb

@@ -1,11 +1,17 @@
 #! ruby -Ks
 
+$:.unshift(File.dirname(__FILE__))
+
 require 'optparse'
 require 'fileutils'
-require File.join(File.dirname(__FILE__), 'fileinsert')
-require File.join(File.dirname(__FILE__), 'yamltext')
 require 'readline'
-require File.join(File.dirname(__FILE__), 'lib')
+
+require 'fileinsert'
+require 'yamltext'
+require 'lib'
+
+require 'test/unit/assertions'
+include Test::Unit::Assertions
 
 # ���b�Z�[�W�ꗗ
 $init = YamlText.new(File.join(File.dirname(__FILE__), 'init.yaml'))
@@ -14,7 +20,7 @@ $text = YamlText.new(File.join(File.dirname(__FILE__), 'rept.yaml'))
 # �o�[�W�����ԍ�
 Version = $init.get('version')
 
-class Parser
+class ReptParser
   attr_reader :args
   attr_reader :creator
 
@@ -146,12 +152,12 @@ class Creator
     end
 
     mode = :none
-    markerText = nil
+    markerTexts = []
     insertTexts = []
 
     @text.each_with_index do |data, no|
       if (data =~ /\A\s*\z/)
-        if (!insertFromMode(mode, markerText, insertTexts))
+        if (!insertFromMode(mode, markerTexts, insertTexts))
           success = false
         end
         mode = :none
@@ -159,13 +165,13 @@ class Creator
         insertTexts << convertString(data.gsub(/^-->/, ""))
         mode = :insert
       else
-        markerText = convertString(data).chomp
+        markerTexts << convertString(data).chomp
         mode = :marker
       end
     end
 
     if (mode != :none)
-      if (!insertFromMode(mode, markerText, insertTexts))
+      if (!insertFromMode(mode, markerTexts, insertTexts))
         success = false
       end
     end
@@ -173,38 +179,41 @@ class Creator
     success
   end
 
-  def insertFromMode(mode, markerText, insertTexts)
-    success = true
+  def insertFromMode(mode, markerTexts, insertTexts)
+    # �}������
+    success = insertText(markerTexts, insertTexts, headOrTail(mode))
 
-    begin
-      if (mode == :insert)
-        insertText(markerText, insertTexts, 1)
-      elsif (mode == :marker)
-        insertText(markerText, insertTexts, 0)
-      end
-    rescue
-      success = false
-    ensure
-      insertTexts.clear
-      markerText = nil
-    end
+    # �����A���s�Ɋւ�炸�}���Ώۂ��N���A
+    insertTexts.clear
+    markerTexts.clear
 
+    # ���ʂ�Ԃ�
     success
   end
 
-  def insertText(markerText, insertTexts, lineNoOffset)
-    lineNo = searchLineNo(@conv_file_name, markerText)
+  def headOrTail(mode)
+    case mode
+    when :insert
+      :tail
+    when :marker
+      :head
+    else
+      raise
+    end
+  end
+
+  def insertText(markerTexts, insertTexts, headOrTail)
+    lineNo = getInsertPos(@conv_file_name, markerTexts, headOrTail)
 
     if (lineNo != -1)
       if (!@testMode)
-        insertTexts.size.times do |index|
-          puts $text.get('real_insert', '"' + insertTexts[index].chomp + '"', '"' + markerText + '"')
-        end
-        file_insert(@conv_file_name, lineNo + lineNoOffset, insertTexts.to_s)
+        puts $text.get('real_insert', '"' + insertTexts.inspect + '"', '"' + markerTexts.inspect + '"')
+        file_insert(@conv_file_name, lineNo, insertTexts.to_s)
       end
+      true
     else
-      puts $text.get('insert_not_found', '"' + insertTexts[0].chomp + '"', '"' + markerText + '"')
-      raise
+      puts $text.get('insert_not_found', '"' + insertTexts.inspect + '"', '"' + markerTexts.inspect + '"')
+      false
     end
   end
 
@@ -214,12 +223,12 @@ class Creator
     puts $text.get('delete_insert', @conv_file_name)
 
     mode = :none
-    markerText = nil
+    markerTexts = []
     insertTexts = []
 
     @text.each_with_index do |data, no|
       if (data =~ /\A\s*\z/)
-        if (!deleteInsertFromMode(mode, markerText, insertTexts))
+        if (!deleteInsertFromMode(mode, markerTexts, insertTexts))
           success = false
         end
         mode = :none
@@ -227,13 +236,13 @@ class Creator
         insertTexts << convertString(data.gsub(/^-->/, ""))
         mode = :insert
       else
-        markerText = convertString(data)
+        markerTexts << convertString(data).chomp
         mode = :marker
       end
     end
 
     if (mode != :none)
-      if (!deleteInsertFromMode(mode, markerText, insertTexts))
+      if (!deleteInsertFromMode(mode, markerTexts, insertTexts))
         success = false
       end
     end
@@ -241,51 +250,53 @@ class Creator
     success
   end
 
-  def deleteInsertFromMode(mode, markerText, insertTexts)
+  def deleteInsertFromMode(mode, markerTexts, insertTexts)
     # �}���폜
-    if (mode == :insert)
-      deleteInsertText(markerText, insertTexts, 1)
-    elsif (mode == :marker)
-      deleteInsertText(markerText, insertTexts, -insertTexts.size)
-    end
+    deleteInsertText(markerTexts, insertTexts, headOrTail(mode))
 
     # �㏈��
     insertTexts.clear
-    markerText = nil
+    markerTexts.clear
     
     # ���̏��A���s�͖���
     true
   end
 
-  def deleteInsertText(markerText, insertTexts, lineNoOffset)
-    lineNo = searchLineNo(@conv_file_name, markerText)
+  def deleteInsertText(markerTexts, insertTexts, headOrTail)
+    lineNo = getInsertPos(@conv_file_name, markerTexts, headOrTail)
 
-    if (lineNo != -1)
-      data = []
-      open(@conv_file_name) do |file|
-        file.each do |line|
-          data << line
-        end
-      end
+    # ���‚���Ȃ���ΏI��
+    if (lineNo == -1)
+      return
+    end
 
-      startLineNo = lineNo + lineNoOffset
-      success = true
+    # ����������ꍇ�́A�}���e�L�X�g�̃T�C�Y���l������
+    if (headOrTail == :head)
+      lineNo -= insertTexts.size
+    end
 
-      insertTexts.size.times do |index|
-        if (insertTexts[index] != data[startLineNo + index])
-          success = false
-          break
-        end
+    # �폜�J�n
+    data = []
+    open(@conv_file_name) do |file|
+      file.each do |line|
+        data << line
       end
+    end
 
-      if (success)
-        insertTexts.size.times do |index|
-          puts $text.get('real_delete_insert', '"' + insertTexts[index].chomp + '"', '"' + markerText + '"')
-        end
+    startLineNo = lineNo
+    success = true
 
-        file_deleteline(@conv_file_name, startLineNo, insertTexts.size)
+    insertTexts.size.times do |index|
+      if (insertTexts[index] != data[startLineNo + index])
+        success = false
+        break
       end
     end
+
+    if (success)
+      puts $text.get('real_delete_insert', '"' + insertTexts.inspect + '"', '"' + markerTexts.inspect + '"')
+      file_deleteline(@conv_file_name, startLineNo, insertTexts.size)
+    end
   end
 
   def createNewFile
@@ -335,6 +346,94 @@ class Creator
   def insert?
     @text.to_s =~ /^-->/
   end
+
+  # �}���ʒu�����‚���A���‚���Ȃ������ꍇ��-1��Ԃ�
+  def getInsertPos(fileName, markerTexts, headOrTail)
+    # �e�L�X�g�̓��e��z��ɓǂݍ���
+    texts = []
+    File.open(fileName) {|f| f.each {|line| texts << line }}
+
+    # �T���J�n
+    t_head = 0
+    t_tail = 0
+    
+    while (t_tail < texts.size)
+      # �}�[�J�[��擪��
+      m_no = 0
+
+      # �ǂݍ��݌���
+      loop do
+        # �ǂݐi�߂�
+        if (markerTexts[m_no] =~ /^REPT_\*\*/)
+          t_tail, m_no = readMultiGlob(texts, t_tail, markerTexts, m_no)
+        else
+          t_tail, m_no = readNormal(texts, t_tail, markerTexts, m_no)
+        end
+
+        # ���ʏ���
+        if (t_tail == -1)
+          break
+        elsif (m_no >= markerTexts.size)
+          return (headOrTail == :head) ? t_head : t_tail
+        elsif (t_tail >= texts.size)
+          break           # @todo ���̎��_��return���Ă��܂��Ă��������H
+        end
+      end
+
+      # �擪�����炷
+      t_head += 1
+      t_tail = t_head
+    end
+
+    # ���‚���Ȃ�
+    return -1
+  end
+
+  def readMultiGlob(texts, t_tail, markerTexts, m_no)
+    # �}�[�J�[�擪�ł̃}���`�O���u�͋֎~
+    assert(m_no > 0, $text.get('error_multiglob_head'))
+    
+    # �}�[�J�[�I�[�ł̃}���`�O���u�͋֎~
+    assert(m_no < markerTexts.size - 1, $text.get('error_multiglob_term'))
+
+    # �}�[�J�[�����ɐi�߂�
+    m_no += 1
+
+    # �}���`�O���u�̎��̃}�[�J�[�Ɉ���������܂ŒT����i�߂�
+    # rept�̃}���`�O���u�͍ŒZ��v�ł�
+    loop do
+      # �e�L�X�g�̏I�[�܂ŗ��Ă��܂�����T���ł��؂�
+      if (t_tail >= texts.size)
+        return -1, -1
+      end
+
+      # ��v����ꏊ�����‚�������}���`�O���u�����I��
+      if (match? texts[t_tail], markerTexts[m_no])
+        return t_tail + 1, m_no + 1
+      end
+
+      # ���̃e�L�X�g��
+      t_tail += 1
+    end
+  end
+
+  def readNormal(texts, t_tail, markerTexts, m_no)
+    if (match? texts[t_tail], markerTexts[m_no])
+      return t_tail + 1, m_no + 1
+    else
+      return -1, -1
+    end
+  end
+
+  def match?(text, markerText)
+    # REPT_*��.*�ɕϊ��������K�\�������
+    pattern = Regexp.escape(markerText).gsub(/REPT_\\\*/, '.*?')
+
+    # ����
+    return /#{pattern}/ =~ text
+  end
+    
+  private :headOrTail, :readMultiGlob, :readNormal, :match?
 end
 
 def rept
@@ -349,7 +448,7 @@ def rept
 
   # ���s�{��
   if (ARGV.size > 0)
-    parser = Parser.new(ARGV[0])
+    parser = ReptParser.new(ARGV[0])
     parser.parse
 
     args = parser.args

data/lib/rept.yaml

@@ -63,4 +63,10 @@ real_delete_insert: "
 # �Θb���s�킸�Ɏ��s���s��
 force: "�Θb���s�킸�Ɏ��s���s��"
 
+# �}�[�J�[�擪�ł̃}���`�O���u�͋֎~
+error_multiglob_head: "�}�[�J�[�擪�ł̃}���`�O���u�͋֎~�ł�"
+
+# �}�[�J�[�I�[�ł̃}���`�O���u���֎~
+error_multiglob_term: "�}�[�J�[�I�[�ł̃}���`�O���u�͋֎~�ł�"
+
 # @insert

data/lib/rept4diff.rb

@@ -1,12 +1,14 @@
 #! ruby -Ks
 
+$:.unshift(File.dirname(__FILE__))
+
 require 'optparse'
-require File.join(File.dirname(__FILE__), 'yamltext')
 require 'pathname'
-require File.join(File.dirname(__FILE__), 'lib')
 require 'test/unit/assertions'
 include Test::Unit::Assertions
 
+require 'lib'
+
 # ���b�Z�[�W�ꗗ
 $init = YamlText.new(File.join(File.dirname(__FILE__), 'init.yaml'))
 $text = YamlText.new(File.join(File.dirname(__FILE__), 'rept4diff.yaml'))
@@ -14,7 +16,7 @@ $text = YamlText.new(File.join(File.dirname(__FILE__), 'rept4diff.yaml'))
 # �o�[�W�����ԍ�
 Version = $init.get('version')
 
-class Parser
+class Rept4DiffParser
   def initialize(fname, args)
     @data = []
     @args = args
@@ -215,7 +217,7 @@ def rept4diff
 
   # ���s�{��
   if (ARGV.size > 1)
-    parser = Parser.new(ARGV[0], ARGV[1..-1])
+    parser = Rept4DiffParser.new(ARGV[0], ARGV[1..-1])
     parser.parse
     output.print parser.result
   else

data/test/addTest.rept

@@ -5,7 +5,7 @@ Index: test.rb
 # @insert
 Index: test_reptname1.rb
 require 'test/unit'
-require '../bin/reptname1'
+require 'reptname1'
 
 class TC_ReptName1 < Test::Unit::TestCase
   def setup

data/test/rept1.rept

@@ -0,0 +1,5 @@
+Args:
+  ����1
+Index: rept1.txt
+foo
+-->ReptName1

data/test/rept1.txt

@@ -0,0 +1,2 @@
+foo asdfasdfasdf
+bar asdfasdfasdf

data/test/rept2.rept

@@ -0,0 +1,18 @@
+Args:
+  ����1
+  ����2
+  ����3
+Index: rept2.txt
+foo
+bar
+qwe
+-->ReptName1
+-->ReptName1
+
+qwe
+-->ReptName2
+
+-->ReptName3
+foo
+bar
+

data/test/rept2.txt

@@ -0,0 +1,4 @@
+qwe
+foo
+bar
+qwe

data/test/rept3.cpp

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------
+/**
+ * �}���e�X�g
+ */
+
+void hoge()
+{
+  ffff();
+}
+
+// �����s�p�^�[��
+void foo()
+{
+  ffff();
+  ffff();
+  ffff();
+  ffff();
+  ffff();
+  ffff();
+  ffff();
+  ffff();
+}
+
+// �}�[�J�[����v���Ȃ��p�^�[��
+void bar()
+{
+  ffff();

data/test/rept3.rept

@@ -0,0 +1,15 @@
+Args:
+  �}������֐�
+  �}����̊֐��̖��O
+Index: rept3.cpp
+void reptName2()
+{
+REPT_**
+}
+-->
+-->/**************************
+--> * reptName1
+--> *************************/
+-->void reptName1()
+-->{
+-->}

data/test/rept4.rept

@@ -0,0 +1,6 @@
+Args:
+  ����1
+  ����2
+Index: rept4.txt
+aaaaaREPT_*bbbbb(ReptName2)
+-->ReptName1

data/test/rept4.txt

@@ -0,0 +1,4 @@
+aaaaaccccccbbbbb(foo)
+aaaaaddddddbbbbb(bar)
+aaaaaeeeeeebbbbb(qwe)
+kaze

data/test/rept5.rept

@@ -0,0 +1,7 @@
+Args:
+  ����1
+Index: rept5.txt
+aaaaaa
+REPT_**
+REPT_*}
+-->ReptName1

data/test/rept5.txt

@@ -0,0 +1,5 @@
+aaaaaa
+bbbbbb
+cccccc
+dddddd
+ffffff}

data/test/test.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 
-require 'test_rept4diff.rb'
 require 'test_fileinsert.rb'
+require 'test_rept.rb'
+require 'test_rept4diff.rb'
 # @insert

data/test/test_rept.rb

@@ -0,0 +1,19 @@
+require 'test/unit'
+require 'rept'
+
+class TC_rept < Test::Unit::TestCase
+  def setup
+    Dir.chdir('test')
+  end
+
+  def teardown
+    Dir.chdir('..')
+  end
+
+  def test_rept1
+    parser = ReptParser.new('rept1.rept')
+    parser.parse
+    # �����ɖ{���̓e�X�g����������
+  end
+end
+

data/test/test_rept4diff.rb

@@ -17,25 +17,25 @@ class TC_Rept4Diff < Test::Unit::TestCase
   end
 
   def test_test1
-    parser = Parser.new('test1.diff', ['Bar'])
+    parser = Rept4DiffParser.new('test1.diff', ['Bar'])
     parser.parse
     assert_equal(parser.result, readRept('test1.rept'))
   end
 
   def test_test2
-    parser = Parser.new('test2.diff', ['Bar'])
+    parser = Rept4DiffParser.new('test2.diff', ['Bar'])
     parser.parse
     assert_equal(parser.result, readRept('test2.rept'))
   end
 
   def test_test3
-    parser = Parser.new('test3.diff', ['Bar'])
+    parser = Rept4DiffParser.new('test3.diff', ['Bar'])
     parser.parse
     assert_equal(parser.result, readRept('test3.rept'))
   end
 
   def test_test4
-    parser = Parser.new('test4.diff', ['FooBar'])
+    parser = Rept4DiffParser.new('test4.diff', ['FooBar'])
     parser.parse
     assert_equal(parser.result, readRept('test4.rept'))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rept
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - ongaeshi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-24 00:00:00 +09:00
+date: 2009-08-03 00:00:00 +09:00
 default_executable: rept
 dependencies: []
 
@@ -56,6 +56,16 @@ files:
 - test/fileinsert_lf_000.txt
 - test/fileinsert_lf_001.txt
 - test/fileinsert_lf_002.txt
+- test/rept1.rept
+- test/rept1.txt
+- test/rept2.rept
+- test/rept2.txt
+- test/rept3.cpp
+- test/rept3.rept
+- test/rept4.rept
+- test/rept4.txt
+- test/rept5.rept
+- test/rept5.txt
 - test/test.rb
 - test/test1.diff
 - test/test1.rept
@@ -66,6 +76,7 @@ files:
 - test/test4.diff
 - test/test4.rept
 - test/test_fileinsert.rb
+- test/test_rept.rb
 - test/test_rept4diff.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/rept/