fix text and date funcs; fix tests; fix colors

Author: aks

Makefile.inc

@@ -1,9 +1,9 @@
 # Makefile.inc
-# Copyright 2006-2014 Alan K. Stebbens <[email protected]>
+# Copyright 2006-2022 Alan K. Stebbens <[email protected]>
 #
 # $Id$
 #
-# Makefile for managing sets of files 
+# Makefile for managing sets of files
 #
 # bins = list of "binaries" (could be scripts)
 # bindirs = list of directories into which the binaries can be installed
@@ -24,21 +24,21 @@ disthost ?= $(distuser)@$$DISTHOST
 distpath ?= .
 
 # These should be defined in the "parent" Makefile
-# bindirs 
-# bins 
-# libdirs 
-# libs 
+# bindirs
+# bins
+# libdirs
+# libs
 # incdirs
 # incs
 # cssdirs
 # cssfiles
 # tmpldirs
 # tmpls
-# tests 
-# subdirs 
+# tests
+# subdirs
 
 # This is a list of files which are in development, and which should not be installed
-# indev 
+# indev
 
 # if the target is "diff" or "difflist", use -k to keep going even if "diff" errors
 
@@ -55,10 +55,11 @@ allfiles = $(bins) $(libs) $(incs) $(cssfiles) Makefile RCS
 
 afile = dummy
 
-.PHONY: subdirs default help status diff diffs difflist 
+.PHONY: subdirs default help status diff diffs difflist
 .PHONY: fetch install install-bins install-libs install-files zip putzip getzip $(subdirs)
 
 default:	help
+.DEFAULT_GOAL = help
 help:
 	@echo "You can make these things:"
 	@echo " help"
@@ -67,7 +68,7 @@ help:
 	@echo " difflist -- show different files installed versions"
 	@echo " install  -- install"
 	@echo " fetch	 -- fetch the installed file(s)"
-	@echo " test	 -- run tests"
+	@echo " tests	 -- run tests"
 	@echo " zip	 -- Create a zip file "
 	@echo " putzip	 -- distribute zipfile to yoda"
 	@echo " getzip	 -- fetch zipfile from yoda"
@@ -143,7 +144,7 @@ action_if_exists = \
 	if [[ -f $(1) ]]; then	\
 	    $(2) ;		\
 	fi
-	
+
 
 # These are the known actions
 #   diff_file

arg-utils.sh

@@ -2,10 +2,10 @@
 #
 # handy functions for flexibly managing function arguments in bash scripts
 #
-# Copyright 2006-2018 Alan K. Stebbens <[email protected]>
+# Copyright 2006-2022 Alan K. Stebbens <[email protected]>
 #
 
-ARG_UTILS_VERSION="arg-utils.sh v2.2"
+ARG_UTILS_VERSION="arg-utils.sh v2.4"
 
 [[ "$ARG_UTILS_SH" = "$ARG_UTILS_VERSION" ]] && return
 ARG_UTILS_SH="$ARG_UTILS_VERSION"
@@ -160,7 +160,7 @@ __arg_or_input() {
   else
     arg="$1"
   fi
-  echo "$arg"
+  echo -n "$arg"
 }
 
 
@@ -183,7 +183,7 @@ __args_or_input() {
     done
     echo "${args[@]}"
   else
-    echo "$@"
+    echo -n "$@"
   fi
 }
 
