Merge branch 'release/1.0.2'1.0.2

5 files changed, 28 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 44f21f8..7fe10bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ tmp/*
 *.sublime-workspace
 public/*
 .sass-cache/
+.cache/
 bower_components/
 node_modules/
 .tox
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ae2403..aa6739d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 This document records all notable changes to Watson. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.0.2 (2015-10-09)
+
+- Fix a bug where the last frame could not be deleted
+- Improve installation instructions
+- Add an explanation to remove all the frames
+
 ## 1.0.1 (2015-09-17)
 
 Fix packaging error with PyPI
diff --git a/README.md b/README.md
index 3e6ad05..c9d8546 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,20 @@ $ pip install td-watson
 
 You might need to run this command as root in order to install Watson globally.
 
+Alternatively, you can choose to install Watson for your user only by running:
+
+```bash
+$ pip install --user td-watson
+```
+
+If after this the `watson` command is not available, you need to add `~/.local/bin/` to your PATH. If your terminal is Bash, you can do this by running:
+
+```bash
+$ echo 'export PATH="$HOME/.local/bin:$PATH"' >> .bashrc  # Add ~/.local/bin/ to your .bashrc PATH
+```
+
+and restarting your terminal session.
+
 ### Development version
 
 The latest development version can be installed using the following commands:
@@ -241,3 +255,8 @@ On Mac, this is `~/Library/Application Support/watson/config`, on Windows this i
 
 If you want to edit your configuration, the best is to use the
 [`config`](#config) command.
+
+### Deleting all your frames
+
+If you want to remove all your frames, you can delete the `frames` file in your
+configuration folder (see above to find its location).
diff --git a/setup.py b/setup.py
index 397f206..c0a5e5b 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ with open('README.md') as f:
 
 setup(
     name='td-watson',
-    version='1.0.1',
+    version='1.0.2',
     packages=['watson'],
     author='TailorDev',
     author_email='contact@tailordev.com',
diff --git a/watson/watson.py b/watson/watson.py
index 6cb41b9..390adb4 100644
--- a/watson/watson.py
+++ b/watson/watson.py
@@ -143,7 +143,7 @@ class Watson(object):
                 with open(self.state_file, 'w+') as f:
                     json.dump(current, f, indent=1)
 
-            if self._frames and self._frames.changed:
+            if self._frames is not None and self._frames.changed:
                 with open(self.frames_file, 'w+') as f:
                     json.dump(self.frames.dump(), f, indent=1)