rpatch 0.0.1 → 0.0.2

data/t/t0100-patch-directory.sh

@@ -10,15 +10,15 @@ 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
 +baz
 +foo
-diff -u a/bar b/bar
---- a/bar       2013-11-04 16:01:56.000000000 +0800
-+++ b/bar       2013-11-04 16:01:59.000000000 +0800
+diff -u /dev/null b/subdir/baz/bar
+--- /dev/null   2013-11-04 16:01:56.000000000 +0800
++++ b/subdir/baz/bar       2013-11-04 16:01:59.000000000 +0800
 @@ add two lines
 +baz
 +bar
@@ -28,14 +28,14 @@ cat > expect <<EOF
 EOF
 
 cat > expect_errlog <<EOF
-Error: Multiple patch entries (2) have been found in patch <IO>
-Error: Multiple patch entries (2) have been found in patch <IO>
+ERROR: Multiple patch entries (2) have been found in patch <IO>
+ERROR: Multiple patch entries (2) have been found in patch <IO>
 EOF
 
 test_expect_success 'cannot patch single file with multi patch entries' '
 	touch ! -f 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 actual &&
 	test_cmp expect_errlog actual_errlog
 '
@@ -44,7 +44,7 @@ test_expect_success 'cannot patch single file with multi patch entries' '
 
 cat > expect_errlog <<EOF
 Patched "output/foo".
-Patched "output/bar".
+Patched "output/subdir/baz/bar".
 EOF
 
 cat > expect_foo <<EOF
@@ -57,13 +57,42 @@ baz
 bar
 EOF
 
-test_expect_success 'Patch on directory: create new file automatically' '
+test_expect_success 'Patch to create newfiles' '
 	mkdir output &&
-	rpatch output < diff 2>actual_errlog &&
+    test ! -d output/subdir/baz &&
+	rpatch -vv output < diff 2>actual_errlog &&
 	test -f output/foo &&
-	test -f output/bar &&
+	test -f output/subdir/baz/bar &&
 	test_cmp expect_foo output/foo &&
-	test_cmp expect_bar output/bar &&
+	test_cmp expect_bar output/subdir/baz/bar &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > expect_errlog <<EOF
+INFO: output/foo: Hunk 1 (add two lines) is already patched.
+output/foo: nothing changed
+INFO: output/subdir/baz/bar: Hunk 1 (add two lines) is already patched.
+output/subdir/baz/bar: nothing changed
+EOF
+
+cat > expect_foo <<EOF
+baz
+foo
+EOF
+
+cat > expect_bar <<EOF
+baz
+bar
+EOF
+
+test_expect_success 'Patch to create newfiles (2): already patched warning' '
+	test_cmp expect_foo output/foo &&
+	test_cmp expect_bar output/subdir/baz/bar &&
+	rpatch -vv output < diff 2>actual_errlog &&
+	test_cmp expect_foo output/foo &&
+	test_cmp expect_bar output/subdir/baz/bar &&
 	test_cmp expect_errlog actual_errlog
 '
 
@@ -79,9 +108,9 @@ diff -u a/foo b/foo
 @@ tail
  foo
 +tail of foo ...
-diff -u a/bar b/bar
---- a/bar       2013-11-04 16:01:56.000000000 +0800
-+++ b/bar       2013-11-04 16:01:59.000000000 +0800
+diff -u a/subdir/baz/bar b/subdir/baz/bar
+--- a/subdir/baz/bar       2013-11-04 16:01:56.000000000 +0800
++++ b/subdir/baz/bar       2013-11-04 16:01:59.000000000 +0800
 @@ heading
 +heading of bar...
 -baz
@@ -92,7 +121,7 @@ EOF
 
 cat > expect_errlog <<EOF
 Patched "output/foo".
-Patched "output/bar".
+Patched "output/subdir/baz/bar".
 EOF
 
 cat > expect_foo <<EOF
@@ -107,12 +136,12 @@ bar
 tail of bar ...
 EOF
 
-test_expect_success 'Patch on directory (2): patch exist files' '
-	rpatch output < diff 2>actual_errlog &&
+test_expect_success 'Patch exist files' '
+	rpatch -vv output < diff 2>actual_errlog &&
 	test -f output/foo &&
-	test -f output/bar &&
+	test -f output/subdir/baz/bar &&
 	test_cmp expect_foo output/foo &&
-	test_cmp expect_bar output/bar &&
+	test_cmp expect_bar output/subdir/baz/bar &&
 	test_cmp expect_errlog actual_errlog
 '
 
@@ -126,9 +155,9 @@ diff -u a/foo b/foo
  heading of foo...
  foobar
 -tail of foo ...
-diff -u a/bar b/bar
---- a/bar       2013-11-04 16:01:56.000000000 +0800
-+++ b/bar       2013-11-04 16:01:59.000000000 +0800
+diff -u a/subdir/baz/bar b/subdir/baz/bar
+--- a/subdir/baz/bar       2013-11-04 16:01:56.000000000 +0800
++++ b/subdir/baz/bar       2013-11-04 16:01:59.000000000 +0800
 @@ remove tail
  heading of bar...
  bar
@@ -138,7 +167,7 @@ EOF
 cat > expect_errlog <<EOF
 ERROR: output/foo: Hunk 1 (can not match) FAILED to apply. Match failed.
 output/foo: nothing changed
