Fix wrong should work until time on break time (#253)

* Fix wrong should work until time on break time

Fixes #229

* Update dependencies

* Remove os-homedir as it's deprecated and built into node

* Update github handle

* Update readme for binary file setup

Author: albacoretuna

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Omid Hezaveh
+Copyright (c) 2017-2020 Nick Okapi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -3,7 +3,7 @@
 A command line tool for tracking work hours, as simple as it can get.
 
 [![Backers on Open Collective](https://opencollective.com/moro/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/moro/sponsors/badge.svg)](#sponsors)  [![Downloads](https://img.shields.io/npm/dt/moro.svg)](https://npmjs.org/moro)
-[![Greenkeeper badge](https://badges.greenkeeper.io/omidfi/moro.svg)](https://greenkeeper.io/) 
+[![Greenkeeper badge](https://badges.greenkeeper.io/albacoretuna/moro.svg)](https://greenkeeper.io/) 
 [![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors)
 
 ## Demo
@@ -13,18 +13,30 @@ A command line tool for tracking work hours, as simple as it can get.
 ## Install
 
 ### If you have node and npm
+
+You need node version 10 or higher (we haven't tested lower versions)
+
+To install just type this into command line:
+
 ```bash
 npm install -g moro
 
-# yarn works too
+# or if you are using yarn, it works too
 yarn global add  moro
 ```
-You need node version 10 or higher (we haven't tested lower versions)
 
-### No node on your machine?
+You are done installing Moro!
 
-You can download the executable files from [releases page](https://github.com/omidfi/moro/releases) for Linux, Mac and Windows.
+### (alternative install method) Download the compiled binary file
+We recommend installing moro using npm but if you don't have node and npm on your machine, you can download the executable files from [releases page](https://github.com/albacoretuna/moro/releases) for Linux, Mac and Windows.
+
+Remember to copy ./lib/config.json to your home directory and rename it to
+
+```
+~/.moro-config.json
+```
 
+Then you can copy the downloaded executable file to your path, for example to /bin and start using moro just like the nomral installation. 
 
 
 ## Update
@@ -48,7 +60,7 @@ To see the full report of previous days run `moro report --all`.
 Those two steps above should be all you need to know about Moro, but there are 3 ways to learn more:
 
   * `$: moro --help`
-  * See the documentation: [link](https://github.com/omidfi/moro/blob/master/DOCUMENTATION.md)
+  * See the documentation: [link](https://github.com/albacoretuna/moro/blob/master/DOCUMENTATION.md)
   * Or check this screen recording: [link](https://asciinema.org/a/106792)
 
 ## Frequently Asked Questions (FAQ)
@@ -93,9 +105,9 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 <!-- prettier-ignore -->
-| [<img src="https://avatars2.githubusercontent.com/u/7697632?v=3" width="100px;"/><br /><sub><b>Nick Okapi</b></sub>](http://omid.fi)<br />[💬](#question-omidfi "Answering Questions") [🐛](https://github.com/omidfi/moro/issues?q=author%3Aomidfi "Bug reports") [💻](https://github.com/omidfi/moro/commits?author=omidfi "Code") [📖](https://github.com/omidfi/moro/commits?author=omidfi "Documentation") [👀](#review-omidfi "Reviewed Pull Requests") [⚠️](https://github.com/omidfi/moro/commits?author=omidfi "Tests") | [<img src="https://avatars2.githubusercontent.com/u/4089975?v=3" width="100px;"/><br /><sub><b>Mario</b></sub>](https://github.com/mario-s)<br />[💻](https://github.com/omidfi/moro/commits?author=mario-s "Code") [📖](https://github.com/omidfi/moro/commits?author=mario-s "Documentation") [⚠️](https://github.com/omidfi/moro/commits?author=mario-s "Tests") | [<img src="https://avatars2.githubusercontent.com/u/2211050?v=3" width="100px;"/><br /><sub><b>Karl Fleischmann</b></sub>](https://twitter.com/fleischie28)<br />[💻](https://github.com/omidfi/moro/commits?author=fleischie "Code") [📖](https://github.com/omidfi/moro/commits?author=fleischie "Documentation") [⚠️](https://github.com/omidfi/moro/commits?author=fleischie "Tests") | [<img src="https://avatars0.githubusercontent.com/u/12087554?v=3" width="100px;"/><br /><sub><b>Niloofar Motamed</b></sub>](https://niloofarmotamed.com)<br />[📖](https://github.com/omidfi/moro/commits?author=niloomotita "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/5592940?v=3" width="100px;"/><br /><sub><b>Wolf-Rost</b></sub>](https://github.com/Wolf-Rost)<br />[📖](https://github.com/omidfi/moro/commits?author=Wolf-Rost "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/2776719?v=3" width="100px;"/><br /><sub><b>Henri Koski</b></sub>](https://github.com/heppu)<br />[📖](https://github.com/omidfi/moro/commits?author=heppu "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/6113341?v=3" width="100px;"/><br /><sub><b>Olavi Haapala</b></sub>](https://twitter.com/0lpeh)<br />[📖](https://github.com/omidfi/moro/commits?author=olpeh "Documentation") [🐛](https://github.com/omidfi/moro/issues?q=author%3Aolpeh "Bug reports") |
+| [<img src="https://avatars2.githubusercontent.com/u/7697632?v=3" width="100px;"/><br /><sub><b>Nick Okapi</b></sub>](http://omid.fi)<br />[💬](#question-albacoretuna "Answering Questions") [🐛](https://github.com/albacoretuna/moro/issues?q=author%3Aalbacoretuna "Bug reports") [💻](https://github.com/albacoretuna/moro/commits?author=albacoretuna "Code") [📖](https://github.com/albacoretuna/moro/commits?author=albacoretuna "Documentation") [👀](#review-albacoretuna "Reviewed Pull Requests") [⚠️](https://github.com/albacoretuna/moro/commits?author=albacoretuna "Tests") | [<img src="https://avatars2.githubusercontent.com/u/4089975?v=3" width="100px;"/><br /><sub><b>Mario</b></sub>](https://github.com/mario-s)<br />[💻](https://github.com/albacoretuna/moro/commits?author=mario-s "Code") [📖](https://github.com/albacoretuna/moro/commits?author=mario-s "Documentation") [⚠️](https://github.com/albacoretuna/moro/commits?author=mario-s "Tests") | [<img src="https://avatars2.githubusercontent.com/u/2211050?v=3" width="100px;"/><br /><sub><b>Karl Fleischmann</b></sub>](https://twitter.com/fleischie28)<br />[💻](https://github.com/albacoretuna/moro/commits?author=fleischie "Code") [📖](https://github.com/albacoretuna/moro/commits?author=fleischie "Documentation") [⚠️](https://github.com/albacoretuna/moro/commits?author=fleischie "Tests") | [<img src="https://avatars0.githubusercontent.com/u/12087554?v=3" width="100px;"/><br /><sub><b>Niloofar Motamed</b></sub>](https://niloofarmotamed.com)<br />[📖](https://github.com/albacoretuna/moro/commits?author=niloomotita "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/5592940?v=3" width="100px;"/><br /><sub><b>Wolf-Rost</b></sub>](https://github.com/Wolf-Rost)<br />[📖](https://github.com/albacoretuna/moro/commits?author=Wolf-Rost "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/2776719?v=3" width="100px;"/><br /><sub><b>Henri Koski</b></sub>](https://github.com/heppu)<br />[📖](https://github.com/albacoretuna/moro/commits?author=heppu "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/6113341?v=3" width="100px;"/><br /><sub><b>Olavi Haapala</b></sub>](https://twitter.com/0lpeh)<br />[📖](https://github.com/albacoretuna/moro/commits?author=olpeh "Documentation") [🐛](https://github.com/albacoretuna/moro/issues?q=author%3Aolpeh "Bug reports") |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars1.githubusercontent.com/u/15911342?v=4" width="100px;"/><br /><sub><b>Walid Mani</b></sub>](https://github.com/Flouss)<br />[💻](https://github.com/omidfi/moro/commits?author=Flouss "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/15911342?v=4" width="100px;"/><br /><sub><b>Walid Mani</b></sub>](https://github.com/Flouss)<br />[💻](https://github.com/albacoretuna/moro/commits?author=Flouss "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

lib/commands.js

@@ -116,7 +116,7 @@ const report = (args, options, logger, date) => {
               console.log(table)
 
               if (!data.end) {
-                helpers.shouldWorkUntil(data.start, config)
+                helpers.shouldWorkUntil(data.start, config, data.breakDuration)
               }
 
               spinnerInfo(spinner, constants.TEXT.helpTip)

lib/utils/configManager.js

@@ -3,7 +3,7 @@
 // packages and natives
 const path = require('path')
 const jsonfile = require('jsonfile')
-const osHomedir = require('os-homedir')
+const osHomedir = require('os').homedir()
 const Promise = require('bluebird')
 const fs = require('fs-extra')
 
@@ -23,7 +23,7 @@ let configFile
 
 const initConfigFile = () => {
   const CONFIG_FILE_DEFAULT = path.join(__dirname, '..', 'config.json')
-  const CONFIG_FILE_LOCAL = path.join(osHomedir(), '.moro-config.json')
+  const CONFIG_FILE_LOCAL = path.join(osHomedir, '.moro-config.json')
   if (!fs.existsSync(CONFIG_FILE_LOCAL)) {
     fs.copySync(CONFIG_FILE_DEFAULT, CONFIG_FILE_LOCAL)
   }
@@ -45,7 +45,7 @@ const logTestMode = isTestMode => {
 const getDBFilePath = () => {
   initConfigFile()
   const configPath = jsonfile.readFileSync(configFile).DB_FILE_MAIN
-  const defaultPath = path.join(osHomedir(), constants.DB_FILE_MAIN)
+  const defaultPath = path.join(osHomedir, constants.DB_FILE_MAIN)
 
   // test mode
   if (isTestMode) {

lib/utils/helpers.js

@@ -48,10 +48,11 @@ const calculateWorkHours = (start, end, pause) => {
 }
 
 // to tell users when they can go home!
-const shouldWorkUntil = (start, CONFIG) => {
+const shouldWorkUntil = (start, CONFIG, breakDuration) => {
   const goHomeTime = composeDateObject(start)
     .add({ hour: CONFIG.HOURS_IN_A_WORK_DAY })
-    .add({ minutes: CONFIG.BREAK_DEFAULT })
+    // if user has added a total break duration for today, consider that, otherwise just use the default duration
+    .add({ minutes: breakDuration || CONFIG.BREAK_DEFAULT })
     .format('HH:mm')
   // FIXME this can be moved to utils/spinner.js as well
   // for CI