From 8298c61e681f883e8ed5c1c81186979c3d2b7e3b Mon Sep 17 00:00:00 2001
From: James Henstridge <james@jamesh.id.au>
Date: Thu, 18 Jun 2020 10:39:28 +0800
Subject: [PATCH] src: expand '~' in project root path

---
 __tests__/build.test.ts | 12 +++++++++++-
 __tests__/tools.test.ts |  4 ++--
 dist/index.js           | 15 +++++++++++----
 src/build.ts            | 10 +++++++++-
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/__tests__/build.test.ts b/__tests__/build.test.ts
index 1d7e4d6..0bb79bc 100644
--- a/__tests__/build.test.ts
+++ b/__tests__/build.test.ts
@@ -1,6 +1,8 @@
 // -*- mode: javascript; js-indent-level: 2 -*-
 
-import fs = require('fs')
+import * as fs from 'fs'
+import * as os from 'os'
+import * as path from 'path'
 import * as process from 'process'
 import * as exec from '@actions/exec'
 import * as build from '../src/build'
@@ -10,6 +12,14 @@ afterEach(() => {
   jest.restoreAllMocks()
 })
 
+test('SnapcraftBuilder expands tilde in project root', () => {
+  let builder = new build.SnapcraftBuilder('~', true)
+  expect(builder.projectRoot).toBe(os.homedir())
+
+  builder = new build.SnapcraftBuilder('~/foo/bar', true)
+  expect(builder.projectRoot).toBe(path.join(os.homedir(), 'foo/bar'))
+})
+
 test('SnapcraftBuilder.build runs a snap build', async () => {
   expect.assertions(4)
 
diff --git a/__tests__/tools.test.ts b/__tests__/tools.test.ts
index ebc766e..7fb7dc9 100644
--- a/__tests__/tools.test.ts
+++ b/__tests__/tools.test.ts
@@ -1,9 +1,9 @@
 // -*- mode: javascript; js-indent-level: 2 -*-
 
-import * as exec from '@actions/exec'
-import fs = require('fs')
+import * as fs from 'fs'
 import * as os from 'os'
 import * as path from 'path'
+import * as exec from '@actions/exec'
 import * as tools from '../src/tools'
 
 afterEach(() => {
diff --git a/dist/index.js b/dist/index.js
index 1cbfdd5..538a7b6 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1316,6 +1316,9 @@ var core = __webpack_require__(470);
 // EXTERNAL MODULE: external "fs"
 var external_fs_ = __webpack_require__(747);
 
+// EXTERNAL MODULE: external "os"
+var external_os_ = __webpack_require__(87);
+
 // EXTERNAL MODULE: external "path"
 var external_path_ = __webpack_require__(622);
 
@@ -1325,9 +1328,6 @@ var external_process_ = __webpack_require__(765);
 // EXTERNAL MODULE: ./node_modules/@actions/exec/lib/exec.js
 var exec = __webpack_require__(986);
 
-// EXTERNAL MODULE: external "os"
-var external_os_ = __webpack_require__(87);
-
 // CONCATENATED MODULE: ./lib/tools.js
 // -*- mode: javascript; js-indent-level: 2 -*-
 var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -1423,9 +1423,16 @@ var build_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _ar
 
 
 
+
+function expandHome(p) {
+    if (p === '~' || p.startsWith('~/')) {
+        p = Object(external_os_.homedir)() + p.slice(1);
+    }
+    return p;
+}
 class build_SnapcraftBuilder {
     constructor(projectRoot, includeBuildInfo) {
-        this.projectRoot = projectRoot;
+        this.projectRoot = expandHome(projectRoot);
         this.includeBuildInfo = includeBuildInfo;
     }
     build() {
diff --git a/src/build.ts b/src/build.ts
index 7421074..1bdf957 100644
--- a/src/build.ts
+++ b/src/build.ts
@@ -1,6 +1,7 @@
 // -*- mode: javascript; js-indent-level: 2 -*-
 
 import * as fs from 'fs'
+import * as os from 'os'
 import * as path from 'path'
 import * as process from 'process'
 import * as core from '@actions/core'
@@ -14,12 +15,19 @@ interface ImageInfo {
   build_url?: string
 }
 
+function expandHome(p: string): string {
+  if (p === '~' || p.startsWith('~/')) {
+    p = os.homedir() + p.slice(1)
+  }
+  return p
+}
+
 export class SnapcraftBuilder {
   projectRoot: string
   includeBuildInfo: boolean
 
   constructor(projectRoot: string, includeBuildInfo: boolean) {
-    this.projectRoot = projectRoot
+    this.projectRoot = expandHome(projectRoot)
     this.includeBuildInfo = includeBuildInfo
   }