Merge pull request #30 from JohnnyEstilles/refactor/get-stream

Simplify Changelog#generate by using `fs-extra` to create stream

package.json

@@ -34,6 +34,7 @@
  "dependencies": {
  "commander": "^2.8.0",
  "debug": "^2.1.3",
+ "fs-extra": "^0.18.4",
  "lodash": "^3.7.0",
  "q": "^1.2.0"
  },

tasks/git_changelog_generate.js

@@ -31,8 +31,6 @@ Changelog.prototype.writeChangelog = require('./lib/write-change-log');
 Changelog.prototype.organizeCommits = require('./lib/organize-commits');
 Changelog.prototype.getPreviousTag = require('./lib/get-previous-tag');
 Changelog.prototype.getRepoUrl = require('./lib/get-repo-url');
-Changelog.prototype.checkPath = require('./lib/check-path');
-Changelog.prototype.getStream = require('./lib/get-stream');
 Changelog.prototype.generate = require('./lib/generate');
 
 Changelog.prototype.log = require('./lib/log');

tasks/lib/generate.js

@@ -2,27 +2,23 @@
 
 var debug = require('debug')('changelog:generate');
 var q = require('q');
-
-function writeChangelogDone(deferred) {
- deferred.resolve(this.options);
-}
-
-function writeCommitsToStream(deferred, commits, stream) {
- this.writeChangelog(stream, commits)
- .then(writeChangelogDone.bind(this, deferred));
-}
+var fse = require('fs-extra');
 
 function generateFromCommits(deferred, commits) {
+ var stream;
+
  this.message('parsed commits', commits.length);
  this.log('Parsed', commits.length, 'commits');
  this.log('Generating changelog to', this.options.file || 'stdout', '(', this.options.version, ')');
 
- this.getStream(this.options.file)
- .then(writeCommitsToStream.bind(this, deferred, commits));
-}
+ if (this.options.file) {
+ stream = fse.createOutputStream(this.options.file);
+ } else {
+ stream = process.stdout;
+ }
 
-function handleReadGitLogError(err) {
- console.log('error', err);
+ this.writeChangelog(stream, commits)
+  .then(deferred.resolve.bind(deferred, this.options));
 }
 
 function generateFromTag(deferred, tag) {
@@ -40,12 +36,7 @@ function generateFromTag(deferred, tag) {
 
  readGitLog()
  .then(generateFromCommits.bind(this, deferred))
- .catch(handleReadGitLogError);
-}
-
-function handleGenerateError(deferred, err) {
- console.log('Error generating changelog ', err);
- deferred.reject(err);
+ .catch(console.log.bind(console, 'error'));
 }
 
 function generate(params) {
@@ -56,7 +47,7 @@ function generate(params) {
  this.init(params)
  .then(this.getPreviousTag.bind(this))
  .then(generateFromTag.bind(this, deferred))
- .catch(handleGenerateError.bind(null, deferred));
+ .catch(deferred.reject.bind(deferred));
 
  return deferred.promise;
 }