From d33840100851d696a515c25253f7a06435cd4da4 Mon Sep 17 00:00:00 2001 From: Matteo Figus Date: Fri, 29 Apr 2016 02:02:17 +0100 Subject: [PATCH] Moved things around --- README.md | 2 +- logo.png => docs/logo.png | Bin grunt-tasks/jshint.js | 12 ++++++------ .jshintrc => grunt-tasks/support/.jshintrc | 0 grunt-tasks/support/cli-commands-parser.js | 2 +- grunt-tasks/support/task-build.js | 6 +++--- package.json | 4 ++-- {cli => src/cli}/autocomplete.js | 0 {cli => src/cli}/commands.js | 0 {cli => src/cli}/domain/get-components-by-dir.js | 0 {cli => src/cli}/domain/get-components-deps.js | 0 {cli => src/cli}/domain/get-local-npm-modules.js | 0 {cli => src/cli}/domain/get-missing-deps.js | 0 {cli => src/cli}/domain/get-mocked-plugins.js | 0 {cli => src/cli}/domain/local.js | 0 {cli => src/cli}/domain/mock.js | 0 {cli => src/cli}/domain/npm-installer.js | 0 {cli => src/cli}/domain/package-components.js | 2 +- {cli => src/cli}/domain/package-server-script.js | 0 {cli => src/cli}/domain/package-static-files.js | 0 {cli => src/cli}/domain/package-template.js | 0 {cli => src/cli}/domain/registry.js | 2 +- {cli => src/cli}/domain/url-parser.js | 0 {cli => src/cli}/domain/watch.js | 0 {cli => src/cli}/facade/dev.js | 0 {cli => src/cli}/facade/init.js | 0 {cli => src/cli}/facade/mock.js | 0 {cli => src/cli}/facade/preview.js | 0 {cli => src/cli}/facade/publish.js | 0 {cli => src/cli}/facade/registry.js | 0 {cli => src/cli}/facade/version.js | 2 +- {cli => src/cli}/index.js | 0 {cli => src/cli}/wrap-cli-callback.js | 0 .../base-component-handlebars/.npmignore | 0 .../_package/package.json | 1 + .../base-component-handlebars/_package/server.js | 1 + .../_package/template.js | 1 + .../base-component-handlebars/package.json | 0 .../base-component-handlebars/server.js | 0 .../base-component-handlebars/template.html | 0 .../components}/base-component-jade/.npmignore | 0 .../base-component-jade/_package/package.json | 1 + .../base-component-jade/_package/server.js | 1 + .../base-component-jade/_package/template.js | 1 + .../components}/base-component-jade/package.json | 0 .../components}/base-component-jade/server.js | 0 .../components}/base-component-jade/template.jade | 0 .../components}/oc-client/.gitignore | 0 .../components}/oc-client/.npmignore | 0 {components => src/components}/oc-client/LICENSES | 0 .../components}/oc-client/_package/package.json | 2 +- .../components}/oc-client/_package/server.js | 0 .../oc-client/_package/src/head.load.js | 0 .../oc-client/_package/src/oc-client.js | 0 .../oc-client/_package/src/oc-client.min.js | 0 .../oc-client/_package/src/oc-client.min.map | 0 .../components}/oc-client/_package/template.js | 0 .../components}/oc-client/package.json | 0 .../components}/oc-client/server.js | 0 .../components}/oc-client/src/head.load.js | 0 .../components}/oc-client/src/oc-client.js | 0 .../components}/oc-client/src/oc-client.min.js | 0 .../components}/oc-client/src/oc-client.min.map | 0 .../components}/oc-client/template.html | 0 index.js => src/index.js | 2 +- oc-cli.js => src/oc-cli.js | 0 {registry => src/registry}/app-start.js | 2 +- .../registry}/domain/authentication.js | 0 .../registry}/domain/components-cache.js | 0 .../registry}/domain/dependencies-resolver.js | 0 .../registry}/domain/events-handler.js | 0 .../registry}/domain/options-sanitiser.js | 0 .../registry}/domain/plugins-detective.js | 0 .../registry}/domain/plugins-initialiser.js | 0 {registry => src/registry}/domain/repository.js | 4 ++-- .../registry}/domain/require-wrapper.js | 0 {registry => src/registry}/domain/s3.js | 0 {registry => src/registry}/domain/sanitiser.js | 0 {registry => src/registry}/domain/url-builder.js | 0 .../domain/validators/component-parameters.js | 0 .../registry}/domain/validators/index.js | 0 .../registry}/domain/validators/node-version.js | 2 +- .../registry}/domain/validators/oc-cli-version.js | 2 +- .../domain/validators/plugins-requirements.js | 0 .../domain/validators/registry-configuration.js | 0 .../domain/validators/uploaded-package.js | 0 .../registry}/domain/version-handler.js | 0 {registry => src/registry}/index.js | 0 .../registry}/middleware/base-url-handler.js | 0 {registry => src/registry}/middleware/cors.js | 0 .../registry}/middleware/discovery-handler.js | 0 .../registry}/middleware/file-uploads.js | 0 .../registry}/middleware/request-handler.js | 0 {registry => src/registry}/router.js | 0 .../registry}/routes/component-info.js | 0 .../registry}/routes/component-preview.js | 0 {registry => src/registry}/routes/component.js | 0 {registry => src/registry}/routes/components.js | 0 .../helpers/get-component-retrieving-info.js | 0 .../registry}/routes/helpers/get-component.js | 2 +- .../registry}/routes/list-components.js | 2 +- {registry => src/registry}/routes/publish.js | 0 .../registry}/routes/static-redirector.js | 0 .../registry}/views/component-info.jade | 0 .../registry}/views/component-preview.jade | 0 {registry => src/registry}/views/layout.jade | 0 .../registry}/views/list-components.jade | 0 .../registry}/views/static/component-info.js | 0 .../registry}/views/static/list-components.js | 0 {registry => src/registry}/views/static/style.css | 0 {resources => src/resources}/index.js | 0 {resources => src/resources}/settings.js | 0 {utils => src/utils}/date-stringify.js | 0 {utils => src/utils}/get-file-info.js | 0 {utils => src/utils}/get-mime-type.js | 0 {utils => src/utils}/get-next-year.js | 0 {utils => src/utils}/get-unix-utc-timestamp.js | 0 {utils => src/utils}/hash-builder.js | 0 {utils => src/utils}/pad-zero.js | 0 {utils => src/utils}/put.js | 0 test/acceptance/client.js | 2 +- test/acceptance/registry.js | 2 +- test/configuration/karma-common.js | 4 ++-- test/unit/cli-domain-get-components-by-dir.js | 2 +- test/unit/cli-domain-get-local-npm-modules.js | 2 +- test/unit/cli-domain-get-mocked-plugins.js | 2 +- test/unit/cli-domain-mock.js | 2 +- test/unit/cli-domain-package-components.js | 2 +- test/unit/cli-domain-package-server-script.js | 2 +- test/unit/cli-domain-package-static-files.js | 2 +- test/unit/cli-domain-package-template.js | 2 +- test/unit/cli-domain-registry.js | 2 +- test/unit/cli-domain-url-parser.js | 2 +- test/unit/cli-facade-dev.js | 4 ++-- test/unit/cli-facade-init.js | 4 ++-- test/unit/cli-facade-mock.js | 4 ++-- test/unit/cli-facade-preview.js | 2 +- test/unit/cli-facade-publish.js | 6 +++--- test/unit/cli-facade-registry.js | 4 ++-- test/unit/registry-app-start.js | 4 ++-- test/unit/registry-domain-components-cache.js | 2 +- test/unit/registry-domain-plugins-detective.js | 2 +- test/unit/registry-domain-plugins-initialiser.js | 2 +- test/unit/registry-domain-repository.js | 4 ++-- test/unit/registry-domain-require-wrapper.js | 2 +- test/unit/registry-domain-s3.js | 2 +- test/unit/registry-domain-sanitiser.js | 2 +- test/unit/registry-domain-validator.js | 14 +++++++------- test/unit/registry-domain-version-handler.js | 2 +- test/unit/registry-events-handler.js | 4 ++-- test/unit/registry-routes-component.js | 2 +- test/unit/registry-routes-components.js | 2 +- .../unit/registry-routes-helpers-get-component.js | 2 +- test/unit/url-builder.js | 2 +- test/unit/utils-date-stringify.js | 2 +- test/unit/utils-get-file-info.js | 2 +- test/unit/utils-get-mime-type.js | 2 +- test/unit/utils-hash-builder.js | 2 +- test/unit/utils-pad-zero.js | 2 +- 159 files changed, 86 insertions(+), 80 deletions(-) rename logo.png => docs/logo.png (100%) rename .jshintrc => grunt-tasks/support/.jshintrc (100%) rename {cli => src/cli}/autocomplete.js (100%) rename {cli => src/cli}/commands.js (100%) rename {cli => src/cli}/domain/get-components-by-dir.js (100%) rename {cli => src/cli}/domain/get-components-deps.js (100%) rename {cli => src/cli}/domain/get-local-npm-modules.js (100%) rename {cli => src/cli}/domain/get-missing-deps.js (100%) rename {cli => src/cli}/domain/get-mocked-plugins.js (100%) rename {cli => src/cli}/domain/local.js (100%) rename {cli => src/cli}/domain/mock.js (100%) rename {cli => src/cli}/domain/npm-installer.js (100%) rename {cli => src/cli}/domain/package-components.js (97%) rename {cli => src/cli}/domain/package-server-script.js (100%) rename {cli => src/cli}/domain/package-static-files.js (100%) rename {cli => src/cli}/domain/package-template.js (100%) rename {cli => src/cli}/domain/registry.js (98%) rename {cli => src/cli}/domain/url-parser.js (100%) rename {cli => src/cli}/domain/watch.js (100%) rename {cli => src/cli}/facade/dev.js (100%) rename {cli => src/cli}/facade/init.js (100%) rename {cli => src/cli}/facade/mock.js (100%) rename {cli => src/cli}/facade/preview.js (100%) rename {cli => src/cli}/facade/publish.js (100%) rename {cli => src/cli}/facade/registry.js (100%) rename {cli => src/cli}/facade/version.js (73%) rename {cli => src/cli}/index.js (100%) rename {cli => src/cli}/wrap-cli-callback.js (100%) rename {components => src/components}/base-component-handlebars/.npmignore (100%) create mode 100644 src/components/base-component-handlebars/_package/package.json create mode 100644 src/components/base-component-handlebars/_package/server.js create mode 100644 src/components/base-component-handlebars/_package/template.js rename {components => src/components}/base-component-handlebars/package.json (100%) rename {components => src/components}/base-component-handlebars/server.js (100%) rename {components => src/components}/base-component-handlebars/template.html (100%) rename {components => src/components}/base-component-jade/.npmignore (100%) create mode 100644 src/components/base-component-jade/_package/package.json create mode 100644 src/components/base-component-jade/_package/server.js create mode 100644 src/components/base-component-jade/_package/template.js rename {components => src/components}/base-component-jade/package.json (100%) rename {components => src/components}/base-component-jade/server.js (100%) rename {components => src/components}/base-component-jade/template.jade (100%) rename {components => src/components}/oc-client/.gitignore (100%) rename {components => src/components}/oc-client/.npmignore (100%) rename {components => src/components}/oc-client/LICENSES (100%) rename {components => src/components}/oc-client/_package/package.json (95%) rename {components => src/components}/oc-client/_package/server.js (100%) rename {components => src/components}/oc-client/_package/src/head.load.js (100%) rename {components => src/components}/oc-client/_package/src/oc-client.js (100%) rename {components => src/components}/oc-client/_package/src/oc-client.min.js (100%) rename {components => src/components}/oc-client/_package/src/oc-client.min.map (100%) rename {components => src/components}/oc-client/_package/template.js (100%) rename {components => src/components}/oc-client/package.json (100%) rename {components => src/components}/oc-client/server.js (100%) rename {components => src/components}/oc-client/src/head.load.js (100%) rename {components => src/components}/oc-client/src/oc-client.js (100%) rename {components => src/components}/oc-client/src/oc-client.min.js (100%) rename {components => src/components}/oc-client/src/oc-client.min.map (100%) rename {components => src/components}/oc-client/template.html (100%) rename index.js => src/index.js (57%) rename oc-cli.js => src/oc-cli.js (100%) rename {registry => src/registry}/app-start.js (96%) rename {registry => src/registry}/domain/authentication.js (100%) rename {registry => src/registry}/domain/components-cache.js (100%) rename {registry => src/registry}/domain/dependencies-resolver.js (100%) rename {registry => src/registry}/domain/events-handler.js (100%) rename {registry => src/registry}/domain/options-sanitiser.js (100%) rename {registry => src/registry}/domain/plugins-detective.js (100%) rename {registry => src/registry}/domain/plugins-initialiser.js (100%) rename {registry => src/registry}/domain/repository.js (98%) rename {registry => src/registry}/domain/require-wrapper.js (100%) rename {registry => src/registry}/domain/s3.js (100%) rename {registry => src/registry}/domain/sanitiser.js (100%) rename {registry => src/registry}/domain/url-builder.js (100%) rename {registry => src/registry}/domain/validators/component-parameters.js (100%) rename {registry => src/registry}/domain/validators/index.js (100%) rename {registry => src/registry}/domain/validators/node-version.js (94%) rename {registry => src/registry}/domain/validators/oc-cli-version.js (94%) rename {registry => src/registry}/domain/validators/plugins-requirements.js (100%) rename {registry => src/registry}/domain/validators/registry-configuration.js (100%) rename {registry => src/registry}/domain/validators/uploaded-package.js (100%) rename {registry => src/registry}/domain/version-handler.js (100%) rename {registry => src/registry}/index.js (100%) rename {registry => src/registry}/middleware/base-url-handler.js (100%) rename {registry => src/registry}/middleware/cors.js (100%) rename {registry => src/registry}/middleware/discovery-handler.js (100%) rename {registry => src/registry}/middleware/file-uploads.js (100%) rename {registry => src/registry}/middleware/request-handler.js (100%) rename {registry => src/registry}/router.js (100%) rename {registry => src/registry}/routes/component-info.js (100%) rename {registry => src/registry}/routes/component-preview.js (100%) rename {registry => src/registry}/routes/component.js (100%) rename {registry => src/registry}/routes/components.js (100%) rename {registry => src/registry}/routes/helpers/get-component-retrieving-info.js (100%) rename {registry => src/registry}/routes/helpers/get-component.js (99%) rename {registry => src/registry}/routes/list-components.js (97%) rename {registry => src/registry}/routes/publish.js (100%) rename {registry => src/registry}/routes/static-redirector.js (100%) rename {registry => src/registry}/views/component-info.jade (100%) rename {registry => src/registry}/views/component-preview.jade (100%) rename {registry => src/registry}/views/layout.jade (100%) rename {registry => src/registry}/views/list-components.jade (100%) rename {registry => src/registry}/views/static/component-info.js (100%) rename {registry => src/registry}/views/static/list-components.js (100%) rename {registry => src/registry}/views/static/style.css (100%) rename {resources => src/resources}/index.js (100%) rename {resources => src/resources}/settings.js (100%) rename {utils => src/utils}/date-stringify.js (100%) rename {utils => src/utils}/get-file-info.js (100%) rename {utils => src/utils}/get-mime-type.js (100%) rename {utils => src/utils}/get-next-year.js (100%) rename {utils => src/utils}/get-unix-utc-timestamp.js (100%) rename {utils => src/utils}/hash-builder.js (100%) rename {utils => src/utils}/pad-zero.js (100%) rename {utils => src/utils}/put.js (100%) diff --git a/README.md b/README.md index 66bf39d81..e7289f86f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![oc](https://raw.github.com/opentable/oc/master/logo.png) +![oc](https://raw.github.com/opentable/oc/master/docs/logo.png) ============= OpenComponents is a framework to develop and deploy robust and distributed html components. diff --git a/logo.png b/docs/logo.png similarity index 100% rename from logo.png rename to docs/logo.png diff --git a/grunt-tasks/jshint.js b/grunt-tasks/jshint.js index be1791e90..e3a0e6b55 100644 --- a/grunt-tasks/jshint.js +++ b/grunt-tasks/jshint.js @@ -2,15 +2,15 @@ module.exports = { options: { - jshintrc: '.jshintrc', + jshintrc: 'grunt-tasks/support/.jshintrc', ignores: [ 'node_modules', 'client/src/oc-client.min.js', - 'components/oc-client/src/head.load.js', - 'components/oc-client/src/oc-client.min.js', - 'components/oc-client/_package/**/*', - 'components/base-component-handlebars/_package/**/*', - 'components/base-component-jade/_package/**/*', + 'src/components/oc-client/src/head.load.js', + 'src/components/oc-client/src/oc-client.min.js', + 'src/components/oc-client/_package/**/*', + 'src/components/base-component-handlebars/_package/**/*', + 'src/components/base-component-jade/_package/**/*', 'test/fixtures', 'test/front-end', 'test/configuration' diff --git a/.jshintrc b/grunt-tasks/support/.jshintrc similarity index 100% rename from .jshintrc rename to grunt-tasks/support/.jshintrc diff --git a/grunt-tasks/support/cli-commands-parser.js b/grunt-tasks/support/cli-commands-parser.js index b49fab082..84c320f81 100644 --- a/grunt-tasks/support/cli-commands-parser.js +++ b/grunt-tasks/support/cli-commands-parser.js @@ -2,7 +2,7 @@ var _ = require('underscore'); -var commands = require('../../cli/commands'); +var commands = require('../../src/cli/commands'); module.exports = { parse: function(){ diff --git a/grunt-tasks/support/task-build.js b/grunt-tasks/support/task-build.js index c0fbc5719..85fe7e6c9 100644 --- a/grunt-tasks/support/task-build.js +++ b/grunt-tasks/support/task-build.js @@ -11,9 +11,9 @@ module.exports = function(grunt, taskObject){ var done = this.async(), version = taskObject.pkg.version, - clientComponentDir = '../../components/oc-client/', + clientComponentDir = '../../src/components/oc-client/', licenseRow = '/*! OpenComponents client v{0} | (c) 2015-{1} OpenTable, Inc. | {2} */', - licenseLink = 'https://github.com/opentable/oc/tree/master/components/oc-client/LICENSES', + licenseLink = 'https://github.com/opentable/oc/tree/master/src/components/oc-client/LICENSES', license = format(licenseRow, version, new Date().getFullYear(), licenseLink), headLoad = fs.readFileSync(path.join(__dirname, clientComponentDir, 'src/head.load.js')).toString(), ocClient = fs.readFileSync(path.join(__dirname, clientComponentDir, 'src/oc-client.js')).toString(), @@ -34,7 +34,7 @@ module.exports = function(grunt, taskObject){ fs.writeFileSync(path.join(__dirname, clientComponentDir, 'src/oc-client.min.map'), compressed.map); fs.writeFileSync(path.join(__dirname, '../../client/src/oc-client.min.js'), compressedCode); - var Local = require('../../cli/domain/local'), + var Local = require('../../src/cli/domain/local'), local = new Local({ logger: { log: grunt.log.writeln }}); local.package(path.join(__dirname, clientComponentDir), function(err, res){ diff --git a/package.json b/package.json index 568663f35..37eacd596 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "name": "oc", "version": "0.30.2", "description": "A framework for developing and distributing html components", - "main": "index.js", + "main": "./src/index.js", "bin": { - "oc": "./oc-cli.js" + "oc": "./src/oc-cli.js" }, "scripts": { "test": "grunt test" diff --git a/cli/autocomplete.js b/src/cli/autocomplete.js similarity index 100% rename from cli/autocomplete.js rename to src/cli/autocomplete.js diff --git a/cli/commands.js b/src/cli/commands.js similarity index 100% rename from cli/commands.js rename to src/cli/commands.js diff --git a/cli/domain/get-components-by-dir.js b/src/cli/domain/get-components-by-dir.js similarity index 100% rename from cli/domain/get-components-by-dir.js rename to src/cli/domain/get-components-by-dir.js diff --git a/cli/domain/get-components-deps.js b/src/cli/domain/get-components-deps.js similarity index 100% rename from cli/domain/get-components-deps.js rename to src/cli/domain/get-components-deps.js diff --git a/cli/domain/get-local-npm-modules.js b/src/cli/domain/get-local-npm-modules.js similarity index 100% rename from cli/domain/get-local-npm-modules.js rename to src/cli/domain/get-local-npm-modules.js diff --git a/cli/domain/get-missing-deps.js b/src/cli/domain/get-missing-deps.js similarity index 100% rename from cli/domain/get-missing-deps.js rename to src/cli/domain/get-missing-deps.js diff --git a/cli/domain/get-mocked-plugins.js b/src/cli/domain/get-mocked-plugins.js similarity index 100% rename from cli/domain/get-mocked-plugins.js rename to src/cli/domain/get-mocked-plugins.js diff --git a/cli/domain/local.js b/src/cli/domain/local.js similarity index 100% rename from cli/domain/local.js rename to src/cli/domain/local.js diff --git a/cli/domain/mock.js b/src/cli/domain/mock.js similarity index 100% rename from cli/domain/mock.js rename to src/cli/domain/mock.js diff --git a/cli/domain/npm-installer.js b/src/cli/domain/npm-installer.js similarity index 100% rename from cli/domain/npm-installer.js rename to src/cli/domain/npm-installer.js diff --git a/cli/domain/package-components.js b/src/cli/domain/package-components.js similarity index 97% rename from cli/domain/package-components.js rename to src/cli/domain/package-components.js index 85bdbdfec..a2e6390ee 100644 --- a/cli/domain/package-components.js +++ b/src/cli/domain/package-components.js @@ -29,7 +29,7 @@ module.exports = function(){ fs.mkdirSync(publishPath); var componentPackagePath = path.join(componentPath, 'package.json'), - ocPackagePath = path.join(__dirname, '../../package.json'); + ocPackagePath = path.join(__dirname, '../../../package.json'); if(!fs.existsSync(componentPackagePath)){ return callback(new Error('component does not contain package.json')); diff --git a/cli/domain/package-server-script.js b/src/cli/domain/package-server-script.js similarity index 100% rename from cli/domain/package-server-script.js rename to src/cli/domain/package-server-script.js diff --git a/cli/domain/package-static-files.js b/src/cli/domain/package-static-files.js similarity index 100% rename from cli/domain/package-static-files.js rename to src/cli/domain/package-static-files.js diff --git a/cli/domain/package-template.js b/src/cli/domain/package-template.js similarity index 100% rename from cli/domain/package-template.js rename to src/cli/domain/package-template.js diff --git a/cli/domain/registry.js b/src/cli/domain/registry.js similarity index 98% rename from cli/domain/registry.js rename to src/cli/domain/registry.js index 4b847b2d9..b805f6884 100644 --- a/cli/domain/registry.js +++ b/src/cli/domain/registry.js @@ -13,7 +13,7 @@ var urlParser = require('../domain/url-parser'); var getOcVersion = function(){ - var ocPackagePath = path.join(__dirname, '../../package.json'), + var ocPackagePath = path.join(__dirname, '../../../package.json'), ocInfo = fs.readJsonSync(ocPackagePath); return ocInfo.version; diff --git a/cli/domain/url-parser.js b/src/cli/domain/url-parser.js similarity index 100% rename from cli/domain/url-parser.js rename to src/cli/domain/url-parser.js diff --git a/cli/domain/watch.js b/src/cli/domain/watch.js similarity index 100% rename from cli/domain/watch.js rename to src/cli/domain/watch.js diff --git a/cli/facade/dev.js b/src/cli/facade/dev.js similarity index 100% rename from cli/facade/dev.js rename to src/cli/facade/dev.js diff --git a/cli/facade/init.js b/src/cli/facade/init.js similarity index 100% rename from cli/facade/init.js rename to src/cli/facade/init.js diff --git a/cli/facade/mock.js b/src/cli/facade/mock.js similarity index 100% rename from cli/facade/mock.js rename to src/cli/facade/mock.js diff --git a/cli/facade/preview.js b/src/cli/facade/preview.js similarity index 100% rename from cli/facade/preview.js rename to src/cli/facade/preview.js diff --git a/cli/facade/publish.js b/src/cli/facade/publish.js similarity index 100% rename from cli/facade/publish.js rename to src/cli/facade/publish.js diff --git a/cli/facade/registry.js b/src/cli/facade/registry.js similarity index 100% rename from cli/facade/registry.js rename to src/cli/facade/registry.js diff --git a/cli/facade/version.js b/src/cli/facade/version.js similarity index 73% rename from cli/facade/version.js rename to src/cli/facade/version.js index 594efe83d..a9fa40cfb 100644 --- a/cli/facade/version.js +++ b/src/cli/facade/version.js @@ -1,6 +1,6 @@ 'use strict'; -var packageInfo = require('../../package.json'); +var packageInfo = require('../../../package.json'); module.exports = function(dependencies){ return function(){ diff --git a/cli/index.js b/src/cli/index.js similarity index 100% rename from cli/index.js rename to src/cli/index.js diff --git a/cli/wrap-cli-callback.js b/src/cli/wrap-cli-callback.js similarity index 100% rename from cli/wrap-cli-callback.js rename to src/cli/wrap-cli-callback.js diff --git a/components/base-component-handlebars/.npmignore b/src/components/base-component-handlebars/.npmignore similarity index 100% rename from components/base-component-handlebars/.npmignore rename to src/components/base-component-handlebars/.npmignore diff --git a/src/components/base-component-handlebars/_package/package.json b/src/components/base-component-handlebars/_package/package.json new file mode 100644 index 000000000..1f16263b7 --- /dev/null +++ b/src/components/base-component-handlebars/_package/package.json @@ -0,0 +1 @@ +{"name":"base-component-handlebars","description":"","version":"1.0.0","repository":"","oc":{"files":{"template":{"type":"handlebars","hashKey":"a34cffd0625f1eb8a08569f068cd4a9768104a91","src":"template.js"},"dataProvider":{"type":"node.js","hashKey":"c9286a76c6600084f39b7cb129c97b4bddb1dd03","src":"server.js"},"static":[]},"version":"0.30.2","packaged":true,"date":1461887688441}} diff --git a/src/components/base-component-handlebars/_package/server.js b/src/components/base-component-handlebars/_package/server.js new file mode 100644 index 000000000..27d96097b --- /dev/null +++ b/src/components/base-component-handlebars/_package/server.js @@ -0,0 +1 @@ +"use strict";module.exports.data=function(t,u){u(null,{})}; \ No newline at end of file diff --git a/src/components/base-component-handlebars/_package/template.js b/src/components/base-component-handlebars/_package/template.js new file mode 100644 index 000000000..abc99c00e --- /dev/null +++ b/src/components/base-component-handlebars/_package/template.js @@ -0,0 +1 @@ +var oc=oc||{};oc.components=oc.components||{},oc.components.a34cffd0625f1eb8a08569f068cd4a9768104a91={compiler:[6,">= 2.0.0-beta.1"],main:function(o,c,n,a){return" "},useData:!0}; \ No newline at end of file diff --git a/components/base-component-handlebars/package.json b/src/components/base-component-handlebars/package.json similarity index 100% rename from components/base-component-handlebars/package.json rename to src/components/base-component-handlebars/package.json diff --git a/components/base-component-handlebars/server.js b/src/components/base-component-handlebars/server.js similarity index 100% rename from components/base-component-handlebars/server.js rename to src/components/base-component-handlebars/server.js diff --git a/components/base-component-handlebars/template.html b/src/components/base-component-handlebars/template.html similarity index 100% rename from components/base-component-handlebars/template.html rename to src/components/base-component-handlebars/template.html diff --git a/components/base-component-jade/.npmignore b/src/components/base-component-jade/.npmignore similarity index 100% rename from components/base-component-jade/.npmignore rename to src/components/base-component-jade/.npmignore diff --git a/src/components/base-component-jade/_package/package.json b/src/components/base-component-jade/_package/package.json new file mode 100644 index 000000000..7f35deb8a --- /dev/null +++ b/src/components/base-component-jade/_package/package.json @@ -0,0 +1 @@ +{"name":"base-component-jade","description":"","version":"1.0.0","repository":"","oc":{"files":{"template":{"type":"jade","hashKey":"107f7eeca8a523c5d770539f9e51e561a2f217f3","src":"template.js"},"dataProvider":{"type":"node.js","hashKey":"c9286a76c6600084f39b7cb129c97b4bddb1dd03","src":"server.js"},"static":[]},"version":"0.30.2","packaged":true,"date":1461887688472}} diff --git a/src/components/base-component-jade/_package/server.js b/src/components/base-component-jade/_package/server.js new file mode 100644 index 000000000..27d96097b --- /dev/null +++ b/src/components/base-component-jade/_package/server.js @@ -0,0 +1 @@ +"use strict";module.exports.data=function(t,u){u(null,{})}; \ No newline at end of file diff --git a/src/components/base-component-jade/_package/template.js b/src/components/base-component-jade/_package/template.js new file mode 100644 index 000000000..2f08a2470 --- /dev/null +++ b/src/components/base-component-jade/_package/template.js @@ -0,0 +1 @@ +var oc=oc||{};oc.components=oc.components||{},oc.components["107f7eeca8a523c5d770539f9e51e561a2f217f3"]=function(o){var c=[];return c.push(" "),c.join("")}; \ No newline at end of file diff --git a/components/base-component-jade/package.json b/src/components/base-component-jade/package.json similarity index 100% rename from components/base-component-jade/package.json rename to src/components/base-component-jade/package.json diff --git a/components/base-component-jade/server.js b/src/components/base-component-jade/server.js similarity index 100% rename from components/base-component-jade/server.js rename to src/components/base-component-jade/server.js diff --git a/components/base-component-jade/template.jade b/src/components/base-component-jade/template.jade similarity index 100% rename from components/base-component-jade/template.jade rename to src/components/base-component-jade/template.jade diff --git a/components/oc-client/.gitignore b/src/components/oc-client/.gitignore similarity index 100% rename from components/oc-client/.gitignore rename to src/components/oc-client/.gitignore diff --git a/components/oc-client/.npmignore b/src/components/oc-client/.npmignore similarity index 100% rename from components/oc-client/.npmignore rename to src/components/oc-client/.npmignore diff --git a/components/oc-client/LICENSES b/src/components/oc-client/LICENSES similarity index 100% rename from components/oc-client/LICENSES rename to src/components/oc-client/LICENSES diff --git a/components/oc-client/_package/package.json b/src/components/oc-client/_package/package.json similarity index 95% rename from components/oc-client/_package/package.json rename to src/components/oc-client/_package/package.json index 194237bea..9d76f2448 100644 --- a/components/oc-client/_package/package.json +++ b/src/components/oc-client/_package/package.json @@ -1 +1 @@ -{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.30.2","repository":"https://github.com/opentable/oc/tree/master/components/oc-client","author":"Matteo Figus ","oc":{"container":false,"renderInfo":false,"minify":false,"parameters":{},"files":{"template":{"type":"handlebars","hashKey":"bb774de6a2b7280c2b66103bd36d7e708a1b7541","src":"template.js"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"ffb0e43eaf72f55fa13dc1e7262019c14c3dfc81","src":"server.js"}},"version":"0.30.2","packaged":true,"date":1461143035821}} +{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.30.2","repository":"https://github.com/opentable/oc/tree/master/components/oc-client","author":"Matteo Figus ","oc":{"container":false,"renderInfo":false,"minify":false,"parameters":{},"files":{"template":{"type":"handlebars","hashKey":"bb774de6a2b7280c2b66103bd36d7e708a1b7541","src":"template.js"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"ffb0e43eaf72f55fa13dc1e7262019c14c3dfc81","src":"server.js"}},"version":"0.30.2","packaged":true,"date":1461887688497}} diff --git a/components/oc-client/_package/server.js b/src/components/oc-client/_package/server.js similarity index 100% rename from components/oc-client/_package/server.js rename to src/components/oc-client/_package/server.js diff --git a/components/oc-client/_package/src/head.load.js b/src/components/oc-client/_package/src/head.load.js similarity index 100% rename from components/oc-client/_package/src/head.load.js rename to src/components/oc-client/_package/src/head.load.js diff --git a/components/oc-client/_package/src/oc-client.js b/src/components/oc-client/_package/src/oc-client.js similarity index 100% rename from components/oc-client/_package/src/oc-client.js rename to src/components/oc-client/_package/src/oc-client.js diff --git a/components/oc-client/_package/src/oc-client.min.js b/src/components/oc-client/_package/src/oc-client.min.js similarity index 100% rename from components/oc-client/_package/src/oc-client.min.js rename to src/components/oc-client/_package/src/oc-client.min.js diff --git a/components/oc-client/_package/src/oc-client.min.map b/src/components/oc-client/_package/src/oc-client.min.map similarity index 100% rename from components/oc-client/_package/src/oc-client.min.map rename to src/components/oc-client/_package/src/oc-client.min.map diff --git a/components/oc-client/_package/template.js b/src/components/oc-client/_package/template.js similarity index 100% rename from components/oc-client/_package/template.js rename to src/components/oc-client/_package/template.js diff --git a/components/oc-client/package.json b/src/components/oc-client/package.json similarity index 100% rename from components/oc-client/package.json rename to src/components/oc-client/package.json diff --git a/components/oc-client/server.js b/src/components/oc-client/server.js similarity index 100% rename from components/oc-client/server.js rename to src/components/oc-client/server.js diff --git a/components/oc-client/src/head.load.js b/src/components/oc-client/src/head.load.js similarity index 100% rename from components/oc-client/src/head.load.js rename to src/components/oc-client/src/head.load.js diff --git a/components/oc-client/src/oc-client.js b/src/components/oc-client/src/oc-client.js similarity index 100% rename from components/oc-client/src/oc-client.js rename to src/components/oc-client/src/oc-client.js diff --git a/components/oc-client/src/oc-client.min.js b/src/components/oc-client/src/oc-client.min.js similarity index 100% rename from components/oc-client/src/oc-client.min.js rename to src/components/oc-client/src/oc-client.min.js diff --git a/components/oc-client/src/oc-client.min.map b/src/components/oc-client/src/oc-client.min.map similarity index 100% rename from components/oc-client/src/oc-client.min.map rename to src/components/oc-client/src/oc-client.min.map diff --git a/components/oc-client/template.html b/src/components/oc-client/template.html similarity index 100% rename from components/oc-client/template.html rename to src/components/oc-client/template.html diff --git a/index.js b/src/index.js similarity index 57% rename from index.js rename to src/index.js index c1295a1d1..0446f441e 100644 --- a/index.js +++ b/src/index.js @@ -1,4 +1,4 @@ 'use strict'; -module.exports.Client = require('./client'); +module.exports.Client = require('../client'); module.exports.Registry = require('./registry'); \ No newline at end of file diff --git a/oc-cli.js b/src/oc-cli.js similarity index 100% rename from oc-cli.js rename to src/oc-cli.js diff --git a/registry/app-start.js b/src/registry/app-start.js similarity index 96% rename from registry/app-start.js rename to src/registry/app-start.js index 34e84bd23..59a714540 100644 --- a/registry/app-start.js +++ b/src/registry/app-start.js @@ -5,7 +5,7 @@ var format = require('stringformat'); var path = require('path'); var _ = require('underscore'); -var packageInfo = require('../package.json'); +var packageInfo = require('../../package.json'); module.exports = function(repository, options, callback){ diff --git a/registry/domain/authentication.js b/src/registry/domain/authentication.js similarity index 100% rename from registry/domain/authentication.js rename to src/registry/domain/authentication.js diff --git a/registry/domain/components-cache.js b/src/registry/domain/components-cache.js similarity index 100% rename from registry/domain/components-cache.js rename to src/registry/domain/components-cache.js diff --git a/registry/domain/dependencies-resolver.js b/src/registry/domain/dependencies-resolver.js similarity index 100% rename from registry/domain/dependencies-resolver.js rename to src/registry/domain/dependencies-resolver.js diff --git a/registry/domain/events-handler.js b/src/registry/domain/events-handler.js similarity index 100% rename from registry/domain/events-handler.js rename to src/registry/domain/events-handler.js diff --git a/registry/domain/options-sanitiser.js b/src/registry/domain/options-sanitiser.js similarity index 100% rename from registry/domain/options-sanitiser.js rename to src/registry/domain/options-sanitiser.js diff --git a/registry/domain/plugins-detective.js b/src/registry/domain/plugins-detective.js similarity index 100% rename from registry/domain/plugins-detective.js rename to src/registry/domain/plugins-detective.js diff --git a/registry/domain/plugins-initialiser.js b/src/registry/domain/plugins-initialiser.js similarity index 100% rename from registry/domain/plugins-initialiser.js rename to src/registry/domain/plugins-initialiser.js diff --git a/registry/domain/repository.js b/src/registry/domain/repository.js similarity index 98% rename from registry/domain/repository.js rename to src/registry/domain/repository.js index 50d7f7248..3ecff4b03 100644 --- a/registry/domain/repository.js +++ b/src/registry/domain/repository.js @@ -6,7 +6,7 @@ var path = require('path'); var _ = require('underscore'); var ComponentsCache = require('./components-cache'); -var packageInfo = require('../../package.json'); +var packageInfo = require('../../../package.json'); var S3 = require('./s3'); var settings = require('../../resources/settings'); var strings = require('../../resources'); @@ -47,7 +47,7 @@ module.exports = function(conf){ }, getComponentVersions: function(componentName, callback){ if(componentName === 'oc-client'){ - return callback(null, [fs.readJsonSync(path.join(__dirname, '../../package.json')).version]); + return callback(null, [fs.readJsonSync(path.join(__dirname, '../../../package.json')).version]); } if(!_.contains(local.getComponents(), componentName)){ diff --git a/registry/domain/require-wrapper.js b/src/registry/domain/require-wrapper.js similarity index 100% rename from registry/domain/require-wrapper.js rename to src/registry/domain/require-wrapper.js diff --git a/registry/domain/s3.js b/src/registry/domain/s3.js similarity index 100% rename from registry/domain/s3.js rename to src/registry/domain/s3.js diff --git a/registry/domain/sanitiser.js b/src/registry/domain/sanitiser.js similarity index 100% rename from registry/domain/sanitiser.js rename to src/registry/domain/sanitiser.js diff --git a/registry/domain/url-builder.js b/src/registry/domain/url-builder.js similarity index 100% rename from registry/domain/url-builder.js rename to src/registry/domain/url-builder.js diff --git a/registry/domain/validators/component-parameters.js b/src/registry/domain/validators/component-parameters.js similarity index 100% rename from registry/domain/validators/component-parameters.js rename to src/registry/domain/validators/component-parameters.js diff --git a/registry/domain/validators/index.js b/src/registry/domain/validators/index.js similarity index 100% rename from registry/domain/validators/index.js rename to src/registry/domain/validators/index.js diff --git a/registry/domain/validators/node-version.js b/src/registry/domain/validators/node-version.js similarity index 94% rename from registry/domain/validators/node-version.js rename to src/registry/domain/validators/node-version.js index eca7c6705..03ce5cd7d 100644 --- a/registry/domain/validators/node-version.js +++ b/src/registry/domain/validators/node-version.js @@ -3,7 +3,7 @@ var format = require('stringformat'); var semver = require('semver'); -var packageInfo = require('../../../package.json'); +var packageInfo = require('../../../../package.json'); module.exports = function(userAgent, nodeVersion) { var result = { isValid: false}; diff --git a/registry/domain/validators/oc-cli-version.js b/src/registry/domain/validators/oc-cli-version.js similarity index 94% rename from registry/domain/validators/oc-cli-version.js rename to src/registry/domain/validators/oc-cli-version.js index f9fb15ce8..9daae18fb 100644 --- a/registry/domain/validators/oc-cli-version.js +++ b/src/registry/domain/validators/oc-cli-version.js @@ -3,7 +3,7 @@ var format = require('stringformat'); var semver = require('semver'); -var packageInfo = require('../../../package.json'); +var packageInfo = require('../../../../package.json'); module.exports = function(userAgent) { var result = { isValid: false}; diff --git a/registry/domain/validators/plugins-requirements.js b/src/registry/domain/validators/plugins-requirements.js similarity index 100% rename from registry/domain/validators/plugins-requirements.js rename to src/registry/domain/validators/plugins-requirements.js diff --git a/registry/domain/validators/registry-configuration.js b/src/registry/domain/validators/registry-configuration.js similarity index 100% rename from registry/domain/validators/registry-configuration.js rename to src/registry/domain/validators/registry-configuration.js diff --git a/registry/domain/validators/uploaded-package.js b/src/registry/domain/validators/uploaded-package.js similarity index 100% rename from registry/domain/validators/uploaded-package.js rename to src/registry/domain/validators/uploaded-package.js diff --git a/registry/domain/version-handler.js b/src/registry/domain/version-handler.js similarity index 100% rename from registry/domain/version-handler.js rename to src/registry/domain/version-handler.js diff --git a/registry/index.js b/src/registry/index.js similarity index 100% rename from registry/index.js rename to src/registry/index.js diff --git a/registry/middleware/base-url-handler.js b/src/registry/middleware/base-url-handler.js similarity index 100% rename from registry/middleware/base-url-handler.js rename to src/registry/middleware/base-url-handler.js diff --git a/registry/middleware/cors.js b/src/registry/middleware/cors.js similarity index 100% rename from registry/middleware/cors.js rename to src/registry/middleware/cors.js diff --git a/registry/middleware/discovery-handler.js b/src/registry/middleware/discovery-handler.js similarity index 100% rename from registry/middleware/discovery-handler.js rename to src/registry/middleware/discovery-handler.js diff --git a/registry/middleware/file-uploads.js b/src/registry/middleware/file-uploads.js similarity index 100% rename from registry/middleware/file-uploads.js rename to src/registry/middleware/file-uploads.js diff --git a/registry/middleware/request-handler.js b/src/registry/middleware/request-handler.js similarity index 100% rename from registry/middleware/request-handler.js rename to src/registry/middleware/request-handler.js diff --git a/registry/router.js b/src/registry/router.js similarity index 100% rename from registry/router.js rename to src/registry/router.js diff --git a/registry/routes/component-info.js b/src/registry/routes/component-info.js similarity index 100% rename from registry/routes/component-info.js rename to src/registry/routes/component-info.js diff --git a/registry/routes/component-preview.js b/src/registry/routes/component-preview.js similarity index 100% rename from registry/routes/component-preview.js rename to src/registry/routes/component-preview.js diff --git a/registry/routes/component.js b/src/registry/routes/component.js similarity index 100% rename from registry/routes/component.js rename to src/registry/routes/component.js diff --git a/registry/routes/components.js b/src/registry/routes/components.js similarity index 100% rename from registry/routes/components.js rename to src/registry/routes/components.js diff --git a/registry/routes/helpers/get-component-retrieving-info.js b/src/registry/routes/helpers/get-component-retrieving-info.js similarity index 100% rename from registry/routes/helpers/get-component-retrieving-info.js rename to src/registry/routes/helpers/get-component-retrieving-info.js diff --git a/registry/routes/helpers/get-component.js b/src/registry/routes/helpers/get-component.js similarity index 99% rename from registry/routes/helpers/get-component.js rename to src/registry/routes/helpers/get-component.js index 56696ae08..41c120df3 100644 --- a/registry/routes/helpers/get-component.js +++ b/src/registry/routes/helpers/get-component.js @@ -7,7 +7,7 @@ var format = require('stringformat'); var vm = require('vm'); var _ = require('underscore'); -var Client = require('../../../client'); +var Client = require('../../../../client'); var detective = require('../../domain/plugins-detective'); var eventsHandler = require('../../domain/events-handler'); var GetComponentRetrievingInfo = require('./get-component-retrieving-info'); diff --git a/registry/routes/list-components.js b/src/registry/routes/list-components.js similarity index 97% rename from registry/routes/list-components.js rename to src/registry/routes/list-components.js index 522bf9668..9f584130b 100644 --- a/registry/routes/list-components.js +++ b/src/registry/routes/list-components.js @@ -4,7 +4,7 @@ var async = require('async'); var _ = require('underscore'); var dateStringified = require('../../utils/date-stringify'); -var packageInfo = require('../../package.json'); +var packageInfo = require('../../../package.json'); var urlBuilder = require('../domain/url-builder'); module.exports = function(repository){ diff --git a/registry/routes/publish.js b/src/registry/routes/publish.js similarity index 100% rename from registry/routes/publish.js rename to src/registry/routes/publish.js diff --git a/registry/routes/static-redirector.js b/src/registry/routes/static-redirector.js similarity index 100% rename from registry/routes/static-redirector.js rename to src/registry/routes/static-redirector.js diff --git a/registry/views/component-info.jade b/src/registry/views/component-info.jade similarity index 100% rename from registry/views/component-info.jade rename to src/registry/views/component-info.jade diff --git a/registry/views/component-preview.jade b/src/registry/views/component-preview.jade similarity index 100% rename from registry/views/component-preview.jade rename to src/registry/views/component-preview.jade diff --git a/registry/views/layout.jade b/src/registry/views/layout.jade similarity index 100% rename from registry/views/layout.jade rename to src/registry/views/layout.jade diff --git a/registry/views/list-components.jade b/src/registry/views/list-components.jade similarity index 100% rename from registry/views/list-components.jade rename to src/registry/views/list-components.jade diff --git a/registry/views/static/component-info.js b/src/registry/views/static/component-info.js similarity index 100% rename from registry/views/static/component-info.js rename to src/registry/views/static/component-info.js diff --git a/registry/views/static/list-components.js b/src/registry/views/static/list-components.js similarity index 100% rename from registry/views/static/list-components.js rename to src/registry/views/static/list-components.js diff --git a/registry/views/static/style.css b/src/registry/views/static/style.css similarity index 100% rename from registry/views/static/style.css rename to src/registry/views/static/style.css diff --git a/resources/index.js b/src/resources/index.js similarity index 100% rename from resources/index.js rename to src/resources/index.js diff --git a/resources/settings.js b/src/resources/settings.js similarity index 100% rename from resources/settings.js rename to src/resources/settings.js diff --git a/utils/date-stringify.js b/src/utils/date-stringify.js similarity index 100% rename from utils/date-stringify.js rename to src/utils/date-stringify.js diff --git a/utils/get-file-info.js b/src/utils/get-file-info.js similarity index 100% rename from utils/get-file-info.js rename to src/utils/get-file-info.js diff --git a/utils/get-mime-type.js b/src/utils/get-mime-type.js similarity index 100% rename from utils/get-mime-type.js rename to src/utils/get-mime-type.js diff --git a/utils/get-next-year.js b/src/utils/get-next-year.js similarity index 100% rename from utils/get-next-year.js rename to src/utils/get-next-year.js diff --git a/utils/get-unix-utc-timestamp.js b/src/utils/get-unix-utc-timestamp.js similarity index 100% rename from utils/get-unix-utc-timestamp.js rename to src/utils/get-unix-utc-timestamp.js diff --git a/utils/hash-builder.js b/src/utils/hash-builder.js similarity index 100% rename from utils/hash-builder.js rename to src/utils/hash-builder.js diff --git a/utils/pad-zero.js b/src/utils/pad-zero.js similarity index 100% rename from utils/pad-zero.js rename to src/utils/pad-zero.js diff --git a/utils/put.js b/src/utils/put.js similarity index 100% rename from utils/put.js rename to src/utils/put.js diff --git a/test/acceptance/client.js b/test/acceptance/client.js index ac5e037ee..3596f5f38 100644 --- a/test/acceptance/client.js +++ b/test/acceptance/client.js @@ -10,7 +10,7 @@ describe('The node.js OC client', function(){ client, clientOfflineRegistry, result, - oc = require('../../index'), + oc = require('../../src/index'), $component, conf = { local: true, diff --git a/test/acceptance/registry.js b/test/acceptance/registry.js index 6380b4795..9b94f83ce 100644 --- a/test/acceptance/registry.js +++ b/test/acceptance/registry.js @@ -9,7 +9,7 @@ describe('registry', function(){ var registry, result, error, - oc = require('../../index'), + oc = require('../../src/index'), conf = { local: true, path: path.resolve('test/fixtures/components'), diff --git a/test/configuration/karma-common.js b/test/configuration/karma-common.js index 3e8adf161..ff063ad9f 100644 --- a/test/configuration/karma-common.js +++ b/test/configuration/karma-common.js @@ -15,8 +15,8 @@ module.exports = { 'test-settings.js', // The oc-client bundle - '../../components/oc-client/src/head.load.js', - '../../components/oc-client/src/oc-client.js', + '../../src/components/oc-client/src/head.load.js', + '../../src/components/oc-client/src/oc-client.js', // The tests '../front-end/*.js' diff --git a/test/unit/cli-domain-get-components-by-dir.js b/test/unit/cli-domain-get-components-by-dir.js index 6fe7f263a..2a9ef20a8 100644 --- a/test/unit/cli-domain-get-components-by-dir.js +++ b/test/unit/cli-domain-get-components-by-dir.js @@ -32,7 +32,7 @@ var initialise = function(){ } }; - var GetComponentsByDir = injectr('../../cli/domain/get-components-by-dir.js', { + var GetComponentsByDir = injectr('../../src/cli/domain/get-components-by-dir.js', { 'fs-extra': fsMock, path: pathMock }, { __dirname: '' }); diff --git a/test/unit/cli-domain-get-local-npm-modules.js b/test/unit/cli-domain-get-local-npm-modules.js index 84b01cfde..602b028de 100644 --- a/test/unit/cli-domain-get-local-npm-modules.js +++ b/test/unit/cli-domain-get-local-npm-modules.js @@ -28,7 +28,7 @@ var initialise = function(){ } }; - var GetLocalNpmModules = injectr('../../cli/domain/get-local-npm-modules.js', { + var GetLocalNpmModules = injectr('../../src/cli/domain/get-local-npm-modules.js', { 'fs-extra': fsMock, path: pathMock }, { __dirname: '' }); diff --git a/test/unit/cli-domain-get-mocked-plugins.js b/test/unit/cli-domain-get-mocked-plugins.js index 6a3b681ed..df637c428 100644 --- a/test/unit/cli-domain-get-mocked-plugins.js +++ b/test/unit/cli-domain-get-mocked-plugins.js @@ -20,7 +20,7 @@ var initialise = function(fs){ writeFile: sinon.stub().yields(null, 'ok') }, fs || {}); - getMockedPlugins = injectr('../../cli/domain/get-mocked-plugins.js', { + getMockedPlugins = injectr('../../src/cli/domain/get-mocked-plugins.js', { 'fs-extra': fsMock, path: { resolve: function(){ diff --git a/test/unit/cli-domain-mock.js b/test/unit/cli-domain-mock.js index 7061f3b64..ed9c3724a 100644 --- a/test/unit/cli-domain-mock.js +++ b/test/unit/cli-domain-mock.js @@ -28,7 +28,7 @@ var initialise = function(){ } }; - var Local = injectr('../../cli/domain/mock.js', { + var Local = injectr('../../src/cli/domain/mock.js', { 'fs-extra': fsMock, path: pathMock }, { __dirname: '' }); diff --git a/test/unit/cli-domain-package-components.js b/test/unit/cli-domain-package-components.js index 60681d572..7938d20b6 100644 --- a/test/unit/cli-domain-package-components.js +++ b/test/unit/cli-domain-package-components.js @@ -28,7 +28,7 @@ var initialise = function(){ } }; - var Local = injectr('../../cli/domain/package-components.js', { + var Local = injectr('../../src/cli/domain/package-components.js', { 'fs-extra': fsMock, 'uglify-js': { minify: function(code){ diff --git a/test/unit/cli-domain-package-server-script.js b/test/unit/cli-domain-package-server-script.js index 8fe78880c..03130e1d3 100644 --- a/test/unit/cli-domain-package-server-script.js +++ b/test/unit/cli-domain-package-server-script.js @@ -19,7 +19,7 @@ var initialise = function(fs){ writeFile: sinon.stub().yields(null, 'ok') }, fs || {}); - packageServerScript = injectr('../../cli/domain/package-server-script.js', { + packageServerScript = injectr('../../src/cli/domain/package-server-script.js', { 'fs-extra': fsMock, path: { extname: path.extname, diff --git a/test/unit/cli-domain-package-static-files.js b/test/unit/cli-domain-package-static-files.js index cfcb74815..c2ee1430b 100644 --- a/test/unit/cli-domain-package-static-files.js +++ b/test/unit/cli-domain-package-static-files.js @@ -11,7 +11,7 @@ var packageStaticFiles, mocks; var initialise = function(mocks, params, cb){ - packageStaticFiles = injectr('../../cli/domain/package-static-files.js', mocks, { console: console }); + packageStaticFiles = injectr('../../src/cli/domain/package-static-files.js', mocks, { console: console }); packageStaticFiles(params, function(e, r){ error = e; cb(); diff --git a/test/unit/cli-domain-package-template.js b/test/unit/cli-domain-package-template.js index 8be6e471e..3078ca3d0 100644 --- a/test/unit/cli-domain-package-template.js +++ b/test/unit/cli-domain-package-template.js @@ -20,7 +20,7 @@ var initialise = function(fs, uglifyStub){ writeFile: sinon.stub().yields(null, 'ok') }, fs || {}); - packageTemplate = injectr('../../cli/domain/package-template.js', { + packageTemplate = injectr('../../src/cli/domain/package-template.js', { 'fs-extra': fsMock, 'uglify-js': { minify: uglifyStub || function(code){ diff --git a/test/unit/cli-domain-registry.js b/test/unit/cli-domain-registry.js index 2bd2a2b20..00440c2b9 100644 --- a/test/unit/cli-domain-registry.js +++ b/test/unit/cli-domain-registry.js @@ -7,7 +7,7 @@ var sinon = require('sinon'); var getRegistry = function(dependencies, opts){ dependencies.fs = dependencies.fs || {}; dependencies.fs.readJsonSync = sinon.stub().returns({ version: '1.2.3' }); - var Registry = injectr('../../cli/domain/registry.js', { + var Registry = injectr('../../src/cli/domain/registry.js', { 'minimal-request': dependencies.request, 'fs-extra': dependencies.fs, '../../utils/put': dependencies.put, diff --git a/test/unit/cli-domain-url-parser.js b/test/unit/cli-domain-url-parser.js index 6c2c54298..81b2e68ac 100644 --- a/test/unit/cli-domain-url-parser.js +++ b/test/unit/cli-domain-url-parser.js @@ -7,7 +7,7 @@ describe('cli : domain : url-parser', function(){ var parsed; var execute = function(url, returnVersion){ - var urlParser = require('../../cli/domain/url-parser'); + var urlParser = require('../../src/cli/domain/url-parser'); parsed = urlParser.parse({ href: url, diff --git a/test/unit/cli-facade-dev.js b/test/unit/cli-facade-dev.js index 26e7a6280..a5d891225 100644 --- a/test/unit/cli-facade-dev.js +++ b/test/unit/cli-facade-dev.js @@ -7,8 +7,8 @@ var sinon = require('sinon'); describe('cli : facade : dev', function(){ var logSpy = {}, - DevFacade = require('../../cli/facade/dev'), - Local = require('../../cli/domain/local'), + DevFacade = require('../../src/cli/facade/dev'), + Local = require('../../src/cli/domain/local'), local = new Local({ logger: { log: function(){} } }), npm = require('npm'), devFacade = new DevFacade({ local: local, logger: logSpy }); diff --git a/test/unit/cli-facade-init.js b/test/unit/cli-facade-init.js index bb086dcb2..0b44cbcb1 100644 --- a/test/unit/cli-facade-init.js +++ b/test/unit/cli-facade-init.js @@ -7,8 +7,8 @@ var sinon = require('sinon'); describe('cli : facade : init', function(){ var logSpy = {}, - InitFacade = require('../../cli/facade/init'), - Local = require('../../cli/domain/local'), + InitFacade = require('../../src/cli/facade/init'), + Local = require('../../src/cli/domain/local'), local = new Local({ logger: { log: function(){} } }), initFacade = new InitFacade({ local: local, logger: logSpy }); diff --git a/test/unit/cli-facade-mock.js b/test/unit/cli-facade-mock.js index b0fe1ae8f..fa3626b53 100644 --- a/test/unit/cli-facade-mock.js +++ b/test/unit/cli-facade-mock.js @@ -7,8 +7,8 @@ var sinon = require('sinon'); describe('cli : facade : mock', function(){ var logSpy = {}, - MockFacade = require('../../cli/facade/mock'), - Local = require('../../cli/domain/local'), + MockFacade = require('../../src/cli/facade/mock'), + Local = require('../../src/cli/domain/local'), local = new Local({ logger: { log: function(){}}}), mockFacade = new MockFacade({ local: local, logger: logSpy }); diff --git a/test/unit/cli-facade-preview.js b/test/unit/cli-facade-preview.js index 1f98963af..f890f3a96 100644 --- a/test/unit/cli-facade-preview.js +++ b/test/unit/cli-facade-preview.js @@ -15,7 +15,7 @@ describe('cli : facade : preview', function(){ registryStub = { getComponentPreviewUrlByUrl: sinon.stub().yields(error, url)}; logSpy = { log: sinon.spy()}; - var PreviewFacade = injectr('../../cli/facade/preview.js', { opn: opnSpy }), + var PreviewFacade = injectr('../../src/cli/facade/preview.js', { opn: opnSpy }), previewFacade = new PreviewFacade({ logger: logSpy, registry: registryStub }); previewFacade({ componentHref: 'http://components.com/component' }, function(){}); diff --git a/test/unit/cli-facade-publish.js b/test/unit/cli-facade-publish.js index 05cf33649..1385e6582 100644 --- a/test/unit/cli-facade-publish.js +++ b/test/unit/cli-facade-publish.js @@ -10,12 +10,12 @@ var _ = require('underscore'); describe('cli : facade : publish', function(){ var logSpy = {}, - Registry = require('../../cli/domain/registry'), + Registry = require('../../src/cli/domain/registry'), registry = new Registry(), - Local = require('../../cli/domain/local'), + Local = require('../../src/cli/domain/local'), local = new Local({ logger: { log: function(){} } }), readStub = sinon.stub().yields(null, 'test'), - PublishFacade = injectr('../../cli/facade/publish.js', { read: readStub }), + PublishFacade = injectr('../../src/cli/facade/publish.js', { read: readStub }), publishFacade = new PublishFacade({ registry: registry, local: local, logger: logSpy }); var execute = function(cb, creds){ diff --git a/test/unit/cli-facade-registry.js b/test/unit/cli-facade-registry.js index 9798d9646..af190c9f8 100644 --- a/test/unit/cli-facade-registry.js +++ b/test/unit/cli-facade-registry.js @@ -7,9 +7,9 @@ var sinon = require('sinon'); describe('cli : facade : registry', function(){ var logSpy = {}, - Registry = require('../../cli/domain/registry'), + Registry = require('../../src/cli/domain/registry'), registry = new Registry(), - RegistryFacade = require('../../cli/facade/registry'), + RegistryFacade = require('../../src/cli/facade/registry'), registryFacade = new RegistryFacade({ registry: registry, logger: logSpy }); var execute = function(command){ diff --git a/test/unit/registry-app-start.js b/test/unit/registry-app-start.js index 10f940181..776d775e4 100644 --- a/test/unit/registry-app-start.js +++ b/test/unit/registry-app-start.js @@ -5,8 +5,8 @@ var injectr = require('injectr'); var sinon = require('sinon'); var getAppStart = function(mockedRepository, options, callback){ - var appStart = injectr('../../registry/app-start.js', { - '../package.json': { version: '1.2.3' } + var appStart = injectr('../../src/registry/app-start.js', { + '../../package.json': { version: '1.2.3' } }, { console: { log: sinon.stub() }, __dirname: '.'}); return appStart(mockedRepository, options, callback); diff --git a/test/unit/registry-domain-components-cache.js b/test/unit/registry-domain-components-cache.js index 8b46d4f45..f86b7daa2 100644 --- a/test/unit/registry-domain-components-cache.js +++ b/test/unit/registry-domain-components-cache.js @@ -30,7 +30,7 @@ describe('registry : domain : components-cache', function(){ clearIntervalStub = sinon.stub(); setIntervalStub = sinon.stub(); eventsHandlerStub = { fire: sinon.stub() }; - var ComponentsCache = injctr('../../registry/domain/components-cache.js', { + var ComponentsCache = injctr('../../src/registry/domain/components-cache.js', { '../../utils/get-unix-utc-timestamp': function(){ return 12345678; }, diff --git a/test/unit/registry-domain-plugins-detective.js b/test/unit/registry-domain-plugins-detective.js index c48c91339..405fc03b9 100644 --- a/test/unit/registry-domain-plugins-detective.js +++ b/test/unit/registry-domain-plugins-detective.js @@ -4,7 +4,7 @@ var expect = require('chai').expect; describe('registry : domain : plugins-detective', function(){ - var detective = require('../../registry/domain/plugins-detective'); + var detective = require('../../src/registry/domain/plugins-detective'); describe('when detecting plugins usage', function(){ diff --git a/test/unit/registry-domain-plugins-initialiser.js b/test/unit/registry-domain-plugins-initialiser.js index 91434f7b8..5c779c7ec 100644 --- a/test/unit/registry-domain-plugins-initialiser.js +++ b/test/unit/registry-domain-plugins-initialiser.js @@ -4,7 +4,7 @@ var expect = require('chai').expect; describe('registry : domain : plugins-initialiser', function(){ - var pluginsInitialiser = require('../../registry/domain/plugins-initialiser'); + var pluginsInitialiser = require('../../src/registry/domain/plugins-initialiser'); describe('when initialising not valid plugins', function(){ diff --git a/test/unit/registry-domain-repository.js b/test/unit/registry-domain-repository.js index 2d8a2b2d0..21fdc25c1 100644 --- a/test/unit/registry-domain-repository.js +++ b/test/unit/registry-domain-repository.js @@ -27,7 +27,7 @@ describe('registry : domain : repository', function(){ putDir: sinon.stub() }; - var Repository = injectr('../../registry/domain/repository.js', { + var Repository = injectr('../../src/registry/domain/repository.js', { './s3': function(conf){ return s3Mock; }, @@ -226,7 +226,7 @@ describe('registry : domain : repository', function(){ describe('when on local configuration', function(){ - var Repository = require('../../registry/domain/repository'); + var Repository = require('../../src/registry/domain/repository'); var localConfiguration = { local: true, diff --git a/test/unit/registry-domain-require-wrapper.js b/test/unit/registry-domain-require-wrapper.js index 00dd61041..98a177778 100644 --- a/test/unit/registry-domain-require-wrapper.js +++ b/test/unit/registry-domain-require-wrapper.js @@ -5,7 +5,7 @@ var vm = require('vm'); describe('registry : domain : require-wrapper', function(){ - var RequireWrapper = require('../../registry/domain/require-wrapper'); + var RequireWrapper = require('../../src/registry/domain/require-wrapper'); describe('when using the require wrapper in a clear context', function(){ diff --git a/test/unit/registry-domain-s3.js b/test/unit/registry-domain-s3.js index 5e4bfffc7..4715b59f6 100644 --- a/test/unit/registry-domain-s3.js +++ b/test/unit/registry-domain-s3.js @@ -12,7 +12,7 @@ describe('registry : domain : s3', function(){ error, response; - var S3 = injectr('../../registry/domain/s3.js', { + var S3 = injectr('../../src/registry/domain/s3.js', { 'fs-extra': { readFile: sinon.stub().yields(null, 'file content!') }, diff --git a/test/unit/registry-domain-sanitiser.js b/test/unit/registry-domain-sanitiser.js index 8488e9a13..43b4470db 100644 --- a/test/unit/registry-domain-sanitiser.js +++ b/test/unit/registry-domain-sanitiser.js @@ -4,7 +4,7 @@ var expect = require('chai').expect; describe('registry : domain : sanitiser', function(){ - var sanitiser = require('../../registry/domain/sanitiser'); + var sanitiser = require('../../src/registry/domain/sanitiser'); describe('when sanitising component\'s request parameters', function(){ diff --git a/test/unit/registry-domain-validator.js b/test/unit/registry-domain-validator.js index 37df92ff0..04f122033 100644 --- a/test/unit/registry-domain-validator.js +++ b/test/unit/registry-domain-validator.js @@ -5,7 +5,7 @@ var injectr = require('injectr'); describe('registry : domain : validator', function(){ - var validator = require('../../registry/domain/validators'), + var validator = require('../../src/registry/domain/validators'), baseS3Conf = { bucket: 'oc-components', key: 's3-key', @@ -746,9 +746,9 @@ describe('registry : domain : validator', function(){ }); describe('when validating CLI OC version in request headers', function(){ - var validator = injectr('../../registry/domain/validators/index.js', { - './oc-cli-version': injectr('../../registry/domain/validators/oc-cli-version.js', { - '../../../package.json': { version: '0.16.34'} + var validator = injectr('../../src/registry/domain/validators/index.js', { + './oc-cli-version': injectr('../../src/registry/domain/validators/oc-cli-version.js', { + '../../../../package.json': { version: '0.16.34'} }) }); @@ -818,9 +818,9 @@ describe('registry : domain : validator', function(){ }); describe('when validating node engine version in request headers', function(){ - var validator = injectr('../../registry/domain/validators/index.js', { - './node-version': injectr('../../registry/domain/validators/node-version.js', { - '../../../package.json': { engines: { node: '>=0.10.35' }} + var validator = injectr('../../src/registry/domain/validators/index.js', { + './node-version': injectr('../../src/registry/domain/validators/node-version.js', { + '../../../../package.json': { engines: { node: '>=0.10.35' }} }) }); diff --git a/test/unit/registry-domain-version-handler.js b/test/unit/registry-domain-version-handler.js index 26fae633c..6c3331827 100644 --- a/test/unit/registry-domain-version-handler.js +++ b/test/unit/registry-domain-version-handler.js @@ -4,7 +4,7 @@ var expect = require('chai').expect; describe('registry : domain : version-handler', function(){ - var versionHandler = require('../../registry/domain/version-handler'); + var versionHandler = require('../../src/registry/domain/version-handler'); describe('when getting component', function(){ diff --git a/test/unit/registry-events-handler.js b/test/unit/registry-events-handler.js index d66ea0a23..05840b99e 100644 --- a/test/unit/registry-events-handler.js +++ b/test/unit/registry-events-handler.js @@ -5,7 +5,7 @@ var sinon = require('sinon'); describe('registry : events-handler', function(){ - var eventsHandler = require('../../registry/domain/events-handler'); + var eventsHandler = require('../../src/registry/domain/events-handler'); describe('when requiring it multiple times', function(){ @@ -14,7 +14,7 @@ describe('registry : events-handler', function(){ before(function(){ eventsHandler.on('eventName', spy); - handler2 = require('../../registry/domain/events-handler'); + handler2 = require('../../src/registry/domain/events-handler'); handler2.fire('eventName', { a: 1234 }); }); diff --git a/test/unit/registry-routes-component.js b/test/unit/registry-routes-component.js index e5a1868ce..7a0ce7b24 100644 --- a/test/unit/registry-routes-component.js +++ b/test/unit/registry-routes-component.js @@ -6,7 +6,7 @@ var _ = require('underscore'); describe('registry : routes : component', function(){ - var ComponentRoute = require('../../registry/routes/component'), + var ComponentRoute = require('../../src/registry/routes/component'), mockedComponents = require('../fixtures/mocked-components'), mockedRepository, resJsonStub, componentRoute; diff --git a/test/unit/registry-routes-components.js b/test/unit/registry-routes-components.js index c1fff8ff8..602018662 100644 --- a/test/unit/registry-routes-components.js +++ b/test/unit/registry-routes-components.js @@ -5,7 +5,7 @@ var sinon = require('sinon'); describe('registry : routes : components', function(){ - var ComponentsRoute = require('../../registry/routes/components'), + var ComponentsRoute = require('../../src/registry/routes/components'), mockedComponents = require('../fixtures/mocked-components'), mockedRepository, resJsonStub, diff --git a/test/unit/registry-routes-helpers-get-component.js b/test/unit/registry-routes-helpers-get-component.js index ab5b0e42f..dca37903f 100644 --- a/test/unit/registry-routes-helpers-get-component.js +++ b/test/unit/registry-routes-helpers-get-component.js @@ -11,7 +11,7 @@ describe('registry : routes : helpers : get-component', function(){ mockedComponents = require('../fixtures/mocked-components'), mockedRepository, getComponent, - GetComponent = injectr('../../registry/routes/helpers/get-component.js', { + GetComponent = injectr('../../src/registry/routes/helpers/get-component.js', { '../../domain/events-handler': { on: _.noop, fire: fireStub diff --git a/test/unit/url-builder.js b/test/unit/url-builder.js index f2eecdf65..c98d76bd4 100644 --- a/test/unit/url-builder.js +++ b/test/unit/url-builder.js @@ -4,7 +4,7 @@ var expect = require('chai').expect; describe('registry : domain : url-builder', function(){ - var urlBuilder = require('../../registry/domain/url-builder'); + var urlBuilder = require('../../src/registry/domain/url-builder'); var builtUrl; var execute = function(component, baseUrl){ diff --git a/test/unit/utils-date-stringify.js b/test/unit/utils-date-stringify.js index 7fff80cec..662c9d126 100644 --- a/test/unit/utils-date-stringify.js +++ b/test/unit/utils-date-stringify.js @@ -5,7 +5,7 @@ var sinon = require('sinon'); describe('utils : dateStringify', function(){ - var dateStringified = require('../../utils/date-stringify'); + var dateStringified = require('../../src/utils/date-stringify'); describe('when the date is provided', function(){ var anyValidDate = new Date(1442592664035); diff --git a/test/unit/utils-get-file-info.js b/test/unit/utils-get-file-info.js index baf0181dd..5e658b6dd 100644 --- a/test/unit/utils-get-file-info.js +++ b/test/unit/utils-get-file-info.js @@ -4,7 +4,7 @@ var expect = require('chai').expect; describe('utils : getFileInfo', function(){ - var getFileInfo = require('../../utils/get-file-info'); + var getFileInfo = require('../../src/utils/get-file-info'); describe('when extension is .js', function(){ var fileInfo = getFileInfo('/path/file.js'); diff --git a/test/unit/utils-get-mime-type.js b/test/unit/utils-get-mime-type.js index c72feb1a2..4bfab720f 100644 --- a/test/unit/utils-get-mime-type.js +++ b/test/unit/utils-get-mime-type.js @@ -4,7 +4,7 @@ var expect = require('chai').expect; describe('utils : getMimeType', function(){ - var getMimeType = require('../../utils/get-mime-type'); + var getMimeType = require('../../src/utils/get-mime-type'); describe('when extension is known', function(){ var mimeType = getMimeType('.js'); diff --git a/test/unit/utils-hash-builder.js b/test/unit/utils-hash-builder.js index 7d73bdf22..717bf7f5a 100644 --- a/test/unit/utils-hash-builder.js +++ b/test/unit/utils-hash-builder.js @@ -4,7 +4,7 @@ var expect = require('chai').expect; describe('utils : hash-builder', function(){ - var hashBuilder = require('../../utils/hash-builder'); + var hashBuilder = require('../../src/utils/hash-builder'); it('should build an hash from a string', function(){ var hash = hashBuilder.fromString('
this is a component
'); diff --git a/test/unit/utils-pad-zero.js b/test/unit/utils-pad-zero.js index 90eae0c0f..67e6e2c27 100644 --- a/test/unit/utils-pad-zero.js +++ b/test/unit/utils-pad-zero.js @@ -4,7 +4,7 @@ var expect = require('chai').expect; describe('utils : padZero', function(){ - var padZero = require('../../utils/pad-zero'); + var padZero = require('../../src/utils/pad-zero'); describe('when the correct parameters are provided', function(){ var anyData = 3;