rpatch 0.0.1

data/spec/patch_hunk_spec.rb

@@ -0,0 +1,272 @@
+#!/usr/bin/env ruby
+#
+
+require 'spec_helper'
+
+describe Rpatch::PatchHunk do
+
+  let(:hunk_text) do
+    <<-EOF
++/*
++ * Copyright (c) 2013 Jiang Xin
++ */
++
+ When I hack files using GNU patch,
+ sometimes fail because of the change of upstream files.
+ If patch can ignore blank lines, support regex patterns
+ in patch, it will be nice.
++So comes rpatch.
++
+ Happy hacking.
+-
+--- jiangxin
++--
++jiangxin
+    EOF
+  end
+
+  let(:patch_hunk) do
+    hunk = Rpatch::PatchHunk.new('@@ description')
+    hunk_text.lines.each do |line|
+      hunk.feed_line line.chomp
+    end
+    hunk
+  end
+
+  it "Initial with description only" do
+    title = "foo.bar"
+    Rpatch::PatchHunk.new("@@ #{title}").title.should be == title
+  end
+
+  it "Initial with zero patterns_before_patch.size and zero patterns_after_patch.size" do
+    Rpatch::PatchHunk.new("@@ test").diffs.size.should be == 0
+    Rpatch::PatchHunk.new("@@ test").patterns_before_patch.size.should be == 0
+    Rpatch::PatchHunk.new("@@ test").patterns_after_patch.size.should be == 0
+  end
+
+
+  it "patch_hunk's desc and contents test" do
+    patch_hunk.title.should be == 'description'
+    patch_hunk.diffs.size.should be == hunk_text.split("\n").size
+    patch_hunk.patterns.size.should be == 15
+  end
+
+  it "should have 7 patterns_before_patch.sizes" do
+    patch_hunk.patterns_before_patch.size.should be == 7
+    patch_hunk.patterns_before_patch.size.should be == 7
+  end
+
+  it "should have 13 patterns_after_patch.sizes" do
+    patch_hunk.patterns_after_patch.size.should be == 13
+    patch_hunk.patterns_after_patch.size.should be == 13
+  end
+
+  it "patch success (1)" do
+    before = <<-EOF
+When I hack files using GNU patch,
+sometimes fail because of the change of upstream files.
+If patch can ignore blank lines, support regex patterns
+in patch, it will be nice.
+Happy hacking.
+
+-- jiangxin
+    EOF
+    before_lines = before.split("\n")
+    before_lines_dup = before_lines.dup
+
+    after = <<-EOF
+/*
+ * Copyright (c) 2013 Jiang Xin
+ */
+
+When I hack files using GNU patch,
+sometimes fail because of the change of upstream files.
+If patch can ignore blank lines, support regex patterns
+in patch, it will be nice.
+So comes rpatch.
+
+Happy hacking.
+--
+jiangxin
+    EOF
+
+    patch_hunk.match_after_patch(before_lines).should be == nil
+    patch_hunk.match_before_patch(before_lines).should be == [0, 7]
+    result = before_lines.dup
+    patch_hunk.patch(result).should be == after.split("\n")
+    (result * "\n" + "\n").should be == after
+    before_lines_dup.should be == before_lines
+  end
+
+  it "patch success (2): whitespaces" do
+    before = <<-EOF
+  When  I hack files using GNU patch,
+		sometimes fail  because of the change of upstream files.
+  If patch can	ignore blank lines, support regex patterns
+		in patch,	   it    will be nice.
+Happy                  hacking.   
+
+--      jiangxin
+    EOF
+    before_lines = before.split("\n")
+    before_lines_dup = before_lines.dup
+
+    after = <<-EOF
+/*
+ * Copyright (c) 2013 Jiang Xin
+ */
+
+  When  I hack files using GNU patch,
+		sometimes fail  because of the change of upstream files.
+  If patch can	ignore blank lines, support regex patterns
+		in patch,	   it    will be nice.
+So comes rpatch.
+
+Happy                  hacking.   
+--
+jiangxin
+    EOF
+
+    patch_hunk.match_after_patch(before_lines).should be == nil
+    patch_hunk.match_before_patch(before_lines).should be == [0, 7]
+    result = before_lines.dup
+    patch_hunk.patch(result)
+    (result * "\n" + "\n").should be == after
+    before_lines_dup.should be == before_lines
+  end
+
+  it "patch success (3): blank lines and comments " do
+    before = <<-EOF
+
+
+  When  I hack files using GNU patch,
+
+    sometimes fail  because of the change of upstream files.
+
+    #   If patch can	ignore blank lines, support regex patterns
+		##  in patch,	   it    will be nice.
+Happy                  hacking.   
+
+--      jiangxin
+    EOF
+    before_lines = before.split("\n")
+    before_lines_dup = before_lines.dup
+
+    after = <<-EOF
+
+
+/*
+ * Copyright (c) 2013 Jiang Xin
+ */
+
+  When  I hack files using GNU patch,
+
+    sometimes fail  because of the change of upstream files.
+
+    #   If patch can	ignore blank lines, support regex patterns
+		##  in patch,	   it    will be nice.
+So comes rpatch.
+
+Happy                  hacking.   
+--
+jiangxin
+    EOF
+
+    patch_hunk.match_after_patch(before_lines).should be == nil
+    patch_hunk.match_before_patch(before_lines).should be == [2, 9]
+    result = before_lines.dup
+    patch_hunk.patch(result)
+    (result * "\n" + "\n").should be == after
+    before_lines_dup.should be == before_lines
+  end
+
+  it "patch failed (1): not match" do
+    before = "Hello, \nworld."
+    before_lines = before.split("\n")
+    before_lines_dup = before_lines.dup
+
+    patch_hunk.match_after_patch(before_lines).should be == nil
+    patch_hunk.match_before_patch(before_lines).should be == nil
+    expect {
+      patch_hunk.patch(before_lines)
+    }.to raise_exception Rpatch::PatchHunkError, /Hunk # \(description\) FAILED to apply. Match failed./
+    before_lines.should be == before_lines_dup
+  end
+
+  it "patch failed (2): already patched" do
+    before = <<-EOF
+/*
+ * Copyright (c) 2013 Jiang Xin
+ */
+
+
+
+  When  I hack files using GNU patch,
+
+    sometimes fail  because of the change of upstream files.
+
+    #   If patch can	ignore blank lines, support regex patterns
+		##  in patch,	   it    will be nice.
+So comes rpatch.
+
+Happy                  hacking.   
+--
+jiangxin
+    EOF
+
+
+    before_lines = before.split("\n")
+    before_lines_dup = before_lines.dup
+
+    patch_hunk.match_after_patch(before_lines).should be == [0, 17]
+    patch_hunk.match_before_patch(before_lines).should be == nil
+    expect {
+      patch_hunk.patch(before_lines)
+    }.to raise_exception Rpatch::AlreadyPatchedError
+    before_lines.should be == before_lines_dup
+  end
+
+  it "patch partial of text" do
+    before = <<-EOF
+When I hack files using GNU patch,
+sometimes fail because of the change of upstream files.
+So comes rpatch.
+
+Happy hacking.
+    EOF
+    before_lines = before.split("\n")
+    result = before_lines.dup
+
+    diff = <<-EOF
++/*
++ * Copyright (c) 2013 Jiang Xin
++ */
++
+ When I hack files using GNU patch,
+ sometimes fail because of the change of upstream files.
+    EOF
+
+    after = <<-EOF
+/*
+ * Copyright (c) 2013 Jiang Xin
+ */
+
+When I hack files using GNU patch,
+sometimes fail because of the change of upstream files.
+So comes rpatch.
+
+Happy hacking.
+    EOF
+
+    patch_hunk = Rpatch::PatchHunk.new('@@ description')
+    diff.lines.each do |line|
+      patch_hunk.feed_line line.chomp
+    end
+
+    patch_hunk.match_after_patch(before_lines).should be == nil
+    patch_hunk.match_before_patch(before_lines).should be == [0, 2]
+    result.should be == before_lines
+    patch_hunk.patch(result)
+    (result * "\n" + "\n").should be == after
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end
+
+$:.unshift 'lib'
+require 'rpatch/patch'
+require 'rpatch/entry'
+require 'rpatch/hunk'
+require 'rpatch/error'
+require 'rpatch/version'

