New test for working dir, as well as refactoring of test code into separate files.

tests/commitlog.bats

@@ -0,0 +1,38 @@
+#!/usr/bin/env bats
+
+# This is a testscript using the bats testing framework:
+# https://github.com/sstephenson/bats
+# To run it, at a command prompt:
+# bats testscript.bats
+
+load startup-shutdown
+
+@test "commit log messages working" {
+    # Start up gitwatch with logging, see if works
+    ${BATS_TEST_DIRNAME}/../gitwatch.sh -l 10 "$testdir/local/remote" 3>&- &
+    GITWATCH_PID=$!
+
+    # Keeps kill message from printing to screen
+    disown
+
+    # Create a file, verify that it hasn't been added yet, then commit
+    cd remote
+
+    # According to inotify documentation, a race condition results if you write
+    # to directory too soon after it has been created; hence, a short wait.
+    sleep 1
+    echo "line1" >> file1.txt
+
+    # Wait a bit for inotify to figure out the file has changed, and do its add,
+    # and commit
+    sleep 5
+
+    # Make a new change
+    echo "line2" >> file1.txt
+    sleep 5
+
+    # Check commit log that the diff is in there
+    run git log -1 --oneline
+    [[ $output == *"file1.txt"* ]]
+}
+

tests/remotedirs.bats

@@ -0,0 +1,41 @@
+#!/usr/bin/env bats
+
+# This is a testscript using the bats testing framework:
+# https://github.com/sstephenson/bats
+# To run it, at a command prompt:
+# bats testscript.bats
+
+load startup-shutdown
+
+@test "remote git dirs working" {
+    # Start up gitwatch, intentionally in wrong directory, wiht remote dir specified
+    ${BATS_TEST_DIRNAME}/../gitwatch.sh -g "$testdir/local/remote" "/tmp" 3>&- &
+    GITWATCH_PID=$!
+
+    # Keeps kill message from printing to screen
+    disown
+
+    # Create a file, verify that it hasn't been added yet, then commit
+    cd remote
+
+    # According to inotify documentation, a race condition results if you write
+    # to directory too soon after it has been created; hence, a short wait.
+    sleep 1
+    echo "line1" >> file1.txt
+
+    # Wait a bit for inotify to figure out the file has changed, and do its add,
+    # and commit
+    sleep 5
+
+    # Store commit for later comparison
+    lastcommit=$(git rev-parse master)
+
+    # Make a new change
+    echo "line2" >> file1.txt
+    sleep 5
+    
+    # Verify that new commit has happened
+    currentcommit=$(git rev-parse master)
+    [ "$lastcommit" != "$currentcommit" ]
+}
+

tests/startup-shutdown.bash

@@ -0,0 +1,24 @@
+setup() {
+    # Set up directory structure and initialize remote
+    testdir=$(mktemp -d)
+    cd $testdir
+    mkdir remote
+    cd remote
+    git init -q --bare
+    cd ..
+    mkdir local
+    cd local
+    git clone -q ../remote
+}
+
+
+teardown() {
+    # Remove testing directories
+    cd /tmp
+
+    rm -rf $testdir
+
+    # Make sure gitwatch script gets killed if script stopped background
+    # Must kill the entire tree of processes generated
+    pkill -15 -P $GITWATCH_PID
+}

tests/status-change.bats

@@ -0,0 +1,40 @@
+#!/usr/bin/env bats
+
+# This is a testscript using the bats testing framework:
+# https://github.com/sstephenson/bats
+# To run it, at a command prompt:
+# bats testscript.bats
+
+load startup-shutdown
+
+@test "commit only when git status change" {
+
+    # Start up gitwatch and capture its output
+    ${BATS_TEST_DIRNAME}/../gitwatch.sh "$testdir/local/remote" > "$testdir/output.txt" 3>&- &
+    GITWATCH_PID=$!
+
+    # Keeps kill message from printing to screen
+    disown
+
+    # Create a file, verify that it hasn't been added yet, then commit
+    cd remote
+
+    # According to inotify documentation, a race condition results if you write
+    # to directory too soon after it has been created; hence, a short wait.
+    sleep 1
+    echo "line1" >> file1.txt
+
+    # Wait a bit for inotify to figure out the file has changed, and do its add,
+    # and commit
+    sleep 5
+
+    # Touch the file, but no change
+    touch file1.txt
+    sleep 5
+
+    run bash -c "grep \"nothing to commit\" \"$testdir/output.txt\" | wc -l"
+    [[ $output == "0" ]]
+    
+}
+
+

tests/sync.bats

@@ -0,0 +1,72 @@
+#!/usr/bin/env bats
+
+# This is a testscript using the bats testing framework:
+# https://github.com/sstephenson/bats
+# To run it, at a command prompt:
+# bats testscript.bats
+
+load startup-shutdown
+
+@test "syncing correctly" {
+    # Start up gitwatch and see if commit and push happen automatically
+    # after waiting two seconds
+    ${BATS_TEST_DIRNAME}/../gitwatch.sh -r origin "$testdir/local/remote" 3>- &
+    GITWATCH_PID=$!
+
+    # Keeps kill message from printing to screen
+    disown
+
+    # Create a file, verify that it hasn't been added yet,
+    # then commit and push
+    cd remote
+
+    # According to inotify documentation, a race condition results if you write
+    # to directory too soon after it has been created; hence, a short wait.
+    sleep 1
+    echo "line1" >> file1.txt
+
+    # Wait a bit for inotify to figure out the file has changed, and do its add,
+    # commit, and push.
+    sleep 5
+
+    # Verify that push happened
+    currentcommit=$(git rev-parse master)
+    remotecommit=$(git rev-parse origin/master)
+    [ "$currentcommit" = "$remotecommit" ]
+     
+    # Try making subdirectory with file
+    lastcommit=$(git rev-parse master)
+    mkdir subdir
+    cd subdir
+    echo "line2" >> file2.txt
+
+    sleep 5
+
+    # Verify that new commit has happened
+    currentcommit=$(git rev-parse master)
+    [ "$lastcommit" != "$currentcommit" ]
+      
+    # Verify that push happened
+    currentcommit=$(git rev-parse master)
+    remotecommit=$(git rev-parse origin/master)
+    [ "$currentcommit" = "$remotecommit" ]
+
+
+    # Try removing file to see if can work
+    rm file2.txt
+    sleep 5
+
+    # Verify that new commit has happened
+    currentcommit=$(git rev-parse master)
+    [ "$lastcommit" != "$currentcommit" ]
+      
+    # Verify that push happened
+    currentcommit=$(git rev-parse master)
+    remotecommit=$(git rev-parse origin/master)
+    [ "$currentcommit" = "$remotecommit" ]
+
+    # Remove testing directories
+    cd /tmp
+    rm -rf $testdir
+}
+

