Merging upstream 3.20 for production!

Merge remote branch '2600hz/3.20' into 3.20

Conflicts:
	.gitignore
	applications/acdc/src/acdc_agent_fsm.erl
	applications/acdc/src/acdc_queue_fsm.erl
	applications/acdc/src/acdc_util.erl
	applications/callflow/src/cf_endpoint.erl
	applications/callflow/src/cf_exe.erl
	applications/crossbar/doc/apps_store.md
	applications/crossbar/doc/voicemail.md
	applications/crossbar/priv/couchdb/account/users.json
	applications/crossbar/priv/couchdb/schemas/provisioner_v5.json
	applications/crossbar/src/cb_context.erl
	applications/crossbar/src/crossbar_doc.erl
	applications/crossbar/src/crossbar_maintenance.erl
	applications/crossbar/src/crossbar_util.erl
	applications/crossbar/src/modules/cb_apps_store.erl
	applications/crossbar/src/modules/cb_conferences.erl
	applications/crossbar/src/modules/cb_notifications.erl
	applications/crossbar/src/modules/cb_search.erl
	applications/crossbar/src/modules/provisioner_util.erl
	applications/crossbar/src/modules/provisioner_v5.erl
	applications/doodle/src/doodle.hrl
	applications/doodle/src/doodle_inbound_listener.erl
	applications/doodle/src/doodle_inbound_listener_sup.erl
	applications/ecallmgr/src/ecallmgr_call_events.erl
	applications/ecallmgr/src/ecallmgr_fs_event_stream.erl
	applications/ecallmgr/src/ecallmgr_fs_notify.erl
	applications/ecallmgr/src/ecallmgr_fs_xml.erl
	applications/notify/src/notify_voicemail_to_email.erl
	applications/omnipresence/src/omnip_dialog.erl
	applications/omnipresence/src/omnip_presence.erl
	applications/omnipresence/src/omnip_subscriptions.erl
	applications/omnipresence/src/omnipresence_listener.erl
	applications/registrar/src/reg_authn_req.erl
	applications/stepswitch/src/stepswitch_inbound.erl
	applications/stepswitch/src/stepswitch_sms.erl
	applications/stepswitch/src/stepswitch_util.erl
	applications/teletype/src/teletype_util.erl
	applications/teletype/src/templates/teletype_voicemail_full.erl
	applications/teletype/src/templates/teletype_voicemail_to_email.erl
	core/kazoo_documents-1.0.0/src/kz_call_event.erl
	core/kazoo_token_buckets-1.0.0/src/kz_buckets.erl
	core/kazoo_token_buckets-1.0.0/src/kz_token_bucket.erl
	core/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl
	core/whistle-1.0.0/src/api/wapi_presence.erl
	core/whistle-1.0.0/src/wh_json.hrl
	core/whistle-1.0.0/src/wh_util.erl
	core/whistle_apps-1.0.0/src/whapps_call.erl
	core/whistle_number_manager-1.0.0/include/wh_number_manager.hrl
	core/whistle_number_manager-1.0.0/src/providers/wnm_prepend.erl
	core/whistle_number_manager-1.0.0/src/wh_number_manager.erl
	core/whistle_services-1.0.0/src/bookkeepers/wh_bookkeeper_braintree.erl
	core/whistle_services-1.0.0/src/wh_services.erl

.gitignore

@@ -13,9 +13,12 @@
 *.pid
 *.dump
 *.orig
-core/*/test
+*.DS_Store
+core/*/test/*.beam
+core/*/test/*.app
 deps/*/test
-applications/*/test
+applications/*/test/*.beam
+applications/*/test/*.app
 deps/erlydtl-*/src/erlydtl_parser.erl
 deps/zucchini-1.0.0/src/zucchini_lexer.erl
 deps/zucchini-1.0.0/src/zucchini_parser.erl
@@ -54,3 +57,5 @@ applications/*/priv/ssl
 .project
 .settings
 /deps/rabbit_common-3.3.5/
+/deps/slex-*/src/slex_parser.erl
+/deps/slex-*/src/slex_scanner.erl

.travis.yml

@@ -1,18 +1,24 @@
 language: erlang
 notifications:
-  email: 
+  email:
     - [email protected]
     - [email protected]
-  irc: 
-    channels: 
+  irc:
+    channels:
       - "irc.freenode.org#2600hz-dev"
 otp_release:
   - R16B
   - R15B03
   - R15B02
-  - R15B01
-  - R15B
 before_install:
