rpatch 0.0.1 → 0.0.2

data/spec/patch_hunk_with_qmark_exp_spec.rb

@@ -0,0 +1,152 @@
+#!/usr/bin/env ruby
+#
+
+require 'spec_helper'
+
+describe Rpatch::PatchHunk do
+
+  it "Question mark expression in pattern" do
+    before = <<-EOF
+original text
+end of text
+    EOF
+
+    diff = <<-EOF
+? original text
++    foobar
+    EOF
+
+    after = <<-EOF
+original text
+    foobar
+end of text
+    EOF
+
+    hunk = Rpatch::PatchHunk.new('@@ description')
+    diff.split($/).each {|line| hunk.feed_line line.chomp}
+
+    hunk.match_after_patch(before.split($/)).should eq nil
+    hunk.match_before_patch(before.split($/)).should eq [0, 1]
+    result = hunk.patch(before.split($/))
+    (result * "\n" + "\n").should eq after
+  end
+
+  it "Question mark expression in pattern (2)" do
+    before = <<-EOF
+original text
+end of text
+    EOF
+
+    diff = <<-EOF
+? original text
+?+    # comment for foobar
++    foobar
+    EOF
+
+    after = <<-EOF
+original text
+    # comment for foobar
+    foobar
+end of text
+    EOF
+
+    hunk = Rpatch::PatchHunk.new('@@ description')
+    diff.split($/).each {|line| hunk.feed_line line.chomp}
+
+    hunk.match_after_patch(before.split($/)).should eq nil
+    hunk.match_before_patch(before.split($/)).should eq [0, 1]
+    result = hunk.patch(before.split($/))
+    (result * "\n" + "\n").should eq after
+  end
+
+  it "Question mark expression in pattern (3)" do
+    before = <<-EOF
+changed original contents
+  foobar
+end of text
+    EOF
+
+    diff = <<-EOF
+? original text
+?+    # comment for foobar
++    foobar
+    EOF
+
+    after = <<-EOF
+changed original contents
+  foobar
+end of text
+    EOF
+
+    hunk = Rpatch::PatchHunk.new('@@ patch with qmark')
+    diff.split($/).each {|line| hunk.feed_line line.chomp}
+
+    hunk.match_after_patch(before.split($/)).should eq [1, 1]
+    hunk.match_before_patch(before.split($/)).should eq nil
+    expect {
+      hunk.patch(before.split($/))
+    }.to raise_exception Rpatch::AlreadyPatchedError, /Hunk # \(patch with qmark\) is already patched\./
+  end
+
+  it "Question mark expression in pattern (4)" do
+    before = <<-EOF
+Copyright 2013, jiangxin
+  foo
+  baz
+
+  bar
+bye.
+    EOF
+
+    diff = <<-EOF
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    baz
+    EOF
+
+    after = before.dup
+
+    hunk = Rpatch::PatchHunk.new('@@ patch with qmark')
+    diff.split($/).each {|line| hunk.feed_line line.chomp}
+
+    hunk.match_after_patch(before.split($/)).should eq [2, 1]
+    hunk.match_before_patch(before.split($/)).should eq nil
+    expect {
+      hunk.patch(before.split($/))
+    }.to raise_exception Rpatch::AlreadyPatchedError, /Hunk # \(patch with qmark\) is already patched\./
+  end
+
+  it "Question mark expression in pattern (5)" do
+    before = <<-EOF
+Copyright 2013, jiangxin
+Hello, world
+  foo
+  baz
+
+  bar
+bye.
+    EOF
+
+    diff = <<-EOF
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    baz
+    EOF
+
+    after = before.dup
+
+    hunk = Rpatch::PatchHunk.new('@@ patch with qmark')
+    diff.split($/).each {|line| hunk.feed_line line.chomp}
+
+    hunk.match_after_patch(before.split($/)).should eq [3, 1]
+    hunk.match_before_patch(before.split($/)).should eq [0, 2]
+    hunk.patterns_before_patch.size.should eq 2
+    hunk.patterns_after_patch.size.should eq 1
+    expect {
+      hunk.patch(before.split($/))
+    }.to raise_exception Rpatch::AlreadyPatchedError, /Hunk # \(patch with qmark\) is already patched\./
+  end
+
+end