testscript.bats

@@ -1,154 +0,0 @@
-#!/usr/bin/env bats
-
-# This is a testscript using the bats testing framework:
-# https://github.com/sstephenson/bats
-# To run it, at a command prompt:
-# bats testscript.bats
-
-setup() {
-    # Set up directory structure and initialize remote
-    testdir=$(mktemp -d)
-    cd $testdir
-    mkdir remote
-    cd remote
-    git init -q --bare
-    cd ..
-    mkdir local
-    cd local
-    git clone -q ../remote
-}
-
-@test "syncing correctly" {
-    # Start up gitwatch and see if commit and push happen automatically
-    # after waiting two seconds
-    ${BATS_TEST_DIRNAME}/gitwatch.sh -r origin "$testdir/local/remote" 3>- &
-    GITWATCH_PID=$!
-
-    # Keeps kill message from printing to screen
-    disown
-
-    # Create a file, verify that it hasn't been added yet,
-    # then commit and push
-    cd remote
-
-    # According to inotify documentation, a race condition results if you write
-    # to directory too soon after it has been created; hence, a short wait.
-    sleep 1
-    echo "line1" >> file1.txt
-
-    # Wait a bit for inotify to figure out the file has changed, and do its add,
-    # commit, and push.
-    sleep 5
-
-    # Verify that push happened
-    currentcommit=$(git rev-parse master)
-    remotecommit=$(git rev-parse origin/master)
-    [ "$currentcommit" = "$remotecommit" ]
-     
-    # Try making subdirectory with file
-    lastcommit=$(git rev-parse master)
-    mkdir subdir
-    cd subdir
-    echo "line2" >> file2.txt
-
-    sleep 5
-
-    # Verify that new commit has happened
-    currentcommit=$(git rev-parse master)
-    [ "$lastcommit" != "$currentcommit" ]
-      
-    # Verify that push happened
-    currentcommit=$(git rev-parse master)
-    remotecommit=$(git rev-parse origin/master)
-    [ "$currentcommit" = "$remotecommit" ]
-
-
-    # Try removing file to see if can work
-    rm file2.txt
-    sleep 5
-
-    # Verify that new commit has happened
-    currentcommit=$(git rev-parse master)
-    [ "$lastcommit" != "$currentcommit" ]
-      
-    # Verify that push happened
-    currentcommit=$(git rev-parse master)
-    remotecommit=$(git rev-parse origin/master)
-    [ "$currentcommit" = "$remotecommit" ]
-
-    # Remove testing directories
-    cd /tmp
-    rm -rf $testdir
-}
-
-
-@test "commit log messages working" {
-    # Start up gitwatch with logging, see if works
-    ${BATS_TEST_DIRNAME}/gitwatch.sh -l 10 "$testdir/local/remote" 3>&- &
-    GITWATCH_PID=$!
-
-    # Keeps kill message from printing to screen
-    disown
-
-    # Create a file, verify that it hasn't been added yet, then commit
-    cd remote
-
-    # According to inotify documentation, a race condition results if you write
-    # to directory too soon after it has been created; hence, a short wait.
-    sleep 1
-    echo "line1" >> file1.txt
-
-    # Wait a bit for inotify to figure out the file has changed, and do its add,
-    # and commit
-    sleep 5
-
-    # Make a new change
-    echo "line2" >> file1.txt
-    sleep 5
-
-    # Check commit log that the diff is in there
-    run git log -1 --oneline
-    [[ $output == *"file1.txt"* ]]
-}
-
-@test "commit only when git status change" {
-
-    # Start up gitwatch and capture its output
-    ${BATS_TEST_DIRNAME}/gitwatch.sh "$testdir/local/remote" > "$testdir/output.txt" 3>&- &
-    GITWATCH_PID=$!
-
-    # Keeps kill message from printing to screen
-    disown
-
-    # Create a file, verify that it hasn't been added yet, then commit
-    cd remote
-
-    # According to inotify documentation, a race condition results if you write
-    # to directory too soon after it has been created; hence, a short wait.
-    sleep 1
-    echo "line1" >> file1.txt
-
-    # Wait a bit for inotify to figure out the file has changed, and do its add,
-    # and commit
-    sleep 5
-
-    # Touch the file, but no change
-    touch file1.txt
-    sleep 5
-
-    run bash -c "grep \"nothing to commit\" \"$testdir/output.txt\" | wc -l"
-    [[ $output == "0" ]]
-    
-}
-
-
-teardown() {
-    # Remove testing directories
-    cd /tmp
-
-    rm -rf $testdir
-
-    # Make sure gitwatch script gets killed if script stopped background
-    # Must kill the entire tree of processes generated
-    pkill -15 -P $GITWATCH_PID
-}