Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: lint against remote baseBranch if user is on baseBranch #67

Merged
merged 1 commit into from
Oct 4, 2019
Merged

feat: lint against remote baseBranch if user is on baseBranch #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 10 additions & 15 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ if (process.stdout.isTTY) {
const Cache = require("file-system-cache").default;

const cache = Cache({
basePath: `${os.homedir()}/.lint-prepush`, //Path where cache files are stored.
ns: process.cwd() //A grouping namespace for items.
basePath: `${os.homedir()}/.lint-prepush`, // Path where cache files are stored.
ns: process.cwd() // A grouping namespace for items.
});

const success = chalk.keyword("green");
Expand All @@ -33,28 +33,23 @@ if (process.stdout.isTTY) {
}

let { base : baseBranch = 'master', tasks = {} } = userConfig || {};
debug('Base Branch:' + baseBranch);
debug('Base Branch: ' + baseBranch);

// Skip linter for base branch
let getCurrentBranchCommand = 'git rev-parse --abbrev-ref HEAD';
execChildProcess({ command: getCurrentBranchCommand })
.then(currentBranch => {

debug('Current Branch:' + currentBranch);

if(currentBranch === baseBranch) {
log(warning("\nNOTE: Skipping checks since you are in the base branch\n"));
return;
}
debug('Current Branch: ' + currentBranch);

execChildProcess({ command: 'git rev-parse HEAD' })
.then((commitHash = '') => {
debug('Current Commit Hash:' + commitHash);
debug('Latest Commit SHA: ' + commitHash);

let cachedCommitHash = cache.getSync("linted-hash") || "";
debug('Cached Commit Hash:' + cachedCommitHash);
debug('Cached Commit SHA: ' + cachedCommitHash);

if(commitHash === cachedCommitHash) {
debug('Skipping checks since the commit(s) have been linted already.');
log(warning("\nNOTE: Skipping checks since the commit(s) have been linted already.\n"));
return;
}
Expand All @@ -76,18 +71,18 @@ if (process.stdout.isTTY) {
return execChildProcess({ command: getRemote })
.then((remote) => {
const branch = `${remote}/${currentBranch}`;
debug('Branch to Diff:' + branch);
debug('Branch to Diff: ' + branch);
return branch;
})
.catch(() => {
debug('Branch to Diff:' + baseBranch);
debug('Branch to Diff: ' + baseBranch);

// if we can't find the remote, we'll fall back to the baseBranch
return baseBranch;
});
})
.catch(() => {
debug('Branch to Diff:' + baseBranch);
debug('Branch to Diff: ' + baseBranch);

return resolveBranch;
});
Expand Down