From e29d95e3fb6c6123aecd16c9c1ba7253a3f610b4 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 7 Jan 2017 15:50:48 +0100 Subject: [PATCH 1/3] GHI-#13 Remove unnecessary "cd" command --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index c85a232..21a057e 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,6 @@ SNOWSAW_BIN="bin/snowsaw" SNOWBLOCKS_BASE_DIR_NAME="snowblocks" SNOWBLOCKSDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$SNOWBLOCKS_BASE_DIR_NAME" -cd "${SNOWBLOCKSDIR}" "${SNOWSAW_DIR}/${SNOWSAW_BIN}" -s "${SNOWBLOCKSDIR}" "${@}" ``` The `${@}` allows to additionally specify supported options on the terminal for a dynamic script execution. From 86f2381c6c47c72bdbfe402f98413892e309ed82 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 7 Jan 2017 16:30:26 +0100 Subject: [PATCH 2/3] GHI-#14 Join base snowblocks directory to get the absolute path --- snowsaw/cli.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snowsaw/cli.py b/snowsaw/cli.py index 1596b9f..040465f 100644 --- a/snowsaw/cli.py +++ b/snowsaw/cli.py @@ -83,14 +83,14 @@ def main(): if os.path.isdir(os.path.join(options.snowblocks_directory[0], snowblock))] for snowblock in snowblocks: - if os.path.isfile(os.path.join(snowblock, snowblock_config_filename)): + if os.path.isfile(os.path.join(options.snowblocks_directory[0], snowblock, snowblock_config_filename)): log.info("❄ {}".format(snowblock)) - tasks = read_config(os.path.join(snowblock, snowblock_config_filename)) + tasks = read_config(os.path.join(options.snowblocks_directory[0], snowblock, snowblock_config_filename)) if not isinstance(tasks, list): raise ReadingError("Configuration file must be a list of tasks") - dispatcher = Dispatcher(snowblock) + dispatcher = Dispatcher(os.path.join(options.snowblocks_directory[0], snowblock)) success = dispatcher.dispatch(tasks) if success: log.info("==> All tasks executed successfully\n") From 326fb89de325ec24af653c75f2cd2be6bb21fd94 Mon Sep 17 00:00:00 2001 From: Arctic Ice Studio Date: Sat, 7 Jan 2017 16:45:20 +0100 Subject: [PATCH 3/3] Prepare stable development release version 0.1.1 --- CHANGELOG.md | 7 +++++++ README.md | 4 ++-- snowsaw/setup.py | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ee29b4..4bfb5c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ --- +# 0.1.1 +*2017-01-07* +## Bug Fixes +❯ Removed the unnecessary `cd "${SNOWBLOCKSDIR}"` command in the README example [`bootstrap`](https://github.com/arcticicestudio/snowsaw#create-a-bootstrap-script) script to fix the path error `./bootstrap: line 11: .snowsaw/bin/snowsaw: No such file or directory`. (@arcticicestudio, #13, 850a72b9) + +❯ Fixed a relative path mismatch error when searching for snowblock configuration files although the path must actually be absolute which caused all snowblocks to be skipped since no `snowblock.json` has been found relative to the working directory. (@arcticicestudio, #14, 4455d20f) + # 0.1.0 *2017-01-07* ## Features diff --git a/README.md b/README.md index 21a057e..5fe1251 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ git submodule add https://github.com/arcticicestudio/snowsaw .snowsaw This command will add the snowsaw project at the main development branch `develop`, but it is recommened to use a stable release version by running ```sh cd .snowsaw -git checkout v0.1.0 +git checkout v0.1.1 cd .. ``` and commit the changes in your dotfile repository to lock it on the specified version tag. @@ -266,7 +266,7 @@ Defaults are specified as a dictionary mapping action names to settings, which a ``` ## Development -[![](https://img.shields.io/badge/Changelog-0.1.0-blue.svg)](https://github.com/arcticicestudio/snowsaw/blob/v0.1.0/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver) +[![](https://img.shields.io/badge/Changelog-0.1.1-blue.svg)](https://github.com/arcticicestudio/snowsaw/blob/v0.1.1/CHANGELOG.md) [![](https://img.shields.io/badge/Workflow-gitflow--branching--model-blue.svg)](http://nvie.com/posts/a-successful-git-branching-model) [![](https://img.shields.io/badge/Versioning-ArcVer_0.8.0-blue.svg)](https://github.com/arcticicestudio/arcver) ### Contribution Please report issues/bugs, feature requests and suggestions for improvements to the [issue tracker](https://github.com/arcticicestudio/snowsaw/issues). diff --git a/snowsaw/setup.py b/snowsaw/setup.py index e59c7f3..3985730 100644 --- a/snowsaw/setup.py +++ b/snowsaw/setup.py @@ -2,7 +2,7 @@ setup( name='snowsaw', - version='0.1.0', + version='0.1.1', packages=['', 'util', 'logging'], package_dir={'': 'snowsaw'}, url='https://github.com/arcticicestudio/snowsaw',