(client) Add dokku git remote when specifying app name

Previously the client would only add the git remote
for you if it was generating a random name for you.
This commit is contained in:
Paul McLanahan
2016-02-24 12:17:23 -05:00
parent a146849a58
commit 1b6973665a
2 changed files with 34 additions and 14 deletions

View File

@@ -68,19 +68,23 @@ if [[ ! -z $DOKKU_HOST ]]; then
esac esac
fi fi
if [[ "$1" = "apps:create" ]] && [[ -z "$2" ]]; then if [[ "$1" = "apps:create" ]]; then
appname=$(random_name) if [[ -z "$2" ]]; then
counter=0 appname=$(random_name)
while ssh "dokku@$DOKKU_HOST" apps 2>/dev/null| grep -q "$appname"; do counter=0
if [[ $counter -ge 100 ]]; then while ssh "dokku@$DOKKU_HOST" apps 2>/dev/null| grep -q "$appname"; do
echo "Error: could not reasonably generate a new app name. try cleaning up some apps..." if [[ $counter -ge 100 ]]; then
ssh "dokku@$DOKKU_HOST" apps echo "Error: could not reasonably generate a new app name. try cleaning up some apps..."
exit 1 ssh "dokku@$DOKKU_HOST" apps
else exit 1
appname=$(random_name) else
counter=$((counter+1)) appname=$(random_name)
fi counter=$((counter+1))
done fi
done
else
appname="$2"
fi
if git remote add dokku "dokku@$DOKKU_HOST:$appname"; then if git remote add dokku "dokku@$DOKKU_HOST:$appname"; then
echo "-----> Dokku remote added at $DOKKU_HOST" echo "-----> Dokku remote added at $DOKKU_HOST"
echo "-----> Application name is $appname" echo "-----> Application name is $appname"

View File

@@ -27,12 +27,28 @@ teardown() {
assert_success assert_success
} }
@test "(client) apps:create AND apps:destroy" { @test "(client) apps:create AND apps:destroy with random name" {
setup_client_repo setup_client_repo
run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:create" run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:create"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
git remote | grep dokku
run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh --force apps:destroy"
echo "output: "$output
echo "status: "$status
assert_success
}
@test "(client) apps:create AND apps:destroy with name" {
setup_client_repo
local test_app_name=test-apps-create-with-name
run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh apps:create $test_app_name"
echo "output: "$output
echo "status: "$status
assert_success
git remote | grep dokku
git remote -v | grep $test_app_name
run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh --force apps:destroy" run bash -c "${BATS_TEST_DIRNAME}/../../contrib/dokku_client.sh --force apps:destroy"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status