data/t/Makefile

@@ -0,0 +1,80 @@
+# Run tests
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+
+#GIT_TEST_OPTS = --verbose --debug
+SHELL_PATH ?= $(SHELL)
+PERL_PATH ?= /usr/bin/perl
+TAR ?= $(TAR)
+RM ?= rm -f
+PROVE ?= prove
+DEFAULT_TEST_TARGET ?= test
+TEST_LINT ?= test-lint-duplicates test-lint-executable
+
+ifdef TEST_OUTPUT_DIRECTORY
+TEST_RESULTS_DIRECTORY = $(TEST_OUTPUT_DIRECTORY)/test-results
+else
+TEST_RESULTS_DIRECTORY = test-results
+endif
+
+# Shell quote;
+SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
+TEST_RESULTS_DIRECTORY_SQ = $(subst ','\'',$(TEST_RESULTS_DIRECTORY))
+
+T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
+
+all: $(DEFAULT_TEST_TARGET)
+
+test: pre-clean $(TEST_LINT)
+	$(MAKE) aggregate-results-and-cleanup
+
+prove: pre-clean $(TEST_LINT)
+	@echo "*** prove ***"; $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
+	$(MAKE) clean-except-prove-cache
+
+$(T):
+	@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+
+pre-clean:
+	$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
+
+clean-except-prove-cache:
+	$(RM) -r 'trash directory'.* '$(TEST_RESULTS_DIRECTORY_SQ)'
+	$(RM) -r valgrind/bin
+
+clean: clean-except-prove-cache
+	$(RM) .prove
+
+test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax
+
+test-lint-duplicates:
+	@dups=`echo $(T) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \
+		test -z "$$dups" || { \
+		echo >&2 "duplicate test numbers:" $$dups; exit 1; }
+
+test-lint-executable:
+	@bad=`for i in $(T); do test -x "$$i" || echo $$i; done` && \
+		test -z "$$bad" || { \
+		echo >&2 "non-executable tests:" $$bad; exit 1; }
+
+test-lint-shell-syntax:
+	@'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T)
+
+aggregate-results-and-cleanup: $(T)
+	$(MAKE) aggregate-results
+	$(MAKE) clean
+
+aggregate-results:
+	for f in '$(TEST_RESULTS_DIRECTORY_SQ)'/t*-*.counts; do \
+		echo "$$f"; \
+	done | '$(SHELL_PATH_SQ)' ./aggregate-results.sh
+
+valgrind:
+	$(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"
+
+perf:
+	$(MAKE) -C perf/ all
+
+.PHONY: pre-clean $(T) aggregate-results clean valgrind perf

data/t/README

@@ -0,0 +1,3 @@
+Run unit test at spec/, and run integrate test at here.
+
+This integrate test framework are from git.git, and designed by Junio C Hamano.

data/t/aggregate-results.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+failed_tests=
+fixed=0
+success=0
+failed=0
+broken=0
+total=0
+
+while read file
+do
+	while read type value
+	do
+		case $type in
+		'')
+			continue ;;
+		fixed)
+			fixed=$(($fixed + $value)) ;;
+		success)
+			success=$(($success + $value)) ;;
+		failed)
+			failed=$(($failed + $value))
+			if test $value != 0
+			then
+				testnum=$(expr "$file" : 'test-results/\(t[0-9]*\)-')
+				failed_tests="$failed_tests $testnum"
+			fi
+			;;
+		broken)
+			broken=$(($broken + $value)) ;;
+		total)
+			total=$(($total + $value)) ;;
+		esac
+	done <"$file"
+done
+
+if test -n "$failed_tests"
+then
+	printf "\nfailed test(s):$failed_tests\n\n"
+fi
+
+printf "%-8s%d\n" fixed $fixed
+printf "%-8s%d\n" success $success
+printf "%-8s%d\n" failed $failed
+printf "%-8s%d\n" broken $broken
+printf "%-8s%d\n" total $total

data/t/t0000-patch-file.sh

@@ -0,0 +1,297 @@
+#!/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 > expect <<EOF
+bar
+baz
+EOF
+
+test_expect_success 'patch newfile' '
+	touch ! -f actual &&
+	touch actual &&
+	rpatch -p1 actual < diff &&
+	test_cmp expect actual
+'
+
+############################################################
+
+cat > expect_errlog <<EOF
+Patched "actual".
+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 &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > orig <<EOF
+bar
+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
++Insert at the beginning
+@@ add/remove
+ bar
+-baz
++foo
+@@ insert footer
+ foo
++end of text
+EOF
+
+cat > expect <<EOF
+Insert at the beginning
+bar
+foo
+end of text
+EOF
+
+test_expect_success 'patch add/remote contents' '
+	cp orig actual &&
+	rpatch actual < diff &&
+	test_cmp expect actual
+'
+
+############################################################
+
+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.
+actual: nothing changed
+EOF
+
+test_expect_success 'patch add/remote contents (2nd)' '
+	rpatch 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
+@@ delete all
+-Insert at the beginning
+-bar
+-foo
+-end of text
+EOF
+
+cat > expect_errlog <<EOF
+Remove "actual".
+EOF
+
+test_expect_success 'patch to rm file' '
+	rpatch -p1 actual < diff 2> actual_errlog &&
+	test ! -f actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > expect_errlog <<EOF
+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 &&
+	test -z "$(cat actual)" &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > orig <<EOF
+	 FOO
+       bAr
+ 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
+@@ remove bAr
+RE: ^[\\s]+(foo|FOO)\$
+RE:-[bB][aA][rR]
++bar
+@@ mixed
+RE: baz
++end of text
+EOF
+
+cat > expect <<EOF
+	 FOO
+bar
+ baz
+end of text
+EOF
+
+cat > expect_errlog <<EOF
+Patched "actual".
+EOF
+
+test_expect_success 'use regexp in patch' '
+	cp orig actual &&
+	rpatch actual < diff 2> actual_errlog &&
+	test_cmp expect actual &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > expect_errlog <<EOF
+actual: Hunk 1 (remove bAr) is already patched.
+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 &&
+	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
+trash text
+EOF
+
+cat > expect_errlog <<EOF
+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_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > orig <<EOF
+foo
+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 one
+ bar
++baz
+EOF
+
+cat > expect_errlog <<EOF
+ERROR: actual: Hunk 1 (insert one) FAILED to apply. Match failed.
+actual: nothing changed
+EOF
+
+test_expect_success 'patch apply fail' '
+	cp orig actual &&
+	test_must_fail rpatch actual < diff 2> actual_errlog &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > orig <<EOF
+foo
+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 header
++# header...
+ foo
+@@ add footer
+ baz
++footer...
+EOF
+
+cat > expect <<EOF
+# header...
+foo
+EOF
+
+cat > expect_errlog <<EOF
+ERROR: actual: Hunk 2 (add footer) FAILED to apply. Match failed.
+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 -f actual.orig &&
+	test_cmp actual.orig orig &&
+	test_cmp actual expect &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+cat > expect_errlog <<EOF
+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 -f actual.orig &&
+	test_cmp actual.orig orig &&
+	test_cmp actual expect &&
+	test_cmp expect_errlog actual_errlog
+'
+
+############################################################
+
+test_done