Split project into core, cli, and plugins

.dockerignore

@@ -1,8 +1,5 @@
-electron
+docs
+examples
 node_modules
+secrets
 server
-tests
-tests_cache
-.DS_Store
-.git
-.tscache

.gitignore

@@ -1,20 +1,8 @@
-/lib
+/secrets
 node_modules
 .DS_Store
 .tscache
 .istanbul.yml
 .nyc_output
 .vscode
-coverage/
-meteor/
-server/context/CMakeLists.txt
-server/context/bin/
-server/context/build/
-server/context/trie_modules/
-server/context/.idea
-server/context/tmake_server.xcodeproj
-server/context/Info.plist
-/tests
-/dist
-/tests_cache
-/nexe
+.tmake

.npmignore

@@ -1,11 +1,6 @@
-/.nyc_output
-/src
+/.vscode
 /docker
-/meteor
+/examples
+/src/*/src
 /server
-/nexe
 /tests
-/tests_cache
-/test
-/coverage
-node_modules

.travis.yml

@@ -1,20 +1,15 @@
 os:
 - linux
-- osx
 dist: trusty
 language: node_js
 node_js:
 - '6'
+- '7'
 before_install:
 - npm config set progress=false
-script: npm run travis
+script: make travis
 after_script:
 - cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
 deploy:
-  provider: npm
-  on:
-    branch: release
-  email: structuresound@gmail.com
-  skip_cleanup: true
   api_key:
-    secure: fR8zPV59CIjW3NniwReGWZ4IHDxbl4VJNjGFFsV+TwMcmOek+pYRJR58sZdZ+2E+CI0zdffa9Bd65WPHcHX3J5j00okSQXNYcASIT/8sfcQG2lQhZ7Ijz5G1v6wCJLec8WUILiylREqzBZzh3SPzW6DidNbdvNVbxpN3CKfz3yhECbtUzc5Vm4p/kwRbRhM9hVmK3Z+9amLXxpI9HG37rClhpetMhLmrdrVnQo0pSL6Rwm2EpHf9MR7evWkDmYxsd8zXHZ0XWkQJMrid2iEEuAjMUFIgejIAbM02zoCKrraQf62VhzTewLObucSYeGpfMglfwgDX9IjyVZVOwUFt+xO0aHrIA7vklh1rMxKcoUzLbcfDVvq+DPrJoP89dg7oQBPKj+d1sndaqAeEBKWuCGzyPb0Gb3gjiI4hzs0qtQZFMQXmAMOvyWOqQ/tlchalyRai8qyDqyojkRSZCb/F9oxdUtDtTDCT4UpX7QuSleyX3b5o1NoGoG3+4D4EheMhoZJsV9qTxHC5COHyqskJMdNf06fQGl2HgGeD7yzdiqtkgGKBTPW6XLG3qQUpJUBkJIYw3ActmOP8VgW2MzI76GUOfUqKlJLfXQ5PaQrl1bVqhbTDNwuEuMFACeNbFKKfHk7RurwIoJxaTZvcBRIjBUDnaAmaU4iHt5dqFGazhC0=
+    secure: LSfjJTmLEKnTGjKNFdOZmdGiS8AZdakZzBM5EQByYoE0Zeuh5VDHA0UiDIj17NHGDOpvV7ABaz0Tfy8v4GM0+AwzR0g7V1rIB8/IUNQLiojZTgM0SVTlRRAk6EYWD1EtR6swugSqwYFnrNvwRtxAVAEz4W6ZR4pVFII18VhqtcDo2NzB5uSfcHun8cnAgCcT9cnNiMqpM9ihb8jxfhP12AkVQFuFAyOtnFXSy4to2H2SIvUWWu0rVPrvOQaB6OwHMTeWKETQtg9Fn3Y5KnvwmA3ADdat+y31s4JqSc4JdNjSyAzt/UKhDfw3NNFpNYY5dd+00FesNnPEMZ8p6JaJdyzhF9zDtbKpy2MHJY/WuqDr1P5+eMFGvyLdu9y9O3271mML7ZxXrf7F5TVxxm9jMjKTVVbgwF6KVd3lXMNCcZ+UNbgbq43+mpG9YM9oagQhdFXIVgWXXLBd2GUXb/Ch7Lue6p5Qi/Y1cfQMW87NvoOlSBq4mD4pQ7IdBsIAi+PKCGYtWlS7uHYeUuL5sefG/sti8pljJdk5luvkUnse3cI7Y6CZYv9KJ1Cs809FXo/nDrNJqj2tPxA+lq5TtqlUVHfa/czv5nv9QcfvWVi4d8vL3EzjebIFd8r9KE25CWtCjAO5xRbRC/d3sAse65J3TuwPif2TvGvRSY6fzqD7ICc=

Dockerfile

@@ -1,28 +1,30 @@
 FROM 1e1f/tmake:base
-MAINTAINER chroma <leif@chroma.io>
+MAINTAINER chroma <structuresound@gmail.com>
 
-RUN apt-get install -y runit apt-transport-https
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get install -y yarn
+
+ENV YARN_VERSION 0.21.3
+ADD https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v${YARN_VERSION}.tar.gz /opt/yarn.tar.gz
+RUN yarnDirectory=/opt/yarn && \
+    mkdir -p "$yarnDirectory" && \
+    tar -xzf /opt/yarn.tar.gz -C "$yarnDirectory" && \
+    ln -s "$yarnDirectory/dist/bin/yarn" /usr/local/bin/ && \
+    rm /opt/yarn.tar.gz
 
 RUN npm i -g mocha
 
 COPY docker/image/ /
 COPY package.json /tmake/
-COPY yarn.lock /tmake/
+COPY Makefile /tmake/
+COPY bin/ /tmake/bin/
+COPY settings/ /tmake/settings/
+COPY src/ /tmake/src/
+COPY tests/src /tmake/tests/src
+COPY tests/package.json /tmake/tests/package.json
 
 ENV HOME /tmake
 WORKDIR /tmake
-RUN yarn install --production
-
-COPY bin/ /tmake/bin/
-COPY src/ /tmake/src/
-COPY lib/ /tmake/lib/
-COPY test/ /tmake/test/
 
-RUN NODE_ENV=test mocha --require source-map-support/register test/
+RUN make test
 RUN npm link
 
-WORKDIR /tmake/build
 ENTRYPOINT [ "/tmake/entrypoint.sh" ]

Makefile

@@ -2,20 +2,46 @@ dockerBase:
 	cd docker/base && docker build -t 1e1f/tmake:base .
 
 tmake:
-	gulp scripts
-docker: tmake
+	cd src && yarn
+	cd src/core && npm run distribute && npm link
+	cd src/cmake && npm run distribute  && npm link
+	cd src/make && npm run distribute && npm link
+	cd src/cli && npm run distribute && npm link
+
+pre-test: tmake
+	mkdir -p tests/.tmake/plugins
+	touch tests/.tmake/plugins/package.json
+	cd tests/.tmake/plugins && npm link tmake-plugin-cmake
+	cd tests/.tmake/plugins && npm link tmake-plugin-make
+
+test: pre-test
+	cd tests && npm run before && npm test
+
+coverage: pre-test
+	cd tests && npm run before && npm run cover
+
+travis: coverage
+
+docker: clean
+	rm -Rf tests/.tmake
 	docker build -t 1e1f/tmake .
 
+docker-clean:
+	docker rmi 1e1f/tmake:server
+	docker rmi 1e1f/tmake
+	docker rmi 1e1f/tmake:base
+
 server:
 	cd server/project && docker build -t 1e1f/tmake:server .
 
 run:
 	cd server && docker compose up
 
 clean:
-	docker rmi 1e1f/tmake:server
-	docker rmi 1e1f/tmake
-	docker rmi 1e1f/tmake:base
+	rm -Rf **/node_modules
+	rm -Rf **/**/node_modules
+	rm -Rf **/**/**/node_modules
+	rm -Rf server/data
 
 install:
 	docker push 1e1f/tmake:base

README.md

@@ -130,5 +130,5 @@ see 'warning' at the top, *update* this project is ALMOST useful now, please hol
 _(Nothing yet)_
 
 ## License
-Copyright (c) 2016 1e1f
+Copyright (c) 2018 1e1f
 Licensed under the MIT license.

bin/.gitignore

@@ -0,0 +1 @@
+/dist