From 8c3fdfc9d4cf1e2729481f470c20a7f18801534a Mon Sep 17 00:00:00 2001 From: Jari Bakken Date: Fri, 31 Oct 2014 16:35:35 +0100 Subject: [PATCH] Move unleash-server to top level. --- .gitignore | 16 +++--- README.md | 49 +++++++++++++++++-- finnbuild.json | 14 +++--- {unleash-server/lib => lib}/dbPool.js | 0 {unleash-server/lib => lib}/eventApi.js | 0 {unleash-server/lib => lib}/eventDb.js | 0 {unleash-server/lib => lib}/eventStore.js | 0 {unleash-server/lib => lib}/eventType.js | 0 {unleash-server/lib => lib}/featureApi.js | 0 {unleash-server/lib => lib}/featureDb.js | 0 {unleash-server/lib => lib}/logger.js | 0 {unleash-server/lib => lib}/routes.js | 0 {unleash-server/lib => lib}/strategyApi.js | 0 .../20141020151056-initial-schema.js | 0 .../sql/001-initial-schema.down.sql | 0 .../sql/001-initial-schema.up.sql | 0 unleash-server/package.json => package.json | 0 .../public => public}/css/unleash.css | 0 {unleash-server/public => public}/index.html | 0 {unleash-server/public => public}/js/app.jsx | 0 .../js/components/ErrorMessages.jsx | 0 .../js/components/FeatureList.jsx | 0 .../public => public}/js/components/Menu.jsx | 0 .../js/components/SavedFeature.jsx | 0 .../js/components/Unleash.jsx | 0 .../js/components/UnsavedFeature.jsx | 0 .../js/stores/FeatureStore.js | 0 .../public => public}/js/utils/Timer.js | 0 .../generate-liquibase-artifact.js | 0 .../scripts => scripts}/init.down.sql | 0 .../scripts => scripts}/init.up.sql | 0 unleash-server/server.js => server.js | 0 .../test => test}/eventApi.test.js | 0 {unleash-server/test => test}/eventDbMock.js | 2 +- .../test => test}/eventStoreSpec.js | 0 .../test => test}/featureApiSpec.js | 0 .../test => test}/featureDbMock.js | 0 {unleash-server/test => test}/routers.test.js | 0 unleash-server/README.md | 48 ------------------ .../webpack.config.js => webpack.config.js | 0 40 files changed, 60 insertions(+), 69 deletions(-) rename {unleash-server/lib => lib}/dbPool.js (100%) rename {unleash-server/lib => lib}/eventApi.js (100%) rename {unleash-server/lib => lib}/eventDb.js (100%) rename {unleash-server/lib => lib}/eventStore.js (100%) rename {unleash-server/lib => lib}/eventType.js (100%) rename {unleash-server/lib => lib}/featureApi.js (100%) rename {unleash-server/lib => lib}/featureDb.js (100%) rename {unleash-server/lib => lib}/logger.js (100%) rename {unleash-server/lib => lib}/routes.js (100%) rename {unleash-server/lib => lib}/strategyApi.js (100%) rename {unleash-server/migrations => migrations}/20141020151056-initial-schema.js (100%) rename {unleash-server/migrations => migrations}/sql/001-initial-schema.down.sql (100%) rename {unleash-server/migrations => migrations}/sql/001-initial-schema.up.sql (100%) rename unleash-server/package.json => package.json (100%) rename {unleash-server/public => public}/css/unleash.css (100%) rename {unleash-server/public => public}/index.html (100%) rename {unleash-server/public => public}/js/app.jsx (100%) rename {unleash-server/public => public}/js/components/ErrorMessages.jsx (100%) rename {unleash-server/public => public}/js/components/FeatureList.jsx (100%) rename {unleash-server/public => public}/js/components/Menu.jsx (100%) rename {unleash-server/public => public}/js/components/SavedFeature.jsx (100%) rename {unleash-server/public => public}/js/components/Unleash.jsx (100%) rename {unleash-server/public => public}/js/components/UnsavedFeature.jsx (100%) rename {unleash-server/public => public}/js/stores/FeatureStore.js (100%) rename {unleash-server/public => public}/js/utils/Timer.js (100%) rename {unleash-server/scripts => scripts}/generate-liquibase-artifact.js (100%) rename {unleash-server/scripts => scripts}/init.down.sql (100%) rename {unleash-server/scripts => scripts}/init.up.sql (100%) rename unleash-server/server.js => server.js (100%) rename {unleash-server/test => test}/eventApi.test.js (100%) rename {unleash-server/test => test}/eventDbMock.js (98%) rename {unleash-server/test => test}/eventStoreSpec.js (100%) rename {unleash-server/test => test}/featureApiSpec.js (100%) rename {unleash-server/test => test}/featureDbMock.js (100%) rename {unleash-server/test => test}/routers.test.js (100%) delete mode 100644 unleash-server/README.md rename unleash-server/webpack.config.js => webpack.config.js (100%) diff --git a/.gitignore b/.gitignore index b34b254cde..c15934e84a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,14 +27,12 @@ node_modules # Users Environment Variables .lock-wscript -# Idea stuff -.idea -*.iml - -# Java -target - # webpack output -/unleash-server/public/js/bundle.js +public/js/bundle.js -.DS_Store \ No newline at end of file +.DS_Store + +# liquibase stuff +/sql +unleash-db.jar +unleash-server.tar.gz \ No newline at end of file diff --git a/README.md b/README.md index 0917bdc7ea..09ffeba00b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,48 @@ -# [unleash](http://finn-no.github.io/unleash/) [![Build Status](https://travis-ci.org/finn-no/unleash.svg?branch=master)](https://travis-ci.org/finn-no/unleash) [![Coverage Status](https://coveralls.io/repos/finn-no/unleash/badge.png?branch=master)](https://coveralls.io/r/finn-no/unleash?branch=master) +# unleash-server [![Build Status](https://travis-ci.org/finn-no/unleash.svg?branch=master)](https://travis-ci.org/finn-no/unleash) [![Code Climate](https://codeclimate.com/github/finn-no/unleash/badges/gpa.svg)](https://codeclimate.com/github/finn-no/unleash) [![Coverage Status](https://coveralls.io/repos/finn-no/unleash/badge.png?branch=master)](https://coveralls.io/r/finn-no/unleash?branch=master) +unleash-server is a place to ask for the status of features. -feature toggle service +### Create a local unleash-db on postgres +```bash +$ psql postgres < sql/db.changelog-master.xml"}, - { "command" : "cd unleash-server && jar -cf ../unleash-db.jar sql"}, + { "command" : "rm -rf sql && mkdir sql" }, + { "command" : "scripts/generate-liquibase-artifact.js > sql/db.changelog-master.xml"}, + { "command" : "jar -cf unleash-db.jar sql"}, { "command": "mvn deploy:deploy-file -Durl=http://mavenproxy.finntech.no/finntech-internal-snapshot/ -DrepositoryId=finntech-internal-snapshot -Dfile=unleash-db.jar -DgroupId=no.finntech.unleash -DartifactId=unleash-db -Dversion=0.1337-SNAPSHOT -Dpackaging=jar", "pipelines": [ @@ -36,7 +36,7 @@ ], "default": [ - {"command": "cd unleash-server && npm install && npm test"}, + {"command": "npm install && npm test"}, ] } diff --git a/unleash-server/lib/dbPool.js b/lib/dbPool.js similarity index 100% rename from unleash-server/lib/dbPool.js rename to lib/dbPool.js diff --git a/unleash-server/lib/eventApi.js b/lib/eventApi.js similarity index 100% rename from unleash-server/lib/eventApi.js rename to lib/eventApi.js diff --git a/unleash-server/lib/eventDb.js b/lib/eventDb.js similarity index 100% rename from unleash-server/lib/eventDb.js rename to lib/eventDb.js diff --git a/unleash-server/lib/eventStore.js b/lib/eventStore.js similarity index 100% rename from unleash-server/lib/eventStore.js rename to lib/eventStore.js diff --git a/unleash-server/lib/eventType.js b/lib/eventType.js similarity index 100% rename from unleash-server/lib/eventType.js rename to lib/eventType.js diff --git a/unleash-server/lib/featureApi.js b/lib/featureApi.js similarity index 100% rename from unleash-server/lib/featureApi.js rename to lib/featureApi.js diff --git a/unleash-server/lib/featureDb.js b/lib/featureDb.js similarity index 100% rename from unleash-server/lib/featureDb.js rename to lib/featureDb.js diff --git a/unleash-server/lib/logger.js b/lib/logger.js similarity index 100% rename from unleash-server/lib/logger.js rename to lib/logger.js diff --git a/unleash-server/lib/routes.js b/lib/routes.js similarity index 100% rename from unleash-server/lib/routes.js rename to lib/routes.js diff --git a/unleash-server/lib/strategyApi.js b/lib/strategyApi.js similarity index 100% rename from unleash-server/lib/strategyApi.js rename to lib/strategyApi.js diff --git a/unleash-server/migrations/20141020151056-initial-schema.js b/migrations/20141020151056-initial-schema.js similarity index 100% rename from unleash-server/migrations/20141020151056-initial-schema.js rename to migrations/20141020151056-initial-schema.js diff --git a/unleash-server/migrations/sql/001-initial-schema.down.sql b/migrations/sql/001-initial-schema.down.sql similarity index 100% rename from unleash-server/migrations/sql/001-initial-schema.down.sql rename to migrations/sql/001-initial-schema.down.sql diff --git a/unleash-server/migrations/sql/001-initial-schema.up.sql b/migrations/sql/001-initial-schema.up.sql similarity index 100% rename from unleash-server/migrations/sql/001-initial-schema.up.sql rename to migrations/sql/001-initial-schema.up.sql diff --git a/unleash-server/package.json b/package.json similarity index 100% rename from unleash-server/package.json rename to package.json diff --git a/unleash-server/public/css/unleash.css b/public/css/unleash.css similarity index 100% rename from unleash-server/public/css/unleash.css rename to public/css/unleash.css diff --git a/unleash-server/public/index.html b/public/index.html similarity index 100% rename from unleash-server/public/index.html rename to public/index.html diff --git a/unleash-server/public/js/app.jsx b/public/js/app.jsx similarity index 100% rename from unleash-server/public/js/app.jsx rename to public/js/app.jsx diff --git a/unleash-server/public/js/components/ErrorMessages.jsx b/public/js/components/ErrorMessages.jsx similarity index 100% rename from unleash-server/public/js/components/ErrorMessages.jsx rename to public/js/components/ErrorMessages.jsx diff --git a/unleash-server/public/js/components/FeatureList.jsx b/public/js/components/FeatureList.jsx similarity index 100% rename from unleash-server/public/js/components/FeatureList.jsx rename to public/js/components/FeatureList.jsx diff --git a/unleash-server/public/js/components/Menu.jsx b/public/js/components/Menu.jsx similarity index 100% rename from unleash-server/public/js/components/Menu.jsx rename to public/js/components/Menu.jsx diff --git a/unleash-server/public/js/components/SavedFeature.jsx b/public/js/components/SavedFeature.jsx similarity index 100% rename from unleash-server/public/js/components/SavedFeature.jsx rename to public/js/components/SavedFeature.jsx diff --git a/unleash-server/public/js/components/Unleash.jsx b/public/js/components/Unleash.jsx similarity index 100% rename from unleash-server/public/js/components/Unleash.jsx rename to public/js/components/Unleash.jsx diff --git a/unleash-server/public/js/components/UnsavedFeature.jsx b/public/js/components/UnsavedFeature.jsx similarity index 100% rename from unleash-server/public/js/components/UnsavedFeature.jsx rename to public/js/components/UnsavedFeature.jsx diff --git a/unleash-server/public/js/stores/FeatureStore.js b/public/js/stores/FeatureStore.js similarity index 100% rename from unleash-server/public/js/stores/FeatureStore.js rename to public/js/stores/FeatureStore.js diff --git a/unleash-server/public/js/utils/Timer.js b/public/js/utils/Timer.js similarity index 100% rename from unleash-server/public/js/utils/Timer.js rename to public/js/utils/Timer.js diff --git a/unleash-server/scripts/generate-liquibase-artifact.js b/scripts/generate-liquibase-artifact.js similarity index 100% rename from unleash-server/scripts/generate-liquibase-artifact.js rename to scripts/generate-liquibase-artifact.js diff --git a/unleash-server/scripts/init.down.sql b/scripts/init.down.sql similarity index 100% rename from unleash-server/scripts/init.down.sql rename to scripts/init.down.sql diff --git a/unleash-server/scripts/init.up.sql b/scripts/init.up.sql similarity index 100% rename from unleash-server/scripts/init.up.sql rename to scripts/init.up.sql diff --git a/unleash-server/server.js b/server.js similarity index 100% rename from unleash-server/server.js rename to server.js diff --git a/unleash-server/test/eventApi.test.js b/test/eventApi.test.js similarity index 100% rename from unleash-server/test/eventApi.test.js rename to test/eventApi.test.js diff --git a/unleash-server/test/eventDbMock.js b/test/eventDbMock.js similarity index 98% rename from unleash-server/test/eventDbMock.js rename to test/eventDbMock.js index 9d943270fc..b151e19a7d 100644 --- a/unleash-server/test/eventDbMock.js +++ b/test/eventDbMock.js @@ -7,7 +7,7 @@ var events = [ "type": "feature-create", "created_by": "me", "data": { - + } }, { diff --git a/unleash-server/test/eventStoreSpec.js b/test/eventStoreSpec.js similarity index 100% rename from unleash-server/test/eventStoreSpec.js rename to test/eventStoreSpec.js diff --git a/unleash-server/test/featureApiSpec.js b/test/featureApiSpec.js similarity index 100% rename from unleash-server/test/featureApiSpec.js rename to test/featureApiSpec.js diff --git a/unleash-server/test/featureDbMock.js b/test/featureDbMock.js similarity index 100% rename from unleash-server/test/featureDbMock.js rename to test/featureDbMock.js diff --git a/unleash-server/test/routers.test.js b/test/routers.test.js similarity index 100% rename from unleash-server/test/routers.test.js rename to test/routers.test.js diff --git a/unleash-server/README.md b/unleash-server/README.md deleted file mode 100644 index 09ffeba00b..0000000000 --- a/unleash-server/README.md +++ /dev/null @@ -1,48 +0,0 @@ -# unleash-server [![Build Status](https://travis-ci.org/finn-no/unleash.svg?branch=master)](https://travis-ci.org/finn-no/unleash) [![Code Climate](https://codeclimate.com/github/finn-no/unleash/badges/gpa.svg)](https://codeclimate.com/github/finn-no/unleash) [![Coverage Status](https://coveralls.io/repos/finn-no/unleash/badge.png?branch=master)](https://coveralls.io/r/finn-no/unleash?branch=master) -unleash-server is a place to ask for the status of features. - -### Create a local unleash-db on postgres - -```bash -$ psql postgres <