Added File replace and replaceAll

atomist · Oct 2, 2017 · 6805e55 · 6805e55
1 parent b1a1b85
commit 6805e55
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@atomist/automation-client",
-  "version": "0.1.36",
+  "version": "0.1.37",
   "description": "Atomist automation client for running command and event handlers",
   "author": "Atomist, Inc.",
   "license": "GPL-3.0",

diff --git a/src/project/File.ts b/src/project/File.ts
@@ -51,6 +51,10 @@ export interface FileAsync extends FileCore {
 
     getContent(): Promise<string>;
 
+    replace(re: RegExp, replacement: string): Promise<this>;
+
+    replaceAll(oldLiteral: string, newLiteral: string): Promise<this>;
+
     setPath(path: string): Promise<this>;
 
 }

diff --git a/src/project/support/AbstractFile.ts b/src/project/support/AbstractFile.ts
@@ -36,8 +36,22 @@ export abstract class AbstractFile extends AbstractScriptedFlushable<File> imple
         return this.recordAction(f => f.setPath(path));
     }
 
+    public replace(re: RegExp, replacement: string): Promise<this> {
+        return this.getContent()
+            .then(content =>
+                this.setContent(content.replace(re, replacement)),
+            );
+    }
+
+    public replaceAll(oldLiteral: string, newLiteral: string): Promise<this> {
+        return this.getContent()
+            .then(content =>
+                this.setContent(content.split(oldLiteral).join(newLiteral)),
+            );
+    }
+
     public recordReplace(re: RegExp, replacement: string): this {
-        // TODO
+        // TODO use replace
         return this.recordSetContent(this.getContentSync().replace(re, replacement));
     }
 

diff --git a/test/project/git/GitProjectTest.ts b/test/project/git/GitProjectTest.ts
@@ -130,7 +130,7 @@ describe("GitProject", () => {
                 done();
             })
             .catch(done);
-    });
+    }).timeout(6000);
 
     it("add a file, then PR push to remote repo", function(done) {
         this.retries(5);

diff --git a/test/project/util/projectUtilsTest.ts b/test/project/util/projectUtilsTest.ts
@@ -181,4 +181,26 @@ describe("projectUtils", () => {
             }).catch(done);
     });
 
+    it("replaces literals across project", () => {
+        const p = tempProject();
+        p.addFileSync("Thing", "A");
+        p.addFileSync("config/Thing", "B");
+        doWithFiles(p, "**/Thing", f => f.replaceAll("A", "alpha"))
+            .run()
+            .then(_ => {
+                assert(p.findFileSync("Thing").getContentSync() === "alpha");
+            });
+    });
+
+    it("replaces regex across project", () => {
+        const p = tempProject();
+        p.addFileSync("Thing", "A");
+        p.addFileSync("config/Thing", "B");
+        doWithFiles(p, "**/Thing", f => f.replace(/A-Z/, "alpha"))
+            .run()
+            .then(_ => {
+                assert(p.findFileSync("Thing").getContentSync() === "alpha");
+            });
+    });
+
 });