diff --git a/bin/barracks-device-get b/bin/barracks-device-get deleted file mode 100755 index b28c808..0000000 --- a/bin/barracks-device-get +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const DeviceCommand = require('../commands/DeviceCommand'); -new DeviceCommand().render(); \ No newline at end of file diff --git a/bin/barracks-device-ls b/bin/barracks-device-ls deleted file mode 100755 index 7a376fa..0000000 --- a/bin/barracks-device-ls +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const DevicesCommand = require('../commands/DevicesCommand'); -new DevicesCommand().render(); \ No newline at end of file diff --git a/bin/barracks-filter-create b/bin/barracks-filter-create deleted file mode 100755 index 8d32450..0000000 --- a/bin/barracks-filter-create +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const CreateFilterCommand = require('../commands/CreateFilterCommand'); -new CreateFilterCommand().render(); \ No newline at end of file diff --git a/bin/barracks-filter-ls b/bin/barracks-filter-ls deleted file mode 100755 index cff7309..0000000 --- a/bin/barracks-filter-ls +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const FiltersCommand = require('../commands/FiltersCommand'); -new FiltersCommand().render(); \ No newline at end of file diff --git a/bin/barracks-filter-rm b/bin/barracks-filter-rm deleted file mode 100755 index 5b6d439..0000000 --- a/bin/barracks-filter-rm +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const DeleteFilterCommand = require('../commands/DeleteFilterCommand'); -new DeleteFilterCommand().render(); \ No newline at end of file diff --git a/bin/barracks-integration-ganalytics-init b/bin/barracks-integration-ganalytics-init deleted file mode 100755 index aa2b813..0000000 --- a/bin/barracks-integration-ganalytics-init +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const SetGoogleAnalyticsTrackingIdCommand = require('../commands/SetGoogleAnalyticsTrackingIdCommand'); -new SetGoogleAnalyticsTrackingIdCommand().render(); \ No newline at end of file diff --git a/bin/barracks-package-create b/bin/barracks-package-create deleted file mode 100755 index 08beb29..0000000 --- a/bin/barracks-package-create +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const CreatePackageCommand = require('../commands/CreatePackageCommand'); -new CreatePackageCommand().render(); \ No newline at end of file diff --git a/bin/barracks-package-ls b/bin/barracks-package-ls deleted file mode 100755 index 1c4a84c..0000000 --- a/bin/barracks-package-ls +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const PackagesCommand = require('../commands/PackagesCommand'); -new PackagesCommand().render(); \ No newline at end of file diff --git a/bin/barracks-package-plan-deploy b/bin/barracks-package-plan-deploy deleted file mode 100755 index 6b898d7..0000000 --- a/bin/barracks-package-plan-deploy +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const CreateDeploymentPlanCommand = require('../commands/CreateDeploymentPlanCommand'); -new CreateDeploymentPlanCommand().render(); \ No newline at end of file diff --git a/bin/barracks-package-version-create b/bin/barracks-package-version-create deleted file mode 100755 index 40ecfa9..0000000 --- a/bin/barracks-package-version-create +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const CreatePackageVersionCommand = require('../commands/CreatePackageVersionCommand'); -new CreatePackageVersionCommand().render(); \ No newline at end of file diff --git a/bin/barracks-package-version-ls b/bin/barracks-package-version-ls deleted file mode 100755 index 3374f5f..0000000 --- a/bin/barracks-package-version-ls +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const PackageVersionsCommand = require('../commands/PackageVersionsCommand'); -new PackageVersionsCommand().render(); \ No newline at end of file diff --git a/bin/barracks-segment-create b/bin/barracks-segment-create deleted file mode 100755 index b1ede9f..0000000 --- a/bin/barracks-segment-create +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const CreateSegmentCommand = require('../commands/CreateSegmentCommand'); -new CreateSegmentCommand().render(); \ No newline at end of file diff --git a/bin/barracks-segment-edit b/bin/barracks-segment-edit deleted file mode 100755 index 6ecc683..0000000 --- a/bin/barracks-segment-edit +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const EditSegmentCommand = require('../commands/EditSegmentCommand'); -new EditSegmentCommand().render(); \ No newline at end of file diff --git a/bin/barracks-segment-ls b/bin/barracks-segment-ls deleted file mode 100755 index ed9ca5d..0000000 --- a/bin/barracks-segment-ls +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const SegmentsCommand = require('../commands/SegmentsCommand'); -new SegmentsCommand().render(); \ No newline at end of file diff --git a/bin/barracks-segment-set-active b/bin/barracks-segment-set-active deleted file mode 100755 index 57920b2..0000000 --- a/bin/barracks-segment-set-active +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const SetActiveSegmentsCommand = require('../commands/SetActiveSegmentsCommand'); -new SetActiveSegmentsCommand().render(); \ No newline at end of file diff --git a/bin/barracks-token-create b/bin/barracks-token-create deleted file mode 100755 index 5874116..0000000 --- a/bin/barracks-token-create +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const CreateTokenCommand = require('../commands/CreateTokenCommand'); -new CreateTokenCommand().render(); \ No newline at end of file diff --git a/bin/barracks-token-ls b/bin/barracks-token-ls deleted file mode 100755 index d743ad0..0000000 --- a/bin/barracks-token-ls +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const TokensCommand = require('../commands/TokensCommand'); -new TokensCommand().render(); \ No newline at end of file diff --git a/bin/barracks-token-revoke b/bin/barracks-token-revoke deleted file mode 100755 index f07549f..0000000 --- a/bin/barracks-token-revoke +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const RevokeTokenCommand = require('../commands/RevokeTokenCommand'); -new RevokeTokenCommand().render(); \ No newline at end of file diff --git a/bin/barracks-update-archive b/bin/barracks-update-archive deleted file mode 100755 index d24c9cc..0000000 --- a/bin/barracks-update-archive +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const ArchiveCommand = require('../commands/ArchiveCommand'); -new ArchiveCommand().render(); \ No newline at end of file diff --git a/bin/barracks-update-create b/bin/barracks-update-create deleted file mode 100755 index bf6f6fb..0000000 --- a/bin/barracks-update-create +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const CreateUpdateCommand = require('../commands/CreateUpdateCommand'); -new CreateUpdateCommand().render(); \ No newline at end of file diff --git a/bin/barracks-update-edit b/bin/barracks-update-edit deleted file mode 100755 index 23da4d0..0000000 --- a/bin/barracks-update-edit +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const EditUpdateCommand = require('../commands/EditUpdateCommand'); -new EditUpdateCommand().render(); \ No newline at end of file diff --git a/bin/barracks-update-ls b/bin/barracks-update-ls deleted file mode 100755 index 34cc6b7..0000000 --- a/bin/barracks-update-ls +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const UpdatesCommand = require('../commands/UpdatesCommand'); -new UpdatesCommand().render(); \ No newline at end of file diff --git a/bin/barracks-update-publish b/bin/barracks-update-publish deleted file mode 100755 index ed53086..0000000 --- a/bin/barracks-update-publish +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const PublishCommand = require('../commands/PublishCommand'); -new PublishCommand().render(); \ No newline at end of file diff --git a/bin/barracks-update-schedule b/bin/barracks-update-schedule deleted file mode 100755 index 7d8c205..0000000 --- a/bin/barracks-update-schedule +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env node - -const ScheduleCommand = require('../commands/ScheduleCommand'); -new ScheduleCommand().render(); \ No newline at end of file diff --git a/package.json b/package.json index 1e02da7..c9cde6b 100644 --- a/package.json +++ b/package.json @@ -3,15 +3,15 @@ "version": "1.1.0", "description": "A CLI tool for Barracks", "scripts": { - "start": "./bin/barracks", - "lint": "jshint **/**.js", + "start": "./src/bin/barracks", + "lint": "jshint src/**/**.js && jshint tests/**/**.js", "test": "npm run lint && npm run coverage && npm run check-coverage", - "coverage": "DEBUG=true istanbul cover ./node_modules/mocha/bin/_mocha **/*.spec.js -- -R spec", + "coverage": "DEBUG=true istanbul cover ./node_modules/mocha/bin/_mocha ./tests/ --recursive -- --recursive", "check-coverage": "istanbul check-coverage --statement 95 --branch 95 --function 95", "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls" }, "bin": { - "barracks": "bin/barracks" + "barracks": "src/bin/barracks" }, "contributors": [ { diff --git a/bin/barracks b/src/bin/barracks similarity index 94% rename from bin/barracks rename to src/bin/barracks index 832602f..1f9d232 100755 --- a/bin/barracks +++ b/src/bin/barracks @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); program .version(pjson.version) diff --git a/bin/barracks-account b/src/bin/barracks-account similarity index 100% rename from bin/barracks-account rename to src/bin/barracks-account diff --git a/bin/barracks-check-update b/src/bin/barracks-check-update similarity index 100% rename from bin/barracks-check-update rename to src/bin/barracks-check-update diff --git a/bin/barracks-device b/src/bin/barracks-device similarity index 88% rename from bin/barracks-device rename to src/bin/barracks-device index dae6062..47c260b 100755 --- a/bin/barracks-device +++ b/src/bin/barracks-device @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); const barracks = program .version(pjson.version) diff --git a/src/bin/barracks-device-get b/src/bin/barracks-device-get new file mode 100755 index 0000000..5668e73 --- /dev/null +++ b/src/bin/barracks-device-get @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const DeviceCommand = require('../commands/device/DeviceCommand'); +new DeviceCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-device-ls b/src/bin/barracks-device-ls new file mode 100755 index 0000000..421b041 --- /dev/null +++ b/src/bin/barracks-device-ls @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const DevicesCommand = require('../commands/device/DevicesCommand'); +new DevicesCommand().render(); \ No newline at end of file diff --git a/bin/barracks-filter b/src/bin/barracks-filter similarity index 87% rename from bin/barracks-filter rename to src/bin/barracks-filter index a9757df..5f979e2 100755 --- a/bin/barracks-filter +++ b/src/bin/barracks-filter @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); const barracks = program .command('ls', 'List filters') diff --git a/src/bin/barracks-filter-create b/src/bin/barracks-filter-create new file mode 100755 index 0000000..8654d4f --- /dev/null +++ b/src/bin/barracks-filter-create @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const CreateFilterCommand = require('../commands/filter/CreateFilterCommand'); +new CreateFilterCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-filter-ls b/src/bin/barracks-filter-ls new file mode 100755 index 0000000..7d0bb18 --- /dev/null +++ b/src/bin/barracks-filter-ls @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const FiltersCommand = require('../commands/filter/FiltersCommand'); +new FiltersCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-filter-rm b/src/bin/barracks-filter-rm new file mode 100755 index 0000000..5e127c6 --- /dev/null +++ b/src/bin/barracks-filter-rm @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const DeleteFilterCommand = require('../commands/filter/DeleteFilterCommand'); +new DeleteFilterCommand().render(); \ No newline at end of file diff --git a/bin/barracks-integration b/src/bin/barracks-integration similarity index 87% rename from bin/barracks-integration rename to src/bin/barracks-integration index dcd2383..ecc1fd4 100755 --- a/bin/barracks-integration +++ b/src/bin/barracks-integration @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); const barracks = program .version(pjson.version) diff --git a/bin/barracks-integration-ganalytics b/src/bin/barracks-integration-ganalytics similarity index 86% rename from bin/barracks-integration-ganalytics rename to src/bin/barracks-integration-ganalytics index 1d48baa..ef3710f 100755 --- a/bin/barracks-integration-ganalytics +++ b/src/bin/barracks-integration-ganalytics @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); const barracks = program .version(pjson.version) diff --git a/src/bin/barracks-integration-ganalytics-init b/src/bin/barracks-integration-ganalytics-init new file mode 100755 index 0000000..2dc7ac4 --- /dev/null +++ b/src/bin/barracks-integration-ganalytics-init @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const SetGoogleAnalyticsTrackingIdCommand = require('../commands/integration/SetGoogleAnalyticsTrackingIdCommand'); +new SetGoogleAnalyticsTrackingIdCommand().render(); \ No newline at end of file diff --git a/bin/barracks-login b/src/bin/barracks-login similarity index 100% rename from bin/barracks-login rename to src/bin/barracks-login diff --git a/bin/barracks-package b/src/bin/barracks-package similarity index 89% rename from bin/barracks-package rename to src/bin/barracks-package index 0c7a15f..fb5d44c 100755 --- a/bin/barracks-package +++ b/src/bin/barracks-package @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); const barracks = program .command('ls', 'List packages') diff --git a/src/bin/barracks-package-create b/src/bin/barracks-package-create new file mode 100755 index 0000000..1999637 --- /dev/null +++ b/src/bin/barracks-package-create @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const CreatePackageCommand = require('../commands/package/CreatePackageCommand'); +new CreatePackageCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-package-ls b/src/bin/barracks-package-ls new file mode 100755 index 0000000..de7fa4e --- /dev/null +++ b/src/bin/barracks-package-ls @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const PackagesCommand = require('../commands/package/PackagesCommand'); +new PackagesCommand().render(); \ No newline at end of file diff --git a/bin/barracks-package-plan b/src/bin/barracks-package-plan similarity index 85% rename from bin/barracks-package-plan rename to src/bin/barracks-package-plan index 6a94f6b..229d062 100755 --- a/bin/barracks-package-plan +++ b/src/bin/barracks-package-plan @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); const barracks = program .command('deploy', 'Deploy a deployment plan'); diff --git a/src/bin/barracks-package-plan-deploy b/src/bin/barracks-package-plan-deploy new file mode 100755 index 0000000..24cb8fb --- /dev/null +++ b/src/bin/barracks-package-plan-deploy @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const CreateDeploymentPlanCommand = require('../commands/package/CreateDeploymentPlanCommand'); +new CreateDeploymentPlanCommand().render(); \ No newline at end of file diff --git a/bin/barracks-package-version b/src/bin/barracks-package-version similarity index 86% rename from bin/barracks-package-version rename to src/bin/barracks-package-version index bf5e605..a052a22 100755 --- a/bin/barracks-package-version +++ b/src/bin/barracks-package-version @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); const barracks = program .command('ls', 'List versions') diff --git a/src/bin/barracks-package-version-create b/src/bin/barracks-package-version-create new file mode 100755 index 0000000..80afd20 --- /dev/null +++ b/src/bin/barracks-package-version-create @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const CreatePackageVersionCommand = require('../commands/package/CreatePackageVersionCommand'); +new CreatePackageVersionCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-package-version-ls b/src/bin/barracks-package-version-ls new file mode 100755 index 0000000..1c03748 --- /dev/null +++ b/src/bin/barracks-package-version-ls @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const PackageVersionsCommand = require('../commands/package/PackageVersionsCommand'); +new PackageVersionsCommand().render(); \ No newline at end of file diff --git a/bin/barracks-segment b/src/bin/barracks-segment similarity index 89% rename from bin/barracks-segment rename to src/bin/barracks-segment index 0a0d0ec..696d496 100755 --- a/bin/barracks-segment +++ b/src/bin/barracks-segment @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); program .version(pjson.version) diff --git a/src/bin/barracks-segment-create b/src/bin/barracks-segment-create new file mode 100755 index 0000000..9f3c1eb --- /dev/null +++ b/src/bin/barracks-segment-create @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const CreateSegmentCommand = require('../commands/segment/CreateSegmentCommand'); +new CreateSegmentCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-segment-edit b/src/bin/barracks-segment-edit new file mode 100755 index 0000000..a72c4d8 --- /dev/null +++ b/src/bin/barracks-segment-edit @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const EditSegmentCommand = require('../commands/segment/EditSegmentCommand'); +new EditSegmentCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-segment-ls b/src/bin/barracks-segment-ls new file mode 100755 index 0000000..5b171a1 --- /dev/null +++ b/src/bin/barracks-segment-ls @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const SegmentsCommand = require('../commands/segment/SegmentsCommand'); +new SegmentsCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-segment-set-active b/src/bin/barracks-segment-set-active new file mode 100755 index 0000000..fc59632 --- /dev/null +++ b/src/bin/barracks-segment-set-active @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const SetActiveSegmentsCommand = require('../commands/segment/SetActiveSegmentsCommand'); +new SetActiveSegmentsCommand().render(); \ No newline at end of file diff --git a/bin/barracks-token b/src/bin/barracks-token similarity index 87% rename from bin/barracks-token rename to src/bin/barracks-token index 4dc1b43..43cfbd3 100755 --- a/bin/barracks-token +++ b/src/bin/barracks-token @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); const barracks = program .command('ls', 'List tokens') diff --git a/src/bin/barracks-token-create b/src/bin/barracks-token-create new file mode 100755 index 0000000..51b2e9b --- /dev/null +++ b/src/bin/barracks-token-create @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const CreateTokenCommand = require('../commands/token/CreateTokenCommand'); +new CreateTokenCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-token-ls b/src/bin/barracks-token-ls new file mode 100755 index 0000000..6776873 --- /dev/null +++ b/src/bin/barracks-token-ls @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const TokensCommand = require('../commands/token/TokensCommand'); +new TokensCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-token-revoke b/src/bin/barracks-token-revoke new file mode 100755 index 0000000..76d264a --- /dev/null +++ b/src/bin/barracks-token-revoke @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const RevokeTokenCommand = require('../commands/token/RevokeTokenCommand'); +new RevokeTokenCommand().render(); \ No newline at end of file diff --git a/bin/barracks-update b/src/bin/barracks-update similarity index 91% rename from bin/barracks-update rename to src/bin/barracks-update index d43643f..c5d4647 100755 --- a/bin/barracks-update +++ b/src/bin/barracks-update @@ -2,7 +2,7 @@ const program = require('commander'); const config = require('../config.js'); -const pjson = require('../package.json'); +const pjson = require('../../package.json'); const barracks = program .version(pjson.version) diff --git a/src/bin/barracks-update-archive b/src/bin/barracks-update-archive new file mode 100755 index 0000000..cb2f407 --- /dev/null +++ b/src/bin/barracks-update-archive @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const ArchiveCommand = require('../commands/update/ArchiveCommand'); +new ArchiveCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-update-create b/src/bin/barracks-update-create new file mode 100755 index 0000000..0c42360 --- /dev/null +++ b/src/bin/barracks-update-create @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const CreateUpdateCommand = require('../commands/update/CreateUpdateCommand'); +new CreateUpdateCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-update-edit b/src/bin/barracks-update-edit new file mode 100755 index 0000000..44c7907 --- /dev/null +++ b/src/bin/barracks-update-edit @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const EditUpdateCommand = require('../commands/update/EditUpdateCommand'); +new EditUpdateCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-update-ls b/src/bin/barracks-update-ls new file mode 100755 index 0000000..1799d9a --- /dev/null +++ b/src/bin/barracks-update-ls @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const UpdatesCommand = require('../commands/update/UpdatesCommand'); +new UpdatesCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-update-publish b/src/bin/barracks-update-publish new file mode 100755 index 0000000..c27474f --- /dev/null +++ b/src/bin/barracks-update-publish @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const PublishCommand = require('../commands/update/PublishCommand'); +new PublishCommand().render(); \ No newline at end of file diff --git a/src/bin/barracks-update-schedule b/src/bin/barracks-update-schedule new file mode 100755 index 0000000..bb45067 --- /dev/null +++ b/src/bin/barracks-update-schedule @@ -0,0 +1,4 @@ +#!/usr/bin/env node + +const ScheduleCommand = require('../commands/update/ScheduleCommand'); +new ScheduleCommand().render(); \ No newline at end of file diff --git a/clients/Barracks.js b/src/clients/Barracks.js similarity index 100% rename from clients/Barracks.js rename to src/clients/Barracks.js diff --git a/clients/HTTPClient.js b/src/clients/HTTPClient.js similarity index 100% rename from clients/HTTPClient.js rename to src/clients/HTTPClient.js diff --git a/clients/PageableStream.js b/src/clients/PageableStream.js similarity index 100% rename from clients/PageableStream.js rename to src/clients/PageableStream.js diff --git a/commands/AccountCommand.js b/src/commands/AccountCommand.js similarity index 100% rename from commands/AccountCommand.js rename to src/commands/AccountCommand.js diff --git a/commands/BarracksCommand.js b/src/commands/BarracksCommand.js similarity index 100% rename from commands/BarracksCommand.js rename to src/commands/BarracksCommand.js diff --git a/commands/CheckUpdateCommand.js b/src/commands/CheckUpdateCommand.js similarity index 100% rename from commands/CheckUpdateCommand.js rename to src/commands/CheckUpdateCommand.js diff --git a/commands/LoginCommand.js b/src/commands/LoginCommand.js similarity index 100% rename from commands/LoginCommand.js rename to src/commands/LoginCommand.js diff --git a/commands/DeviceCommand.js b/src/commands/device/DeviceCommand.js similarity index 93% rename from commands/DeviceCommand.js rename to src/commands/device/DeviceCommand.js index f600552..337d632 100644 --- a/commands/DeviceCommand.js +++ b/src/commands/device/DeviceCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class DeviceCommand extends BarracksCommand { diff --git a/commands/DevicesCommand.js b/src/commands/device/DevicesCommand.js similarity index 97% rename from commands/DevicesCommand.js rename to src/commands/device/DevicesCommand.js index eccc928..dcd0a55 100644 --- a/commands/DevicesCommand.js +++ b/src/commands/device/DevicesCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); function getAllDevicesFromFilter(token, barracks, filterName) { return new Promise((resolve, reject) => { diff --git a/commands/CreateFilterCommand.js b/src/commands/filter/CreateFilterCommand.js similarity index 86% rename from commands/CreateFilterCommand.js rename to src/commands/filter/CreateFilterCommand.js index 4500f09..3d26075 100644 --- a/commands/CreateFilterCommand.js +++ b/src/commands/filter/CreateFilterCommand.js @@ -1,5 +1,5 @@ -const Validator = require('../utils/Validator'); -const BarracksCommand = require('./BarracksCommand'); +const Validator = require('../../utils/Validator'); +const BarracksCommand = require('../BarracksCommand'); class CreateFilterCommand extends BarracksCommand { diff --git a/commands/DeleteFilterCommand.js b/src/commands/filter/DeleteFilterCommand.js similarity index 79% rename from commands/DeleteFilterCommand.js rename to src/commands/filter/DeleteFilterCommand.js index ffc3371..f1c08a0 100644 --- a/commands/DeleteFilterCommand.js +++ b/src/commands/filter/DeleteFilterCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class DeleteFilterCommand extends BarracksCommand { diff --git a/commands/FiltersCommand.js b/src/commands/filter/FiltersCommand.js similarity index 79% rename from commands/FiltersCommand.js rename to src/commands/filter/FiltersCommand.js index 5bbd9ee..40fdaf0 100644 --- a/commands/FiltersCommand.js +++ b/src/commands/filter/FiltersCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class FiltersCommand extends BarracksCommand { diff --git a/commands/SetGoogleAnalyticsTrackingIdCommand.js b/src/commands/integration/SetGoogleAnalyticsTrackingIdCommand.js similarity index 90% rename from commands/SetGoogleAnalyticsTrackingIdCommand.js rename to src/commands/integration/SetGoogleAnalyticsTrackingIdCommand.js index 4a8b3e2..a15c201 100644 --- a/commands/SetGoogleAnalyticsTrackingIdCommand.js +++ b/src/commands/integration/SetGoogleAnalyticsTrackingIdCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class SetGoogleAnalyticsTrackingIdCommand extends BarracksCommand { diff --git a/commands/CreateDeploymentPlanCommand.js b/src/commands/package/CreateDeploymentPlanCommand.js similarity index 95% rename from commands/CreateDeploymentPlanCommand.js rename to src/commands/package/CreateDeploymentPlanCommand.js index 56aadcf..c7efa03 100644 --- a/commands/CreateDeploymentPlanCommand.js +++ b/src/commands/package/CreateDeploymentPlanCommand.js @@ -1,5 +1,5 @@ -const BarracksCommand = require('./BarracksCommand'); -const Validator = require('../utils/Validator'); +const BarracksCommand = require('../BarracksCommand'); +const Validator = require('../../utils/Validator'); const inStream = require('in-stream'); const fs = require('fs'); diff --git a/commands/CreatePackageCommand.js b/src/commands/package/CreatePackageCommand.js similarity index 94% rename from commands/CreatePackageCommand.js rename to src/commands/package/CreatePackageCommand.js index 722b068..b49f40d 100644 --- a/commands/CreatePackageCommand.js +++ b/src/commands/package/CreatePackageCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class CreatePackageCommand extends BarracksCommand { diff --git a/commands/CreatePackageVersionCommand.js b/src/commands/package/CreatePackageVersionCommand.js similarity index 93% rename from commands/CreatePackageVersionCommand.js rename to src/commands/package/CreatePackageVersionCommand.js index de25a14..bf0fb6d 100644 --- a/commands/CreatePackageVersionCommand.js +++ b/src/commands/package/CreatePackageVersionCommand.js @@ -1,5 +1,5 @@ -const Validator = require('../utils/Validator'); -const BarracksCommand = require('./BarracksCommand'); +const Validator = require('../../utils/Validator'); +const BarracksCommand = require('../BarracksCommand'); class CreatePackageVersionCommand extends BarracksCommand { diff --git a/commands/PackageVersionsCommand.js b/src/commands/package/PackageVersionsCommand.js similarity index 84% rename from commands/PackageVersionsCommand.js rename to src/commands/package/PackageVersionsCommand.js index 33a38c9..a410b69 100644 --- a/commands/PackageVersionsCommand.js +++ b/src/commands/package/PackageVersionsCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class PackageVersionsCommand extends BarracksCommand { diff --git a/commands/PackagesCommand.js b/src/commands/package/PackagesCommand.js similarity index 83% rename from commands/PackagesCommand.js rename to src/commands/package/PackagesCommand.js index c4a9f35..659e730 100644 --- a/commands/PackagesCommand.js +++ b/src/commands/package/PackagesCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class PackagesCommand extends BarracksCommand { diff --git a/commands/CreateSegmentCommand.js b/src/commands/segment/CreateSegmentCommand.js similarity index 86% rename from commands/CreateSegmentCommand.js rename to src/commands/segment/CreateSegmentCommand.js index 3573e2e..86c4d98 100644 --- a/commands/CreateSegmentCommand.js +++ b/src/commands/segment/CreateSegmentCommand.js @@ -1,5 +1,5 @@ -const Validator = require('../utils/Validator'); -const BarracksCommand = require('./BarracksCommand'); +const Validator = require('../../utils/Validator'); +const BarracksCommand = require('../BarracksCommand'); class CreateSegmentCommand extends BarracksCommand { diff --git a/commands/EditSegmentCommand.js b/src/commands/segment/EditSegmentCommand.js similarity index 92% rename from commands/EditSegmentCommand.js rename to src/commands/segment/EditSegmentCommand.js index 4de1751..2d24ade 100644 --- a/commands/EditSegmentCommand.js +++ b/src/commands/segment/EditSegmentCommand.js @@ -1,5 +1,5 @@ -const Validator = require('../utils/Validator'); -const BarracksCommand = require('./BarracksCommand'); +const Validator = require('../../utils/Validator'); +const BarracksCommand = require('../BarracksCommand'); function extractOptions(program, fields) { const options = {}; diff --git a/commands/SegmentsCommand.js b/src/commands/segment/SegmentsCommand.js similarity index 79% rename from commands/SegmentsCommand.js rename to src/commands/segment/SegmentsCommand.js index e607a64..956411c 100644 --- a/commands/SegmentsCommand.js +++ b/src/commands/segment/SegmentsCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class SegmentsCommand extends BarracksCommand { diff --git a/commands/SetActiveSegmentsCommand.js b/src/commands/segment/SetActiveSegmentsCommand.js similarity index 92% rename from commands/SetActiveSegmentsCommand.js rename to src/commands/segment/SetActiveSegmentsCommand.js index 7c8b90a..cd2e9eb 100644 --- a/commands/SetActiveSegmentsCommand.js +++ b/src/commands/segment/SetActiveSegmentsCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class SetActiveSegmentsCommand extends BarracksCommand { diff --git a/commands/CreateTokenCommand.js b/src/commands/token/CreateTokenCommand.js similarity index 89% rename from commands/CreateTokenCommand.js rename to src/commands/token/CreateTokenCommand.js index 3269b00..1af22c2 100644 --- a/commands/CreateTokenCommand.js +++ b/src/commands/token/CreateTokenCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class CreateTokenCommand extends BarracksCommand { diff --git a/commands/RevokeTokenCommand.js b/src/commands/token/RevokeTokenCommand.js similarity index 88% rename from commands/RevokeTokenCommand.js rename to src/commands/token/RevokeTokenCommand.js index 2fbc8a7..db25c61 100644 --- a/commands/RevokeTokenCommand.js +++ b/src/commands/token/RevokeTokenCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class RevokeTokenCommand extends BarracksCommand { diff --git a/commands/TokensCommand.js b/src/commands/token/TokensCommand.js similarity index 79% rename from commands/TokensCommand.js rename to src/commands/token/TokensCommand.js index 1d11cd9..c72fee7 100644 --- a/commands/TokensCommand.js +++ b/src/commands/token/TokensCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class TokensCommand extends BarracksCommand { diff --git a/commands/ArchiveCommand.js b/src/commands/update/ArchiveCommand.js similarity index 80% rename from commands/ArchiveCommand.js rename to src/commands/update/ArchiveCommand.js index d93af68..e4a2a58 100644 --- a/commands/ArchiveCommand.js +++ b/src/commands/update/ArchiveCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class ArchiveCommand extends BarracksCommand { diff --git a/commands/CreateUpdateCommand.js b/src/commands/update/CreateUpdateCommand.js similarity index 94% rename from commands/CreateUpdateCommand.js rename to src/commands/update/CreateUpdateCommand.js index d56313b..bd5340e 100644 --- a/commands/CreateUpdateCommand.js +++ b/src/commands/update/CreateUpdateCommand.js @@ -1,5 +1,5 @@ -const Validator = require('../utils/Validator'); -const BarracksCommand = require('./BarracksCommand'); +const Validator = require('../../utils/Validator'); +const BarracksCommand = require('../BarracksCommand'); class CreateUpdateCommand extends BarracksCommand { diff --git a/commands/EditUpdateCommand.js b/src/commands/update/EditUpdateCommand.js similarity index 96% rename from commands/EditUpdateCommand.js rename to src/commands/update/EditUpdateCommand.js index 37ee510..bc0fea9 100644 --- a/commands/EditUpdateCommand.js +++ b/src/commands/update/EditUpdateCommand.js @@ -1,5 +1,5 @@ -const Validator = require('../utils/Validator'); -const BarracksCommand = require('./BarracksCommand'); +const Validator = require('../../utils/Validator'); +const BarracksCommand = require('../BarracksCommand'); function extractOptions(program, fields) { const options = {}; diff --git a/commands/PublishCommand.js b/src/commands/update/PublishCommand.js similarity index 81% rename from commands/PublishCommand.js rename to src/commands/update/PublishCommand.js index 7ae672b..b3505bc 100644 --- a/commands/PublishCommand.js +++ b/src/commands/update/PublishCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class PublishCommand extends BarracksCommand { diff --git a/commands/ScheduleCommand.js b/src/commands/update/ScheduleCommand.js similarity index 90% rename from commands/ScheduleCommand.js rename to src/commands/update/ScheduleCommand.js index e41b34b..e09ab91 100644 --- a/commands/ScheduleCommand.js +++ b/src/commands/update/ScheduleCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); function isDate(date) { return new RegExp(/\d{4}-\d{2}-\d{2}/).test(date); diff --git a/commands/UpdatesCommand.js b/src/commands/update/UpdatesCommand.js similarity index 88% rename from commands/UpdatesCommand.js rename to src/commands/update/UpdatesCommand.js index 7535ab3..cc2495f 100644 --- a/commands/UpdatesCommand.js +++ b/src/commands/update/UpdatesCommand.js @@ -1,4 +1,4 @@ -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require('../BarracksCommand'); class UpdatesCommand extends BarracksCommand { diff --git a/config.js b/src/config.js similarity index 97% rename from config.js rename to src/config.js index 36931ee..33739cb 100644 --- a/config.js +++ b/src/config.js @@ -72,10 +72,6 @@ module.exports = { method: 'GET', path: '/api/member/segments/:id' }, - getFilters: { - method: 'GET', - path: '/api/member/filters/' - }, getSegmentDevices: { method: 'GET', path: '/api/member/segments/:segmentId/devices' diff --git a/renderers/jsonRenderer.js b/src/renderers/jsonRenderer.js similarity index 100% rename from renderers/jsonRenderer.js rename to src/renderers/jsonRenderer.js diff --git a/renderers/prettyRenderer.js b/src/renderers/prettyRenderer.js similarity index 100% rename from renderers/prettyRenderer.js rename to src/renderers/prettyRenderer.js diff --git a/repositories/UserConfiguration.js b/src/repositories/UserConfiguration.js similarity index 100% rename from repositories/UserConfiguration.js rename to src/repositories/UserConfiguration.js diff --git a/utils/Validator.js b/src/utils/Validator.js similarity index 100% rename from utils/Validator.js rename to src/utils/Validator.js diff --git a/utils/logger.js b/src/utils/logger.js similarity index 100% rename from utils/logger.js rename to src/utils/logger.js diff --git a/clients/Barracks.spec.js b/tests/clients/Barracks.spec.js similarity index 99% rename from clients/Barracks.spec.js rename to tests/clients/Barracks.spec.js index 450214d..1b51159 100644 --- a/clients/Barracks.spec.js +++ b/tests/clients/Barracks.spec.js @@ -1,10 +1,11 @@ -const PageableStream = require('../clients/PageableStream'); +const barracksClientPath = '../../src/clients/Barracks'; +const PageableStream = require('../../src/clients/PageableStream'); const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const chaiAsPromised = require('chai-as-promised'); -const Barracks = require('./Barracks'); +const Barracks = require(barracksClientPath); const proxyquire = require('proxyquire').noCallThru(); chai.use(chaiAsPromised); @@ -642,7 +643,7 @@ describe('Barracks', () => { describe('#createPackage()', () => { beforeEach(() => { - const ProxifiedBarracks = proxyquire('./Barracks', { + const ProxifiedBarracks = proxyquire(barracksClientPath, { fs: { createReadStream: file => { return mockedCreateReadStream(file) } }, path: { basename: file => { return mockedBasename(file) } } }); @@ -1676,7 +1677,7 @@ describe('Barracks', () => { return filename; }; - const ProxifiedBarracks = proxyquire('./Barracks', { + const ProxifiedBarracks = proxyquire(barracksClientPath, { fs: { createReadStream: (path) => { return proxyCreateReadStream(path); }}, @@ -1839,7 +1840,7 @@ describe('Barracks', () => { const device = { unitId, versionId }; const constructorSpy = sinon.spy(); const checkUpdateSpy = sinon.stub().returns(Promise.reject(error)); - const ProxifiedBarracks = proxyquire('./Barracks', { + const ProxifiedBarracks = proxyquire(barracksClientPath, { 'barracks-sdk': function Constructor (options) { constructorSpy(options); this.checkUpdate = checkUpdateSpy; @@ -1877,7 +1878,7 @@ describe('Barracks', () => { const device = { unitId, versionId }; const constructorSpy = sinon.spy(); const checkUpdateSpy = sinon.stub().returns(Promise.resolve(undefined)); - const ProxifiedBarracks = proxyquire('./Barracks', { + const ProxifiedBarracks = proxyquire(barracksClientPath, { 'barracks-sdk': function Constructor (options) { constructorSpy(options); this.checkUpdate = checkUpdateSpy; @@ -1917,7 +1918,7 @@ describe('Barracks', () => { const device = { unitId, versionId }; const constructorSpy = sinon.spy(); const checkUpdateSpy = sinon.stub().returns(Promise.resolve(response)); - const ProxifiedBarracks = proxyquire('./Barracks', { + const ProxifiedBarracks = proxyquire(barracksClientPath, { 'barracks-sdk': function Constructor (options) { constructorSpy(options); this.checkUpdate = checkUpdateSpy; @@ -1958,7 +1959,7 @@ describe('Barracks', () => { const device = { unitId, versionId, customClientData }; const constructorSpy = sinon.spy(); const checkUpdateSpy = sinon.stub().returns(Promise.resolve(response)); - const ProxifiedBarracks = proxyquire('./Barracks', { + const ProxifiedBarracks = proxyquire(barracksClientPath, { 'barracks-sdk': function Constructor (options) { constructorSpy(options); this.checkUpdate = checkUpdateSpy; @@ -2152,7 +2153,7 @@ describe('Barracks', () => { const device = { unitId, versionId }; const constructorSpy = sinon.spy(); const checkUpdateSpy = sinon.stub().returns(Promise.reject(error)); - const ProxifiedBarracks = proxyquire('./Barracks', { + const ProxifiedBarracks = proxyquire(barracksClientPath, { 'barracks-sdk': function Constructor (options) { constructorSpy(options); this.checkUpdate = checkUpdateSpy; @@ -2187,7 +2188,7 @@ describe('Barracks', () => { const device = { unitId, versionId }; const constructorSpy = sinon.spy(); const checkUpdateSpy = sinon.stub().returns(Promise.resolve(undefined)); - const ProxifiedBarracks = proxyquire('./Barracks', { + const ProxifiedBarracks = proxyquire(barracksClientPath, { 'barracks-sdk': function Constructor (options) { constructorSpy(options); this.checkUpdate = checkUpdateSpy; @@ -2226,7 +2227,7 @@ describe('Barracks', () => { const downloadSpy = sinon.stub().returns(Promise.resolve(file)); const update = { download: downloadSpy }; const checkUpdateSpy = sinon.stub().returns(Promise.resolve(update)); - const ProxifiedBarracks = proxyquire('./Barracks', { + const ProxifiedBarracks = proxyquire(barracksClientPath, { 'barracks-sdk': function Constructor (options) { constructorSpy(options); this.checkUpdate = checkUpdateSpy; diff --git a/clients/HTTPClient.spec.js b/tests/clients/HTTPClient.spec.js similarity index 98% rename from clients/HTTPClient.spec.js rename to tests/clients/HTTPClient.spec.js index bb9a3b6..a62892a 100644 --- a/clients/HTTPClient.spec.js +++ b/tests/clients/HTTPClient.spec.js @@ -2,9 +2,9 @@ const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); -const chaiAsPromised = require("chai-as-promised"); +const chaiAsPromised = require('chai-as-promised'); const proxyquire = require('proxyquire').noCallThru(); -const PageableStream = require('./PageableStream'); +const PageableStream = require('../../src/clients/PageableStream'); chai.use(chaiAsPromised); chai.use(sinonChai); @@ -18,7 +18,7 @@ const baseUrl = 'http://barracks.io/'; describe('HTTPClient', () => { beforeEach(() => { - const HTTPClient = proxyquire('./HTTPClient', { + const HTTPClient = proxyquire('../../src/clients/HTTPClient', { 'request-promise': (options) => { return requestMock(options); } diff --git a/clients/PageableStream.spec.js b/tests/clients/PageableStream.spec.js similarity index 93% rename from clients/PageableStream.spec.js rename to tests/clients/PageableStream.spec.js index 3960d7e..0fb7aa0 100644 --- a/clients/PageableStream.spec.js +++ b/tests/clients/PageableStream.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; -const chaiAsPromised = require("chai-as-promised"); -const PageableStream = require('./PageableStream'); +const chaiAsPromised = require('chai-as-promised'); +const PageableStream = require('../../src/clients/PageableStream'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/AccountCommand.spec.js b/tests/commands/AccountCommand.spec.js similarity index 94% rename from commands/AccountCommand.spec.js rename to tests/commands/AccountCommand.spec.js index 3b418c1..31b0044 100644 --- a/commands/AccountCommand.spec.js +++ b/tests/commands/AccountCommand.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; -const chaiAsPromised = require("chai-as-promised"); -const AccountCommand = require('./AccountCommand'); +const chaiAsPromised = require('chai-as-promised'); +const AccountCommand = require('../../src/commands/AccountCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/BarracksCommand.spec.js b/tests/commands/BarracksCommand.spec.js similarity index 98% rename from commands/BarracksCommand.spec.js rename to tests/commands/BarracksCommand.spec.js index 30d7dbf..b18d995 100644 --- a/commands/BarracksCommand.spec.js +++ b/tests/commands/BarracksCommand.spec.js @@ -1,10 +1,11 @@ +const barracksCommandPath = '../../src/commands/BarracksCommand'; const mockStdin = require('mock-stdin'); const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; const chaiAsPromised = require('chai-as-promised'); -const BarracksCommand = require('./BarracksCommand'); +const BarracksCommand = require(barracksCommandPath); const proxyquire = require('proxyquire').noCallThru(); chai.use(chaiAsPromised); @@ -159,7 +160,7 @@ describe('BarracksCommand', () => { // Given const error = 'error'; const checkMockedRead = sinon.spy(); - const MockedBarracksCommand = proxyquire('./BarracksCommand', { + const MockedBarracksCommand = proxyquire(barracksCommandPath, { 'read': (options, callback) => { return mockedRead(options, callback); } @@ -190,7 +191,7 @@ describe('BarracksCommand', () => { const error = 'error'; const checkFirstMockedRead = sinon.spy(); const checkSecondMockedRead = sinon.spy(); - const MockedBarracksCommand = proxyquire('./BarracksCommand', { + const MockedBarracksCommand = proxyquire(barracksCommandPath, { 'read': (options, callback) => { return mockedRead(options, callback); } @@ -327,7 +328,7 @@ describe('BarracksCommand', () => { parse: () => { return program; } }; let program = minimumProgram; - const MockedBarracksCommand = proxyquire('./BarracksCommand', { + const MockedBarracksCommand = proxyquire(barracksCommandPath, { commander: program }); @@ -446,7 +447,7 @@ describe('BarracksCommand', () => { parse: () => { return program; } }; let program = minimumProgram; - const MockedBarracksCommand = proxyquire('./BarracksCommand', { + const MockedBarracksCommand = proxyquire(barracksCommandPath, { commander: program }); @@ -700,7 +701,7 @@ describe('BarracksCommand', () => { parse: () => { return program; }, help: () => {} }; - const MockedBarracksCommand = proxyquire('./BarracksCommand', { + const MockedBarracksCommand = proxyquire(barracksCommandPath, { '../renderers/prettyRenderer': (data) => { mockedRender(data); }, diff --git a/commands/CheckUpdateCommand.spec.js b/tests/commands/CheckUpdateCommand.spec.js similarity index 98% rename from commands/CheckUpdateCommand.spec.js rename to tests/commands/CheckUpdateCommand.spec.js index 8a86aba..1d35c6f 100644 --- a/commands/CheckUpdateCommand.spec.js +++ b/tests/commands/CheckUpdateCommand.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; -const chaiAsPromised = require("chai-as-promised"); -const CheckUpdateCommand = require('./CheckUpdateCommand'); +const chaiAsPromised = require('chai-as-promised'); +const CheckUpdateCommand = require('../../src/commands/CheckUpdateCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/LoginCommand.spec.js b/tests/commands/LoginCommand.spec.js similarity index 98% rename from commands/LoginCommand.spec.js rename to tests/commands/LoginCommand.spec.js index f0c9616..890a7af 100644 --- a/commands/LoginCommand.spec.js +++ b/tests/commands/LoginCommand.spec.js @@ -4,7 +4,7 @@ const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const chaiAsPromised = require('chai-as-promised'); -const LoginCommand = require('./LoginCommand'); +const LoginCommand = require('../../src/commands/LoginCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/DeviceCommand.spec.js b/tests/commands/device/DeviceCommand.spec.js similarity index 95% rename from commands/DeviceCommand.spec.js rename to tests/commands/device/DeviceCommand.spec.js index ce14ccf..742eec6 100644 --- a/commands/DeviceCommand.spec.js +++ b/tests/commands/device/DeviceCommand.spec.js @@ -2,9 +2,9 @@ const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); -const chaiAsPromised = require("chai-as-promised"); -const DeviceCommand = require('./DeviceCommand'); -const PageableStream = require('../clients/PageableStream'); +const chaiAsPromised = require('chai-as-promised'); +const DeviceCommand = require('../../../src/commands/device/DeviceCommand'); +const PageableStream = require('../../../src/clients/PageableStream'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/DevicesCommand.spec.js b/tests/commands/device/DevicesCommand.spec.js similarity index 98% rename from commands/DevicesCommand.spec.js rename to tests/commands/device/DevicesCommand.spec.js index 16b26ef..7ba6f78 100644 --- a/commands/DevicesCommand.spec.js +++ b/tests/commands/device/DevicesCommand.spec.js @@ -1,10 +1,10 @@ -const PageableStream = require('../clients/PageableStream'); +const PageableStream = require('../../../src/clients/PageableStream'); const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); -const chaiAsPromised = require("chai-as-promised"); -const DevicesCommand = require('./DevicesCommand'); +const chaiAsPromised = require('chai-as-promised'); +const DevicesCommand = require('../../../src/commands/device/DevicesCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/CreateFilterCommand.spec.js b/tests/commands/filter/CreateFilterCommand.spec.js similarity index 97% rename from commands/CreateFilterCommand.spec.js rename to tests/commands/filter/CreateFilterCommand.spec.js index 2c7dcfe..8561425 100644 --- a/commands/CreateFilterCommand.spec.js +++ b/tests/commands/filter/CreateFilterCommand.spec.js @@ -14,8 +14,8 @@ describe('CreateFilterCommand', () => { let proxyIsJsonString; let proxyFileExists; - const CreateFilterCommand = proxyquire('./CreateFilterCommand', { - '../utils/Validator': { + const CreateFilterCommand = proxyquire('../../../src/commands/filter/CreateFilterCommand', { + '../../utils/Validator': { isJsonString: (str) => { return proxyIsJsonString(str); }, diff --git a/commands/DeleteFilterCommand.spec.js b/tests/commands/filter/DeleteFilterCommand.spec.js similarity index 96% rename from commands/DeleteFilterCommand.spec.js rename to tests/commands/filter/DeleteFilterCommand.spec.js index d71c035..17d4d77 100644 --- a/commands/DeleteFilterCommand.spec.js +++ b/tests/commands/filter/DeleteFilterCommand.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; -const chaiAsPromised = require("chai-as-promised"); -const DeleteFilterCommand = require('./DeleteFilterCommand'); +const chaiAsPromised = require('chai-as-promised'); +const DeleteFilterCommand = require('../../../src/commands/filter/DeleteFilterCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/FiltersCommand.spec.js b/tests/commands/filter/FiltersCommand.spec.js similarity index 94% rename from commands/FiltersCommand.spec.js rename to tests/commands/filter/FiltersCommand.spec.js index 563c045..1329948 100644 --- a/commands/FiltersCommand.spec.js +++ b/tests/commands/filter/FiltersCommand.spec.js @@ -3,7 +3,7 @@ const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const chaiAsPromised = require('chai-as-promised'); -const FiltersCommand = require('./FiltersCommand'); +const FiltersCommand = require('../../../src/commands/filter/FiltersCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/SetGoogleAnalyticsTrackingIdCommand.spec.js b/tests/commands/integration/SetGoogleAnalyticsTrackingIdCommand.spec.js similarity index 95% rename from commands/SetGoogleAnalyticsTrackingIdCommand.spec.js rename to tests/commands/integration/SetGoogleAnalyticsTrackingIdCommand.spec.js index acb5310..eaf5eb5 100644 --- a/commands/SetGoogleAnalyticsTrackingIdCommand.spec.js +++ b/tests/commands/integration/SetGoogleAnalyticsTrackingIdCommand.spec.js @@ -1,10 +1,10 @@ -const PageableStream = require('../clients/PageableStream'); +const PageableStream = require('../../../src/clients/PageableStream'); const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const chaiAsPromised = require('chai-as-promised'); -const SetGoogleAnalyticsTrackingIdCommand = require('./SetGoogleAnalyticsTrackingIdCommand'); +const SetGoogleAnalyticsTrackingIdCommand = require('../../../src/commands/integration/SetGoogleAnalyticsTrackingIdCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/CreateDeploymentPlanCommand.spec.js b/tests/commands/package/CreateDeploymentPlanCommand.spec.js similarity index 99% rename from commands/CreateDeploymentPlanCommand.spec.js rename to tests/commands/package/CreateDeploymentPlanCommand.spec.js index dc71abd..b031580 100644 --- a/commands/CreateDeploymentPlanCommand.spec.js +++ b/tests/commands/package/CreateDeploymentPlanCommand.spec.js @@ -25,8 +25,8 @@ describe('CreateDeploymentPlanCommand', () => { const validProgram = { file }; function getProxyCommand() { - return proxyquire('./CreateDeploymentPlanCommand', { - '../utils/Validator': { + return proxyquire('../../../src/commands/package/CreateDeploymentPlanCommand', { + '../../utils/Validator': { isJsonString: (str) => { return proxyIsJsonString(str); }, diff --git a/commands/CreatePackageCommand.spec.js b/tests/commands/package/CreatePackageCommand.spec.js similarity index 97% rename from commands/CreatePackageCommand.spec.js rename to tests/commands/package/CreatePackageCommand.spec.js index 9be8de1..fdf5208 100644 --- a/commands/CreatePackageCommand.spec.js +++ b/tests/commands/package/CreatePackageCommand.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); -const chaiAsPromised = require("chai-as-promised"); -const CreatePackageCommand = require('./CreatePackageCommand'); +const chaiAsPromised = require('chai-as-promised'); +const CreatePackageCommand = require('../../../src/commands/package/CreatePackageCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/CreatePackageVersionCommand.spec.js b/tests/commands/package/CreatePackageVersionCommand.spec.js similarity index 98% rename from commands/CreatePackageVersionCommand.spec.js rename to tests/commands/package/CreatePackageVersionCommand.spec.js index cd971c2..69cba59 100644 --- a/commands/CreatePackageVersionCommand.spec.js +++ b/tests/commands/package/CreatePackageVersionCommand.spec.js @@ -14,8 +14,8 @@ describe('CreatePackageVersionCommand', () => { let proxyIsJsonString; let proxyFileExists; - const CreatePackageVersionCommand = proxyquire('./CreatePackageVersionCommand', { - '../utils/Validator': { + const CreatePackageVersionCommand = proxyquire('../../../src/commands/package/CreatePackageVersionCommand', { + '../../utils/Validator': { isJsonString: (str) => { return proxyIsJsonString(str); }, diff --git a/commands/PackageVersionsCommand.spec.js b/tests/commands/package/PackageVersionsCommand.spec.js similarity index 95% rename from commands/PackageVersionsCommand.spec.js rename to tests/commands/package/PackageVersionsCommand.spec.js index 3ab2dd3..06f6aa5 100644 --- a/commands/PackageVersionsCommand.spec.js +++ b/tests/commands/package/PackageVersionsCommand.spec.js @@ -3,8 +3,8 @@ const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const chaiAsPromised = require('chai-as-promised'); -const PackageVersionsCommand = require('./PackageVersionsCommand'); -const PageableStream = require('../clients/PageableStream'); +const PackageVersionsCommand = require('../../../src/commands/package/PackageVersionsCommand'); +const PageableStream = require('../../../src/clients/PageableStream'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/PackagesCommand.spec.js b/tests/commands/package/PackagesCommand.spec.js similarity index 94% rename from commands/PackagesCommand.spec.js rename to tests/commands/package/PackagesCommand.spec.js index 415dafc..6ea747b 100644 --- a/commands/PackagesCommand.spec.js +++ b/tests/commands/package/PackagesCommand.spec.js @@ -1,10 +1,10 @@ -const PageableStream = require('../clients/PageableStream'); +const PageableStream = require('../../../src/clients/PageableStream'); const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const chaiAsPromised = require('chai-as-promised'); -const PackagesCommand = require('./PackagesCommand'); +const PackagesCommand = require('../../../src/commands/package/PackagesCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/CreateSegmentCommand.spec.js b/tests/commands/segment/CreateSegmentCommand.spec.js similarity index 97% rename from commands/CreateSegmentCommand.spec.js rename to tests/commands/segment/CreateSegmentCommand.spec.js index a3654c8..763eb91 100644 --- a/commands/CreateSegmentCommand.spec.js +++ b/tests/commands/segment/CreateSegmentCommand.spec.js @@ -14,8 +14,8 @@ describe('CreateSegmentCommand', () => { let proxyIsJsonString; let proxyFileExists; - const CreateSegmentCommand = proxyquire('./CreateSegmentCommand', { - '../utils/Validator': { + const CreateSegmentCommand = proxyquire('../../../src/commands/segment/CreateSegmentCommand', { + '../../utils/Validator': { isJsonString: (str) => { return proxyIsJsonString(str); }, diff --git a/commands/EditSegmentCommand.spec.js b/tests/commands/segment/EditSegmentCommand.spec.js similarity index 98% rename from commands/EditSegmentCommand.spec.js rename to tests/commands/segment/EditSegmentCommand.spec.js index 8eace3e..7379499 100644 --- a/commands/EditSegmentCommand.spec.js +++ b/tests/commands/segment/EditSegmentCommand.spec.js @@ -14,8 +14,8 @@ describe('EditSegmentCommand', () => { let proxyIsJsonString; let proxyFileExists; - const EditSegmentCommand = proxyquire('./EditSegmentCommand', { - '../utils/Validator': { + const EditSegmentCommand = proxyquire('../../../src/commands/segment/EditSegmentCommand', { + '../../utils/Validator': { isJsonString: (str) => { return proxyIsJsonString(str); }, diff --git a/commands/SegmentsCommand.spec.js b/tests/commands/segment/SegmentsCommand.spec.js similarity index 92% rename from commands/SegmentsCommand.spec.js rename to tests/commands/segment/SegmentsCommand.spec.js index 0cddcb7..83402d9 100644 --- a/commands/SegmentsCommand.spec.js +++ b/tests/commands/segment/SegmentsCommand.spec.js @@ -2,9 +2,9 @@ const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); -const chaiAsPromised = require("chai-as-promised"); -const SegmentsCommand = require('./SegmentsCommand'); -const PageableStream = require('../clients/PageableStream'); +const chaiAsPromised = require('chai-as-promised'); +const SegmentsCommand = require('../../../src/commands/segment/SegmentsCommand'); +const PageableStream = require('../../../src/clients/PageableStream'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/SetActiveSegmentsCommand.spec.js b/tests/commands/segment/SetActiveSegmentsCommand.spec.js similarity index 96% rename from commands/SetActiveSegmentsCommand.spec.js rename to tests/commands/segment/SetActiveSegmentsCommand.spec.js index 01e8d02..10cdb17 100644 --- a/commands/SetActiveSegmentsCommand.spec.js +++ b/tests/commands/segment/SetActiveSegmentsCommand.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); -const chaiAsPromised = require("chai-as-promised"); -const SetActiveSegmentsCommand = require('./SetActiveSegmentsCommand'); +const chaiAsPromised = require('chai-as-promised'); +const SetActiveSegmentsCommand = require('../../../src/commands/segment/SetActiveSegmentsCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/CreateTokenCommand.spec.js b/tests/commands/token/CreateTokenCommand.spec.js similarity index 96% rename from commands/CreateTokenCommand.spec.js rename to tests/commands/token/CreateTokenCommand.spec.js index a3e8ed2..2e552eb 100644 --- a/commands/CreateTokenCommand.spec.js +++ b/tests/commands/token/CreateTokenCommand.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; -const chaiAsPromised = require("chai-as-promised"); -const CreateTokenCommand = require('./CreateTokenCommand'); +const chaiAsPromised = require('chai-as-promised'); +const CreateTokenCommand = require('../../../src/commands/token/CreateTokenCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/RevokeTokenCommand.spec.js b/tests/commands/token/RevokeTokenCommand.spec.js similarity index 96% rename from commands/RevokeTokenCommand.spec.js rename to tests/commands/token/RevokeTokenCommand.spec.js index 827a672..43a68d1 100644 --- a/commands/RevokeTokenCommand.spec.js +++ b/tests/commands/token/RevokeTokenCommand.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; -const chaiAsPromised = require("chai-as-promised"); -const RevokeTokenCommand = require('./RevokeTokenCommand'); +const chaiAsPromised = require('chai-as-promised'); +const RevokeTokenCommand = require('../../../src/commands/token/RevokeTokenCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/TokensCommand.spec.js b/tests/commands/token/TokensCommand.spec.js similarity index 95% rename from commands/TokensCommand.spec.js rename to tests/commands/token/TokensCommand.spec.js index 5074d9c..422aabe 100644 --- a/commands/TokensCommand.spec.js +++ b/tests/commands/token/TokensCommand.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; -const chaiAsPromised = require("chai-as-promised"); -const TokensCommand = require('./TokensCommand'); +const chaiAsPromised = require('chai-as-promised'); +const TokensCommand = require('../../../src/commands/token/TokensCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/ArchiveCommand.spec.js b/tests/commands/update/ArchiveCommand.spec.js similarity index 97% rename from commands/ArchiveCommand.spec.js rename to tests/commands/update/ArchiveCommand.spec.js index 863fc2e..b066f13 100644 --- a/commands/ArchiveCommand.spec.js +++ b/tests/commands/update/ArchiveCommand.spec.js @@ -2,8 +2,8 @@ const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; -const chaiAsPromised = require("chai-as-promised"); -const ArchiveCommand = require('./ArchiveCommand'); +const chaiAsPromised = require('chai-as-promised'); +const ArchiveCommand = require('../../../src/commands/update/ArchiveCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/CreateUpdateCommand.spec.js b/tests/commands/update/CreateUpdateCommand.spec.js similarity index 99% rename from commands/CreateUpdateCommand.spec.js rename to tests/commands/update/CreateUpdateCommand.spec.js index a54d24c..af9943b 100644 --- a/commands/CreateUpdateCommand.spec.js +++ b/tests/commands/update/CreateUpdateCommand.spec.js @@ -14,8 +14,8 @@ describe('CreateUpdateCommand', () => { let proxyIsJsonString; let proxyFileExists; - const CreateUpdateCommand = proxyquire('./CreateUpdateCommand', { - '../utils/Validator': { + const CreateUpdateCommand = proxyquire('../../../src/commands/update/CreateUpdateCommand', { + '../../utils/Validator': { isJsonString: (str) => { return proxyIsJsonString(str); }, diff --git a/commands/EditUpdateCommand.spec.js b/tests/commands/update/EditUpdateCommand.spec.js similarity index 98% rename from commands/EditUpdateCommand.spec.js rename to tests/commands/update/EditUpdateCommand.spec.js index 6b99ba2..a2f3eb9 100644 --- a/commands/EditUpdateCommand.spec.js +++ b/tests/commands/update/EditUpdateCommand.spec.js @@ -15,8 +15,8 @@ describe('EditUpdateCommand', () => { let proxyIsJsonString; let proxyFileExists; - const EditUpdateCommand = proxyquire('./EditUpdateCommand', { - '../utils/Validator': { + const EditUpdateCommand = proxyquire('../../../src/commands/update/EditUpdateCommand', { + '../../utils/Validator': { isJsonString: (str) => { return proxyIsJsonString(str); }, diff --git a/commands/PublishCommand.spec.js b/tests/commands/update/PublishCommand.spec.js similarity index 97% rename from commands/PublishCommand.spec.js rename to tests/commands/update/PublishCommand.spec.js index 01b6a0f..cec40b9 100644 --- a/commands/PublishCommand.spec.js +++ b/tests/commands/update/PublishCommand.spec.js @@ -3,7 +3,7 @@ const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; const chaiAsPromised = require('chai-as-promised'); -const PublishCommand = require('./PublishCommand'); +const PublishCommand = require('../../../src/commands/update/PublishCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/ScheduleCommand.spec.js b/tests/commands/update/ScheduleCommand.spec.js similarity index 98% rename from commands/ScheduleCommand.spec.js rename to tests/commands/update/ScheduleCommand.spec.js index d2c59af..8fd883b 100644 --- a/commands/ScheduleCommand.spec.js +++ b/tests/commands/update/ScheduleCommand.spec.js @@ -3,7 +3,7 @@ const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; const chaiAsPromised = require('chai-as-promised'); -const ScheduleCommand = require('./ScheduleCommand'); +const ScheduleCommand = require('../../../src/commands/update/ScheduleCommand'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/commands/UpdatesCommand.spec.js b/tests/commands/update/UpdatesCommand.spec.js similarity index 93% rename from commands/UpdatesCommand.spec.js rename to tests/commands/update/UpdatesCommand.spec.js index 8abc028..bfaa65f 100644 --- a/commands/UpdatesCommand.spec.js +++ b/tests/commands/update/UpdatesCommand.spec.js @@ -1,12 +1,10 @@ -"use strict"; - const chai = require('chai'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); -const chaiAsPromised = require("chai-as-promised"); -const UpdatesCommand = require('./UpdatesCommand'); -const PageableStream = require('../clients/PageableStream'); +const chaiAsPromised = require('chai-as-promised'); +const UpdatesCommand = require('../../../src/commands/update/UpdatesCommand'); +const PageableStream = require('../../../src/clients/PageableStream'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/renderers/jsonRenderer.spec.js b/tests/renderers/jsonRenderer.spec.js similarity index 92% rename from renderers/jsonRenderer.spec.js rename to tests/renderers/jsonRenderer.spec.js index 8cd7209..7bf377c 100644 --- a/renderers/jsonRenderer.spec.js +++ b/tests/renderers/jsonRenderer.spec.js @@ -1,10 +1,10 @@ const chai = require('chai'); -const PageableStream = require('../clients/PageableStream'); +const PageableStream = require('../../src/clients/PageableStream'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); -const chaiAsPromised = require("chai-as-promised"); -const jsonRenderer = require('./jsonRenderer'); +const chaiAsPromised = require('chai-as-promised'); +const jsonRenderer = require('../../src/renderers/jsonRenderer'); chai.use(chaiAsPromised); chai.use(sinonChai); diff --git a/renderers/prettyRenderer.spec.js b/tests/renderers/prettyRenderer.spec.js similarity index 93% rename from renderers/prettyRenderer.spec.js rename to tests/renderers/prettyRenderer.spec.js index fcda5fa..91d665d 100644 --- a/renderers/prettyRenderer.spec.js +++ b/tests/renderers/prettyRenderer.spec.js @@ -1,10 +1,10 @@ const chai = require('chai'); -const PageableStream = require('../clients/PageableStream'); +const PageableStream = require('../../src/clients/PageableStream'); const expect = chai.expect; const sinon = require('sinon'); const sinonChai = require('sinon-chai'); -const chaiAsPromised = require("chai-as-promised"); -const prettyRenderer = require('./prettyRenderer'); +const chaiAsPromised = require('chai-as-promised'); +const prettyRenderer = require('../../src/renderers/prettyRenderer'); const prettyjson = require('prettyjson'); chai.use(chaiAsPromised); diff --git a/repositories/UserConfiguration.spec.js b/tests/repositories/UserConfiguration.spec.js similarity index 98% rename from repositories/UserConfiguration.spec.js rename to tests/repositories/UserConfiguration.spec.js index ef28c32..c4586a4 100644 --- a/repositories/UserConfiguration.spec.js +++ b/tests/repositories/UserConfiguration.spec.js @@ -1,9 +1,10 @@ +const userConfirgurationPath = '../../src/repositories/UserConfiguration'; const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; const chaiAsPromised = require('chai-as-promised'); -const UserConfiguration = require('./UserConfiguration'); +const UserConfiguration = require(userConfirgurationPath); const proxyquire = require('proxyquire').noCallThru(); chai.use(chaiAsPromised); @@ -110,7 +111,7 @@ describe('UserConfiguration', () => { let proxyMkdrip = undefined; let proxyFsExists = undefined; let proxyFsReadFile = undefined; - const ProxyUserConfiguration = proxyquire('./UserConfiguration', { + const ProxyUserConfiguration = proxyquire(userConfirgurationPath, { mkdirp: (folder, callback) => { proxyMkdrip(folder, callback) }, @@ -365,7 +366,7 @@ describe('UserConfiguration', () => { describe('#writeUserConfiguration()', () => { let proxyFsWriteFile = undefined; - const ProxyUserConfiguration = proxyquire('./UserConfiguration', { + const ProxyUserConfiguration = proxyquire(userConfirgurationPath, { fs: { writeFile: (file, encoding, callback) => { proxyFsWriteFile(file, encoding, callback); diff --git a/utils/Validator.spec.js b/tests/utils/Validator.spec.js similarity index 93% rename from utils/Validator.spec.js rename to tests/utils/Validator.spec.js index 6651700..670d48e 100644 --- a/utils/Validator.spec.js +++ b/tests/utils/Validator.spec.js @@ -1,9 +1,10 @@ +const validatorPath = '../../src/utils/Validator'; const chai = require('chai'); const sinon = require('sinon'); const sinonChai = require('sinon-chai'); const expect = chai.expect; const chaiAsPromised = require('chai-as-promised'); -const Validator = require('./Validator'); +const Validator = require(validatorPath); const proxyquire = require('proxyquire').noCallThru(); chai.use(chaiAsPromised); @@ -37,7 +38,7 @@ describe('Validator', () => { let proxyAccessSync; const F_OK = 'OKAYY'; - const ProxyValidator = proxyquire('./Validator', { + const ProxyValidator = proxyquire(validatorPath, { 'fs': { accessSync: (path, option) => { proxyAccessSync(path, option);