refactor according to mxschmitt#77 comments

Author: c-m-y-kawabe

action.yml

@@ -11,7 +11,7 @@ inputs:
     description: 'If apt should be executed with sudo or without'
     required: false
     default: 'true'
-  install_dependencies:
+  install-dependencies:
     description: 'Whether or not to install dependencies for tmate on linux (openssh-client, xz-utils)'
     required: false
     default: 'true'
@@ -34,4 +34,4 @@ inputs:
   tmate-server-ed25519-fingerprint:
     description: 'The ed25519 fingerprint for your tmate server'
     required: false
-    default: ''
+    default: ''

lib/index.js

@@ -10317,13 +10317,7 @@ const TMATE_ARCH_MAP = {
 /** @param {number} ms */
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
-async function installDependenciesLinux(optionalSudoPrefix='sudo') {
-  await execShellCommand(optionalSudoPrefix + 'apt-get update');
-  await execShellCommand(optionalSudoPrefix + 'apt-get install -y openssh-client xz-utils');
-}
-
 async function run() {
-  const optionalSudoPrefix = core.getInput('sudo') === "true" ? "sudo " : "";
   try {
     core.debug("Installing dependencies")
     let tmateExecutable = "tmate"
@@ -10333,8 +10327,10 @@ async function run() {
       await execShellCommand('pacman -Sy --noconfirm tmate');
       tmateExecutable = 'CHERE_INVOKING=1 tmate'
     } else {
-      if (core.getInput('install_dependencies') === "true") {
-        await installDependenciesLinux(optionalSudoPrefix);
+      if (core.getInput("install-dependencies") === "true") {
+        const optionalSudoPrefix = core.getInput("sudo") === "true" ? "sudo " : "";
+        await execShellCommand(optionalSudoPrefix + "apt-get update");
+        await execShellCommand(optionalSudoPrefix + "apt-get install -y openssh-client xz-utils");
       }
 
       const tmateArch = TMATE_ARCH_MAP[external_os_default().arch()];

src/index.js

@@ -24,13 +24,7 @@ const TMATE_ARCH_MAP = {
 /** @param {number} ms */
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
-export async function installDependenciesLinux(optionalSudoPrefix='sudo') {
-  await execShellCommand(optionalSudoPrefix + 'apt-get update');
-  await execShellCommand(optionalSudoPrefix + 'apt-get install -y openssh-client xz-utils');
-}
-
 export async function run() {
-  const optionalSudoPrefix = core.getInput('sudo') === "true" ? "sudo " : "";
   try {
     core.debug("Installing dependencies")
     let tmateExecutable = "tmate"
@@ -40,8 +34,10 @@ export async function run() {
       await execShellCommand('pacman -Sy --noconfirm tmate');
       tmateExecutable = 'CHERE_INVOKING=1 tmate'
     } else {
-      if (core.getInput('install_dependencies') === "true") {
-        await installDependenciesLinux(optionalSudoPrefix);
+      if (core.getInput("install-dependencies") === "true") {
+        const optionalSudoPrefix = core.getInput("sudo") === "true" ? "sudo " : "";
+        await execShellCommand(optionalSudoPrefix + "apt-get update");
+        await execShellCommand(optionalSudoPrefix + "apt-get install -y openssh-client xz-utils");
       }
 
       const tmateArch = TMATE_ARCH_MAP[os.arch()];

src/index.test.js

@@ -54,7 +54,7 @@ describe('Tmate GitHub integration', () => {
     Object.defineProperty(process, "platform", {
       value: "linux"
     })
-    core.getInput.mockReturnValueOnce("false").mockReturnValueOnce("true").mockReturnValue("false")
+    core.getInput.mockReturnValueOnce("true").mockReturnValueOnce("false")
     const customConnectionString = "foobar"
     execShellCommand.mockReturnValue(Promise.resolve(customConnectionString))
     await run()
@@ -63,7 +63,7 @@ describe('Tmate GitHub integration', () => {
     expect(core.info).toHaveBeenNthCalledWith(2, `SSH: ${customConnectionString}`);
     expect(core.info).toHaveBeenNthCalledWith(3, "Exiting debugging session because the continue file was created");
   });
-  it('should be handle the main loop for linux without installing dependencies', async () => {
+  it('should be handle the main loop for linux without dependency installation', async () => {
     Object.defineProperty(process, "platform", {
       value: "linux"
     })