removing --strip-components because it's "removing one level", updated "should log output" because of deprecations, updated "should copy to remote" to make sure it does not conflict with other builds, added force_color=0 to ensure that "color" is not appended, fixing babelNode resolve

Author: oleg-andreyev

jest.config.js

@@ -1,3 +1,5 @@
+process.env.FORCE_COLOR=0;
+
 module.exports = {
   testEnvironment: 'node',
   roots: ['packages'],

packages/shipit-cli/tests/integration.test.js

@@ -3,22 +3,23 @@ import { exec } from 'ssh-pool'
 
 const shipitCli = path.resolve(__dirname, '../src/cli.js')
 const shipitFile = path.resolve(__dirname, './sandbox/shipitfile.babel.js')
+const babelNode = require.resolve('@babel/node/bin/babel-node');
 
 describe('shipit-cli', () => {
   it('should run a local task', async () => {
-    const { stdout } = await exec(
-      `babel-node ${shipitCli} --shipitfile ${shipitFile} test localHello`,
-    )
+    let { stdout } = await exec(`FORCE_COLOR=0 ${babelNode} ${shipitCli} --shipitfile ${shipitFile} test localHello`)
+    stdout = stdout.trim();
+
     expect(stdout).toMatch(/Running 'localHello' task.../)
     expect(stdout).toMatch(/Running "echo "hello"" on local./)
     expect(stdout).toMatch(/@ hello/)
     expect(stdout).toMatch(/Finished 'localHello' after/)
   }, 10000)
 
   it('should run a remote task', async () => {
-    const { stdout } = await exec(
-      `babel-node ${shipitCli} --shipitfile ${shipitFile} test remoteUser`,
-    )
+    let { stdout } = await exec(`FORCE_COLOR=0 ${babelNode} ${shipitCli} --shipitfile ${shipitFile} test remoteUser`)
+    stdout = stdout.trim();
+
     expect(stdout).toMatch(/Running 'remoteUser' task.../)
     expect(stdout).toMatch(/Running "echo \$USER" on host "test.shipitjs.com"./)
     expect(stdout).toMatch(/@test.shipitjs.com deploy/)
@@ -27,7 +28,7 @@ describe('shipit-cli', () => {
 
   it('should work with "~"', async () => {
     const { stdout } = await exec(
-      `babel-node ${shipitCli} --shipitfile ${shipitFile} test cwdSsh`,
+      `${babelNode} ${shipitCli} --shipitfile ${shipitFile} test cwdSsh`,
     )
     expect(stdout).toMatch(/@test.shipitjs.com \/home\/deploy\/\.ssh/)
   }, 10000)

packages/shipit-deploy/tests/integration.test.js

@@ -4,12 +4,13 @@ import { exec } from 'ssh-pool'
 
 const shipitCli = path.resolve(__dirname, '../../shipit-cli/src/cli.js')
 const shipitFile = path.resolve(__dirname, './sandbox/shipitfile.babel.js')
+const babelNode = require.resolve('@babel/node/bin/babel-node');
 
 describe('shipit-cli', () => {
   it('should run a local task', async () => {
     try {
       await exec(
-        `babel-node ${shipitCli} --shipitfile ${shipitFile} test deploy`,
+        `${babelNode} ${shipitCli} --shipitfile ${shipitFile} test deploy`,
       )
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -19,7 +20,7 @@ describe('shipit-cli', () => {
     }
 
     const { stdout: lsReleases } = await exec(
-      `babel-node ${shipitCli} --shipitfile ${shipitFile} test ls-releases`,
+      `${babelNode} ${shipitCli} --shipitfile ${shipitFile} test ls-releases`,
     )
 
     const latestRelease = lsReleases
@@ -28,13 +29,13 @@ describe('shipit-cli', () => {
       .match(/\d{14}/)[0]
 
     const { stdout: lsCurrent } = await exec(
-      `babel-node ${shipitCli} --shipitfile ${shipitFile} test ls-current`,
+      `${babelNode} ${shipitCli} --shipitfile ${shipitFile} test ls-current`,
     )
 
     const currentRelease = lsCurrent
       .split('\n')[3]
       .match(/releases\/(\d{14})/)[1]
 
     expect(latestRelease).toBe(currentRelease)
-  }, 25000)
+  }, 30000)
 })

packages/ssh-pool/src/Connection.test.js

@@ -312,7 +312,7 @@ describe('Connection', () => {
           expect.any(Function),
         ])
         expect(exec.mock.calls[4]).toEqual([
-          'ssh user@host "cd /x/y/z && tar --strip-components=1 -xzf foo.tar.gz"',
+          'ssh user@host "cd /x/y/z && tar -xzf foo.tar.gz"',
           { maxBuffer: 1024000 },
           expect.any(Function),
         ])
@@ -351,7 +351,7 @@ describe('Connection', () => {
           expect.any(Function),
         ])
         expect(exec.mock.calls[4]).toEqual([
-          'cd /x/y/z && tar --strip-components=1 -xzf foo.tar.gz',
+          'cd /x/y/z && tar -xzf foo.tar.gz',
           { maxBuffer: 1024000 },
           expect.any(Function),
         ])
@@ -392,7 +392,7 @@ describe('Connection', () => {
           expect.any(Function),
         ])
         expect(exec.mock.calls[4]).toEqual([
-          'ssh -p 12345 -i /path/to/key user@host "cd /x/y/z && tar --strip-components=1 -xzf foo.tar.gz"',
+          'ssh -p 12345 -i /path/to/key user@host "cd /x/y/z && tar -xzf foo.tar.gz"',
           { maxBuffer: 1024000 },
           expect.any(Function),
         ])
@@ -481,8 +481,8 @@ describe('Connection', () => {
         '/src/dir',
         'user@host:/dest/dir',
       )
-      expect(output.stdout[0].toString()).toBe('@host first line\n')
-      expect(output.stderr[0].toString()).toBe('@host-err an error\n')
+      expect(output.stdout.toString()).toContain('@host first line\n')
+      expect(output.stderr.toString()).toContain('@host-err an error\n')
     })
   })
 })

packages/ssh-pool/src/commands/tar.js

@@ -18,7 +18,6 @@ export function formatTarCommand({ file, archive, excludes, mode }) {
     }
     case 'extract': {
       requireArgs(['archive'], { file, archive }, 'tar')
-      args = [...args, '--strip-components=1']
       args = [...args, '-xzf', archive]
       return joinCommandArgs(args)
     }

packages/ssh-pool/src/commands/tar.test.js

@@ -54,7 +54,7 @@ describe('tar', () => {
           archive: 'file.tar.gz',
           mode: 'extract',
         }),
-      ).toBe('tar --strip-components=1 -xzf file.tar.gz')
+      ).toBe('tar -xzf file.tar.gz')
     })
 
     it('should support "excludes"', () => {

packages/ssh-pool/tests/integration.test.js

@@ -1,4 +1,5 @@
-import path from 'path'
+import {resolve, basename} from 'path'
+import {copyFileSync, unlinkSync} from 'fs';
 
 const sshPool = require('../src')
 
@@ -7,7 +8,7 @@ describe('ssh-pool', () => {
 
   beforeEach(() => {
     pool = new sshPool.ConnectionPool(['[email protected]'], {
-      key: path.resolve(__dirname, '../../../ssh/id_rsa'),
+      key: resolve(__dirname, '../../../ssh/id_rsa'),
     })
   })
 
@@ -25,9 +26,19 @@ describe('ssh-pool', () => {
   }, 10000)
 
   it('should copy to remote', async () => {
-    await pool.scpCopyToRemote(
-      path.resolve(__dirname, '__fixtures__/test.txt'),
-      './',
-    )
-  }, 20000)
+    const time = (+new Date);
+    const sourceFile = resolve(__dirname, '__fixtures__/test.txt')
+    const targetFile = `${__dirname}/__fixtures__/test.${time}.txt`;
+
+    copyFileSync(sourceFile, targetFile);
+
+    try {
+      await pool.scpCopyToRemote(targetFile, './',);
+      const [{ stdout: first }] = await pool.run(`cd ./ && cat ${basename(targetFile)}`);
+      expect(first).toBe('Hello\n')
+    } finally {
+      unlinkSync(targetFile);
+    }
+
+  }, 1e6)
 })