Merge pull request #145 from JrGoodle/scripts

Scripts to rule them all

.travis.yml

@@ -9,23 +9,18 @@ dist: trusty
 
 env:
   matrix:
-    - TARGET="test_cats_example"
-    - TARGET="test_llvm_example"
+    - TARGET="cats"
+    - TARGET="llvm"
 
-before_install:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update; fi
+before_install: script/bootstrap
 
-install:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install python3; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install github-release; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -y python3-setuptools; fi
+install: if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install github-release; fi
 
-before_script: sudo python3 setup.py install
+before_script: script/setup
 
-script: scripts/${TARGET}.sh
+script: script/test ${TARGET}
 
-after_success: if [ "$TRAVIS_OS_NAME" = "osx" ]; then scripts/deploy.sh; fi
+after_success: if [ "$TRAVIS_OS_NAME" = "osx" ]; then script/deploy; fi
 
 branches:
   only: # whitelist

README.md

@@ -38,7 +38,7 @@ $ brew install python3
 To install from the [GitHub Releases](https://github.com/JrGoodle/clowder/releases) open a terminal and run:
 
 ```bash
-$ pip3 install https://github.com/JrGoodle/clowder/releases/download/1.1.0/clowder-1.1.0-py3-none-any.whl
+$ pip3 install https://github.com/JrGoodle/clowder/releases/download/1.1.1/clowder-1.1.1-py3-none-any.whl
 ```
 
 For terminal autocompletion, add the following to your shell profile:

clowder/cmd.py

@@ -65,7 +65,7 @@ def __init__(self):
         self.args = parser.parse_args()
 
         if self.args.clowder_version:
-            print('clowder version 1.1.0')
+            print('clowder version 1.1.1')
             sys.exit(0)
         print('')
         if self.args.command is None or not hasattr(self, self.args.command):

scripts/README.md → script/README.md

@@ -1,4 +1,4 @@
-# Test Scripts
+# Scripts
 
 ## `test_cats_example.sh`
 

script/bootstrap

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+case "$(uname)" in
+    Linux) export MY_PLATFORM="linux";
+        sudo apt-get update
+        sudo apt-get install -y python3-setuptools
+        ;;
+    Darwin) export MY_PLATFORM="osx";
+        which brew || exit 1
+        brew update
+        brew install python3
+        ;;
+    CYGWIN*) export MY_PLATFORM="windows";
+        ;;
+esac
+
+echo $MY_PLATFORM

uninstall.sh → script/clean

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 cd "$( dirname "${BASH_SOURCE[0]}" )" || exit 1
+
 sudo -H rm -rf clowder.egg-info
 sudo -H rm -rf dist
 sudo -H rm -rf build

scripts/deploy.sh → script/deploy

@@ -2,7 +2,7 @@
 
 cd "$( dirname "${BASH_SOURCE[0]}" )" || exit 1
 
-echo "deploy.sh"
+echo "deploy"
 
 if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
   echo "This is a pull request. No deployment will be done."

script/setup

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+cd "$( dirname "${BASH_SOURCE[0]}" )/.." || exit 1
+sudo python3 setup.py install

script/test

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+cd "$( dirname "${BASH_SOURCE[0]}" )" || exit 1
+
+if [ $1 == "cats" ]; then
+    ./test_cats_example.sh
+elif [ $1 == "llvm" ]; then
+    ./test_llvm_example.sh
+fi

install.sh → script/update

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
 
 cd "$( dirname "${BASH_SOURCE[0]}" )" || exit 1
-sudo python3 setup.py install
+
+./clean
+./setup

update_version.sh → script/update_version

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-cd "$( dirname "${BASH_SOURCE[0]}" )" || exit 1
+cd "$( dirname "${BASH_SOURCE[0]}" )/.." || exit 1
 
 OLD_VERSION=$1
 NEW_VERSION=$2

setup.py

@@ -13,7 +13,7 @@
 setup(
     name='clowder',
     description='A tool for managing code',
-    version='1.1.0',
+    version='1.1.1',
     url='http://clowder.cat',
     author='joe DeCapo',
     author_email='joe@polka.cat',