-    - sudo apt-get install -qq xsltproc
-script: "make compile"
-after script: "make eunit"
+  - set -e
+  - sudo apt-get install -qq xsltproc
+  - cd $HOME
+  - git clone --depth=50 --branch=master https://github.com/manopapad/proper.git proper
+  - cd proper
+  - make fast
+  - cd $TRAVIS_BUILD_DIR
+script: make compile
+after_success:
+  - make xref
+  - ERL_LIBS="$HOME/proper" make test

Makefile

@@ -1,15 +1,13 @@
 ROOT = .
-DIALYZER = dialyzer
+
+KAZOODIRS = core/Makefile \
+	    applications/Makefile
 
 MAKEDIRS = deps/Makefile \
 	   core/Makefile \
 	   applications/Makefile
 
-DIRS = $(ROOT)/core/whistle-1.0.0 \
-	   $(ROOT)/core/whistle_amqp-1.0.0 \
-	   $(ROOT)/core/whistle_apps-1.0.0
-
-.PHONY: $(MAKEDIRS)
+.PHONY: $(MAKEDIRS) core deps apps
 
 all : compile
 
@@ -19,30 +17,39 @@ compile: $(MAKEDIRS)
 $(MAKEDIRS):
 	$(MAKE) -C $(@D) $(ACTION)
 