data/spec/patch_hunk_with_regex_spec.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+#
+
+require 'spec_helper'
+
+describe Rpatch::PatchHunk do
+
+  it "Regexp in pattern" do
+    before = <<-EOF
+    HeLLo
+    world
+    EOF
+
+    diff = <<-EOF
+/ [hH][eE][lL]{2}[oO]
++foo
++bar
+    EOF
+
+    after = <<-EOF
+    HeLLo
+foo
+bar
+    world
+    EOF
+
+    hunk = Rpatch::PatchHunk.new('@@ description')
+    diff.split($/).each {|line| hunk.feed_line line.chomp}
+
+    hunk.match_after_patch(before.split($/)).should eq nil
+    hunk.match_before_patch(before.split($/)).should eq [0, 1]
+    result = hunk.patch(before.split($/))
+    (result * "\n" + "\n").should eq after
+  end
+
+  it "Regexp in pattern (2)" do
+    before = <<-EOF
+Copyright 2013
+    HeLLo
+    world
+--
+jiangxin
+    EOF
+
+    diff = <<-EOF
+/ [hH][eE][lL]{2}[oO]
++foo
++bar
+/-wo*
++baz
+    EOF
+
+    after = <<-EOF
+Copyright 2013
+    HeLLo
+foo
+bar
+baz
+--
+jiangxin
+    EOF
+
+    hunk = Rpatch::PatchHunk.new('@@ description')
+    diff.split($/).each {|line| hunk.feed_line line.chomp}
+
+    hunk.match_after_patch(before.split($/)).should eq nil
+    hunk.match_before_patch(before.split($/)).should eq [1, 2]
+    result = hunk.patch(before.split($/))
+    (result * "\n" + "\n").should eq after
+  end
+
+end

data/t/t0000-patch-file.sh

@@ -10,8 +10,8 @@ test_description='patch file test'
 ############################################################
 
 cat > diff <<EOF
-diff -u a/foo b/foo
---- a/foo       2013-11-04 16:01:56.000000000 +0800
+diff -u /dev/null b/foo
+--- /dev/null   2013-11-04 16:01:56.000000000 +0800
 +++ b/foo       2013-11-04 16:01:59.000000000 +0800
 @@ add two lines
 +bar
@@ -34,15 +34,15 @@ test_expect_success 'patch newfile' '
 
 cat > expect_errlog <<EOF
 Patched "actual".
-actual: Hunk 1 (add two lines) is already patched.
+INFO: actual: Hunk 1 (add two lines) is already patched.
 actual: nothing changed
 EOF
 
 test_expect_success 'patch newfile (2nd)' '
 	rm actual &&
 	touch actual &&
-	rpatch actual < diff 2> actual_errlog &&
-	rpatch actual < diff 2>>actual_errlog &&
+	rpatch -vv actual < diff 2> actual_errlog &&
+	rpatch -vv actual < diff 2>>actual_errlog &&
 	test_cmp expect actual &&
 	test_cmp expect_errlog actual_errlog
 '
@@ -55,7 +55,6 @@ baz
 EOF
 
 cat > diff <<EOF
-diff -u a/foo b/foo
 --- a/foo       2013-11-04 16:01:56.000000000 +0800
 +++ b/foo       2013-11-04 16:01:59.000000000 +0800
 @@ insert heading
@@ -85,14 +84,14 @@ test_expect_success 'patch add/remote contents' '
 ############################################################
 
 cat > expect_errlog <<EOF
