replaced git-standup with gitlog #18

mojoaxel · 2017-04-18T21:16:04Z

I replaced git-standup with gitlog.
This should solve issues #11 and #14 🎉
This is an alternative to #8.

mojoaxel · 2017-04-18T21:44:32Z

This should also fix #17

madve2 · 2017-04-19T13:47:00Z

The nice thing about this is that it also works on Windows! Yay, thank you!

notwaldorf · 2017-04-19T17:31:23Z

package.json

@@ -4,6 +4,9 @@
  "description": "A terminal that tries to take care of you 💖",
  "main": "care.js",
  "author": "Monica Dinculescu <[email protected]>",
+  "contributors": [


I haven't been doing this for anyone else who has been sending PRs, so I'm inclined to just have the GitHub contributors reflect this. WDYT?

No problem at all! Let's keep the package.json slim 😉

notwaldorf · 2017-04-19T17:32:29Z

I tried running your patch locally, but I get:

Error: Repo location does not exist
    at gitlog (/Users/noms/Code/tiny-terminal-code/node_modules/gitlog/index.js:59:11)
    at async.each (/Users/noms/Code/tiny-terminal-code/care.js:124:5)
    at /Users/noms/Code/tiny-terminal-code/node_modules/async/dist/async.js:3047:16

notwaldorf · 2017-04-19T17:34:37Z

Ohhh I see. So the advantage of git-standup is that you can just pass a directory that contains a bunch of other repos (like ~/Code contains all my projects), and it would just crawl through them. With this approach, it looks like I have to list every repo? I have about 140, so I don't think that would work 😂

mojoaxel · 2017-04-19T17:43:04Z

With this approach, it looks like I have to list every repo? I have about 140, so I don't think that would work

Good, point! I see if I can improve further... 🤘

mojoaxel · 2017-04-20T07:43:26Z

@notwaldorf I introduced a new env var TTC_REPOS_DEPTH to define the max directory-depth.

mojoaxel · 2017-04-20T07:45:24Z

package.json

    "parrotsay-api": "^0.1.1",
    "scraperjs": "^1.2.0",
+    "subdirs": "github:mojoaxel/subdirs",


This is not perfect. I'm waiting for jarofghosts/subdirs#2 to get merged and published...

mojoaxel · 2017-04-21T07:59:56Z

@notwaldorf Ok, I now also updated the README and introduced some error handling ✨.

Now you have to decide if you want to get rid of the script-based git-standup solutions in favor of this pure-js implementation. If you want to stick with git-standup that's also OK with me, just close this PR than (no hard feelings).

madve2 · 2017-04-21T11:05:07Z

I really hope this will be the solution going forward, because the git-standup script version will never work on Windows.

Garbee · 2017-04-21T11:38:56Z

If Windows support with the helper script is needed that is certainly simple enough to be ported into a Windows script that can be executed based on the environment. No need to convert the entire subsystem over just for that.

madve2 · 2017-04-21T12:07:00Z

Are you sure about that? Replacing a dependency with a similar one (e.g. git-standup => gitlog) is hardly "convert[ing] the entire subsystem", and there are clear benefits in having a platform-independent, pure JS solution over having platform specific scripts written for different environments. (That's the whole point of node.js after all.) Yes, PowerShell is perfectly capable of what the current shell script is doing, but is a ps1 script really worth writing and maintaining? Especially considering the burden of having to update and test both scripts from now on for the rest of the project's lifetime, which won't be easy as it will require testing on at least two different operating systems.

Garbee · 2017-04-21T12:26:16Z

I never said it was a bad change, I simply was stating if Windows support is desired then this effort of changing the way the git logs are retrieved (the subsystem) is not entirely required. The script is simple enough to do in a native Windows shell to at least get some initial support until this solution can be more thoroughly looked over. From some experience in the Firefox's new HTML-based Debugger for their DevTools, handling git stuff well and in a compatible way through Node isn't always straightforward. Some care should be taken before rushing into it and then having quirky setups cause issues that need to be solved that otherwise aren't issues.

Garbee · 2017-04-21T12:27:47Z

care.js

+ * and look for repositories.
+ * Calls `callback` with array of repositories.
+ */
+function getGitRepos(repos, depth, callback) {


It looks like PR #36 may land opening up more ES6 usage. It may be good to wait for that to land then refactor these extra functions into isolated modules to keep the main care file smaller.

notwaldorf · 2017-04-26T20:03:19Z

care.js

 var blessed = require('blessed');
 var contrib = require('blessed-contrib');
 var chalk = require('chalk');
 var parrotSay = require('parrotsay-api');
 var bunnySay = require('sign-bunny');
 var weather = require('weather-js');

+console.dir(gitbot);


😱 sorry...gone

notwaldorf · 2017-04-26T20:03:28Z

care.js

@@ -1,15 +1,18 @@
 #!/usr/bin/env node
 var config = require(__dirname + '/config.js');
 var twitterbot = require(__dirname + '/twitterbot.js');
+var gitbot = require(__dirname + '/gitbot.js');


notwaldorf · 2017-04-26T20:04:54Z

care.js

+  }
+
+  gitbot.findGitRepos(config.repos, config.reposDepth-1, (err, allRepos) => {
+    if (err) return showError(err);


return on a new line, please (here and everywhere)

notwaldorf · 2017-04-26T20:06:38Z

care.js

+  }
+
+  function showError(err, box) {
+    getCommits(`😥  ${err}`, box);


Is this bit actually needed? For an error, can't we just do box.content = err?

notwaldorf · 2017-04-26T20:07:17Z

config.js

+  repos: (process.env.TTC_REPOS || '~/Code').split(','),
+
+  // The directory-depth on how to look for git-repos. Use with care!
+  reposDepth: process.env.TTC_REPOS_DEPTH || 1,


this is already called depth, below

sorry...merges and stuff...will fix

mojoaxel · 2017-04-26T20:54:50Z

I'll add the repos to the commits and think about a nice way for the transition!

mojoaxel · 2017-04-27T07:28:03Z

@notwaldorf I added the repo names. I also added a var 'TTC_GITBOT' to switch between git-standup and the node implementation. Both methods seem to work on linux, hopefully also on mac.

mojoaxel · 2017-04-27T07:56:56Z

Interesting: git-standup seems to filter out merge-commits like e.g. this one: Merge branch 'master' into gitlog.
So both implementations do not result in the same commits at the moment. Not sure if that's a bug or a feature 😕

mojoaxel · 2017-04-27T08:29:23Z

Update: I now also filter pure administrative commits like merges (gitlog has a attribute for that).

notwaldorf

I think the gitlog is aces, and works great for me. My only concern is that along with adding gitlog, this PR also changes the current behaviour of git-standup, which means if people don't switch to gitlog they might have new git-standup problems they didn't have this PR, and I'd really like to not have that

notwaldorf · 2017-05-06T09:49:06Z

care.js

+  if (config.gitbot.toLowerCase() === 'gitstandup') {
+    todayBox.content = '';
+    config.repos.forEach(repo => {
+      var today = spawn(`cd ${repo} && git-standup`, [`-m ${config.depth}`, '-d 1'], {shell:true});


uhhhhhh so I'm not 100% sure this works, because git-standup is on the wrong path (and works locally, but doesn't work when installed as a package). Can you just revert this, and leave the old git-standup behaviour, so that this PR just adds gitlog, and not other things? That way it's easier if something goes wrong after this PR :)

notwaldorf · 2017-05-06T09:49:14Z

care.js

+    });
+    weekBox.content = '';
+    config.repos.forEach(repo => {
+      var today = spawn(`cd ${repo} && git-standup`, [`-m ${config.depth}`, '-d 7'], {shell:true});


notwaldorf · 2017-05-06T09:49:52Z

care.js

+  } else {
+    gitbot.findGitRepos(config.repos, config.depth-1, (err, allRepos) => {
+      if (err)
+        return todayBox.content = err;


this won't call screen.render() anywhere, will it?

good point! I'll improve..

notwaldorf · 2017-05-06T09:50:18Z

config.js


  // Directory-depth to look for git repositories.
  depth: (process.env.TTC_REPOS_DEPTH || 1),

+  // Which method is to be used to read the git commits ('gitstandup' | 'gitlog').
+  gitbot: (process.env.TTC_GITBOT || 'gitstandup'),


👍 Awesome!

git-standup is the default settings for now. Let's give the gitlog implementation a try on different platforms, maybe we can remove the whole bash-scripting stuff all together at some point!

notwaldorf · 2017-05-06T09:50:34Z

package.json

    "twit": "^2.2.5",
    "weather-js": "^2.0.0"
  },
-  "peerDependencies": {


pls add this back in

@notwaldorf Wow! You actually reviewed this at #jsconfeu ! 🎉 Thx. I'll try to have a look tonight.

because it just works ;-)

mojoaxel · 2017-05-07T09:26:47Z

@notwaldorf Yo! Check this out! ;-)
(I was a little side-tracked from @fhinkel's talk - hope it works!)

…gitlog

notwaldorf · 2017-05-14T00:24:26Z

Awesome! YAY! Thanks!

mojoaxel · 2017-05-14T15:16:45Z

🎉 🎈 !

KernelDeimos · 2017-05-14T18:20:35Z

I just cloned the latest changes and received a new error :D (sorry, my computer is probably perfectly screwed up for this, lol)

Any idea what might be causing this?

I'm going to add my steps for running in case that changes something:

Add export TTC_GITBOT=gitlog to .profile and source ~/.profile
Clone the repo
cd into repo and run npm install
run npm start

notwaldorf · 2017-05-14T21:17:53Z

@KernelDeimos What's your node version? It seems like it isn't loving the ES6 keywords.

mojoaxel · 2017-05-14T21:17:57Z

Any idea what might be causing this?

Wow! Please update node.js to >= 6.10.3

KernelDeimos · 2017-05-15T00:09:56Z

My bad - I thought Ubuntu's repos would have it at least reasonably up-to-date :/ boy was I wrong

Side note: Apparently I can't upgrade node.js without running some shell script from the Internet as root. I haven't found a single reference online that tells me I can just add something to my sources file... what's up with that?

Garbee · 2017-05-17T14:11:04Z

I haven't found a single reference online that tells me I can just add something to my sources file... what's up with that?

The only stable way to get a newer version without root access is Node Version Manager. It installs node versions into your user folder with your permissions. The os-level update from an external repository will need root access since in those cases you are editing your global software sources list and installing the new version.

Generally running trusted scripts as root isn't a problem. You can always download the script and look it over before running it to see what it is doing. If you don't have root access (which is fairly uncommon, especially on workstation machines) then you'll need to go the NVM route.

replaced git-standup with gitlog

e159030

mojoaxel added 2 commits April 19, 2017 16:17

removed git-standup dependencie

a2f3250

added myself as contributor ;-)

83da292

DanielAndreasen mentioned this pull request Apr 19, 2017

throw er; // Unhanded 'error' event #22

Closed

notwaldorf reviewed Apr 19, 2017

View reviewed changes

DanielAndreasen mentioned this pull request Apr 19, 2017

Terminal doesn't display commits/Problems with git-standup #14

Closed

reverted: added myself as contributor ;-)

8cff4ac

notwaldorf added the ⏳ pending-response What are you waiting for? Christmas? label Apr 19, 2017

komiga mentioned this pull request Apr 20, 2017

Run git-standup directly to avoid platform issues #8

Open

also get gitlogs also from subdirs up to a given depth

ed9f20e

mojoaxel commented Apr 20, 2017

View reviewed changes

mojoaxel and others added 5 commits April 20, 2017 09:50

Merge branch 'master' into gitlog

36cb216

updated README

2146858

updated subdirs release

cf3ecc8

added error handling

f38f9fd

Merge remote-tracking branch 'upstream/master' into gitlog

d349d8d

Garbee reviewed Apr 21, 2017

View reviewed changes

This was referenced Apr 21, 2017

Fix spawn call #42

Closed

Replace standup-helper.sh with javascript solution #45

Closed

notwaldorf requested changes Apr 26, 2017

View reviewed changes

mojoaxel added 2 commits April 26, 2017 22:10

fixed emty commit list

df56ba5

@notwaldorf review comments

6922c43

mojoaxel added 4 commits April 27, 2017 08:47

Merge branch 'master' into gitlog

3eebc08

added repo name to commit history

4bc9a05

do not hide commits while reloading

1aed41b

make it possible to switch between git-standup and gitlog

3f3886d

filter pure administrative commits

294657b

notwaldorf requested changes May 6, 2017

View reviewed changes

mojoaxel and others added 3 commits May 7, 2017 10:20

readded git-stanup as peerDependency

4cf5e21

use existing git-standup implementation

86caaa0

because it just works ;-)

Merge branch 'master' into gitlog

7d6ed23

mojoaxel added 2 commits May 12, 2017 09:57

Merge branch 'master' into gitlog

f945c1e

Merge branch 'gitlog' of github.com:mojoaxel/tiny-care-terminal into …

e1ded0d

…gitlog

notwaldorf approved these changes May 14, 2017

View reviewed changes

notwaldorf merged commit 3ad069c into notwaldorf:master May 14, 2017

mojoaxel deleted the gitlog branch May 14, 2017 15:16

mojoaxel mentioned this pull request May 14, 2017

use node >= 6.10.3 #88

Merged

replaced git-standup with gitlog #18

replaced git-standup with gitlog #18

Conversation

mojoaxel commented Apr 18, 2017 • edited Loading

mojoaxel commented Apr 18, 2017 • edited Loading

madve2 commented Apr 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

notwaldorf commented Apr 19, 2017

notwaldorf commented Apr 19, 2017 • edited Loading

mojoaxel commented Apr 19, 2017 • edited Loading

mojoaxel commented Apr 20, 2017

mojoaxel Apr 20, 2017 • edited Loading

Choose a reason for hiding this comment

mojoaxel commented Apr 21, 2017

madve2 commented Apr 21, 2017

Garbee commented Apr 21, 2017

madve2 commented Apr 21, 2017

Garbee commented Apr 21, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mojoaxel commented Apr 26, 2017

mojoaxel commented Apr 27, 2017 • edited Loading

mojoaxel commented Apr 27, 2017 • edited Loading

mojoaxel commented Apr 27, 2017

notwaldorf left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mojoaxel commented May 7, 2017

notwaldorf commented May 14, 2017

mojoaxel commented May 14, 2017

KernelDeimos commented May 14, 2017 • edited Loading

notwaldorf commented May 14, 2017

mojoaxel commented May 14, 2017 • edited Loading

KernelDeimos commented May 15, 2017 • edited Loading

Garbee commented May 17, 2017

mojoaxel commented Apr 18, 2017 •

edited

Loading

mojoaxel commented Apr 18, 2017 •

edited

Loading

notwaldorf commented Apr 19, 2017 •

edited

Loading

mojoaxel commented Apr 19, 2017 •

edited

Loading

mojoaxel Apr 20, 2017 •

edited

Loading

mojoaxel commented Apr 27, 2017 •

edited

Loading

mojoaxel commented Apr 27, 2017 •

edited

Loading

KernelDeimos commented May 14, 2017 •

edited

Loading

mojoaxel commented May 14, 2017 •

edited

Loading

KernelDeimos commented May 15, 2017 •

edited

Loading