Support Rebar3.

Author: ricardobcl

.gitignore

@@ -1,16 +1,4 @@
-*.beam
-.eunit
-.rebar
-deps/*
-ebin/*
-rel/dotted_db
-dev
-apps/dotted_db/src/*
-.idea/*
-DottedDB.iml
 benchmarks/tests/*
-.combo_dialyzer_plt
-.local_dialyzer_plt
-dialyzer_unhandled_warnings
-dialyzer_warnings
-dialyzer.ignore-warnings
+benchmarks/*.out
+benchmarks/*.svg
+_build/*

Makefile

@@ -1,51 +1,54 @@
-REBAR = $(shell pwd)/rebar
-.PHONY: deps
+REBAR3_URL=https://s3.amazonaws.com/rebar3/rebar3
 
-all: deps compile
+# If there is a rebar in the current directory, use it
+ifeq ($(wildcard rebar3),rebar3)
+REBAR3 = $(CURDIR)/rebar3
+endif
 
-compile:
-	$(REBAR) compile
+# Fallback to rebar on PATH
+REBAR3 ?= $(shell test -e `which rebar3` 2>/dev/null && which rebar3 || echo "./rebar3")
 
-deps:
-	$(REBAR) get-deps
+# And finally, prep to download rebar if all else fails
+ifeq ($(REBAR3),)
+REBAR3 = $(CURDIR)/rebar3
+endif
 
-compile-no-deps:
-	$(REBAR) compile skip_deps=true
+.PHONY: all
 
-test: compile
-	$(REBAR) eunit skip_deps=true
+all: $(REBAR3)
+	@$(REBAR3) do deps, compile
+
+rel: compile
+	@$(REBAR3) release -d false --overlay_vars config/vars.config
+
+rel_dev: compile
+	@$(REBAR3) release --overlay_vars config/vars.config
 
 clean:
-	$(REBAR) clean
+	@$(REBAR3) clean
 
-distclean: clean devclean relclean
-	$(REBAR) delete-deps
+compile:
+	@$(REBAR3) compile
 
-rel: all
-	$(REBAR) generate
+compile-no-deps:
+	@$(REBAR3) compile
 
-relclean:
-	rm -rf rel/dotted_db
+deps:
+	@$(REBAR3) deps
 
-xref: all
-	$(REBAR) skip_deps=true xref
+doc: compile
+	@$(REBAR3) edoc
 
-stage: rel
-	$(foreach dep,$(wildcard deps/*), rm -rf rel/dotted_db/lib/$(shell basename $(dep))-* && ln -sf $(abspath $(dep)) rel/dotted_db/lib;)
-	$(foreach app,$(wildcard apps/*), rm -rf rel/dotted_db/lib/$(shell basename $(app))-* && ln -sf $(abspath $(app)) rel/dotted_db/lib;)
+dialyzer: compile
+	@$(REBAR3) dialyzer
 
-##
-## Lock Targets
-##
-##  see https://github.com/seth/rebar_lock_deps_plugin
-lock: deps compile
-	./rebar lock-deps
+test: deps compile
+	@$(REBAR3) do eunit skip_deps=true, ct, dialyzer
 
-locked-all: locked-deps compile
 
-locked-deps:
-	@echo "Using rebar.config.lock file to fetch dependencies"
-	./rebar -C rebar.config.lock get-deps
+$(REBAR3):
+	curl -Lo rebar3 $(REBAR3_URL) || wget $(REBAR3_URL)
+	chmod a+x rebar3
 
 
 ##
@@ -59,7 +62,7 @@ locked-deps:
 ##  Example, make a 68 node devrel cluster
 ##    make stagedevrel DEVNODES=68
 
-.PHONY : stagedevrel devrel
+.PHONY : devrel
 DEVNODES ?= 4
 
 # 'seq' is not available on all *BSD, so using an alternate in awk
@@ -68,72 +71,11 @@ SEQ = $(shell awk 'BEGIN { for (i = 1; i < '$(DEVNODES)'; i++) printf("%i ", i);
 $(eval stagedevrel : $(foreach n,$(SEQ),stagedev$(n)))
 $(eval devrel : $(foreach n,$(SEQ),dev$(n)))
 
-dev% : all
-	mkdir -p dev
-	rel/gen_dev $@ rel/vars/dev_vars.config.src rel/vars/$@_vars.config
-	(cd rel && $(REBAR) generate target_dir=../dev/$@ overlay_vars=vars/$@_vars.config)
-
-stagedev% : dev%
-	  $(foreach dep,$(wildcard deps/*), rm -rf dev/$^/lib/$(shell basename $(dep))* && ln -sf $(abspath $(dep)) dev/$^/lib;)
-	  $(foreach app,$(wildcard apps/*), rm -rf dev/$^/lib/$(shell basename $(app))* && ln -sf $(abspath $(app)) dev/$^/lib;)
+dev% : devclean all
+	mkdir -p _build/dev/$@
+	config/gen_dev $@ config/vars/dev_vars.config.src config/vars/$@_vars.config
+	$(REBAR3) release -o _build/dev/$@ --overlay_vars config/vars/$@_vars.config
 
 devclean: clean
-	rm -rf dev
-
-
-## Dialyzer
-
-DIALYZER_APPS = kernel stdlib sasl erts ssl tools os_mon runtime_tools crypto inets \
-	xmerl webtool eunit syntax_tools compiler public_key snmp
-
-
-PLT ?= $(PWD)/.combo_dialyzer_plt
-LOCAL_PLT = $(PWD)/.local_dialyzer_plt
-DIALYZER_FLAGS ?= -Wunmatched_returns -Werror_handling -Wrace_conditions -Wunderspecs
-
-${PLT}: compile-no-deps
-	@if [ -f $(PLT) ]; then \
-		dialyzer --check_plt --plt $(PLT) --apps $(DIALYZER_APPS) && \
-		dialyzer --add_to_plt --plt $(PLT) --output_plt $(PLT) --apps $(DIALYZER_APPS) ; test $$? -ne 1; \
-	else \
-		dialyzer --build_plt --output_plt $(PLT) --apps $(DIALYZER_APPS); test $$? -ne 1; \
-	fi
-
-${LOCAL_PLT}: compile-no-deps
-	@if [ -d deps ]; then \
-		if [ -f $(LOCAL_PLT) ]; then \
-			dialyzer --check_plt --plt $(LOCAL_PLT) deps/*/ebin ebin && \
-			dialyzer --add_to_plt --plt $(LOCAL_PLT) --output_plt $(LOCAL_PLT) deps/*/ebin ebin ; test $$? -ne 1; \
-		else \
-			dialyzer --build_plt --output_plt $(LOCAL_PLT) deps/*/ebin ebin ; test $$? -ne 1; \
-		fi \
-	fi
-
-dialyzer: ${PLT} ${LOCAL_PLT}
-	@echo "==> $(shell basename $(shell pwd)) (dialyzer)"
-	@if [ -f $(LOCAL_PLT) ]; then \
-		PLTS="$(PLT) $(LOCAL_PLT)"; \
-	else \
-		PLTS=$(PLT); \
-	fi; \
-	if [ -f dialyzer.ignore-warnings ]; then \
-		if [ $$(grep -cvE '[^[:space:]]' dialyzer.ignore-warnings) -ne 0 ]; then \
-			echo "ERROR: dialyzer.ignore-warnings contains a blank/empty line, this will match all messages!"; \
-			exit 1; \
-		fi; \
-		dialyzer $(DIALYZER_FLAGS) --plts $${PLTS} -c ebin > dialyzer_warnings ; \
-		egrep -v "^[[:space:]]*(done|Checking|Proceeding|Compiling)" dialyzer_warnings | grep -F -f dialyzer.ignore-warnings -v > dialyzer_unhandled_warnings ; \
-		cat dialyzer_unhandled_warnings ; \
-		[ $$(cat dialyzer_unhandled_warnings | wc -l) -eq 0 ] ; \
-	else \
-		dialyzer $(DIALYZER_FLAGS) --plts $${PLTS} -c ebin; \
-	fi
-
-cleanplt:
-	@echo
-	@echo "Are you sure?  It takes several minutes to re-build."
-	@echo Deleting $(PLT) and $(LOCAL_PLT) in 5 seconds.
-	@echo
-	sleep 5
-	rm $(PLT)
-	rm $(LOCAL_PLT)
+	rm -rf _build/dev
+

