refactor(publish): DRY verification of working tree cleanliness

lerna · Jan 9, 2019 · 5e975e0 · 5e975e0
1 parent 2580e72
commit 5e975e0
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/commands/publish/index.js b/commands/publish/index.js
@@ -111,6 +111,8 @@ class PublishCommand extends Command {
 
     let chain = Promise.resolve();
 
+    // attempting to publish a release with local changes is not allowed
+    chain = chain.then(() => this.verifyWorkingTreeClean());
     chain = chain.then(() => this.findVersionedUpdates());
 
     return chain.then(result => {
@@ -190,6 +192,10 @@ class PublishCommand extends Command {
     });
   }
 
+  verifyWorkingTreeClean() {
+    return describeRef(this.execOpts).then(checkWorkingTree.throwIfUncommitted);
+  }
+
   findVersionedUpdates() {
     let chain = Promise.resolve();
 
@@ -206,19 +212,12 @@ class PublishCommand extends Command {
     return chain;
   }
 
-  verifyWorkingTreeClean() {
-    return describeRef(this.execOpts).then(checkWorkingTree.throwIfUncommitted);
-  }
-
   detectFromGit() {
     const { tagVersionPrefix = "v" } = this.options;
     const matchingPattern = this.project.isIndependent() ? "*@*" : `${tagVersionPrefix}*.*.*`;
 
     let chain = Promise.resolve();
 
-    // attempting to publish a tagged release with local changes is not allowed
-    chain = chain.then(() => this.verifyWorkingTreeClean());
-
     chain = chain.then(() => getCurrentTags(this.execOpts, matchingPattern));
     chain = chain.then(taggedPackageNames => {
       if (!taggedPackageNames.length) {
@@ -248,9 +247,6 @@ class PublishCommand extends Command {
   detectFromPackage() {
     let chain = Promise.resolve();
 
-    // attempting to publish a release with local changes is not allowed
-    chain = chain.then(() => this.verifyWorkingTreeClean());
-
     chain = chain.then(() => getUnpublishedPackages(this.project, this.conf.snapshot));
     chain = chain.then(unpublishedPackages => {
       if (!unpublishedPackages.length) {
@@ -286,9 +282,6 @@ class PublishCommand extends Command {
 
     let chain = Promise.resolve();
 
-    // attempting to publish a canary release with local changes is not allowed
-    chain = chain.then(() => this.verifyWorkingTreeClean());
-
     // find changed packages since last release, if any
     chain = chain.then(() =>
       collectUpdates(this.packageGraph.rawPackageList, this.packageGraph, this.execOpts, {