Skip to content

Commit

Permalink
Merge branch 'release/0.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
arcticicestudio committed Jan 7, 2017
2 parents fbbba49 + 326fb89 commit 12aa507
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -267,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).
Expand Down
6 changes: 3 additions & 3 deletions snowsaw/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion snowsaw/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit 12aa507

Please sign in to comment.