chore: use lerna for bootstrap

gritzko · Dec 10, 2015 · 6d5858c · 6d5858c
1 parent 94f8255
commit 6d5858c
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 109 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: node_js
 node_js:
+  - "5.2"
+  - "5.1"
   - "5.0"
+  - "4.2"
   - "4.1"
   - "4.0"
   - "0.12"

diff --git a/Makefile b/Makefile
@@ -1,43 +1,16 @@
 BIN = ./node_modules/.bin
+PACKAGES = $(shell ls -1 ./packages/)
 
-SOURCES = \
-		  ./lib/*.js
+foreach_package = $(foreach pkg,$(PACKAGES),(cd packages/$(pkg) && $(1)) || exit 1;)
 
-all:: prepare testdist test dist todo
+.PHONY: bootstrap test
 
-prepare::
-	if [ ! -e dist/ ]; then mkdir dist; fi
-	if [ ! -e node_modules ]; then mkdir node_modules; fi
-	./links.sh
-	npm install
+bootstrap:
+	@npm install .
+	@$(BIN)/lerna bootstrap
 
-clean:
-	find . -name '*.min.js' | xargs rm -f ;
-	rm dist/*.js ;
-	rm -rf coverage ;
-
-test:: testdist
-	node test/runner.js && rm -rf .test.*
-
-lint::
-	$(BIN)/jshint $(SOURCES)
-
-dist:: testdist html5dist nodedist
-
-html5dist: prepare
-	$(BIN)/browserify lib/Html5Client.js -o dist/swarm-html5.js
-
-testdist: prepare
-	$(BIN)/browserify test/Tests.js -o dist/swarm-tests.js
-
-nodedist: prepare
-	$(BIN)/browserify lib/NodeServer.js -o dist/swarm-node.js
-
-commit:: all
-	git diff --exit-code && git commit && echo "well, git push now"
-
-todo::
-	@echo === GROUND LEVEL BUG/ISSUE TRACKER ===
-	@git grep -w --color -n -P 'TO\DO|FIX\ME'
-	@echo
+test:
+	@$(call foreach_package, make test)
 
+clean:
+	@$(call foreach_package, make clean)
diff --git a/Makefile.package.in b/Makefile.package.in
@@ -0,0 +1,8 @@
+BIN = ../../node_modules/.bin
+.PHONY: install test clean
+
+test:
+	@if [ -d "test" ]; then $(BIN)/tape test/*.js | $(BIN)/tap-spec; else true; fi;
+
+clean:
+	@rm -rf node_modules
diff --git a/VERSION b/VERSION
@@ -0,0 +1 @@
+1.0.0
diff --git a/package.json b/package.json
@@ -32,11 +32,14 @@
   ],
   "main": "",
   "browser": "",
-  "dependencies": {
-  },
+  "dependencies": {},
   "devDependencies": {
+    "lerna": "^1.0.4",
+    "tape": "^4.0.2",
+    "tap-spec": "^4.0.2",
+    "tape-dom": "^0.0.8"
   },
   "scripts": {
-    "test": "./test-all.sh"
+    "test": "make bootstrap test"
   }
 }
diff --git a/packages/swarm-bat/Makefile b/packages/swarm-bat/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.package.in
diff --git a/packages/swarm-bat/package.json b/packages/swarm-bat/package.json
@@ -13,11 +13,6 @@
         "stream-url": "~0.0.12",
         "eventemitter3": "^1.1.1"
     },
-    "devDependencies": {
-        "tape": "^4.0.2",
-        "tap-spec": "^4.0.2",
-        "tape-dom": "^0.0.8"
-    },
     "scripts": {
         "test": "tape test/*.js | tap-spec"
     }

diff --git a/packages/swarm-client/Makefile b/packages/swarm-client/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.package.in
diff --git a/packages/swarm-client/package.json b/packages/swarm-client/package.json
@@ -23,15 +23,10 @@
   "dependencies": {
       "levelup":        "^1.2.1",
       "level-js":       "^2.2.2",
-      "swarm-syncable": "^1.0.0",
-      "swarm-replica":  "^1.0.0"
-  },
-  "devDependencies": {
-    "tape": "^4.0.2",
-    "tap-spec": "^4.0.2",
-    "tape-dom": "^0.0.8"
+      "swarm-syncable": "^1.0.3",
+      "swarm-replica":  "^1.0.4"
   },
   "scripts": {
-    "test": "tape test/*.js | tap-spec"
+    "test": "true"
   }
 }
diff --git a/packages/swarm-gw/Makefile b/packages/swarm-gw/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.package.in
diff --git a/packages/swarm-gw/package.json b/packages/swarm-gw/package.json
@@ -18,7 +18,10 @@
   ],
   "main": "src/Gateway.js",
   "dependencies": {
-    "swarm-syncable":"1.0.3"
+    "swarm-syncable": "^1.0.3"
+  },
+  "scripts": {
+    "test": "true"
   },
   "devDependencies": {
   }

diff --git a/packages/swarm-replica/Makefile b/packages/swarm-replica/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.package.in
diff --git a/packages/swarm-replica/package.json b/packages/swarm-replica/package.json
@@ -22,18 +22,15 @@
     "main": "src/Replica.js",
     "browser": "src/Replica.js",
     "dependencies": {
-        "swarm-stamp": "1.0.0",
-        "swarm-syncable": "~1.0.3",
+        "swarm-stamp": "^1.0.0",
+        "swarm-syncable": "^1.0.3",
         "level": "^1.3.0",
         "stream-url": "~0.0.12",
         "eventemitter3": "~1.1.1"
     },
     "devDependencies": {
-        "swarm-bat": "~1.0.2",
-        "memdown": "^1.0.0",
-        "tape": "^4.0.2",
-        "tap-spec": "^4.0.2",
-        "tape-dom": "^0.0.10"
+        "swarm-bat": "^1.0.2",
+        "memdown": "^1.0.0"
     },
     "scripts": {
         "test": "tape test/*.js | tap-spec"

diff --git a/packages/swarm-server/Makefile b/packages/swarm-server/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.package.in
diff --git a/packages/swarm-server/package.json b/packages/swarm-server/package.json
@@ -22,21 +22,19 @@
     "main": "./src/Server.js",
     "bin":  "./src/cli.js",
     "dependencies": {
-        "swarm-stamp": "1.0.0",
-        "swarm-syncable": "1.0.3",
+        "swarm-stamp": "^1.0.0",
+        "swarm-syncable": "^1.0.3",
+        "swarm-replica": "^1.0.4",
         "level": "^1.3.0",
         "stream-url-ws": "^0.1.1",
         "stream-url-node": "^0.0.1",
         "eventemitter3": "^1.1.1",
         "yargs": "^3.30.0"
     },
     "devDependencies": {
-        "swarm-bat": "1.0.2",
+        "swarm-bat": "^1.0.2",
         "memdown": "^1.0.0",
-        "tape": "^4.0.2",
-        "rimraf": "~2.4.4",
-        "tap-spec": "^4.0.2",
-        "tape-dom": "^0.0.10"
+        "rimraf": "~2.4.4"
     },
     "scripts": {
         "test": "tape test/*.js | tap-spec"

diff --git a/packages/swarm-server/test/01_server_restart_bb.js b/packages/swarm-server/test/01_server_restart_bb.js
@@ -74,7 +74,6 @@ tape ('server.1.A log aggregation', function (t) {
     }
 
     function end () {
-        console.log('end');
         fs.existsSync(db_path) && rimraf.sync(db_path);
         server.close();
         t.end();

diff --git a/packages/swarm-stamp/Makefile b/packages/swarm-stamp/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.package.in
diff --git a/packages/swarm-stamp/package.json b/packages/swarm-stamp/package.json
@@ -24,11 +24,6 @@
   "browser": "index.js",
   "dependencies": {
   },
-  "devDependencies": {
-    "tape": "^4.0.2",
-    "tap-spec": "^4.0.2",
-    "tape-dom": "^0.0.8"
-  },
   "scripts": {
     "test": "tape test/*.js | tap-spec"
   }

diff --git a/packages/swarm-syncable/Makefile b/packages/swarm-syncable/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.package.in
diff --git a/packages/swarm-syncable/package.json b/packages/swarm-syncable/package.json
@@ -23,15 +23,12 @@
   "browser": "index.js",
   "dependencies": {
       "stream-url": "^0.0.12",
-      "swarm-stamp": "~1.0.0",
+      "swarm-stamp": "^1.0.0",
       "readable-stream": "~1.1.0",
       "eventemitter3": "^1.1.1"
   },
   "devDependencies": {
-    "tape": "^4.0.2",
-    "tap-spec": "^4.0.2",
-    "tape-dom": "^0.0.9",
-    "swarm-bat": "1.0.2"
+    "swarm-bat": "^1.0.2"
   },
   "scripts": {
     "test": "tape test/*.js | tap-spec"

diff --git a/test-all.sh b/test-all.sh