diff --git a/__tests__/auth.test.ts b/__tests__/auth.test.ts index 09745a6b..4a56744e 100644 --- a/__tests__/auth.test.ts +++ b/__tests__/auth.test.ts @@ -23,7 +23,7 @@ const env = process.env; const m2Dir = path.join(__dirname, auth.M2_DIR); const settingsFile = path.join(m2Dir, auth.SETTINGS_FILE); const gpgDir = path.join(__dirname, auth.GPG_DIR); -const gpgFile = path.join(gpgDir, auth.GPG_FILE); +const gpgFile = auth.GPG_FILE; describe('auth tests', () => { beforeEach(async () => { @@ -180,7 +180,11 @@ describe('auth tests', () => { await auth.configAuthentication(id, username, password, gpgPrivateKey); - expect(exec.exec).toHaveBeenCalledWith(`gpg --import --batch ${gpgFile}`); + expect(exec.exec).toHaveBeenCalledWith( + 'gpg', + ['--import', '--batch', gpgFile], + {cwd: gpgDir} + ); expect(fs.existsSync(gpgDir)).toBe(false); }, 100000); @@ -193,7 +197,9 @@ describe('auth tests', () => { await auth.configAuthentication(id, username, password); expect(exec.exec).not.toHaveBeenCalledWith( - `gpg --import --batch ${gpgFile}` + 'gpg', + ['--import', '--batch', gpgFile], + {cwd: gpgDir} ); expect(fs.existsSync(gpgDir)).toBe(false); diff --git a/dist/index.js b/dist/index.js index 22077061..02a84d71 100644 Binary files a/dist/index.js and b/dist/index.js differ diff --git a/src/auth.ts b/src/auth.ts index b343f614..46fbb67f 100644 --- a/src/auth.ts +++ b/src/auth.ts @@ -13,8 +13,8 @@ export const GPG_FILE = 'private.asc'; export const DEFAULT_ID = 'github'; export const DEFAULT_USERNAME = 'GITHUB_ACTOR'; export const DEFAULT_PASSWORD = 'GITHUB_TOKEN'; -export const DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE'; export const DEFAULT_GPG_PRIVATE_KEY = ''; +export const DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE'; export async function configAuthentication( id = DEFAULT_ID, @@ -110,6 +110,5 @@ async function write(directory: string, file: string, contents: string) { } async function importGpgKey(directory: string, file: string) { - const location = path.join(directory, file); - exec.exec(`gpg --import --batch ${location}`); + exec.exec('gpg', ['--import', '--batch', file], {cwd: directory}); }