Rakefile

@@ -5,7 +5,7 @@ require 'fileutils'
 NUM_NODES = 4
 NUM_NODES_STR = "4"
 #RING_SIZE = 16
-BACKEND = 'leveldb' #options: bitcask, leveldb, memory.
+# BACKEND = 'leveldb' #options: bitcask, leveldb, memory.
 
 task :default => :help
 
@@ -15,25 +15,25 @@ end
 
 desc "counters # of errors lines in the dev cluster log"
 task :errors do
-  sh "cat dev/dev?/log/error.log dev/dev?/log/crash.log| wc -l" rescue "print errors error"
-  sh "cat dev/dev1/log/error.log dev/dev1/log/crash.log| wc -l" rescue "print errors error"
-  sh "cat dev/dev2/log/error.log dev/dev2/log/crash.log| wc -l" rescue "print errors error"
-  sh "cat dev/dev3/log/error.log dev/dev3/log/crash.log| wc -l" rescue "print errors error"
-  sh "cat dev/dev4/log/error.log dev/dev4/log/crash.log| wc -l" rescue "print errors error"
+  sh "cat _build/dev/dev?/dotted_db/log/error.log dev/dev?/log/crash.log| wc -l" rescue "print errors error"
+  sh "cat _build/dev/dev1/dotted_db/log/error.log dev/dev1/log/crash.log| wc -l" rescue "print errors error"
+  sh "cat _build/dev/dev2/dotted_db/log/error.log dev/dev2/log/crash.log| wc -l" rescue "print errors error"
+  sh "cat _build/dev/dev3/dotted_db/log/error.log dev/dev3/log/crash.log| wc -l" rescue "print errors error"
+  sh "cat _build/dev/dev4/dotted_db/log/error.log dev/dev4/log/crash.log| wc -l" rescue "print errors error"
 end
 
 desc "resets the logs"
 task :clean_errors do
   (1..NUM_NODES).each do |n|
