From 7bc90881cadf83d77e88909fc65e880738aeba6f Mon Sep 17 00:00:00 2001 From: wonderingabout Date: Sun, 5 Jul 2020 00:08:55 +0200 Subject: [PATCH] Split /utils into( /gtp, /options), and /test/utils ( /test/base_server_packets, /test/fake_modules, /test/module_loading, /test/utils) (#342) * move gtp helpers from /utils to /gtp_helpers * rename /utils to /options_helpers * move base server packets to /test/base_server_packets * move module loading helpers to /test/module_loading_helpers * move fake modules to /test/fake_modules * rename _helpers to "" * add /gtp/** and /options/** to npm package.json for an npm install * fix console logging version 6.0 to 6.0.0 * version bump from 6.0.0 to 6.0.1 --- bot.js | 6 +++--- config.js | 10 +++++----- connection.js | 6 +++--- game.js | 4 ++-- {utils => gtp}/char2num.js | 0 {utils => gtp}/decodeMoves.js | 0 {utils => gtp}/gtpchar2num.js | 0 {utils => gtp}/move2gtpvertex.js | 0 {utils => gtp}/num2char.js | 0 {utils => options}/getArgNamesGRU.js | 0 {utils => options}/getArgNamesUnderscoredGRU.js | 0 {utils => options}/getOptionName.js | 0 {utils => options}/getRankedUnranked.js | 0 {utils => options}/getRankedUnrankedUnderscored.js | 0 package.json | 7 +++++-- pv.js | 6 +++--- .../base_active_game.js | 0 .../base_challenge.js | 0 .../base_gamedata.js | 0 test/checkChallenge.test.js | 10 +++++----- test/e2e.test.js | 14 +++++++------- test/{utils => fake_modules}/FakeAPI.js | 0 test/{utils => fake_modules}/FakeGTP.js | 0 test/{utils => fake_modules}/FakeSocket.js | 0 .../assignConfigArguments.js | 0 test/{utils => module_loading}/getNewConfig.js | 0 .../getNewConfigUncached.js | 0 .../getNewConnectionUncached.js | 0 test/{utils => module_loading}/requireUncached.js | 0 29 files changed, 33 insertions(+), 30 deletions(-) rename {utils => gtp}/char2num.js (100%) rename {utils => gtp}/decodeMoves.js (100%) rename {utils => gtp}/gtpchar2num.js (100%) rename {utils => gtp}/move2gtpvertex.js (100%) rename {utils => gtp}/num2char.js (100%) rename {utils => options}/getArgNamesGRU.js (100%) rename {utils => options}/getArgNamesUnderscoredGRU.js (100%) rename {utils => options}/getOptionName.js (100%) rename {utils => options}/getRankedUnranked.js (100%) rename {utils => options}/getRankedUnrankedUnderscored.js (100%) rename test/{utils => base_server_packets}/base_active_game.js (100%) rename test/{utils => base_server_packets}/base_challenge.js (100%) rename test/{utils => base_server_packets}/base_gamedata.js (100%) rename test/{utils => fake_modules}/FakeAPI.js (100%) rename test/{utils => fake_modules}/FakeGTP.js (100%) rename test/{utils => fake_modules}/FakeSocket.js (100%) rename test/{utils => module_loading}/assignConfigArguments.js (100%) rename test/{utils => module_loading}/getNewConfig.js (100%) rename test/{utils => module_loading}/getNewConfigUncached.js (100%) rename test/{utils => module_loading}/getNewConnectionUncached.js (100%) rename test/{utils => module_loading}/requireUncached.js (100%) diff --git a/bot.js b/bot.js index 56e130a76..47261acc5 100644 --- a/bot.js +++ b/bot.js @@ -3,9 +3,9 @@ const child_process = require('child_process'); const split2 = require('split2'); -const { decodeMoves } = require("./utils/decodeMoves"); -const { gtpchar2num } = require("./utils/gtpchar2num"); -const { move2gtpvertex } = require("./utils/move2gtpvertex"); +const { decodeMoves } = require("./gtp/decodeMoves"); +const { gtpchar2num } = require("./gtp/gtpchar2num"); +const { move2gtpvertex } = require("./gtp/move2gtpvertex"); const console = require('./console').console; const config = require('./config'); diff --git a/config.js b/config.js index ec7361259..570ea04f1 100644 --- a/config.js +++ b/config.js @@ -5,10 +5,10 @@ const fs = require('fs'); -const { getArgNamesGRU } = require('./utils/getArgNamesGRU'); -const { getOptionName } = require('./utils/getOptionName'); -const { getRankedUnranked } = require('./utils/getRankedUnranked'); -const { getRankedUnrankedUnderscored } = require('./utils/getRankedUnrankedUnderscored'); +const { getArgNamesGRU } = require('./options/getArgNamesGRU'); +const { getOptionName } = require('./options/getOptionName'); +const { getRankedUnranked } = require('./options/getRankedUnranked'); +const { getRankedUnrankedUnderscored } = require('./options/getRankedUnrankedUnderscored'); exports.check_rejectnew = function() {}; @@ -210,7 +210,7 @@ exports.updateFromArgv = function() { // A- greeting and debug status const debugStatus = argv.debug ? "ON" : "OFF"; - console.log(`\ngtp2ogs version 6.0` + console.log(`\ngtp2ogs version 6.0.1` + `\n--------------------` + `\n- For changelog or latest devel updates, ` + `please visit https://github.com/online-go/gtp2ogs/tree/devel` diff --git a/connection.js b/connection.js index e4ceca5c8..7b5583009 100644 --- a/connection.js +++ b/connection.js @@ -4,9 +4,9 @@ const http = require('http'); const https = require('https'); const querystring = require('querystring'); -const { getArgNamesGRU } = require('./utils/getArgNamesGRU'); -const { getArgNamesUnderscoredGRU } = require('./utils/getArgNamesUnderscoredGRU'); -const { getRankedUnranked } = require('./utils/getRankedUnranked'); +const { getArgNamesGRU } = require('./options/getArgNamesGRU'); +const { getArgNamesUnderscoredGRU } = require('./options/getArgNamesUnderscoredGRU'); +const { getRankedUnranked } = require('./options/getRankedUnranked'); let config; const console = require('./console').console; diff --git a/game.js b/game.js index 347f369ef..ffeeab1f2 100644 --- a/game.js +++ b/game.js @@ -1,7 +1,7 @@ // vim: tw=120 softtabstop=4 shiftwidth=4 -const { decodeMoves } = require("./utils/decodeMoves"); -const { move2gtpvertex } = require("./utils/move2gtpvertex"); +const { decodeMoves } = require("./gtp/decodeMoves"); +const { move2gtpvertex } = require("./gtp/move2gtpvertex"); const Bot = require('./bot').Bot; const console = require('./console').console; diff --git a/utils/char2num.js b/gtp/char2num.js similarity index 100% rename from utils/char2num.js rename to gtp/char2num.js diff --git a/utils/decodeMoves.js b/gtp/decodeMoves.js similarity index 100% rename from utils/decodeMoves.js rename to gtp/decodeMoves.js diff --git a/utils/gtpchar2num.js b/gtp/gtpchar2num.js similarity index 100% rename from utils/gtpchar2num.js rename to gtp/gtpchar2num.js diff --git a/utils/move2gtpvertex.js b/gtp/move2gtpvertex.js similarity index 100% rename from utils/move2gtpvertex.js rename to gtp/move2gtpvertex.js diff --git a/utils/num2char.js b/gtp/num2char.js similarity index 100% rename from utils/num2char.js rename to gtp/num2char.js diff --git a/utils/getArgNamesGRU.js b/options/getArgNamesGRU.js similarity index 100% rename from utils/getArgNamesGRU.js rename to options/getArgNamesGRU.js diff --git a/utils/getArgNamesUnderscoredGRU.js b/options/getArgNamesUnderscoredGRU.js similarity index 100% rename from utils/getArgNamesUnderscoredGRU.js rename to options/getArgNamesUnderscoredGRU.js diff --git a/utils/getOptionName.js b/options/getOptionName.js similarity index 100% rename from utils/getOptionName.js rename to options/getOptionName.js diff --git a/utils/getRankedUnranked.js b/options/getRankedUnranked.js similarity index 100% rename from utils/getRankedUnranked.js rename to options/getRankedUnranked.js diff --git a/utils/getRankedUnrankedUnderscored.js b/options/getRankedUnrankedUnderscored.js similarity index 100% rename from utils/getRankedUnrankedUnderscored.js rename to options/getRankedUnrankedUnderscored.js diff --git a/package.json b/package.json index a64b33cef..c76a4c580 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gtp2ogs", - "version": "6.0.0", + "version": "6.0.1", "description": "Wrapper to allow Gnu Go Text Protocol speaking Go engines to connect to Online-Go.com and play games", "main": "gtp2ogs.js", "files": [ @@ -9,7 +9,10 @@ "connection.js", "console.js", "game.js", - "gtp2ogs.js" + "gtp2ogs.js", + "pv.js", + "gtp/**", + "options/**" ], "bin": { "gtp2ogs": "gtp2ogs.js" diff --git a/pv.js b/pv.js index 38fc479a3..7196df274 100644 --- a/pv.js +++ b/pv.js @@ -1,6 +1,6 @@ -const { char2num } = require("./utils/char2num"); -const { gtpchar2num } = require("./utils/gtpchar2num"); -const { num2char } = require("./utils/num2char"); +const { char2num } = require("./gtp/char2num"); +const { gtpchar2num } = require("./gtp/gtpchar2num"); +const { num2char } = require("./gtp/num2char"); class Pv { constructor(setting, game) { diff --git a/test/utils/base_active_game.js b/test/base_server_packets/base_active_game.js similarity index 100% rename from test/utils/base_active_game.js rename to test/base_server_packets/base_active_game.js diff --git a/test/utils/base_challenge.js b/test/base_server_packets/base_challenge.js similarity index 100% rename from test/utils/base_challenge.js rename to test/base_server_packets/base_challenge.js diff --git a/test/utils/base_gamedata.js b/test/base_server_packets/base_gamedata.js similarity index 100% rename from test/utils/base_gamedata.js rename to test/base_server_packets/base_gamedata.js diff --git a/test/checkChallenge.test.js b/test/checkChallenge.test.js index 94882d5cd..a53b90d25 100644 --- a/test/checkChallenge.test.js +++ b/test/checkChallenge.test.js @@ -4,11 +4,11 @@ const assert = require('assert'); const https = require('https'); const sinon = require('sinon'); -const { base_challenge } = require('./utils/base_challenge'); -const { FakeAPI } = require('./utils/FakeAPI'); -const { FakeSocket } = require('./utils/FakeSocket'); -const { getNewConfigUncached } = require('./utils/getNewConfigUncached'); -const { getNewConnectionUncached } = require('./utils/getNewConnectionUncached'); +const { base_challenge } = require('./base_server_packets/base_challenge'); +const { FakeAPI } = require('./fake_modules/FakeAPI'); +const { FakeSocket } = require('./fake_modules/FakeSocket'); +const { getNewConfigUncached } = require('./module_loading/getNewConfigUncached'); +const { getNewConnectionUncached } = require('./module_loading/getNewConnectionUncached'); const { stub_console } = require('./utils/stub_console'); let config; diff --git a/test/e2e.test.js b/test/e2e.test.js index 6a3c95a4d..4336135f0 100644 --- a/test/e2e.test.js +++ b/test/e2e.test.js @@ -6,13 +6,13 @@ const fs = require('fs'); const https = require('https'); const sinon = require('sinon'); -const { base_active_game } = require('./utils/base_active_game'); -const { base_challenge } = require('./utils/base_challenge'); -const { base_gamedata } = require('./utils/base_gamedata'); -const { FakeAPI } = require('./utils/FakeAPI'); -const { FakeGTP } = require('./utils/FakeGTP'); -const { FakeSocket } = require('./utils/FakeSocket'); -const { getNewConfig } = require('./utils/getNewConfig'); +const { base_active_game } = require('./base_server_packets/base_active_game'); +const { base_challenge } = require('./base_server_packets/base_challenge'); +const { base_gamedata } = require('./base_server_packets/base_gamedata'); +const { FakeAPI } = require('./fake_modules/FakeAPI'); +const { FakeGTP } = require('./fake_modules/FakeGTP'); +const { FakeSocket } = require('./fake_modules/FakeSocket'); +const { getNewConfig } = require('./module_loading/getNewConfig'); const { stub_console } = require('./utils/stub_console'); const { Bot } = require('../bot'); diff --git a/test/utils/FakeAPI.js b/test/fake_modules/FakeAPI.js similarity index 100% rename from test/utils/FakeAPI.js rename to test/fake_modules/FakeAPI.js diff --git a/test/utils/FakeGTP.js b/test/fake_modules/FakeGTP.js similarity index 100% rename from test/utils/FakeGTP.js rename to test/fake_modules/FakeGTP.js diff --git a/test/utils/FakeSocket.js b/test/fake_modules/FakeSocket.js similarity index 100% rename from test/utils/FakeSocket.js rename to test/fake_modules/FakeSocket.js diff --git a/test/utils/assignConfigArguments.js b/test/module_loading/assignConfigArguments.js similarity index 100% rename from test/utils/assignConfigArguments.js rename to test/module_loading/assignConfigArguments.js diff --git a/test/utils/getNewConfig.js b/test/module_loading/getNewConfig.js similarity index 100% rename from test/utils/getNewConfig.js rename to test/module_loading/getNewConfig.js diff --git a/test/utils/getNewConfigUncached.js b/test/module_loading/getNewConfigUncached.js similarity index 100% rename from test/utils/getNewConfigUncached.js rename to test/module_loading/getNewConfigUncached.js diff --git a/test/utils/getNewConnectionUncached.js b/test/module_loading/getNewConnectionUncached.js similarity index 100% rename from test/utils/getNewConnectionUncached.js rename to test/module_loading/getNewConnectionUncached.js diff --git a/test/utils/requireUncached.js b/test/module_loading/requireUncached.js similarity index 100% rename from test/utils/requireUncached.js rename to test/module_loading/requireUncached.js