From 82f59f31ceef20a262846fc1912de86b9d2df677 Mon Sep 17 00:00:00 2001
From: Mike Burns <mike@mike-burns.com>
Date: Fri, 30 May 2014 16:53:57 +0200
Subject: Allow the user to override SYMLINK_DIRS with -s

This adds a `-s` that can be used to override the `SYMLINK_DIRS` config,
or the `-S` flag, to lsrc(1), mkrc(1), rcup(1), and rcdn(1).

The `-s` flag is the opposite of -S: any argument, if it is a directory,
is not symlinked but instead recurred down.
---
 test/Makefile.am         |  3 +++
 test/lsrc-symlink-dirs.t | 17 +++++++++++++++++
 test/mkrc-symlink-dirs.t | 23 +++++++++++++++++++++++
 test/rcup-symlink-dirs.t | 11 +++++++++++
 4 files changed, 54 insertions(+)
 create mode 100644 test/lsrc-symlink-dirs.t
 create mode 100644 test/mkrc-symlink-dirs.t
 create mode 100644 test/rcup-symlink-dirs.t

(limited to 'test')

diff --git a/test/Makefile.am b/test/Makefile.am
index 7e067e4..afa2631 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,6 +4,7 @@ TESTS = \
 	lsrc-hostname.t \
 	lsrc-sigils.t \
 	lsrc.t \
+	lsrc-symlink-dirs.t \
 	lsrc-tags.t \
 	lsrc-usage.t \
 	mkrc-alternate-dotfiles-dir.t \
@@ -11,6 +12,7 @@ TESTS = \
 	mkrc-host-file.t \
 	mkrc-hostname.t \
 	mkrc-simple-output.t \
+	mkrc-symlink-dirs.t \
 	mkrc-tagged-file.t \
 	mkrc-usage.t \
 	rcrc-custom.t \
@@ -18,6 +20,7 @@ TESTS = \
 	rcrc.t \
 	rcup-link-files.t \
 	rcup-hostname.t \
+	rcup-symlink-dirs.t \
 	rcup-usage.t
 
 dist_check_SCRIPTS = $(TESTS)
diff --git a/test/lsrc-symlink-dirs.t b/test/lsrc-symlink-dirs.t
new file mode 100644
index 0000000..a08ce97
--- /dev/null
+++ b/test/lsrc-symlink-dirs.t
@@ -0,0 +1,17 @@
+  $ . "$TESTDIR/helper.sh"
+
+Overrides SYMLINK_DIRS with -s
+
+  $ mkdir -p .dotfiles/eggplant_firetruck/lampshade
+  > touch .dotfiles/eggplant_firetruck/lampshade/bottle
+
+  $ echo 'SYMLINK_DIRS="eggplant_firetruck"' > $HOME/.rcrc
+
+  $ lsrc
+  /*/.eggplant_firetruck:/*/.dotfiles/eggplant_firetruck (glob)
+
+  $ lsrc -s eggplant_firetruck
+  /*/.eggplant_firetruck/lampshade/bottle:/*/.dotfiles/eggplant_firetruck/lampshade/bottle (glob)
+
+  $ lsrc -S eggplant_firetruck -s eggplant_firetruck
+  /*/.eggplant_firetruck/lampshade/bottle:/*/.dotfiles/eggplant_firetruck/lampshade/bottle (glob)
diff --git a/test/mkrc-symlink-dirs.t b/test/mkrc-symlink-dirs.t
new file mode 100644
index 0000000..1638d41
--- /dev/null
+++ b/test/mkrc-symlink-dirs.t
@@ -0,0 +1,23 @@
+  $ . "$TESTDIR/helper.sh"
+
+Overrides SYMLINK_DIRS with -s
+
+  $ mkdir -p .eggplant_firetruck/lampshade
+  > touch .eggplant_firetruck/lampshade/bottle
+
+  $ mkdir -p .boxing_card
+  > touch .boxing_card/fragrance
+
+  $ echo 'SYMLINK_DIRS="eggplant_firetruck boxing_card"' > $HOME/.rcrc
+
+  $ mkrc -v .boxing_card
+  Moving...
+  '/*/.boxing_card' -> '/*/.dotfiles/boxing_card' (glob)
+  Linking...
+  '/*/.dotfiles/boxing_card' -> '/*/.boxing_card' (glob)
+
+  $ mkrc -vs .eggplant_firetruck
+  Moving...
+  '/*/.eggplant_firetruck' -> '/*/.dotfiles/eggplant_firetruck' (glob)
+  Linking...
+  '/*/.dotfiles/eggplant_firetruck/lampshade/bottle' -> '/*/.eggplant_firetruck/lampshade/bottle' (glob)
diff --git a/test/rcup-symlink-dirs.t b/test/rcup-symlink-dirs.t
new file mode 100644
index 0000000..07a2bbe
--- /dev/null
+++ b/test/rcup-symlink-dirs.t
@@ -0,0 +1,11 @@
+  $ . "$TESTDIR/helper.sh"
+
+Overrides SYMLINK_DIRS with -s
+
+  $ mkdir -p .dotfiles/eggplant_firetruck/lampshade
+  > touch .dotfiles/eggplant_firetruck/lampshade/bottle
+
+  $ echo 'SYMLINK_DIRS="eggplant_firetruck"' > $HOME/.rcrc
+
+  $ rcup -s eggplant_firetruck
+  $ assert_linked "$HOME/.eggplant_firetruck/lampshade/bottle" "$HOME/.dotfiles/eggplant_firetruck/lampshade/bottle"
-- 
cgit v1.2.3