Merge pull request #242 from onmodulus/feature/server-option

Add --server option for overriding default.
XervoIO · Oct 26, 2016 · 29155be · 29155be
2 parents b34fba6 + 34a98fb
commit 29155be
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/bin/demeteorizer b/bin/demeteorizer
@@ -25,6 +25,9 @@ Program
   .option(
     '-v, --verbose',
     'Output extra build information')
+  .option(
+    '-s, --server',
+    'Remote DDP Server location [localhost:3000]')
   .option(
     '--node-version <version>',
     'Node version set in generated package.json')
@@ -53,6 +56,7 @@ var options = {
   json: Program.json,
   architecture: Program.architecture,
   verbose: Boolean(Program.verbose),
+  server: Program.server,
   npmVersion: Program.npmVersion,
   nodeVersion: Program.nodeVersion
 };

diff --git a/lib/build.js b/lib/build.js
@@ -4,13 +4,13 @@ const Util = require('util')
 const Exec = require('./exec')
 
 const defaults = {
-  server: 'localhost',
+  server: 'localhost:3000',
   directory: '.demeteorized'
 }
 
 //
 // Options include:
-//    server - URL of the server (defaults to localhost).
+//    server - URL of the server (defaults to localhost:3000).
 //    directory - The output directory (defaults to .demeteorized).
 //    architecture - Architecture build target.
 //

diff --git a/test/build.js b/test/build.js
@@ -36,7 +36,7 @@ describe('build', () => {
       expect(cpStub.spawn.calledWith('meteor', [
         'build',
         '--server',
-        'localhost',
+        'localhost:3000',
         '--directory',
         '.demeteorized'
       ])).to.be.true()
@@ -52,7 +52,7 @@ describe('build', () => {
       expect(cpStub.spawn.calledWith('meteor', [
         'build',
         '--server',
-        'localhost',
+        'localhost:3000',
         '--directory',
         '.demeteorized',
         '--architecture',
@@ -70,7 +70,7 @@ describe('build', () => {
       expect(cpStub.spawn.calledWith('meteor', [
         'build',
         '--server',
-        'localhost',
+        'localhost:3000',
         '--directory',
         '.demeteorized',
         '--debug'
@@ -87,7 +87,7 @@ describe('build', () => {
       expect(cpStub.spawn.calledWith('meteor', [
         'build',
         '--server',
-        'localhost',
+        'localhost:3000',
         '--directory',
         '.demeteorized',
         '--server-only'
@@ -99,12 +99,12 @@ describe('build', () => {
     emitter.emit('close', 0)
   })
 
-  it('includes verbose when provided', function (done) {
-    Build({ verbose: true }, function () {
+  it('includes verbose when provided', (done) => {
+    Build({ verbose: true }, () => {
       expect(cpStub.spawn.calledWith('meteor', [
         'build',
         '--server',
-        'localhost',
+        'localhost:3000',
         '--directory',
         '.demeteorized',
         '--verbose'
@@ -116,6 +116,22 @@ describe('build', () => {
     emitter.emit('close', 0)
   })
 
+  it('overrides server when provided', (done) => {
+    Build({ server: 'http://example.com' }, () => {
+      expect(cpStub.spawn.calledWith('meteor', [
+        'build',
+        '--server',
+        'http://example.com',
+        '--directory',
+        '.demeteorized'
+      ])).to.be.true()
+
+      done()
+    })
+
+    emitter.emit('close', 0)
+  })
+
   it('returns an error on failed exit', (done) => {
     Build({}, (err) => {
       expect(err.message).to.equal('Conversion failed.')