-    sh %{rm -rf dev/dev#{n}/log/*}
-    sh "touch dev/dev#{n}/log/error.log dev/dev#{n}/log/crash.log" rescue "print clean error"
+    sh %{rm -rf _build/dev/dotted_db/dev#{n}/log/*}
+    sh "touch _build/dev/dev#{n}/dotted_db/log/error.log _build/dev/dev#{n}/dotted_db/log/crash.log" rescue "print clean error"
   end
 end
 
 desc "attach to a dottedDB console"
 task :attach, :node do |t, args|
   args.with_defaults(:node => 1)
-  sh %{dev/dev#{args.node}/bin/dotted_db attach} rescue "attach error"
+  sh %{_build/dev/dev#{args.node}/dotted_db/bin/dotted_db attach} rescue "attach error"
 end
 
 
@@ -57,15 +57,15 @@ end
 
 desc "make the dev dotted_db folders"
 task :build => :clear do
-  sh "make stagedevrel" rescue "build dev error"
+  sh "make devrel" rescue "build dev error"
 end
 
 desc "start all dotted_db nodes"
 task :start do
   # (1..NUM_NODES).each do |n|
   #   sh %{dev/dev#{n}/bin/dotted_db start}
   # end
-  sh "for d in dev/dev*; do $d/bin/dotted_db start; done" rescue "not running"
+  sh "for d in _build/dev/dev*; do $d/dotted_db/bin/dotted_db start; done" rescue "not running"
   puts "========================================"
   puts "Dotted Dev Cluster started"
   puts "========================================"
@@ -75,38 +75,38 @@ desc "join dotted_db nodes (only needed once)"
 task :join do
   sleep(2)
   (2..NUM_NODES).each do |n|
-      sh %{dev/dev#{n}/bin/dotted_db-admin cluster join [email protected]} rescue "already joined"
+      sh %{_build/dev/dev#{n}/dotted_db/bin/dotted_db-admin cluster join [email protected]} rescue "already joined"
   end
-  sh %{dev/dev1/bin/dotted_db-admin cluster plan}
-  sh %{dev/dev1/bin/dotted_db-admin cluster commit}
+  sh %{_build/dev/dev1/dotted_db/bin/dotted_db-admin cluster plan}
+  sh %{_build/dev/dev1/dotted_db/bin/dotted_db-admin cluster commit}
 end
 
 desc "waits for cluster vnode converge to stabilize"
 task :converge do
   puts "waiting for cluster vnode reshuffling to converge"
   $stdout.sync = true
-  cmd = `dev/dev1/bin/dotted_db-admin member-status | grep "\ \-\-" | wc -l`
-  cmd = `dev/dev1/bin/dotted_db-admin member-status | grep "\ \-\-" | wc -l`
+  cmd = `_build/dev/dev1/dotted_db/bin/dotted_db-admin member-status | grep "\ \-\-" | wc -l`
+  # cmd = `dev/dev1/bin/dotted_db-admin member-status | grep "\ \-\-" | wc -l`
   counter = 1
   tries = 0
   continue = true
   while (cmd.strip != NUM_NODES_STR and continue)
     print "."
     sleep(1)
-    cmd = `dev/dev1/bin/dotted_db-admin member-status | grep "\ \-\-" | wc -l`
+    cmd = `_build/dev/dev1/dotted_db/bin/dotted_db-admin member-status | grep "\ \-\-" | wc -l`
     counter = counter + 1
     if counter > 5
       tries = tries + 1
       puts ""
       puts "Try # #{tries} of 20"
-      sh %{dev/dev1/bin/dotted_db-admin member-status}
+      sh %{_build/dev/dev1/dotted_db/bin/dotted_db-admin member-status}
       counter = 1
     end
     if tries > 39
       continue = false
     end
   end
-  sh %{dev/dev1/bin/dotted_db-admin member-status}
+  sh %{_build/dev/dev1/dotted_db/bin/dotted_db-admin member-status}
   if continue
     puts "READY SET GO!"
   else
@@ -116,15 +116,15 @@ end
 
 desc "dotted_db-admin member-status"
 task :member_status do
-  sh %{dev/dev1/bin/dotted_db-admin member-status}
+  sh %{_build/dev/dev1/dotted_db/bin/dotted_db-admin member-status}
 end
 
 desc "stop all dotted_db nodes"
 task :stop do
   # (1..NUM_NODES).each do |n|
   #   sh %{dev/dev#{n}/bin/dotted_db stop} rescue "not running"
   # end
-  sh "for d in dev/dev*; do $d/bin/dotted_db stop; done" rescue "not running"
+  sh "for d in _build/dev/dev*; do $d/dotted_db/bin/dotted_db stop; done" rescue "not running"
   puts "========================================"
   puts "Dotted Dev Cluster stopped"
   puts "========================================"
@@ -139,32 +139,32 @@ task :restart_with_storage => [:stop, :compile, :start]
 desc "clear data from all dotted_db nodes"
   task :clear => :stop do
     (1..NUM_NODES).each do |n|
-      sh %{rm -rf dev/dev#{n}}
+      sh %{rm -rf _build/dev/dev#{n}}
   end
 end
 
 desc "ping all dotted_db nodes"
 task :ping do
   (1..NUM_NODES).each do |n|
-      sh %{dev/dev#{n}/bin/dotted_db ping}
+      sh %{_build/dev/dev#{n}/dotted_db/bin/dotted_db ping}
   end
 end
 
 desc "dotted_db-admin test"
 task :test do
   (1..NUM_NODES).each do |n|
-    sh %{dev/dev#{n}/bin/dotted_db-admin test}
+    sh %{_build/dev/dev#{n}/dotted_db/bin/dotted_db-admin test}
   end
 end
 
 desc "dotted_db-admin status"
 task :status do
-  sh %{dev/dev1/bin/dotted_db-admin  status}
+  sh %{_build/dev/dev1/dotted_db/bin/dotted_db-admin  status}
 end
 
 desc "dotted_db-admin ring-status"
 task :ring_status do
-  sh %{dev/dev1/bin/dotted_db-admin  ring-status}
+  sh %{_build/dev/dev1/dotted_db/bin/dotted_db-admin  ring-status}
 end
 
 desc "plot local dev nodes stats"
@@ -175,8 +175,8 @@ end
 desc "deletes the database storage to start from scratch"
 task :delete_storage do
   (1..NUM_NODES).each do |n|
-    sh %{rm -rf dev/dev#{n}/data/vnode_state}
-    sh %{rm -rf dev/dev#{n}/data/objects}
+    sh %{rm -rf _build/dev/dev#{n}/dotted_db/data/vnode_state}
+    sh %{rm -rf _build/dev/dev#{n}/dotted_db/data/objects}
     # sh %{rm -rf dev/dev#{n}/log}
   end
 end

apps/dotted_db/ebin

@@ -1,17 +1,14 @@
 #! /bin/sh
 #
-# gen_dev dev4 vars.src vars
-#
 # Generate an overlay config for devNNN from vars.src and write to vars
 #
+# Ex: > gen_dev dev4 vars.src vars
+#
 
 NAME=$1
 TEMPLATE=$2
 VARFILE=$3
 
-## Allocate 10 ports per node
-##   .7 - http
-
 NUMBER=${NAME##dev}
 BASE=$((10000 + 10 * $NUMBER))
 WEBPORT=$(($BASE + 8))