Merge branch 'develop'

Author: mdeboer

.circleci/config.yml

@@ -0,0 +1,29 @@
+version: 2
+jobs:
+  test:
+    docker:
+      - image: debian
+    steps:
+      - checkout
+      - run:
+          name: Install zsh
+          command: |
+            apt-get update
+            apt-get install -y --no-install-recommends zsh curl ca-certificates
+      - run:
+          name: Install zunit
+          command: |
+            curl -L https://github.com/zunit-zsh/zunit/releases/download/v0.8.2/zunit > /usr/local/bin/zunit
+            curl -L https://raw.githubusercontent.com/molovo/revolver/master/revolver > /usr/local/bin/revolver
+            curl -L https://raw.githubusercontent.com/molovo/color/master/color.zsh > /usr/local/bin/color
+            chmod +x /usr/local/bin/{color,revolver,zunit}
+            chmod +x tests/_support/bin/*
+      - run:
+          name: Run tests
+          command: zunit
+  
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test

.zunit.yml

@@ -0,0 +1,8 @@
+tap: false
+directories:
+  tests: tests
+  output: tests/_output
+  support: tests/_support
+time_limit: 30
+fail_fast: false
+allow_risky: false

README.md

@@ -2,7 +2,9 @@
 
 > The command that can save you typing 15 characters or more, each time!
 
-This plugins adds `start`, `restart`, `stop`, `up` and `down` commands when it detects a docker-compose or Vagrant file in the current directory (e.g. your application). Just run `up` and get coding!
+[![CircleCI](https://circleci.com/gh/Cloudstek/zsh-plugin-appup.svg?style=svg)](https://circleci.com/gh/Cloudstek/zsh-plugin-appup)
+
+This plugins adds `start`, `restart`, `stop`, `up` and `down` commands when it detects a docker-compose or Vagrant file in the current directory (e.g. your application). Just run `up` and get coding! This saves you typing `docker-compose` or `vagrant` every time or aliasing them. Also gives you one set of commands that work for both environments.
 
 ### Docker
 
@@ -12,7 +14,7 @@ Aside from simply running `up`, you can also extend your configuration by runnin
 
 Vagrant doesn't have a `down`, `restart`, `start` or `stop` commands natively but don't worry, that's been taken care of and running those commands will actually run vagrant's equivalent commands. Additional arguments will be directly supplied to vagrant.
 
-## Command mapping
+### Command mapping
 
 | Command | Vagrant command                                            | Docker command                                               |
 | ------- | ---------------------------------------------------------- | ------------------------------------------------------------ |
@@ -22,3 +24,28 @@ Vagrant doesn't have a `down`, `restart`, `start` or `stop` commands natively bu
 | restart | [reload](https://www.vagrantup.com/docs/cli/reload.html)   | [restart](https://docs.docker.com/compose/reference/restart/) |
 | stop    | [halt](https://www.vagrantup.com/docs/cli/halt.html)       | [stop](https://docs.docker.com/compose/reference/stop/)      |
 
+## Installation
+
+### oh-my-zsh
+
+1. Clone this repository in `$ZSH_CUSTOM/plugins/appup`:
+
+   ```bash
+   git clone https://github.com/Cloudstek/zsh-plugin-appup.git "$ZSH_CUSTOM/plugins/appup"
+   ```
+2. Edit `~/.zshrc` and add `appup` to the list of plugins
+
+### Plain ZSH
+
+1. Clone this repository somewhere
+
+2. Edit your `~/.zshrc` and add this line near the bottom of the file:
+
+   ```bash
+   source path/to/the/repository/appup.plugin.zsh
+   ```
+
+## Updating
+
+1. Go to the directory where you cloned the plugin repository
+2. Run `git pull origin master`

appup.plugin.zsh

@@ -16,17 +16,38 @@ _appup_docker () {
             fi
         fi
 
+        # Check YAML extension
+        compose_file=''
+        compose_project_file=''
+        
+        if [ -e "docker-compose.yml" ]; then
+            compose_file='docker-compose.yml'
+        elif [ -e "docker-compose.yaml" ]; then
+            compose_file='docker-compose.yaml'
+        fi
+        
         # <cmd> <project name> will look for docker-compose.<project name>.yml
-        if [ -n "$2" -a -e "docker-compose.$2.yml" ]; then
-            project=$(source ".env.$2"; echo $COMPOSE_PROJECT_NAME)
+        if [ -n "$2" ]; then
+            if [ -e "docker-compose.$2.yml" ]; then
+                compose_project_file="docker-compose.$2.yml"
+            elif [ -e "docker-compose.$2.yaml" ]; then
+                compose_project_file="docker-compose.$2.yaml"
+            fi
+            
+            if [ -n "$compose_project_file" ]; then 
+                # Override project name from custom env
+                if [ -e ".env.$2" ]; then
+                    project=$(source ".env.$2"; echo $COMPOSE_PROJECT_NAME)
 
-            if [ -n $project ]; then
-                docker-compose -p "${project}" -f docker-compose.yml -f "docker-compose.${2}.yml" $1 "${@:3}"
+                    if [ -n $project ]; then
+                        docker-compose -p "${project}" -f "$compose_file" -f "$compose_project_file" $1 "${@:3}"
+                        return
+                    fi
+                fi
+
+                docker-compose -f "$compose_file" -f "$compose_project_file" $1 "${@:3}"
                 return
             fi
-
-            docker-compose -f docker-compose.yml -f "docker-compose.${2}.yml" $1 "${@:3}"
-            return
         fi
 
         docker-compose $1 "${@:2}"
@@ -45,7 +66,7 @@ _appup_vagrant () {
 }
 
 up () {
-    if [ -e "docker-compose.yml" ]; then
+    if [ -e "docker-compose.yml" ] || [ -e "docker-compose.yaml" ]; then
         _appup_docker up "$@"
     elif [ -e "Vagrantfile" ]; then
         _appup_vagrant up "$@"
@@ -55,7 +76,7 @@ up () {
 }
 
 down () {
-    if [ -e "docker-compose.yml" ]; then
+    if [ -e "docker-compose.yml" ] || [ -e "docker-compose.yaml" ]; then
         _appup_docker down "$@"
     elif [ -e "Vagrantfile" ]; then
         _appup_vagrant destroy "$@"
@@ -65,7 +86,7 @@ down () {
 }
 
 start () {
-    if [ -e "docker-compose.yml" ]; then
+    if [ -e "docker-compose.yml" ] || [ -e "docker-compose.yaml" ]; then
         _appup_docker start "$@"
     elif [ -e "Vagrantfile" ]; then
         _appup_vagrant up "$@"
@@ -75,7 +96,7 @@ start () {
 }
 
 restart () {
-    if [ -e "docker-compose.yml" ]; then
+    if [ -e "docker-compose.yml" ] || [ -e "docker-compose.yaml" ]; then
         _appup_docker restart "$@"
     elif [ -e "Vagrantfile" ]; then
         _appup_vagrant reload "$@"
@@ -85,7 +106,7 @@ restart () {
 }
 
 stop () {
-    if [ -e "docker-compose.yml" ]; then
+    if [ -e "docker-compose.yml" ] || [ -e "docker-compose.yaml" ]; then
         _appup_docker stop "$@"
     elif [ -e "Vagrantfile" ]; then
         _appup_vagrant halt "$@"

tests/_output/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/_support/bin/docker-compose

@@ -0,0 +1,3 @@
+#!/usr/bin/env zsh
+
+echo docker-compose "$@"

tests/_support/bin/vagrant

@@ -0,0 +1,3 @@
+#!/usr/bin/env zsh
+
+echo vagrant "$@"

tests/_support/bootstrap

@@ -0,0 +1,17 @@
+#!/usr/bin/env zsh
+
+if [ -z "$TERM" ]; then
+  export TERM=xterm
+fi
+
+export APPUP_TMP=/tmp/appup_test
+export PATH="${PWD}/tests/_support/bin:${PATH}"
+
+_tmp_setup () {
+    rm -Rf $APPUP_TMP
+    mkdir $APPUP_TMP
+}
+
+_tmp_teardown () {
+    rm -Rf $APPUP_TMP
+}

tests/_support/docker.zsh

@@ -0,0 +1,30 @@
+#!/usr/bin/env zsh
+
+_setup_simple_env () {
+    ext='yml'
+    if [ -n "$1" ]; then
+        ext=$1
+    fi
+    
+    cd $APPUP_TMP
+    
+    touch docker-compose.$ext
+}
+
+_setup_project_env () {
+    project=$1
+    
+    if [ -z "$1" ]; then
+        >&2 echo "Empty project name."
+        exit 2
+    fi
+    
+    ext='yml'
+    if [ -n "$2" ]; then
+        ext=$2
+    fi
+    
+    cd $APPUP_TMP
+    
+    touch {docker-compose,docker-compose.$project}.$ext
+}

tests/_support/vagrant.zsh

@@ -0,0 +1,7 @@
+#!/usr/bin/env zsh
+
+_setup_simple_env () {
+    cd $APPUP_TMP
+    
+    touch Vagrantfile
+}