#291: Save dependencies to clib manifest by default

Makefile

@@ -72,7 +72,7 @@ install: $(BINS)
 uninstall:
 	$(foreach c, $(BINS), $(RM) $(PREFIX)/bin/$(c);)
 
-test:
+test: $(BINS)
 	@./test.sh
 
 # create a list of auto dependencies

src/clib-install.c

@@ -44,8 +44,8 @@ struct options {
   char *token;
   int verbose;
   int dev;
-  int save;
   int savedev;
+  int nosave;
   int force;
   int global;
   int skip_cache;
@@ -89,15 +89,20 @@ static void setopt_dev(command_t *self) {
 }
 
 static void setopt_save(command_t *self) {
-  opts.save = 1;
-  debug(&debugger, "set save flag");
+  logger_warn("deprecated", "--save option is deprecated "
+                            "(dependencies are now saved by default)");
 }
 
 static void setopt_savedev(command_t *self) {
   opts.savedev = 1;
   debug(&debugger, "set savedev flag");
 }
 
+static void setopt_nosave(command_t *self) {
+  opts.nosave = 1;
+  debug(&debugger, "set nosave flag");
+}
+
 static void setopt_force(command_t *self) {
   opts.force = 1;
   debug(&debugger, "set force flag");
@@ -304,10 +309,9 @@ static int install_package(const char *slug) {
     pkg->repo = strdup(slug);
   }
 
-  if (opts.save)
-    save_dependency(pkg);
-  if (opts.savedev)
-    save_dev_dependency(pkg);
+  if (!opts.nosave) {
+    opts.savedev ? save_dev_dependency(pkg) : save_dependency(pkg);
+  }
 
 cleanup:
   clib_package_free(pkg);
@@ -371,10 +375,14 @@ int main(int argc, char *argv[]) {
   command_option(&program, "-d", "--dev", "install development dependencies",
                  setopt_dev);
   command_option(&program, "-S", "--save",
-                 "save dependency in clib.json or package.json", setopt_save);
+                 "[DEPRECATED] save dependency in clib.json or package.json",
+                 setopt_save);
   command_option(&program, "-D", "--save-dev",
                  "save development dependency in clib.json or package.json",
                  setopt_savedev);
+  command_option(&program, "-N", "--no-save",
+                 "don't save dependency in clib.json or package.json",
+                 setopt_nosave);
   command_option(&program, "-f", "--force",
                  "force the action of something, like overwriting a file",
                  setopt_force);
@@ -430,8 +438,8 @@ int main(int argc, char *argv[]) {
     unsigned long int size = strlen(prefix) + 1;
     opts.prefix = malloc(size);
 
-    memset((void *) opts.prefix, 0, size);
-    memcpy((void *) opts.prefix, prefix, size);
+    memset((void *)opts.prefix, 0, size);
+    memcpy((void *)opts.prefix, prefix, size);
   }
 
   clib_cache_init(CLIB_PACKAGE_CACHE_TIME);

test/install-binary-dependencies.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-clib install -c stephenmathieson/[email protected] -P tmp > /dev/null || {
+clib install -c -N stephenmathieson/[email protected] -P tmp > /dev/null || {
   echo >&2 "Failed to install stephenmathieson/tabs-to-spaces"
   exit 1
 }

test/install-brace-expansion.sh

@@ -5,7 +5,7 @@ throw() {
   exit 1
 }
 
-clib install -c -o tmp stephenmathieson/trim.c stephenmathieson/case.c > /dev/null ||
+clib install -c -N -o tmp stephenmathieson/trim.c stephenmathieson/case.c > /dev/null ||
   throw "expecting successful exit code"
 
 [ -d ./tmp/case ] && [ -f ./tmp/case/package.json ] ||

test/install-multiple-clibs-libs.sh

@@ -5,7 +5,7 @@ throw() {
   exit 1
 }
 
-clib install -c -o tmp ms file hash > /dev/null ||
+clib install -c -N -o tmp ms file hash > /dev/null ||
   throw "expecting successful exit code"
 
 [ -d ./tmp/ms ] && [ -f ./tmp/ms/package.json ] ||

test/install-multiple-libs.sh

@@ -5,7 +5,7 @@ throw() {
   exit 1
 }
 
-clib install -c -o tmp \
+clib install -c -N -o tmp \
   stephenmathieson/case.c stephenmathieson/trim.c > /dev/null ||
   throw "expecting successful exit code"
 

test/install-no-save.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+mkdir -p tmp/test-save
+cp test/data/test-save-package.json tmp/test-save/package.json
+
+cd tmp/test-save || exit
+../../clib-install -c --no-save stephenmathieson/[email protected] >/dev/null
+../../clib-install -c -N darthtrevino/[email protected] >/dev/null
+../../clib-install -c --dev --no-save jwerle/[email protected] >/dev/null
+../../clib-install -c -d --no-save clibs/[email protected] >/dev/null
+cd - || exit
+
+if grep --quiet "stephenmathieson/tabs-to-spaces" tmp/test-save/package.json; then
+  echo >&2 "Found stephenmathieson/tabs-to-spaces saved in package.json but --no-save was used"
+  exit 1
+fi
+
+if grep --quiet "darthtrevino/str-concat" tmp/test-save/package.json; then
+  echo >&2 "Found darthtrevino/strconcat saved in package.json but --no-save was used"
+  exit 1
+fi
+
+if grep --quiet "jwerle/fs.c" tmp/test-save/package.json; then
+  echo >&2 "Found jwerle/fs.c saved in package.json but --no-save was used"
+  exit 1
+fi
+
+if grep --quiet "clibs/parson" tmp/test-save/package.json; then
+  echo >&2 "Found clibs/parson saved in package.json but --no-save was used"
+  exit 1
+fi

test/install-save.sh

@@ -3,9 +3,9 @@ mkdir -p tmp/test-save
 cp test/data/test-save-package.json tmp/test-save/package.json
 
 cd tmp/test-save || exit
-../../clib-install -c --save stephenmathieson/[email protected] >/dev/null
-../../clib-install -c -S darthtrevino/[email protected] >/dev/null
-../../clib-install -c --save-dev jwerle/[email protected] >/dev/null
+../../clib-install -c stephenmathieson/[email protected] >/dev/null
+../../clib-install -c darthtrevino/[email protected] >/dev/null
+../../clib-install -c --dev jwerle/[email protected] >/dev/null
 ../../clib-install -c -D clibs/[email protected] >/dev/null
 cd - || exit
 

test/uninstall.sh

@@ -2,7 +2,7 @@
 
 mkdir -p tmp/bin
 
-clib install -c stephenmathieson/[email protected] -P tmp > /dev/null || {
+clib install -c -N stephenmathieson/[email protected] -P tmp > /dev/null || {
   echo >&2 "Failed to install stephenmathieson/tabs-to-spaces"
   exit 1
 }