-Patched "output/bar".
+Patched "output/subdir/baz/bar".
 EOF
 
 cat > expect_foo <<EOF
@@ -152,12 +181,12 @@ heading of bar...
 bar
 EOF
 
-test_expect_success 'Patch on directory (3): one fail, another success' '
-	test_must_fail rpatch output < diff 2>actual_errlog &&
+test_expect_success 'Patch one file fail, another success' '
+	test_must_fail rpatch -vv output < diff 2>actual_errlog &&
 	test -f output/foo &&
-	test -f output/bar &&
+	test -f output/subdir/baz/bar &&
 	test_cmp expect_foo output/foo &&
-	test_cmp expect_bar output/bar &&
+	test_cmp expect_bar output/subdir/baz/bar &&
 	test_cmp expect_errlog actual_errlog
 '
 
@@ -167,21 +196,21 @@ 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
-@@ can not match
-RE:-heading
-RE:-foo
-RE:-tail.*
-diff -u a/bar b/bar
---- a/bar       2013-11-04 16:01:56.000000000 +0800
-+++ b/bar       2013-11-04 16:01:59.000000000 +0800
+@@ remove all
+/-heading
+/-foo
+/-tail.*
+diff -u a/subdir/baz/bar b/subdir/baz/bar
+--- a/subdir/baz/bar       2013-11-04 16:01:56.000000000 +0800
++++ b/subdir/baz/bar       2013-11-04 16:01:59.000000000 +0800
 @@ add tail
-RE: ^[bB][aA][rR]$
+/ ^[bB][aA][rR]$
 +tail of bar...
 EOF
 
 cat > expect_errlog <<EOF
 Remove "output/foo".
-Patched "output/bar".
+Patched "output/subdir/baz/bar".
 EOF
 
 cat > expect_bar <<EOF
@@ -190,11 +219,29 @@ bar
 tail of bar...
 EOF
 
-test_expect_success 'Patch on directory (4): remove file' '
-	rpatch -p1 output < diff 2>actual_errlog &&
+test_expect_success 'Patch to remove file' '
+	rpatch -vv -p1 output < diff 2>actual_errlog &&
+	test ! -f output/foo &&
+	test -f output/subdir/baz/bar &&
+	test_cmp expect_bar output/subdir/baz/bar &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > expect_errlog <<EOF
+INFO: output/foo: Hunk 1 (remove all) is already patched.
+output/foo: nothing changed
+INFO: output/subdir/baz/bar: Hunk 1 (add tail) is already patched.
+output/subdir/baz/bar: nothing changed
+EOF
+
+test_expect_success 'Patch to remove file (2)' '
+	test ! -f output/foo &&
+	rpatch -vv -p1 output < diff 2>actual_errlog &&
 	test ! -f output/foo &&
-	test -f output/bar &&
-	test_cmp expect_bar output/bar &&
+	test -f output/subdir/baz/bar &&
+	test_cmp expect_bar output/subdir/baz/bar &&
 	test_cmp expect_errlog actual_errlog
 '
 

metadata

@@ -1,77 +1,59 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rpatch
-version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Jiang Xin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-11-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  type: :development
+  version_requirements: *id004
 description: A patch utility support regexp in patchfile.
-email:
+email: 
 - worldhello.net@gmail.com
-executables:
+executables: 
 - rpatch
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/rpatch/entry.rb
 - lib/rpatch/error.rb
 - lib/rpatch/hunk.rb
 - lib/rpatch/patch.rb
 - lib/rpatch/runner.rb
+- lib/rpatch/utils.rb
 - lib/rpatch/version.rb
 - README.md
 - LICENSE.txt
@@ -79,54 +61,58 @@ files:
 - spec/patch_file_regexp_spec.rb
 - spec/patch_file_spec.rb
 - spec/patch_hunk_spec.rb
+- spec/patch_hunk_with_location_spec.rb
+- spec/patch_hunk_with_qmark_exp_spec.rb
+- spec/patch_hunk_with_regex_spec.rb
 - spec/spec_helper.rb
 - t/Makefile
 - t/README
 - t/aggregate-results.sh
 - t/t0000-patch-file.sh
+- t/t0010-patch-special-direction.sh
 - t/t0100-patch-directory.sh
 - t/test-lib-functions.sh
 - t/test-lib.sh
 - bin/rpatch
 homepage: http://github.com/jiangxin/rpatch
-licenses:
+licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2306715700148282844
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.13
 signing_key: 
-specification_version: 3
-summary: rpatch-0.0.1
-test_files:
+specification_version: 4
+summary: rpatch-0.0.2
+test_files: 
 - spec/patch_entry_spec.rb
 - spec/patch_file_regexp_spec.rb
 - spec/patch_file_spec.rb
 - spec/patch_hunk_spec.rb
+- spec/patch_hunk_with_location_spec.rb
+- spec/patch_hunk_with_qmark_exp_spec.rb
+- spec/patch_hunk_with_regex_spec.rb
 - spec/spec_helper.rb
 - t/Makefile
 - t/README
 - t/aggregate-results.sh
 - t/t0000-patch-file.sh
+- t/t0010-patch-special-direction.sh
 - t/t0100-patch-directory.sh
 - t/test-lib-functions.sh
 - t/test-lib.sh