Skip to content

Commit

Permalink
Remove serverauditor mentions
Browse files Browse the repository at this point in the history
  • Loading branch information
EvgeneOskin committed Dec 8, 2016
1 parent 4657128 commit f57405f
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 25 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ termius sync ssh
## License


Please see [LICENSE](https://github.com/Crystalnix/serverauditor-sshconfig/blob/master/LICENSE).
Please see [LICENSE](https://github.com/Crystalnix/termius-cli/blob/master/LICENSE).


## Notes
Expand Down
3 changes: 0 additions & 3 deletions bin/serverauditor

This file was deleted.

2 changes: 1 addition & 1 deletion bootstrap.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
tar_url='https://github.com/Crystalnix/serverauditor-sshconfig/archive/master.zip'
tar_url='https://github.com/Crystalnix/termius-cli/archive/master.zip'

command_exists() {
command -v "$@" > /dev/null 2>&1
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cli:
build: .
environment:
SERVERAUDITOR_USERNAME:
SERVERAUDITOR_PASSWORD:
TERMIUS_USERNAME:
TERMIUS_PASSWORD:
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def get_long_description():
license='BSD',
author='Crystalnix',
author_email='[email protected]',
url='https://github.com/Crystalnix/serverauditor-sshconfig',
url='https://github.com/Crystalnix/termius-cli',
description='Termius ssh-config utility.',
long_description=get_long_description(),
keywords=['termius', 'crystalnix'],
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/fullclean.bats
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ load test_helper

@test "fullclean logged in" {
login_termius
termius pull -p $SERVERAUDITOR_PASSWORD
termius pull -p $TERMIUS_PASSWORD

run termius fullclean -p $SERVERAUDITOR_PASSWORD
run termius fullclean -p $TERMIUS_PASSWORD
[ "$status" -eq 0 ]
assert_clear_storage
}
Expand Down
16 changes: 8 additions & 8 deletions tests/integration/login.bats
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@ load test_helper
}

@test "log into tester account" {
if [ "$SERVERAUDITOR_USERNAME" == '' ] || [ "$SERVERAUDITOR_PASSWORD" == '' ];then
skip '$SERVERAUDITOR_USERNAME or $SERVERAUDITOR_PASSWORD are not set!'
if [ "$TERMIUS_USERNAME" == '' ] || [ "$TERMIUS_PASSWORD" == '' ];then
skip '$TERMIUS_USERNAME or $TERMIUS_PASSWORD are not set!'
fi
rm ~/.termius/config || true

run termius login --username $SERVERAUDITOR_USERNAME -p $SERVERAUDITOR_PASSWORD
run termius login --username $TERMIUS_USERNAME -p $TERMIUS_PASSWORD
[ "$status" -eq 0 ]
! [ -z "$(cat ~/.termius/config)" ]
}

@test "Change tester account" {
if [ "$SERVERAUDITOR_USERNAME" == '' ] || [ "$SERVERAUDITOR_PASSWORD" == '' ] ||
[ "$SERVERAUDITOR_USERNAME_2" == '' ] || [ "$SERVERAUDITOR_PASSWORD_2" == '' ] ;then
skip '$SERVERAUDITOR_USERNAME or $SERVERAUDITOR_PASSWORD or $SERVERAUDITOR_USERNAME_2 or $SERVERAUDITOR_PASSWORD_2 are not set!'
if [ "$TERMIUS_USERNAME" == '' ] || [ "$TERMIUS_PASSWORD" == '' ] ||
[ "$TERMIUS_USERNAME_2" == '' ] || [ "$TERMIUS_PASSWORD_2" == '' ] ;then
skip '$TERMIUS_USERNAME or $TERMIUS_PASSWORD or $TERMIUS_USERNAME_2 or $TERMIUS_PASSWORD_2 are not set!'
fi
rm ~/.termius/config || true

termius login --username $SERVERAUDITOR_USERNAME -p $SERVERAUDITOR_PASSWORD
termius login --username $TERMIUS_USERNAME -p $TERMIUS_PASSWORD
populate_storage
run termius login --username $SERVERAUDITOR_USERNAME_2 -p $SERVERAUDITOR_PASSWORD_2
run termius login --username $TERMIUS_USERNAME_2 -p $TERMIUS_PASSWORD_2
[ "$status" -eq 0 ]
! [ -z "$(cat ~/.termius/config)" ]
assert_clear_storage
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/pull.bats
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ setup() {
@test "pull logged in" {
login_termius

run termius pull -p $SERVERAUDITOR_PASSWORD
run termius pull -p $TERMIUS_PASSWORD
[ "$status" -eq 0 ]
}

Expand Down
4 changes: 2 additions & 2 deletions tests/integration/push.bats
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ setup() {
@test "push logged in" {
login_termius

termius pull -p $SERVERAUDITOR_PASSWORD
run termius push -p $SERVERAUDITOR_PASSWORD
termius pull -p $TERMIUS_PASSWORD
run termius push -p $TERMIUS_PASSWORD
[ "$status" -eq 0 ]
}

Expand Down
8 changes: 4 additions & 4 deletions tests/integration/test_helper.bash
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
login_termius () {
if [ "$SERVERAUDITOR_USERNAME" == '' ] || [ "$SERVERAUDITOR_PASSWORD" == '' ];then
skip '$SERVERAUDITOR_USERNAME and $SERVERAUDITOR_PASSWORD are not set!'
if [ "$TERMIUS_USERNAME" == '' ] || [ "$TERMIUS_PASSWORD" == '' ];then
skip '$TERMIUS_USERNAME and $TERMIUS_PASSWORD are not set!'
fi

termius login --username $SERVERAUDITOR_USERNAME -p $SERVERAUDITOR_PASSWORD
termius login --username $TERMIUS_USERNAME -p $TERMIUS_PASSWORD
}

pull_termius() {
login_termius

termius pull -p $SERVERAUDITOR_PASSWORD
termius pull -p $TERMIUS_PASSWORD

}

Expand Down

0 comments on commit f57405f

Please sign in to comment.