Merge pull request #10 from DanielHabenicht/update-packages

fix: update packages

Author: DanielHabenicht

.github/workflows/pr-title-check.yml

@@ -28,7 +28,7 @@ jobs:
         id: fc
         with:
           issue-number: ${{ github.event.pull_request.number }}
-          comment-author: "github-actions[bot]"
+          comment-author: 'github-actions[bot]'
           body-includes: Please make sure that your Pull Request title and body does conform to this format
 
       - name: Create comment
@@ -60,4 +60,4 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               comment_id: ${{ steps.fc.outputs.comment-id }},
-            })
+            })

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
       - master
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/cache@v2
         id: npm-cache
         with:
-          path: "**/node_modules"
+          path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
       - name: Install dependencies
         if: steps.npm-cache.outputs.cache-hit != 'true'
@@ -40,7 +40,7 @@ jobs:
       - uses: actions/cache@v2
         id: npm-cache
         with:
-          path: "**/node_modules"
+          path: '**/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
       - name: Install dependencies
         if: steps.npm-cache.outputs.cache-hit != 'true'

.github/workflows/test.yml

@@ -4,7 +4,8 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
+    timeout-minutes: 5
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -17,10 +18,14 @@ jobs:
       - uses: actions/cache@v2
         id: npm-cache
         with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
+          path: 'node_modules'
+          key: ${{ runner.os }}-modules-${{ hashFiles('package-lock.json') }}
       - name: Install dependencies
         if: steps.npm-cache.outputs.cache-hit != 'true'
         run: npm ci
+      - name: Install packages
+        run: sudo apt-get update && sudo apt-get install -y expect
+      - name: Test
+        run: npm link && ./test/setup.exp
       - name: Test
         run: npm run test-ci

.gitpod.yml

@@ -1,9 +1,8 @@
 # List the start up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/
 tasks:
   - init: | 
-      sudo add-apt-repository -y ppa:duggan/bats
       sudo apt-get update
-      sudo apt-get install -y bats
+      sudo apt-get install -y expect
       npm install 
     command: node --inspect-brk dockerproxy.js setup
   # Test

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "printWidth": 100,
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true
+}

.restyled.yaml

@@ -0,0 +1,7 @@
+enabled: true
+restylers:
+  - clang-format:
+      enabled: false
+  - prettier-markdown:
+      enabled: false
+  - "*"

.vscode/launch.json

@@ -1,20 +1,18 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}",
-            "name": "Attach to Remote",
-            "port": 9229,
-            "remoteRoot": "./",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "pwa-node"
-        }
-    ]
-}
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "address": "127.0.0.1",
+      "localRoot": "${workspaceFolder}",
+      "name": "Attach to Remote",
+      "port": 9229,
+      "remoteRoot": "./",
+      "request": "attach",
+      "skipFiles": ["<node_internals>/**"],
+      "type": "pwa-node"
+    }
+  ]
+}

README.md

@@ -35,7 +35,9 @@ Examples:
   $ dockerproxy up      # start the Docker Proxy
   $ dockerproxy down    # stop the Docker Proxy
 ```
+
 ### Up
+
 ```
 Usage: dockerproxy up [options]
 
@@ -49,6 +51,7 @@ Options:
 ```
 
 ### Down
+
 ```
 Usage: dockerproxy down [options]
 
@@ -58,6 +61,7 @@ Options:
 ```
 
 ### Setup
+
 ```
 Usage: dockerproxy setup [options]
 
@@ -68,6 +72,7 @@ Options:
 ```
 
 ### Config
+
 ```
 Usage: dockerproxy config [options]
 
@@ -77,7 +82,6 @@ Options:
   -h, --help  output usage information
 ```
 
-
 ## Example
 
 There are two ways of using this command line tool:
@@ -93,7 +97,11 @@ There are two ways of using this command line tool:
 
 ## Development and Debugging
 
+1. Clone the repository and including the submodules (`git submodule update --init --recursive`)
 1. Launch command with `node --inspect-brk dockerproxy.js setup`.
    1. Follow this [guide](https://stackoverflow.com/a/47558970/9277073).
    2. Launch `Attach to Remote` Debug Task in VSCode.
 
+## Testing
+
+Install bats (`npm i -g bats`) and expect (`sudo apt-get install expect`). Simply run `npm run test` afterwards.

common.js

@@ -1,14 +1,13 @@
 const chalk = require('chalk');
 
 const common = {
-    error(str) {
-        console.error(chalk.red(str));
-    },
+  error(str) {
+    console.error(chalk.red(str));
+  },
 
-    success(str) {
-        console.log(chalk.green(str));
-    }
+  success(str) {
+    console.log(chalk.green(str));
+  },
+};
 
-}
-
-module.exports = common;
+module.exports = common;

configFile.js

@@ -1,6 +1,7 @@
 var fs = require('fs');
+var path = require('path');
 var commander = require('commander');
-const settingsPath = require('os').homedir() + '\\docker-container-proxy-settings.json';
+const settingsPath = path.join(require('os').homedir(), 'docker-container-proxy-settings.json');
 
 const configFile = {
   isConfigured: function () {
@@ -17,7 +18,7 @@ const configFile = {
   },
   getSettingsPath() {
     return settingsPath;
-  }
+  },
 };
 
 module.exports = configFile;