From 6aec0c9e094cc562f2a8923dfb1fcf6af2baf952 Mon Sep 17 00:00:00 2001 From: Fabian Furger Date: Sun, 3 May 2015 20:11:56 +0100 Subject: [PATCH 1/5] Added handling of "-h" parameter --- bin/git-stats | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/git-stats b/bin/git-stats index 686c03f..d6d2138 100755 --- a/bin/git-stats +++ b/bin/git-stats @@ -28,6 +28,7 @@ switch (process.argv[2]) { }); break; case "--help": + case "-h": console.log(Fs.readFileSync(__dirname + "/docs/help", "utf-8")); break; case "-v": From 3a899b3184e0e88fd726238d6b803ffb8e03d2bf Mon Sep 17 00:00:00 2001 From: Fabian Furger Date: Sun, 3 May 2015 20:12:37 +0100 Subject: [PATCH 2/5] Removed unnecessary try/catch --- bin/git-stats | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/bin/git-stats b/bin/git-stats index d6d2138..9e4d12b 100755 --- a/bin/git-stats +++ b/bin/git-stats @@ -18,11 +18,8 @@ Moment.suppressDeprecationWarnings = true; switch (process.argv[2]) { case "--record": var data = process.argv[3].replace(/^\"|\"$/g, ""); - try { - data = JSON.parse(data); - } catch (e) { - throw e; - } + data = JSON.parse(data); + GitStats.record(data, function (err) { if (err) { return Logger.log(err, "error"); } }); From 4d1de322fa7e4963f86d7b35cbdacef56889a6d0 Mon Sep 17 00:00:00 2001 From: Fabian Furger Date: Sun, 3 May 2015 20:26:26 +0100 Subject: [PATCH 3/5] Changed handling of parameters (allowing any order) --- bin/git-stats | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/bin/git-stats b/bin/git-stats index 9e4d12b..06e73b5 100755 --- a/bin/git-stats +++ b/bin/git-stats @@ -32,19 +32,33 @@ switch (process.argv[2]) { console.log(require("../package.json").version); break; default: - var options = {}; + var options = { + theme: "DARK" + }, + parameter, + i; - if (process.argv.length !== 2) { - if (process.argv[2]) { - options.start = Moment(process.argv[2]); - - } - - if (process.argv[3]) { - options.end = Moment(process.argv[3]); + // iterate over all parameters and assign them in options object + for (i = 2; i < process.argv.length; i++) { + parameter = process.argv[i]; + // does the parameter represent a date? + if (Moment(parameter).isValid()) { + // the date is end date if start date is set + if (options.start) { + options.end = Moment(parameter); + } else { + options.start = Moment(parameter); + } + } else if (parameter == "--light") { + // change theme + options.theme = "LIGHT"; + } else if (parameter == "--no-ansi") { + // request no-ansi + options.noansi = true; } } + if (!options.start || !options.start.isValid()) { options.start = Moment().subtract(1, "years"); } @@ -55,9 +69,10 @@ switch (process.argv[2]) { GitStats.ansiCalendar(options, function (err, data) { if (err) { return Logger.log(err, "error"); } + data = AnsiParser.removeAnsi(data); - if (process.argv.indexOf("--no-ansi") === -1) { - data = GitStatsColors(data, process.argv.indexOf("--light") !== -1 ? "LIGHT": "DARK"); + if (!options.noansi) { + data = GitStatsColors(data, options.theme); } console.log(err || data); From 4662a6902e7846c63eda2a7de0dae36bbcd6afb6 Mon Sep 17 00:00:00 2001 From: Fabian Furger Date: Mon, 4 May 2015 09:45:01 +0100 Subject: [PATCH 4/5] Changed to comma style --- bin/git-stats | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/git-stats b/bin/git-stats index 06e73b5..9c386f0 100755 --- a/bin/git-stats +++ b/bin/git-stats @@ -34,9 +34,10 @@ switch (process.argv[2]) { default: var options = { theme: "DARK" - }, - parameter, - i; + } + , parameter + , i + ; // iterate over all parameters and assign them in options object for (i = 2; i < process.argv.length; i++) { From 049b8b75d8c004a130344470a89f0a5067d13884 Mon Sep 17 00:00:00 2001 From: Fabian Furger Date: Mon, 4 May 2015 09:56:55 +0100 Subject: [PATCH 5/5] Added myself to contributors --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dcbdeb1..b3a0f94 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "author": "Ionică Bizău ", "contributors": [ "Gnab ", - "William Boman " + "William Boman ", + "Fabian Furger " ], "license": "MIT", "devDependencies": {}, @@ -38,4 +39,4 @@ "moment": "^2.9.0", "ul": "^1.1.0" } -} \ No newline at end of file +}