Merge pull request #42 from PicoJr/dev

release 2.0.0

Author: PicoJr

.dockerignore

@@ -0,0 +1 @@
+/target

CHANGELOG.md

@@ -5,6 +5,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.0](https://crates.io/crates/rtw/2.0.0) Jul 30, 2020
+
+* Stabilize multiple ongoing activities
+* Stabilize long descriptions
+
+## 2.0.0-rc1 (not released on crates.io) Jul 20, 2020
+
+* Timeline now displays ongoing activities.
+
+## [2.0.0-beta](https://crates.io/crates/rtw/2.0.0-beta) Jul 16, 2020
+
+This version is mostly backward compatible with previous `rtw` data,
+please discard ongoing activities (remove `~/.rtw.json`) before using this version.
+However previous versions of `rtw` will not work on data generated by this version.
+
+* Support multiple ongoing activities.
+* Timeline now supports overlapping activities (experimental).
+* `stop` and `cancel` now have a `--id` optional parameter in order to disambiguate multiple ongoing activities.
+* Add `deny_overlapping` option to `rtw` config.
+* the json containing finished activities now also contains the `rtw` version.
+* add `-d` `--description` option for `start`, `track` and `summary` cf [#40](https://github.com/PicoJr/rtw/issues/40).
+* when provided, descriptions are used when exporting to calendar
+
+## [2.0.0-alpha.1](https://crates.io/crates/rtw/2.0.0-alpha.1) Jul 12, 2020
+
+* bump `htp` to 0.2.1 (fix `next <weekday>`) 
+
+## [2.0.0-alpha](https://crates.io/crates/rtw/2.0.0-alpha) Jul 5, 2020
+
+* Replace `chrono-english` with `htp`.
+* Fix [#37](https://github.com/PicoJr/rtw/issues/37)
+
 ## [1.5.0](https://crates.io/crates/rtw/1.5.0) Jun 21, 2020 
 
 * add `completion <shell>` command.

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "rtw"
-version = "1.5.0"
+version = "2.0.0"
 authors = ["PicoJr <picojr_dev@gmx.com>"]
 edition = "2018"
 repository = "https://github.com/PicoJr/rtw"
@@ -21,12 +21,13 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 dirs = "2.0"
 chrono = { version = "0.4", features = ["serde"] }
-chrono-english = "0.1.4"
+htp = "0.2.1"
 config = "0.10.1"
 ansi_term = "0.12.1"
 term_size = "0.3.2"
-tbl = "1.1.0-alpha"
+tbl = "1.1.0-alpha.1"
 icalendar = "0.9.0"
+itertools = "0.9"
 
 [dev-dependencies]
 tempfile = "3"

Cargo.toml

@@ -32,6 +32,10 @@
       * [Track a finished activity](#track-a-finished-activity)
          * [Track a finished activity with dates](#track-a-finished-activity-with-dates)
          * [Track a finished activity the same day](#track-a-finished-activity-the-same-day)
+      * [Track an activity and provide a long description](#track-an-activity-and-provide-a-long-description)
+      * [For multitasking people](#for-multitasking-people)
+         * [Start (overlapping) activities](#start-overlapping-activities)
+         * [Stop ongoing activity](#stop-ongoing-activity)
 
 <!--te-->
 Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)
@@ -206,8 +210,6 @@ Example output:
 
 ## Display a timeline
 
-:warning: does not work if some activities are overlapping.
-
 ### For the day
 
 ```bash
@@ -342,3 +344,78 @@ Started 2020-03-14T09:00:00
 Ended   2020-03-14T10:00:00
 Total   01:00:00
 ```
+
+## Track an activity and provide a long description
+
+Example:
+
+```
+rtw track 9 - 10 breakfast -d "I ate delicious pancakes"
+rtw summary -d
+```
+
+output:
+```
+breakfast 2020-07-11T09:00:00 2020-07-11T10:00:00 01:00:00
+I ate delicious pancakes
+```
+
+## For multitasking people
+
+Requires `deny_overlapping: false` in `rtw_config.json`
+
+### Start (overlapping) activities
+
+Example:
+
+```
+rtw start work
+rtw start child question -d "answer how fish can breath under water"
+rtw
+```
+
+Output:
+
+```
+./target/debug/rtw                                                                                                                                       PicoJr
+Tracking work
+Total    00:03:03
+Id       0
+Tracking child question
+Total    00:01:25
+Id       1
+```
+
+### Stop ongoing activity
+
+`--id` is only required when ongoing activities > 1.
+
+Example:
+
+```
+rtw stop --id 1
+```
+
+Output:
+
+```                                                                                                                        PicoJr
+Recorded child question
+Started 2020-07-14T10:54:36
+Ended   2020-07-14T10:57:23
+Total   00:02:47
+```
+
+stop the other remaining ongoing activity:
+
+```
+rtw stop
+```
+
+Output:
+
+```
+Recorded work
+Started 2020-07-14T10:52:58
+Ended   2020-07-14T11:00:17
+Total   00:07:18
+```

commands.md

@@ -1,4 +1,5 @@
 {
     "storage_dir_path": "/home/nol",
-    "timeline_colors": [[183,28,28], [26,35,126], [0,77,64], [130,119,23]]
+    "timeline_colors": [[183,28,28], [26,35,126], [0,77,64], [130,119,23]],
+    "deny_overlapping": true
 }

example/rtw_config.json

@@ -4,6 +4,9 @@ RELEASE_DIR="release$(date +%F-%H-%M-%S)"
 
 rustfmt --check src/**/*.rs &&
     cargo test &&
-    cargo build --release &&
+    docker run --rm -it -v "$(pwd)":/home/rust/src ekidd/rust-musl-builder cargo build --release &&
     mkdir -p ${RELEASE_DIR} &&
-    cp -r ./CHANGELOG.md ./commands.md ./shell-completion.md example/ img/ ./README.md ./LICENSE target/release/rtw ${RELEASE_DIR}
+    cp -r ./CHANGELOG.md ./commands.md ./shell-completion.md \
+        example/ img/ ./README.md ./LICENSE ${RELEASE_DIR} &&
+    cp target/x86_64-unknown-linux-musl/release/rtw ${RELEASE_DIR}/rtw-x86_64-unknown-linux-musl
+