@@ -198,12 +198,15 @@ args_or_stdin() {
 
 __args_or_stdin() {
   if [[ $# -gt 0 ]] ; then
-    echo "$*"
+    echo -n "$*"
   else
     cat
   fi
 }
 
+arg_or_stdin()   { __args_or_stdin "$1" ; }
+__arg_or_stdin() { __args_or_stdin "$1" ; }
+
 
 # __append_arg  ARG
 # __append_args ARGS
@@ -216,7 +219,7 @@ __args_or_stdin() {
 __append_arg() {
   local -a data
   read -a data
-  echo "${data[@]}" "$@"
+  echo -n "${data[@]}" "$@"
 }
 __append_args() { __append_arg "$@" ; }
 

date-utils.sh

@@ -1,9 +1,9 @@
 # bash
 # date-utils.sh  -- date management utility for bash
 #
-# Copyright 2009-2015 Alan K. Stebbens <[email protected]>
+# Copyright 2009-2022 Alan K. Stebbens <[email protected]>
 
-DATE_UTILS_VERSION="date-utils.sh v2.2"
+DATE_UTILS_VERSION="date-utils.sh v2.3"
 [[ "$DATE_UTILS_SH" = "$DATE_UTILS_VERSION" ]] && return
 DATE_UTILS_SH="$DATE_UTILS_VERSION"
 
@@ -134,7 +134,7 @@ date_to_days_since_epoch DATESTRING - the number of days since Epoch
 
 date_to_seconds                     - the number of seconds since Epoch
 
-Both `date_to_days_since_epoch` and `date_to_seconds` are provided for 
+Both `date_to_days_since_epoch` and `date_to_seconds` are provided for
 each usage with and for Unix `tm` values.
 
 today         - today's date
@@ -155,7 +155,7 @@ date format, given by DATE_FORMAT.  If DATE_FORMAT is not defined, the format
 
 Most of the date format codes are performed by a function, which are listed
 here for completeness.  Typically, they would be invoked via `date_format CODE
-DATESTRING`.  All of these `df_...` functions accept no arguments, taking 
+DATESTRING`.  All of these `df_...` functions accept no arguments, taking
 the date component values they need from the variables set by `date_parse`.
 Specifically, `year`, `month`, and `day`.
 
@@ -708,15 +708,9 @@ date_to_seconds() {
   echo $(( days * $SECONDS_PER_DAY ))
 }
 
-today() { date +'%F' ; }
-
-tomorrow() {
-  get_date_x_days_since 1 `today`
-}
-
-yesterday() {
-  get_date_x_days_before 1 `today`
-}
+today()     { date +'%F' ; }
+tomorrow()  { get_date_x_days_since 1 `today` ; }
+yesterday() { get_date_x_days_before 1 `today` ; }
 
 # date_format  FORMAT
 # date_format [FORMAT] [DATESTRING]
@@ -948,15 +942,15 @@ get_date_5_years_before() { date_adjust "$1" - 5y ; }
 get_date_x_years_after() {
   local offset="${1:?Missing offset!}"
   shift
-  date_add "$@" $offset years
+  date_add "$*" $offset years
 }
 
 get_date_x_years_since()  { get_date_x_years_after "$@" ; }
 
 get_date_x_years_before() {
   local offset="${1:?Missing offset!}"
   shift
-  date_sub "$@" $offset years
+  date_sub "$*" $offset years
 }
 
 # get_date_last_quarter_end YYYY-MM-DD

generate-prompt-colors

@@ -6,6 +6,8 @@
 # run this script to create "prompt-colors.sh", which contains
 # standard prompt color definitions, and a "reset_prompt_colors"
 # function to unset them all.
+#
+# Copywrite 2006-2022 Alan K. Stebbens <[email protected]>
 
 PROG="${0##*/}"
 THIS_DIR="${0%/*}"
@@ -101,14 +103,14 @@ generate_prompt_color_names() {
     else
       cv="${1}"
     fi
-    echo "\[\033[${cv}m\]"
+    echo "\$'\033[${cv}m'"
   }
 
   # def_color NAME ATTRCODE COLORCODE
   assign_color_name() {
     local color_name="$1"
     local code="`prompt_color_string $2 $3`"
-    local def="$color_name=\"$code\""
+    local def="$color_name=$code"
     votalk "+ $def"
     echo "  $def"
     add_list color_name_list $color_name

test-all

@@ -3,7 +3,7 @@
 # 
 # Run all tests with the name "test-*-*.sh"
 #
-# Copyright 2015, Alan K. Stebbens <[email protected]>
+# Copyright 2015-2022, Alan K. Stebbens <[email protected]>
 
 lines="--------------"
 for test in test-*-*.sh ; do

test-date-utils.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2006-2014, Alan K. Stebbens <[email protected]>
+# Copyright 2006-2022, Alan K. Stebbens <[email protected]>
 #
 # test date-utils.sh
 #
@@ -349,6 +349,30 @@ test_23_days_between() {
   end_test
 }
 
+# run_test_data_and_compare FUNCTION
+run_test_data_and_compare() {
+  local func="${1:?'Missing function'}"
+  local x input_date format expected_result actual_result target_date tdate
+  for(( x=0; x < ${#test_data[*]}; x+=3 )) ; do
+    input_date=${test_data[$x]}
+    format=${test_data[$x+1]}
+    expected_result=${test_data[$x+2]}
+    date_parse "$input_date"
+    actual_result=`$func "$format" "$input_date"`
+    check_equal "$expected_result" "$actual_result" "date_format on '$format': '$expected_result' does not equal '$actual_result' "
+  done
+}
+
+test_30_date_format() {
+  start_test
+  test_data=( 2018-02-08 "-%e-%d-" "- 2-08-"
+              2018-02-09 "-%e-%d-" "- 2-09-"
+              2018-10-10 "-%e-%d-" "-10-10-"
+            )
+  run_test_data_and_compare date_format
+  end_test
+}
+
 
 init_tests "$@"
 run_tests

test-text-utils.sh

@@ -43,7 +43,7 @@ do_filter_test() {
 
   if (( howmany > 1 )); then
     # test pipe with no arg call next
-    out="`echo \"$input\" | $func`"
+    out="`echo -n \"$input\" | $func`"
     check_and_show_results "$output" "$out" "$error in pipe"
   fi
 }