Merge pull request #12 from StealthyCoder/release/0.2.2

Release/0.2.2
StealthyCoder · Feb 21, 2020 · 3f17ea9 · 3f17ea9
2 parents 7929cbb + 6553bb9
commit 3f17ea9
Show file tree

Hide file tree

Showing 16 changed files with 552 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -52,9 +52,12 @@ By running the following command you get a nice clean environment in which `cruc
 
 ## Core
 
-- [ ] Dates
+- [X] Dates
 - [X] Logging
 - [X] Arrays
+- [ ] File I/O
+- [ ] Network I/O
+- [ ] Processes
 
 # Static Code Analysis
 

diff --git a/docker/shellcheck/Dockerfile b/docker/shellcheck/Dockerfile
@@ -5,6 +5,7 @@ RUN apt update && \
     apt install -y shellcheck
 
 RUN echo '#!/usr/bin/env bash\n\
+shopt -s dotglob\n\
 for f in $(ls /srv/crucible/bash/**/*)\n\
 do\n\
 if [ -f $f ]; then shellcheck $f -x -s bash; fi\n\

diff --git a/src/bash/arrays/arrays.sh b/src/bash/arrays/arrays.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ### CRUCIBLE META DATA ###
-# CRUCIBLE_VERSION=0.2.1
+# CRUCIBLE_VERSION=0.2.2
 # CRUCIBLE_AUTHOR=StealthyCoder
-# CRUCIBLE_CREATED=1578009741
+# CRUCIBLE_CREATED=1582286436
 ### CRUCIBLE META DATA ###
 
 require core/.internal

diff --git a/src/bash/bin/crucible b/src/bash/bin/crucible
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-CRUCIBLE_VERSION=0.2.1
-CRUCIBLE_LOCATION=v0.2.1
+CRUCIBLE_VERSION=0.2.2
+CRUCIBLE_LOCATION=v0.2.2
 
 function get_uuid {
 	grep 'id' .crucible | cut -d'=' -f 2

diff --git a/src/bash/core/.internal.sh b/src/bash/core/.internal.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ### CRUCIBLE META DATA ###
-# CRUCIBLE_VERSION=0.2.1
+# CRUCIBLE_VERSION=0.2.2
 # CRUCIBLE_AUTHOR=StealthyCoder
-# CRUCIBLE_CREATED=1578009741
+# CRUCIBLE_CREATED=1582286436
 ### CRUCIBLE META DATA ###
 
 require logging/logging

diff --git a/src/bash/core/dummy.sh b/src/bash/core/dummy.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ### CRUCIBLE META DATA ###
-# CRUCIBLE_VERSION=0.2.1
+# CRUCIBLE_VERSION=0.2.2
 # CRUCIBLE_AUTHOR=StealthyCoder
-# CRUCIBLE_CREATED=1578009741
+# CRUCIBLE_CREATED=1582286436
 ### CRUCIBLE META DATA ###
 
 function noop {

diff --git a/src/bash/core/mould.sh b/src/bash/core/mould.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ### CRUCIBLE META DATA ###
-# CRUCIBLE_VERSION=0.2.1
+# CRUCIBLE_VERSION=0.2.2
 # CRUCIBLE_AUTHOR=StealthyCoder
-# CRUCIBLE_CREATED=1578009741
+# CRUCIBLE_CREATED=1582286436
 ### CRUCIBLE META DATA ###
 
 function require {

diff --git a/src/bash/dates/dates.sh b/src/bash/dates/dates.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+### CRUCIBLE META DATA ###
+# CRUCIBLE_VERSION=0.2.2
+# CRUCIBLE_AUTHOR=StealthyCoder
+# CRUCIBLE_CREATED=1582286436
+### CRUCIBLE META DATA ###
+
+require dates/utc
+require dates/local
diff --git a/src/bash/dates/local.sh b/src/bash/dates/local.sh
@@ -0,0 +1,116 @@
+#!/usr/bin/env bash
+### CRUCIBLE META DATA ###
+# CRUCIBLE_VERSION=0.2.2
+# CRUCIBLE_AUTHOR=StealthyCoder
+# CRUCIBLE_CREATED=1582286436
+### CRUCIBLE META DATA ###
+
+function dates.local.now {
+    if [ -z "$1" ]
+    then
+        date
+    else
+        date "$1"
+    fi
+
+}
+
+function dates.local.now.timestamp {
+    if [ -z "$1" ]
+    then
+        date +%s
+    else
+        date +%s "$1"
+    fi
+
+}
+
+function dates.local.rfc3339.ns {
+    if [ -z "$1" ]
+    then
+        date --rfc-3339=ns
+    else
+        date --rfc-3339=ns "$1"
+    fi
+
+}
+
+function dates.local.rfc3339.seconds {
+    if [ -z "$1" ]
+    then
+        date --rfc-3339=seconds
+    else
+        date --rfc-3339=seconds "$1"
+    fi
+
+}
+
+function dates.local.rfc3339.date {
+    if [ -z "$1" ]
+    then
+        date --rfc-3339=date
+    else
+        date --rfc-3339=date "$1"
+    fi
+
+}
+
+function dates.local.email {
+    if [ -z "$1" ]
+    then
+        date --rfc-email
+    else
+        date --rfc-email "$1"
+    fi
+
+}
+
+function dates.local.iso8601.ns {
+    if [ -z "$1" ]
+    then
+        date --iso-8601=ns
+    else
+        date --iso-8601=ns "$1"
+    fi
+
+}
+
+function dates.local.iso8601.seconds {
+    if [ -z "$1" ]
+    then
+        date --iso-8601=seconds
+    else
+        date --iso-8601=seconds "$1"
+    fi
+
+}
+
+function dates.local.iso8601.minutes {
+    if [ -z "$1" ]
+    then
+        date --iso-8601=minutes
+    else
+        date --iso-8601=minutes "$1"
+    fi
+
+}
+
+function dates.local.iso8601.hours {
+    if [ -z "$1" ]
+    then
+        date --iso-8601=hours
+    else
+        date --iso-8601=hours "$1"
+    fi
+
+}
+
+function dates.local.iso8601.date {
+    if [ -z "$1" ]
+    then
+        date --iso-8601=date
+    else
+        date --iso-8601=date "$1"
+    fi
+
+}
diff --git a/src/bash/dates/utc.sh b/src/bash/dates/utc.sh
@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+### CRUCIBLE META DATA ###
+# CRUCIBLE_VERSION=0.2.2
+# CRUCIBLE_AUTHOR=StealthyCoder
+# CRUCIBLE_CREATED=1582286436
+### CRUCIBLE META DATA ###
+
+function dates.utc.now {
+    if [ -z "$1" ]
+    then
+        date -u
+    else
+        date -u "$1"
+    fi
+
+}
+
+function dates.utc.now.timestamp {
+    if [ -z "$1" ]
+    then
+        date -u +%s
+    else
+        date -u +%s "$1"
+    fi
+}
+
+function dates.utc.rfc3339.ns {
+    if [ -z "$1" ]
+    then
+        date -u --rfc-3339=ns
+    else
+        date -u --rfc-3339=ns "$1"
+    fi
+}
+
+function dates.utc.rfc3339.seconds {
+    if [ -z "$1" ]
+    then
+        date -u --rfc-3339=seconds
+    else
+        date -u --rfc-3339=seconds "$1"
+    fi
+}
+
+function dates.utc.rfc3339.date {
+    if [ -z "$1" ]
+    then
+        date -u --rfc-3339=date
+    else
+        date -u --rfc-3339=date "$1"
+    fi    
+}
+
+function dates.utc.email {
+    if [ -z "$1" ]
+    then
+        date -u --rfc-email    
+    else
+        date -u --rfc-email "$1"
+    fi
+}
+
+function dates.utc.iso8601.ns {
+    if [ -z "$1" ]
+    then
+        date -u --iso-8601=ns
+    else
+        date -u --iso-8601=ns "$1"
+    fi
+}
+
+function dates.utc.iso8601.seconds {
+    if [ -z "$1" ]
+    then
+        date -u --iso-8601=seconds
+    else
+        date -u --iso-8601=seconds "$1"
+    fi
+}
+
+function dates.utc.iso8601.minutes {
+    if [ -z "$1" ]
+    then
+        date -u --iso-8601=minutes
+    else
+        date -u --iso-8601=minutes "$1"
+    fi
+}
+
+function dates.utc.iso8601.hours {
+    if [ -z "$1" ]
+    then
+        date -u --iso-8601=hours
+    else
+        date -u --iso-8601=hours "$1"
+    fi
+}
+
+function dates.utc.iso8601.date {
+    if [ -z "$1" ]
+    then
+        date -u --iso-8601=date
+    else
+        date -u --iso-8601=date "$1"
+    fi
+} 
diff --git a/src/bash/logging/.constants.sh b/src/bash/logging/.constants.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ### CRUCIBLE META DATA ###
-# CRUCIBLE_VERSION=0.2.1
+# CRUCIBLE_VERSION=0.2.2
 # CRUCIBLE_AUTHOR=StealthyCoder
-# CRUCIBLE_CREATED=1578009741
+# CRUCIBLE_CREATED=1582286436
 ### CRUCIBLE META DATA ###
 
 function logging.color.escape_char {

diff --git a/src/bash/logging/.internal.sh b/src/bash/logging/.internal.sh
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 ### CRUCIBLE META DATA ###
-# CRUCIBLE_VERSION=0.2.1
+# CRUCIBLE_VERSION=0.2.2
 # CRUCIBLE_AUTHOR=StealthyCoder
-# CRUCIBLE_CREATED=1578009741
+# CRUCIBLE_CREATED=1582286436
 ### CRUCIBLE META DATA ###
 
 require logging/.constants
+require dates/utc
 
 function _echo {
     echo -e "$1"
@@ -14,22 +15,22 @@ function _echo {
 function _format {
     case $1 in
         INFO)
-            _echo "$(__cyan)[ $1 ] $2 $(__reset)"
+            _echo "$(__cyan)[ $1 ] $(dates.utc.iso8601.ns) $2 $(__reset)"
             ;;
         DEBUG)
-            _echo "$(__blue)[ $1 ] $2 $(__reset)"
+            _echo "$(__blue)[ $1 ] $(dates.utc.iso8601.ns) $2 $(__reset)"
             ;;
         WARNING)
-            _echo "$(__yellow)[ $1 ] $2 $(__reset)"
+            _echo "$(__yellow)[ $1 ] $(dates.utc.iso8601.ns) $2 $(__reset)"
             ;;
         ERROR)
-            _echo "$(__red)[ $1 ] $2 $(__reset)"
+            _echo "$(__red)[ $1 ] $(dates.utc.iso8601.ns) $2 $(__reset)"
             ;;
         SUCCESS)
-            _echo "$(__green)[ $1 ] $2 $(__reset)"
+            _echo "$(__green)[ $1 ] $(dates.utc.iso8601.ns) $2 $(__reset)"
             ;;
         *)
-            _echo "$(__cyan)[ $1 ] $2 $(__reset)"
+            _echo "$(__cyan)[ $1 ] $(dates.utc.iso8601.ns) $2 $(__reset)"
             ;;
     esac
 }

diff --git a/src/bash/logging/logging.sh b/src/bash/logging/logging.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 ### CRUCIBLE META DATA ###
-# CRUCIBLE_VERSION=0.2.1
+# CRUCIBLE_VERSION=0.2.2
 # CRUCIBLE_AUTHOR=StealthyCoder
-# CRUCIBLE_CREATED=1578009741
+# CRUCIBLE_CREATED=1582286436
 ### CRUCIBLE META DATA ###
 
 require logging/.internal