-actual: Hunk 1 (insert heading) is already patched.
-actual: Hunk 2 (add/remove) is already patched.
-actual: Hunk 3 (insert footer) is already patched.
+INFO: actual: Hunk 1 (insert heading) is already patched.
+INFO: actual: Hunk 2 (add/remove) is already patched.
+INFO: actual: Hunk 3 (insert footer) is already patched.
 actual: nothing changed
 EOF
 
 test_expect_success 'patch add/remote contents (2nd)' '
-	rpatch actual < diff 2>actual_errlog &&
+	rpatch -vv actual < diff 2>actual_errlog &&
 	test_cmp expect actual &&
 	test_cmp expect_errlog actual_errlog
 '
@@ -115,7 +114,7 @@ Remove "actual".
 EOF
 
 test_expect_success 'patch to rm file' '
-	rpatch -p1 actual < diff 2> actual_errlog &&
+	rpatch -vv -p1 actual < diff 2> actual_errlog &&
 	test ! -f actual &&
 	test_cmp expect_errlog actual_errlog
 '
@@ -123,13 +122,13 @@ test_expect_success 'patch to rm file' '
 ############################################################
 
 cat > expect_errlog <<EOF
-actual: Hunk 1 (delete all) is already patched.
+INFO: actual: Hunk 1 (delete all) is already patched.
 actual: nothing changed
 EOF
 
 test_expect_success 'patch to rm file (2nd)' '
 	touch actual &&
-	rpatch -p1 actual < diff 2> actual_errlog &&
+	rpatch -vv -p1 actual < diff 2> actual_errlog &&
 	test -z "$(cat actual)" &&
 	test_cmp expect_errlog actual_errlog
 '
@@ -147,11 +146,11 @@ diff -u a/foo b/foo
 --- a/foo       2013-11-04 16:01:56.000000000 +0800
 +++ b/foo       2013-11-04 16:01:59.000000000 +0800
 @@ remove bAr
-RE: ^[\\s]+(foo|FOO)\$
-RE:-[bB][aA][rR]
+/ ^[\\s]+(foo|FOO)\$
+/-[bB][aA][rR]
 +bar
 @@ mixed
-RE: baz
+/ baz
 +end of text
 EOF
 
@@ -168,7 +167,7 @@ EOF
 
 test_expect_success 'use regexp in patch' '
 	cp orig actual &&
-	rpatch actual < diff 2> actual_errlog &&
+	rpatch -vv actual < diff 2> actual_errlog &&
 	test_cmp expect actual &&
 	test_cmp expect_errlog actual_errlog
 '
@@ -176,13 +175,13 @@ test_expect_success 'use regexp in patch' '
 ############################################################
 
 cat > expect_errlog <<EOF
-actual: Hunk 1 (remove bAr) is already patched.
-actual: Hunk 2 (mixed) is already patched.
+INFO: actual: Hunk 1 (remove bAr) is already patched.
+INFO: actual: Hunk 2 (mixed) is already patched.
 actual: nothing changed
 EOF
 
 test_expect_success 'use regexp in patch (2nd)' '
-	rpatch actual < diff 2> actual_errlog &&
+	rpatch -vv actual < diff 2> actual_errlog &&
 	test_cmp expect actual &&
 	test_cmp expect_errlog actual_errlog
 '
@@ -200,14 +199,14 @@ trash text
 EOF
 
 cat > expect_errlog <<EOF
-Error: Line 6 of patch "<IO>" is invalid.
-	=> "trash text"
+ERROR: Line 6 of patch "<IO>" is invalid.
+       => "trash text"
 EOF
 
 test_expect_success 'patch load fail: bad syntax' '
 	rm actual &&
 	touch actual &&
-	test_must_fail rpatch actual < diff 2> actual_errlog &&
+	test_must_fail rpatch -vv actual < diff 2> actual_errlog &&
 	test_cmp expect_errlog actual_errlog
 '
 
@@ -233,7 +232,7 @@ EOF
 
 test_expect_success 'patch apply fail' '
 	cp orig actual &&
