Merge branch 'develop' of git-ftp into test-uploading-heaps

Author: mkllnk

CHANGELOG.md

@@ -1,3 +1,18 @@
+Version 1.0.0-rc.2
+==================
+
+mkllnk:
+* Added more tests, tests clean up and improvements. See README.md in /tests.
+* Improved docs.
+
+Jason Woof, mkllnk:
+* Fixed .git-ftp-include split lines on whitespace.
+* Fixed .git-ftp-include will not upload files that are a substr of another path being uploaded.
+
+René Moser:
+* Added netrc in docs.
+* Fixed sha1 not updated if amended.
+
 Version 1.0.0-rc.1
 ==================
 

git-ftp

@@ -24,7 +24,7 @@
 readonly DEFAULT_PROTOCOL="ftp"
 readonly REMOTE_LCK_FILE="$(basename "$0").lck"
 readonly SYSTEM="$(uname)"
-readonly VERSION='1.0.0-rc.1'
+readonly VERSION='1.0.0-rc.2'
 
 # ------------------------------------------------------------
 # Defaults
@@ -565,20 +565,21 @@ set_changed_files() {
 	if [ -f '.git-ftp-include' ]; then
 		grep -v '^#.*$\|^\s*$' '.git-ftp-include' | tr -d '\r' > '.git-ftp-include-tmp'
 
-		for LINE in $(grep '^!' '.git-ftp-include-tmp')
+		grep '^!' '.git-ftp-include-tmp' | while read LINE
 		do
 			FILE_STATUS='M'
 			FILE_PAIR=$(echo "$LINE" | sed 's/^!//')
 			echo "$FILE_STATUS	$FILE_PAIR" >> '.git-ftp-tmp'
 		done
 
-		for LINE in $(grep ':' '.git-ftp-include-tmp')
+		grep ':' '.git-ftp-include-tmp' | while read LINE
 		do
 			OIFS="$IFS"
 			IFS=":"
 			FILE_PAIR=($LINE)
 			IFS="$OIFS"
-			if [[ $(grep -F "${FILE_PAIR[1]}" '.git-ftp-tmp') && ! $(grep -F "${FILE_PAIR[0]}" '.git-ftp-tmp') ]]; then
+			cat .git-ftp-tmp | tr '\t' ' ' | cut -f2- -d ' ' > .git-ftp-tmp-files
+			if [[ $(grep -Fx "${FILE_PAIR[1]}" '.git-ftp-tmp-files') && ! $(grep -Fx "${FILE_PAIR[0]}" '.git-ftp-tmp-files') ]]; then
 				DELETE_COUNT=0
 				MODIFY_COUNT=0
 
@@ -616,6 +617,7 @@ set_changed_files() {
 	fi
 
 	rm -f '.git-ftp-tmp'
+	rm -f '.git-ftp-tmp-files'
 	rm -f '.git-ftp-include-tmp'
 	rm -f '.git-ftp-ignore-tmp'
 

tests/git-ftp-test.sh

@@ -1,11 +1,9 @@
 #!/bin/sh
 
 oneTimeSetUp() {
-	BASE_PATH=$(readlink -f $TESTDIR/..)/
-	# Maybe this is more robust?
-	#BASE_PATH=$TESTDIR/../
+	cd "$TESTDIR/../"
 
-	GIT_FTP_CMD="${BASE_PATH}git-ftp"
+	GIT_FTP_CMD="$(pwd)/git-ftp"
 	: ${GIT_FTP_USER=ftp}
 	: ${GIT_FTP_PASSWD=}
 	: ${GIT_FTP_ROOT=localhost/}
@@ -57,7 +55,7 @@ test_displays_usage() {
 
 test_prints_version() {
 	version=$($GIT_FTP_CMD 2>&1 --version)
-	assertEquals = "git-ftp version 1.0.0-rc.1"  "$version"
+	assertEquals = "git-ftp version 1.0.0-rc.2"  "$version"
 }
 
 test_inits_and_pushes() {
@@ -261,6 +259,32 @@ test_ignore_dir() {
 	assertTrue 'test failed: wrong dir was ignored' "remote_file_exists 'dir 2/test 2.txt'"
 }
 
+test_ignore_pattern() {
+	cd $GIT_PROJECT_PATH
+	echo "test" > .git-ftp-ignore
+
+	init=$($GIT_FTP_CMD init -u $GIT_FTP_USER -p $GIT_FTP_PASSWD $GIT_FTP_URL)
+
+	for i in 1 2 3 4 5
+	do
+		assertFalse 'test failed: was not ignored' "remote_file_exists 'test $i.txt'"
+	done;
+}
+
+test_ignore_pattern_single() {
+	cd $GIT_PROJECT_PATH
+	echo 'test' > 'test'
+	echo "^test$" > .git-ftp-ignore
+
+	init=$($GIT_FTP_CMD init -u $GIT_FTP_USER -p $GIT_FTP_PASSWD $GIT_FTP_URL)
+
+	assertFalse 'test failed: was not ignored' "remote_file_exists 'test'"
+	for i in 1 2 3 4 5
+	do
+		assertTrue 'test failed: was ignored' "remote_file_exists 'test $i.txt'"
+	done;
+}
+
 test_ignore_wildcard_files() {
 	cd $GIT_PROJECT_PATH
 	echo "test.*\.txt" > .git-ftp-ignore
@@ -285,6 +309,17 @@ test_include_init() {
 	assertTrue 'unversioned.txt was not uploaded' "remote_file_exists 'unversioned.txt'"
 }
 
+test_include_whitespace_init() {
+	cd $GIT_PROJECT_PATH
+	echo 'unversioned' > unversioned.txt
+	echo 'unversioned.txt' >> .gitignore
+	echo 'unversioned.txt:test X.txt' > .git-ftp-include
+	git add .
+	git commit -m 'unversioned file unversioned.txt should not be uploaded. test X.txt does not exist.' > /dev/null
+	init=$($GIT_FTP_CMD init -u $GIT_FTP_USER -p $GIT_FTP_PASSWD $GIT_FTP_URL)
+	assertFalse 'unversioned.txt was uploaded' "remote_file_exists 'unversioned.txt'"
+}
+
 test_include_push() {
 	cd $GIT_PROJECT_PATH
 	init=$($GIT_FTP_CMD init -u $GIT_FTP_USER -p $GIT_FTP_PASSWD $GIT_FTP_URL)
@@ -325,6 +360,48 @@ test_include_ignore_push() {
 	assertFalse ' .htaccess.prod was uploaded' "remote_file_exists '.htaccess.prod'"
 }
 
+test_include_ftp_ignore_init() {
+	cd $GIT_PROJECT_PATH
+	echo 'htaccess' > .htaccess
+	echo 'htaccess.prod' > .htaccess.prod
+	echo '.htaccess:.htaccess.prod' > .git-ftp-include
+	echo '.htaccess.prod' > .git-ftp-ignore
+	git add .
+	git commit -m 'htaccess setup' > /dev/null
+	init=$($GIT_FTP_CMD init -u $GIT_FTP_USER -p $GIT_FTP_PASSWD $GIT_FTP_URL)
+	assertTrue ' .htaccess was ignored' "remote_file_exists '.htaccess'"
+	assertFalse ' .htaccess.prod was uploaded' "remote_file_exists '.htaccess.prod'"
+}
+
+test_include_ftp_ignore_push() {
+	cd $GIT_PROJECT_PATH
+	init=$($GIT_FTP_CMD init -u $GIT_FTP_USER -p $GIT_FTP_PASSWD $GIT_FTP_URL)
+	echo 'htaccess' > .htaccess
+	echo 'htaccess.prod' > .htaccess.prod
+	echo '.htaccess:.htaccess.prod' > .git-ftp-include
+	echo '.htaccess.prod' > .git-ftp-ignore
+	git add .
+	git commit -m 'htaccess setup' > /dev/null
+	push=$($GIT_FTP_CMD push -u $GIT_FTP_USER -p $GIT_FTP_PASSWD $GIT_FTP_URL)
+	assertTrue ' .htaccess was ignored' "remote_file_exists '.htaccess'"
+	assertFalse ' .htaccess.prod was uploaded' "remote_file_exists '.htaccess.prod'"
+}
+
+# addresses issue #41
+test_include_similar() {
+	cd $GIT_PROJECT_PATH
+	echo 'unversioned' > foo.html
+	echo '/foo.html' >> .gitignore
+	echo 'foo.html:templates/foo.html' > .git-ftp-include
+	mkdir templates
+	echo 'new content' >> 'templates/foo.html'
+	git add .
+	git commit -m 'unversioned file foo.html should be uploaded with templates/foo.html' > /dev/null
+	init=$($GIT_FTP_CMD init -u $GIT_FTP_USER -p $GIT_FTP_PASSWD $GIT_FTP_URL)
+	assertTrue 'foo.html was not uploaded' "remote_file_exists 'foo.html'"
+	assertTrue 'templates/foo.html was not uploaded' "remote_file_exists 'templates/foo.html'"
+}
+
 test_hidden_file_only() {
 	cd $GIT_PROJECT_PATH
 	echo "test" > .htaccess