-deps : ACTION = get-deps
-deps : $(MAKEDIRS)
-
-clean : ACTION = clean
-clean : $(MAKEDIRS)
-	rm -f test/*.beam
+clean: ACTION = clean
+clean: $(MAKEDIRS)
 	rm -f *crash.dump
+	rm -rf scripts/log/*
+
+clean-test : ACTION = clean-test
+clean-test : $(KAZOODIRS)
+
+eunit: ACTION = test
+eunit: ERLC_OPTS += -DTEST
+eunit: $(KAZOODIRS)
 
-test : clean app eunit
+proper: ACTION = test
+proper: ERLC_OPTS += -DPROPER
+proper: $(KAZOODIRS)
 
-eunit :
-	@$(REBAR) eunit skip_deps=true
+test: ACTION = test
+test: ERLC_OPTS += -DTEST -DPROPER
+test: $(KAZOODIRS)
+
+core:
+	$(MAKE) -C core all
+deps:
+	$(MAKE) -C deps all
+apps:
+	$(MAKE) -C applications all
+
+kazoo: core apps
 
 build-plt :
 	@$(DIALYZER) --build_plt --output_plt $(ROOT)/.platform_dialyzer.plt \
 		--apps erts kernel stdlib crypto public_key ssl
 
-dialyze :
-	@$(DIALYZER) $(foreach DIR,$(DIRS),$(DIR)/ebin) \
-                --plt $(ROOT)/.platform_dialyzer.plt --no_native \
-		-Werror_handling -Wrace_conditions -Wunmatched_returns # -Wunderspecs
-
-docs:
-	@$(REBAR) doc skip_deps=true
-
-update:
-	./bin/git_update.sh
+xref: EBINS = $(shell find $(ROOT) -name ebin -print)
+xref:
+	@$(ROOT)/scripts/check-xref.escript $(EBINS)

README.md

@@ -56,7 +56,7 @@
                                                  ....           
 ````
 
-[![Build Status](https://secure.travis-ci.org/2600hz/2600hz-platform.png)](http://travis-ci.org/2600hz/2600hz-platform)
+[![Build Status](https://secure.travis-ci.org/2600hz/kazoo.png)](http://travis-ci.org/2600hz/kazoo)
 
 ## Kazoo
 

applications/Makefile

@@ -12,5 +12,11 @@ compile: $(MAKEDIRS)
 clean: ACTION = clean
 clean: $(MAKEDIRS)
 
+clean-test: ACTION = clean-test
+clean-test: $(MAKEDIRS)
+
+test: ACTION = test
+test: $(MAKEDIRS)
+
 $(MAKEDIRS):
 	$(MAKE) -C $(@D) $(ACTION)

applications/acdc/Makefile

@@ -1,27 +1,19 @@
 PROJECT = acdc
 ROOT = ../..
-REBAR = $(ROOT)/utils/rebar/rebar
-DIALYZER = dialyzer
 
-EBINS = $(shell find $(ROOT)/core -maxdepth 2 -name ebin -print) $(shell find $(ROOT)/deps -maxdepth 2 -name ebin -print)
+EBINS = $(shell find $(ROOT)/core/whistle-* -maxdepth 2 -name ebin -print) \
+	$(shell find $(ROOT)/core/whistle_apps-* -maxdepth 2 -name ebin -print) \
+	$(shell find $(ROOT)/deps/lager-* -maxdepth 2 -name ebin -print)
 PA = $(foreach EBIN,$(EBINS),-pa $(EBIN))
 
- ERLC_OPTS = -Werror +debug_info +warn_export_all -I$(ROOT)/core -I$(ROOT)/deps $(PA)
-     # +bin_opt_info
-
-ERL_LIBS = $(subst $(eval) ,:,$(wildcard $(ROOT)/deps/rabbitmq_client-*/deps))
-
-DIRS =  . \
-	$(ROOT)/core/whistle-1.0.0 \
-	$(ROOT)/core/whistle_amqp-1.0.0 \
-	$(ROOT)/core/whistle_couch-1.0.0 \
-	$(ROOT)/core/whistle_apps-1.0.0
+ERLC_OPTS = -Werror +debug_info +warn_export_all $(PA)
 
 .PHONY: all compile clean
 
 all: compile
 
 MODULES = $(shell ls src/*.erl | sed 's/src\///;s/\.erl/,/' | sed '$$s/.$$//')
+TEST_MODULES = $(shell ls test/*.erl | sed 's/test\///;s/\.erl/,/' | sed '$$s/.$$//')
 
 compile: ebin/$(PROJECT).app
 	@cat src/$(PROJECT).app.src \
@@ -35,25 +27,22 @@ ebin/$(PROJECT).app: src/*.erl
 
 compile-test: test/$(PROJECT).app
 	@cat src/$(PROJECT).app.src \
-		| sed 's/{modules, \[\]}/{modules, \[$(MODULES)\]}/' \
+		| sed 's/{modules, \[\]}/{modules, \[$(MODULES),$(TEST_MODULES)\]}/' \
 		> test/$(PROJECT).app
 	-@$(MAKE) test/$(PROJECT).app
 
-test/$(PROJECT).app: src/*.erl
+test/$(PROJECT).app: src/*.erl test/*.erl
 	@mkdir -p test/
-	ERL_LIBS=$(ERL_LIBS) erlc -v $(ERLC_OPTS)  -o test/ -pa test/  $?
+	ERL_LIBS=$(ERL_LIBS) erlc -v $(ERLC_OPTS) -DTEST -o test/ -pa test/ $?
 
 clean:
 	rm -f ebin/*
-	rm -f test/*.beam test/$(PROJECT).app
 	rm -f erl_crash.dump
 
-test: clean compile-test eunit
+clean-test:
+	rm -f test/*.beam test/$(PROJECT).app
 
-eunit: compile-test
-	erl -noshell -pa test -eval "eunit:test([$(MODULES)], [verbose])" -s init stop
+test: clean-test compile-test eunit
 
-dialyze:
-	@$(DIALYZER) $(foreach DIR,$(DIRS),$(DIR)/ebin) \
-		--plt $(ROOT)/.platform_dialyzer.plt --no_native \
-		-Werror_handling -Wrace_conditions -Wunmatched_returns # -Wunderspecs
+eunit: compile-test
+	erl -noshell $(PA) -pa test -eval "case eunit:test([$(TEST_MODULES),$(MODULES)], [verbose]) of 'ok' -> init:stop(); _ -> init:stop(1) end."

applications/acdc/src/acdc.hrl

@@ -1,6 +1,4 @@
 -ifndef(ACDC_HRL).
--include_lib("rabbitmq_client/include/amqp_client.hrl").
--include_lib("whistle/include/wh_amqp.hrl").
 -include_lib("whistle/include/wh_types.hrl").
 -include_lib("whistle/include/wh_log.hrl").
 -include_lib("whistle/include/wh_databases.hrl").
@@ -12,7 +10,7 @@
 
 -define(ACDC_CACHE, 'acdc_cache').
 
--define(ABANDON_TIMEOUT, 'timeout').
+-define(ABANDON_TIMEOUT, 'member_timeout').
 -define(ABANDON_EXIT, 'member_exit').
 -define(ABANDON_HANGUP, 'member_hangup').
 
@@ -34,8 +32,7 @@
 -type abandon_reason() :: ?ABANDON_TIMEOUT | ?ABANDON_EXIT |
                           ?ABANDON_HANGUP.
 
--type delivery() :: #'basic.deliver'{}.
--type deliveries() :: [delivery(),...] | [].
+-type deliveries() :: [gen_listener:basic_deliver(),...] | [].
 
 %% Check for cleanup every 5 minutes
 -define(CLEANUP_PERIOD, whapps_config:get_integer(?CONFIG_CAT, <<"cleanup_period_ms">>, 360000)).