-	test_must_fail rpatch actual < diff 2> actual_errlog &&
+	test_must_fail rpatch -vv actual < diff 2> actual_errlog &&
 	test_cmp expect_errlog actual_errlog
 '
 
@@ -262,14 +261,14 @@ EOF
 
 cat > expect_errlog <<EOF
 ERROR: actual: Hunk 2 (add footer) FAILED to apply. Match failed.
-Warning: saved orignal file as "actual.orig".
+WARNING: saved orignal file as "actual.orig".
 Patched "actual".
 EOF
 
 test_expect_success 'partial patch success' '
 	cp orig actual &&
 	test ! -f actual.orig &&
-	test_must_fail rpatch actual < diff 2> actual_errlog &&
+	test_must_fail rpatch -vv actual < diff 2> actual_errlog &&
 	test -f actual.orig &&
 	test_cmp actual.orig orig &&
 	test_cmp actual expect &&
@@ -279,13 +278,13 @@ test_expect_success 'partial patch success' '
 ############################################################
 
 cat > expect_errlog <<EOF
-actual: Hunk 1 (add header) is already patched.
+INFO: actual: Hunk 1 (add header) is already patched.
 ERROR: actual: Hunk 2 (add footer) FAILED to apply. Match failed.
 actual: nothing changed
 EOF
 
 test_expect_success 'partial patch success (2nd)' '
-	test_must_fail rpatch actual < diff 2> actual_errlog &&
+	test_must_fail rpatch -vv actual < diff 2> actual_errlog &&
 	test -f actual.orig &&
 	test_cmp actual.orig orig &&
 	test_cmp actual expect &&

data/t/t0010-patch-special-direction.sh

