Merge branch 'feature/container-shortcuts'

Author: louisgab

.editorconfig

@@ -1,9 +1,15 @@
 root = true
 
 [*]
-indent_size = 4
 charset = utf-8
 end_of_line = lf
-indent_style = space
 insert_final_newline = true
+indent_style = space
+indent_size = 4
 trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2

CHANGELOG.md

@@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.1] - 2020-05-23
+## [0.4.0] - 2020-12-06
+### Added
+    - "check" command that shortcuts to check-config.sh devilbox file
+    - "exec" command that enables command execution without entering the container
+    - "mysql" command that opens the mysql cli, and possibility to exec query directly
+    
+## [0.3.2] - 2020-05-23
 ### Changed
     - default command shows version and help (@llaville)
 

bin/build.sh

@@ -23,9 +23,12 @@ cat "$SRC_PATH"commands/config/mysql.sh >> "$BUILD" && echo "" >> "$BUILD"
 cat "$SRC_PATH"commands/config/docroot.sh >> "$BUILD" && echo "" >> "$BUILD"
 cat "$SRC_PATH"commands/config/projects.sh >> "$BUILD" && echo "" >> "$BUILD"
 
+cat "$SRC_PATH"commands/check.sh >> "$BUILD" && echo "" >> "$BUILD"
 cat "$SRC_PATH"commands/config.sh >> "$BUILD" && echo "" >> "$BUILD"
 cat "$SRC_PATH"commands/enter.sh >> "$BUILD" && echo "" >> "$BUILD"
+cat "$SRC_PATH"commands/exec.sh >> "$BUILD" && echo "" >> "$BUILD"
 cat "$SRC_PATH"commands/help.sh >> "$BUILD" && echo "" >> "$BUILD"
+cat "$SRC_PATH"commands/mysql.sh >> "$BUILD" && echo "" >> "$BUILD"
 cat "$SRC_PATH"commands/open.sh >> "$BUILD" && echo "" >> "$BUILD"
 cat "$SRC_PATH"commands/restart.sh >> "$BUILD" && echo "" >> "$BUILD"
 cat "$SRC_PATH"commands/run.sh >> "$BUILD" && echo "" >> "$BUILD"

dist/devilbox-cli.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-VERSION="0.3.2"
-DATE="2020-05-27"
+VERSION="0.4.0"
+DATE="2020-12-06"
 NAME="devilbox-cli"
 DESCRIPTION="A simple and conveniant command line to manage devilbox from anywhere"
 LINK="https://github.com/louisgab/devilbox-cli"
@@ -381,6 +381,10 @@ set_projects_path () {
     set_readable_config "Projects path" "$WWWPATH_CONFIG" "$new"
 }
 
+check_command () {
+    ./check-config.sh
+}
+
 config_command () {
     for arg in "$@"; do
         case $arg in
@@ -406,7 +410,16 @@ enter_command () {
         error "Devilbox containers are not running"
         return "$KO_CODE"
     fi
-    sh shell.sh
+    ./shell.sh
+}
+
+exec_command() {
+    if ! is_running; then
+        error "Devilbox containers are not running"
+        return "$KO_CODE"
+    fi
+
+    docker-compose exec -u devilbox php bash -c "$@"
 }
 
 add_usage_command () {
@@ -455,6 +468,19 @@ help_command () {
     printf "\n"
 }
 
+mysql_command() {
+    if ! is_running; then
+        error "Devilbox containers are not running"
+        return "$KO_CODE"
+    fi
+
+    if [ -z "$@" ]; then
+        exec_command 'mysql -hmysql -uroot'
+    else
+        exec_command 'mysql -hmysql -uroot -e "$@"'
+    fi
+}
+
 open_http_intranet () {
     xdg-open "http://localhost/" 2> /dev/null >/dev/null
 }
@@ -612,9 +638,12 @@ main () {
         help_command
     else
         case $1 in
+            check) shift; check_command;;
             c|config) shift; config_command "$@";;
             e|enter) shift; enter_command;;
+            x|exec) shift; exec_command "$@";;
             h|help|-h|--help) shift; help_command;;
+            mysql) shift; mysql_command "$@";;
             o|open) shift; open_command "$@";;
             restart) shift; restart_command "$@";;
             r|run) shift; run_command "$@";;

package.json

@@ -1,6 +1,6 @@
 {
     "name": "devilbox-cli",
-    "version": "0.3.2",
+    "version": "0.4.0",
     "description": "A simple and conveniant command line to manage devilbox from anywhere",
     "author": "Louis Gabriel <code@louisgab.me>",
     "license": "MIT",

src/commands/check.sh

@@ -0,0 +1,3 @@
+check_command () {
+    ./check-config.sh
+}

src/commands/enter.sh

@@ -3,5 +3,5 @@ enter_command () {
         error "Devilbox containers are not running"
         return "$KO_CODE"
     fi
-    sh shell.sh
+    ./shell.sh
 }

src/commands/exec.sh

@@ -0,0 +1,8 @@
+exec_command() {
+    if ! is_running; then
+        error "Devilbox containers are not running"
+        return "$KO_CODE"
+    fi
+
+    docker-compose exec -u devilbox php bash -c "$@"
+}

src/commands/mysql.sh

@@ -0,0 +1,12 @@
+mysql_command() {
+    if ! is_running; then
+        error "Devilbox containers are not running"
+        return "$KO_CODE"
+    fi
+
+    if [ -z "$1" ]; then
+        exec_command 'mysql -hmysql -uroot'
+    else
+        exec_command "mysql -hmysql -uroot -e '$1'"
+    fi
+}

src/config.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-VERSION="0.3.2"
-DATE="2020-05-27"
+VERSION="0.4.0"
+DATE="2020-12-06"
 NAME="devilbox-cli"
 DESCRIPTION="A simple and conveniant command line to manage devilbox from anywhere"
 LINK="https://github.com/louisgab/devilbox-cli"