rebase

Author: billiegoose

README.md

@@ -39,15 +39,27 @@ Now `cd` to a directory in which you have some bare git repos and run this serve
 > cd __fixtures__
 > ls
 test-repo1.git    test-repo2.git   imaginatively-named-repo.git
-> git-http-mock-server &
-> git-ssh-mock-server &
+> git-http-mock-server
 ```
 
 Now in another shell, clone and push away...
 ```sh
 > git clone http://localhost:8174/test-repo1.git
 > git clone http://localhost:8174/test-repo2.git
 > git clone http://localhost:8174/imaginatively-named-repo.git
+```
+
+To do the same thing but with SSH
+
+```sh
+> cd __fixtures__
+> ls
+test-repo1.git    test-repo2.git   imaginatively-named-repo.git
+> git-ssh-mock-server
+```
+
+Now in another shell,
+```sh
 > git clone ssh://localhost:2222/imaginatively-named-repo.git
 ```
 
@@ -65,6 +77,14 @@ you can run the server as a daemon in the background:
 Just be sure to run `start` and `stop` from the same working directory.
 (The `start` command writes the PID of the server to `./git-http-mock-server.pid` so that the `stop` command knows what process to kill.)
 
+Same thing for SSH:
+
+```sh
+> git-ssh-mock-server start
+> # do stuff
+> git-ssh-mock-server stop
+```
+
 ### Environment Variables
 
 - `GIT_HTTP_MOCK_SERVER_PORT` default is 8174 (to be compatible with [git-http-server](https://github.com/bahamas10/node-git-http-server))
@@ -123,9 +143,10 @@ originally inspired by '[git-http-server](https://github.com/bahamas10/node-git-
 
 MIT
 
-
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fisomorphic-git%2Fgit-http-mock-server.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fisomorphic-git%2Fgit-http-mock-server?ref=badge_large)
 
 ## Changelog
 
+1.2.0 - add SSH server
+1.1.0 - support running in background and CORS headers
 1.0.0 - Initial release

daemon.js

@@ -5,57 +5,57 @@ const {spawn} = require('child_process')
 const kill = require('tree-kill')
 const minimisted = require('minimisted')
 
-const cmdName = 'git-http-mock-server'
-const target = require.resolve('./bin.js')
-const args = [
-  target
-]
+module.exports = function (cmdName, target) {
+  const args = [
+    target
+  ]
 
-async function main({_: [cmd]}) {
-  switch (cmd) {
-    case 'start': {
-      require('daemonize-process')()
-      let server = spawn(
-        'node', args,
-        {
-          stdio: 'inherit',
-          windowsHide: true,
-        }
-      )
-      fs.writeFileSync(
-        path.join(process.cwd(), `${cmdName}.pid`),
-        String(process.pid),
-        'utf8'
-      )
-      process.on('exit', server.kill)
-      return
-    }
-    case 'stop': {
-      let pid
-      try {
-        pid = fs.readFileSync(
+  async function main({_: [cmd]}) {
+    switch (cmd) {
+      case 'start': {
+        require('daemonize-process')()
+        let server = spawn(
+          'node', args,
+          {
+            stdio: 'inherit',
+            windowsHide: true,
+          }
+        )
+        fs.writeFileSync(
           path.join(process.cwd(), `${cmdName}.pid`),
+          String(process.pid),
           'utf8'
-        );
-      } catch (err) {
-        console.log(`No ${cmdName}.pid file`)
+        )
+        process.on('exit', server.kill)
         return
       }
-      pid = parseInt(pid)
-      console.log('killing', pid)
-      kill(pid, (err) => {
-        if (err) {
-          console.log(err)
-        } else {
-          fs.unlinkSync(path.join(process.cwd(), `${cmdName}.pid`))
+      case 'stop': {
+        let pid
+        try {
+          pid = fs.readFileSync(
+            path.join(process.cwd(), `${cmdName}.pid`),
+            'utf8'
+          );
+        } catch (err) {
+          console.log(`No ${cmdName}.pid file`)
+          return
         }
-      })
-      return
-    }
-    default: {
-      require(target)
+        pid = parseInt(pid)
+        console.log('killing', pid)
+        kill(pid, (err) => {
+          if (err) {
+            console.log(err)
+          } else {
+            fs.unlinkSync(path.join(process.cwd(), `${cmdName}.pid`))
+          }
+        })
+        return
+      }
+      default: {
+        require(target)
+      }
     }
   }
-}
-
-minimisted(main)
+  
+  minimisted(main)
+}

http-daemon.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+const cmdName = 'git-http-mock-server'
+const target = require.resolve('./http-server.js')
+require('./daemon.js')(cmdName, target)

bin.js renamed to http-server.js

@@ -4,8 +4,8 @@
   "description": "Clone and push to git repository test fixtures over HTTP.",
   "main": "index.js",
   "bin": {
-    "git-http-mock-server": "daemon.js",
-    "git-ssh-mock-server": "ssh-server.js"
+    "git-http-mock-server": "http-daemon.js",
+    "git-ssh-mock-server": "ssh-daemon.js"
   },
   "scripts": {
     "test": "echo \"No tests\"",

package-lock.json

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+const cmdName = 'git-ssh-mock-server'
+const target = require.resolve('./ssh-server.js')
+require('./daemon.js')(cmdName, target)