@@ -0,0 +1,336 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Jiang Xin
+#
+
+test_description='patch file test'
+
+. ./test-lib.sh
+
+############################################################
+
+cat > diff <<EOF
+diff -u a/foo b/foo
+--- a/foo       2013-11-04 16:01:56.000000000 +0800
++++ b/foo       2013-11-04 16:01:59.000000000 +0800
+@@ add two lines
+<
++bar
++baz
+EOF
+
+cat > actual <<EOF
+hello
+world
+EOF
+
+
+cat > expect <<EOF
+bar
+baz
+hello
+world
+EOF
+
+cat > expect_errlog <<EOF
+Patched "actual".
+EOF
+
+test_expect_success 'patch from beginning' '
+	rpatch -p1 -vv actual < diff 2>actual_errlog  &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > diff <<EOF
+diff -u a/foo b/foo
+--- a/foo       2013-11-04 16:01:56.000000000 +0800
++++ b/foo       2013-11-04 16:01:59.000000000 +0800
+@@ add two lines
+>
++bar
++baz
+EOF
+
+cat > actual <<EOF
+hello
+world
+EOF
+
+
+cat > expect <<EOF
+hello
+world
+bar
+baz
+EOF
+
+cat > expect_errlog <<EOF
+Patched "actual".
+EOF
+
+test_expect_success 'patch from tail' '
+	rpatch -p1 -vv actual < diff 2>actual_errlog  &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > diff <<EOF
+diff -u a/foo b/foo
+--- a/foo       2013-11-04 16:01:56.000000000 +0800
++++ b/foo       2013-11-04 16:01:59.000000000 +0800
+@@ add two lines
+<
+ hello, world
++bar
++baz
+EOF
+
+cat > actual <<EOF
+hello,  world
+hello,  world
+EOF
+
+
+cat > expect <<EOF
+hello,  world
+bar
+baz
+hello,  world
+EOF
+
+cat > expect_errlog <<EOF
+Patched "actual".
+EOF
+
+test_expect_success 'patch from beginning (2)' '
+	rpatch -p1 -vv actual < diff 2>actual_errlog  &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > diff <<EOF
+diff -u a/foo b/foo
+--- a/foo       2013-11-04 16:01:56.000000000 +0800
++++ b/foo       2013-11-04 16:01:59.000000000 +0800
+@@ add two lines
+>
+ hello, world
++bar
++baz
+EOF
+
+cat > actual <<EOF
+hello,  world
+hello,  world
+EOF
+
+
+cat > expect <<EOF
+hello,  world
+hello,  world
+bar
+baz
+EOF
+
+cat > expect_errlog <<EOF
+Patched "actual".
+EOF
+
+test_expect_success 'patch from tail (2)' '
+	rpatch -p1 -vv actual < diff 2>actual_errlog  &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > actual <<EOF
+Copyright 2013, jiangxin
+Hello, world
+bye.
+EOF
+
+cat > diff <<EOF
+diff -u a/foo b/foo
+--- a/foo       2013-11-04 16:01:56.000000000 +0800
++++ b/foo       2013-11-04 16:01:59.000000000 +0800
+@@ add two lines
+/ [cC]opyright [0-9]{4}
+/-[Hh]ello
++foo
++bar
+EOF
+
+cat > expect <<EOF
+Copyright 2013, jiangxin
+foo
+bar
+bye.
+EOF
+
+cat > expect_errlog <<EOF
+Patched "actual".
+EOF
+
+test_expect_success 'Start regex pattern with /' '
+	rpatch -p1 -vv actual < diff 2>actual_errlog  &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > actual <<EOF
+Copyright 2013, jiangxin
+Hello, world
+bye.
+EOF
+
+cat > diff <<EOF
+diff -u a/foo b/foo
+--- a/foo       2013-11-04 16:01:56.000000000 +0800
++++ b/foo       2013-11-04 16:01:59.000000000 +0800
+@@ foo
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    foo
+@@ bar
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    bar
+@@ baz
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    baz
+EOF
+
+cat > expect <<EOF
+Copyright 2013, jiangxin
+Hello, world
+
+    baz
+
+    bar
+
+    foo
+bye.
+EOF
+
+cat > expect_errlog <<EOF
+Patched "actual".
+EOF
+
+test_expect_success 'Question mark patterns test (1)' '
+	rpatch -p1 -vv actual < diff 2>actual_errlog  &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > actual <<EOF
+Copyright 2013, jiangxin
+  foo
+  baz
+
+  bar
+bye.
+EOF
+
+cat > diff <<EOF
+diff -u a/foo b/foo
+--- a/foo       2013-11-04 16:01:56.000000000 +0800
++++ b/foo       2013-11-04 16:01:59.000000000 +0800
+@@ foo
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    foo
+@@ bar
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    bar
+@@ baz
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    baz
+EOF
+
+cp actual expect
+
+cat > expect_errlog <<EOF
+INFO: actual: Hunk 1 (foo) is already patched.
+INFO: actual: Hunk 2 (bar) is already patched.
+INFO: actual: Hunk 3 (baz) is already patched.
+actual: nothing changed
+EOF
+
+test_expect_success 'Question mark patterns test (2)' '
+	rpatch -p1 -vv actual < diff 2>actual_errlog &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > actual <<EOF
+Copyright 2013, jiangxin
+Hello, world
+  foo
+  baz
+
+  bar
+bye.
+EOF
+
+cat > diff <<EOF
+diff -u a/foo b/foo
+--- a/foo       2013-11-04 16:01:56.000000000 +0800
++++ b/foo       2013-11-04 16:01:59.000000000 +0800
+@@ foo
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    foo
+@@ bar
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    bar
+@@ baz
+?/ [cC]opyright [0-9]{4}
+? Hello, world
+?+
++    baz
+EOF
+
+cp actual expect
+
+cat > expect_errlog <<EOF
+INFO: actual: Hunk 1 (foo) is already patched.
+INFO: actual: Hunk 2 (bar) is already patched.
+INFO: actual: Hunk 3 (baz) is already patched.
+actual: nothing changed
+EOF
+
+test_expect_success 'Question mark patterns test (3)' '
+	rpatch -p1 -vv actual < diff 2>actual_errlog &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+test_done