From b8742032b9b5cab3ee2ab1bae455ebb4ef74b970 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 17:56:25 +0200 Subject: [PATCH 01/10] remove npm install --dev --- circle.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/circle.yml b/circle.yml index 46fcd27..33950f9 100644 --- a/circle.yml +++ b/circle.yml @@ -1,9 +1,6 @@ machine: node: version: 0.10.28 -dependencies: - override: - - npm install --dev test: override: - node_modules/.bin/mocha -g "packets" From 50fb2ae89daab1f35a9ad926991a9b3f41d6db4f Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 18:02:54 +0200 Subject: [PATCH 02/10] update circle.yml to download minecraft-server.jar --- circle.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 33950f9..018582b 100644 --- a/circle.yml +++ b/circle.yml @@ -1,7 +1,10 @@ machine: node: version: 0.10.28 -test: - override: - - node_modules/.bin/mocha -g "packets" - - node_modules/.bin/mocha -g "mc-server" + java: + version: openjdk7 +dependencies: + pre: + - mkdir minecraft-server + - wget https://s3.amazonaws.com/Minecraft.Download/versions/1.8.3/minecraft_server.1.8.3.jar -O minecraft-server/minecraft_server.1.8.3.jar + - export MC_SERVER_JAR=`pwd`/minecraft-server/minecraft_server.1.8.3.jar From 4f3973db113283b89af4b2442255da22ac5b6cd6 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 18:05:06 +0200 Subject: [PATCH 03/10] fix environment variable in circle.yml --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 018582b..457fe4c 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,6 @@ machine: + environment: + MC_SERVER_JAR: minecraft-server/minecraft_server.1.8.3.jar node: version: 0.10.28 java: @@ -7,4 +9,3 @@ dependencies: pre: - mkdir minecraft-server - wget https://s3.amazonaws.com/Minecraft.Download/versions/1.8.3/minecraft_server.1.8.3.jar -O minecraft-server/minecraft_server.1.8.3.jar - - export MC_SERVER_JAR=`pwd`/minecraft-server/minecraft_server.1.8.3.jar From 8886cc53447805f0c3e9b423d757cbfe72b0bc0f Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 18:12:54 +0200 Subject: [PATCH 04/10] checks if server jar exists --- test/test.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/test.js b/test/test.js index 8a266cc..0da39ab 100644 --- a/test/test.js +++ b/test/test.js @@ -250,7 +250,12 @@ describe("client", function() { batch.end(function(err) { if (err) return done(err); //console.log(MC_SERVER_JAR); - mcServer = spawn('java', [ '-Dlog4j.configurationFile=server/server_debug.xml', '-jar', MC_SERVER_JAR, 'nogui'], { + if (!fs.existsSync(MC_SERVER_JAR)) { + console.log("The file "+MC_SERVER_JAR+" doesn't exist."); + return done(new Error("The file "+MC_SERVER_JAR+" doesn't exist.")); + } + + mcServer = spawn('java', [ '-Dlog4j.configurationFile=server/server_debug.xml', '-jar', MC_SERVER_JAR, 'nogui'], { stdio: 'pipe', cwd: MC_SERVER_PATH, }); From f71a27a3314ed2f903f1a34a30fae5c050d37460 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 18:18:58 +0200 Subject: [PATCH 05/10] checks what the server output is --- test/test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test.js b/test/test.js index 0da39ab..2ab6cbe 100644 --- a/test/test.js +++ b/test/test.js @@ -255,7 +255,7 @@ describe("client", function() { return done(new Error("The file "+MC_SERVER_JAR+" doesn't exist.")); } - mcServer = spawn('java', [ '-Dlog4j.configurationFile=server/server_debug.xml', '-jar', MC_SERVER_JAR, 'nogui'], { + mcServer = spawn('java', [ '-Dlog4j.configurationFile=server/server_debug.xml', '-jar', MC_SERVER_JAR, 'nogui'], { stdio: 'pipe', cwd: MC_SERVER_PATH, }); @@ -266,6 +266,7 @@ describe("client", function() { mcServer.stdout.on('data', onData); mcServer.stderr.on('data', onData); function onData(data) { + console.log(data); buffer += data; var lines = buffer.split("\n"); var len = lines.length - 1; From e120aca4f9ad7132784c72cb9b78f29d339abe02 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 18:23:01 +0200 Subject: [PATCH 06/10] fix mc_server path --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 457fe4c..24d30fd 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: environment: - MC_SERVER_JAR: minecraft-server/minecraft_server.1.8.3.jar + MC_SERVER_JAR: $HOME/minecraft-server/minecraft_server.1.8.3.jar node: version: 0.10.28 java: From f8352d5f7bf68bdb1d15b500c0e11ada2a42a65c Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 18:26:48 +0200 Subject: [PATCH 07/10] fix wget --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 24d30fd..be0f831 100644 --- a/circle.yml +++ b/circle.yml @@ -8,4 +8,4 @@ machine: dependencies: pre: - mkdir minecraft-server - - wget https://s3.amazonaws.com/Minecraft.Download/versions/1.8.3/minecraft_server.1.8.3.jar -O minecraft-server/minecraft_server.1.8.3.jar + - wget https://s3.amazonaws.com/Minecraft.Download/versions/1.8.3/minecraft_server.1.8.3.jar -O $MC_SERVER_JAR From 0e918c496cc6e001bb56d109d9b17c39b25c29b7 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 18:28:11 +0200 Subject: [PATCH 08/10] check where to save the jar --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index be0f831..81784c7 100644 --- a/circle.yml +++ b/circle.yml @@ -8,4 +8,5 @@ machine: dependencies: pre: - mkdir minecraft-server + - echo `pwd` - wget https://s3.amazonaws.com/Minecraft.Download/versions/1.8.3/minecraft_server.1.8.3.jar -O $MC_SERVER_JAR From dfb7aacb5ac063706168a9cb1cfe6760d8f03dd6 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 18:29:19 +0200 Subject: [PATCH 09/10] fix path again --- circle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 81784c7..74d8d5a 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: environment: - MC_SERVER_JAR: $HOME/minecraft-server/minecraft_server.1.8.3.jar + MC_SERVER_JAR: /home/ubuntu/node-minecraft-protocol/minecraft-server/minecraft_server.1.8.3.jar node: version: 0.10.28 java: @@ -8,5 +8,4 @@ machine: dependencies: pre: - mkdir minecraft-server - - echo `pwd` - wget https://s3.amazonaws.com/Minecraft.Download/versions/1.8.3/minecraft_server.1.8.3.jar -O $MC_SERVER_JAR From 73ed7e2cdd44939f15247d30ee296e83f66ca289 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Sun, 29 Mar 2015 18:33:45 +0200 Subject: [PATCH 10/10] removes some console.log --- test/test.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/test.js b/test/test.js index 2ab6cbe..92b19dc 100644 --- a/test/test.js +++ b/test/test.js @@ -249,9 +249,7 @@ describe("client", function() { }); batch.end(function(err) { if (err) return done(err); - //console.log(MC_SERVER_JAR); if (!fs.existsSync(MC_SERVER_JAR)) { - console.log("The file "+MC_SERVER_JAR+" doesn't exist."); return done(new Error("The file "+MC_SERVER_JAR+" doesn't exist.")); } @@ -266,7 +264,6 @@ describe("client", function() { mcServer.stdout.on('data', onData); mcServer.stderr.on('data', onData); function onData(data) { - console.log(data); buffer += data; var lines = buffer.split("\n"); var len = lines.length - 1;