Bunch of new functionality

Author: Szpadel

brew.bash

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+import brew_portable
+import log
+import exec
+
+brew::is_installed() {
+    local pkg=$1
+    if brew::brew list "$1" &>/dev/null;then
+        return 0
+    fi
+    return 1
+}
+
+brew::install() {
+    local pkg=$1
+    log::info "Installing $pkg..."
+    exec::exec_preview brew::brew install "$pkg"
+}
+
+brew::upgrade() {
+    local pkg=$1
+    log::info "Upgrading $pkg..."
+    exec::exec_preview brew::brew upgrade "$pkg"
+}
+
+brew::upgrade_all() {
+    log::info "Upgrading packages..."
+    exec::exec_preview brew::brew upgrade
+}
+
+# $1 pkg name
+# $2 (optional) binary name for quick instalation check
+brew::require() {
+    local pkg=$1
+    local binary=${2:-$1}
+    brew::_assert_env
+    if [ -f "$BASHLIB_BREW_DIR/bin/$binary" ];then
+        return
+    fi
+    if ! brew::is_installed "$pkg";then
+        brew::install "$pkg"
+    fi
+}

brew_portable.bash

@@ -0,0 +1,90 @@
+#!/usr/bin/env bash
+
+# No imports to be able to use as portable install
+# This is only patial of brew module that doesn't contain any depenndencies
+# and is able to work with bash3
+# This is used to bootstrap brew envirionment and restart application under bash4
+
+brew::_install() {
+    local dir=$1
+    mkdir -p "$dir"
+    echo "Initializing private homebrew instance" 1>&2
+    curl -sL https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C "$dir"
+}
+
+brew::_setup() {
+    local dir=$1
+    local mode=$2
+    if ! [[ "$OSTYPE" == "darwin"* ]]; then
+        echo "brew can only we used on MacOs" 1>&2
+        exit 1
+    fi
+    if [ "$BASHLIB_BREW_DIR" != "$dir" ] || [ "$BASHLIB_BREW_MODE" != "$mode" ];then
+        brew::exit
+    fi
+    if ! [ -f "$dir/bin/brew" ];then
+        brew::_install "$dir"
+    fi
+    export BASHLIB_BREW_DIR="$dir"
+    export BASHLIB_BREW_MODE="$mode"
+    if [ "$mode" = "exclusive" ];then
+        export PATH="$dir/bin:$dir/sbin:/usr/bin:/bin:/usr/sbin:/sbin"
+    else
+        export PATH="$dir/bin:$dir/sbin:/usr/bin:/bin:/usr/sbin:/sbin:$PATH"
+    fi
+}
+
+brew::exit() {
+    if [ -z "$BASHLIB_BREW_DIR" ];then
+        return
+    fi
+
+    local path_components
+    local path_component
+    mapfile -d':' -t path_components <<< "$PATH"
+    local new_path=()
+    for path_component in "${path_components[@]}";do
+        if ! [[ path_component == ${BASHLIB_BREW_DIR}* ]];then
+            new_path+=( "$path_component" )
+        fi
+    done
+
+    PATH="$(brew::_join ":" "${new_path[@]}")"
+    unset BASHLIB_BREW_DIR
+    unset BASHLIB_BREW_MODE
+}
+
+brew::_join() {
+    local IFS="$1"
+    shift
+    echo "$*"
+}
+
+brew::_assert_env() {
+    if [ -z "$BASHLIB_BREW_DIR" ];then
+        echo "You need to run this comand in brew envirionment" 1>&2
+        exit 1
+    fi
+}
+
+brew::brew() {
+    brew::_assert_env
+    GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" brew "$@"
+}
+
+brew::_quote () {
+    for a in "${@//\"/\\\"}";do echo -n "\"$a\" ";done;
+}
+
+brew::enter() {
+    local dir=$1
+    local mode=$2
+    brew::_setup "$dir" "$mode"
+}
+
+brew::exec_in() {
+    local dir=$1
+    shift
+    brew::_setup "$dir"
+    exec bash -c "$(brew::_quote "$@")"
+}

cli.bash

@@ -4,11 +4,15 @@ import log
 
 declare -Ag cli__options=()
 declare -Ag cli__descriptions=()
+cli__extra_info=""
+cli__app_description=""
 cli__program_name="$0"
 cli__order=()
 
 cli::reset() {
     cli__order=()
+    cli__extra_info=""
+    cli__app_description=""
     declare -Ag cli__options=()
     declare -Ag cli__descriptions=()
 }
@@ -19,6 +23,20 @@ cli::set_program_name() {
     cli__program_name="${program_name}"
 }
 
+# Additional info that will be displayed under option listing
+cli::set_extra_info() {
+    local info=$1
+
+    cli__extra_info="$info"
+}
+
+# Description visible under first line with arguments
+cli::set_app_description() {
+    local desc=$1
+    
+    cli__app_description="$desc"
+}
+
 cli::_option_encode() {
     local option="$1"
 
@@ -65,7 +83,15 @@ cli::print_help() {
             usage+="\n        "
         fi
     done
-    echo -e "${usage}\n\nOptions:\n${description}"
+    local app_description_formatted
+    if [ -n "$cli__app_description" ];then
+        app_description_formatted="\n\n    ${cli__app_description//\\n/\\n    }"
+    fi
+    local extra_info_formatted
+    if [ -n "$cli__extra_info" ];then
+        extra_info_formatted="\nAdditional informations:\n\n    ${cli__extra_info//\\n/\\n    }"
+    fi
+    echo -e "${usage}${app_description_formatted}\n\nOptions:\n${description}${extra_info_formatted}"
 }
 
 cli::handle() {

develop.bash

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+import exec
+import git
+
+develop::lint() {
+    local dir=$1
+    shift
+    local files_raw
+    local files
+    if ! develop::is_in_dev_mode "$dir";then
+        # we are not in git or git ins't dirty, then we run in production mode
+        return 0
+    fi
+    exec::is_cmd_available shellcheck || return 0
+    log::info "Running in development mode, linting files first"
+    files_raw=$(find -L "$dir" -type f -name '*.bash' -not -path "$dir/.*")
+    log::info "Linting: ${files_raw}"
+    mapfile -t files <<< "$files_raw"
+    exec::exec_preview develop::_shellcheck "$dir" "$@" "${files[@]}" || log::fatal "There are issues in source code, aborting"
+    log::success "Lint succeed, continuing"
+}
+
+develop::is_in_dev_mode() {
+    local dir=$1
+    if ! git::is_git_repo "$dir" || ! git::is_dirty "$dir";then
+        # we are not in git or git ins't dirty, then we run in production mode
+        return 0
+    fi
+    return 1
+}
+
+develop::_shellcheck() {
+    local dir=$1
+    shift
+    echo "DEV MODE: Linting..."
+    (
+        cd "$dir" || return 1
+        shellcheck -Calways -S style "$@"
+    )
+}