Merge PoolBoy 1.3

.editorconfig

@@ -0,0 +1,14 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# 4 space indentation
+[*.{erl,src}]
+indent_style = space
+indent_size = 4

.gitignore

@@ -1,5 +1,5 @@
-*.app
-*.beam
-.test
+.rebar
 .eunit
 .dialyzer_plt
+erl_crash.dump
+ebin

.travis.yml

@@ -3,7 +3,10 @@ notifications:
   webhooks: http://basho-engbot.herokuapp.com/travis?key=f298b56e20009568a29135485bca1220d0733d05
   email: [email protected]
 otp_release:
-  - R15B01
-  - R15B
-  - R14B04
-  - R14B03
+  - 17.1
+  - 17.0
+  - R16B03-1
+  - R16B03
+  - R16B02
+  - R16B01
+  - R16B

Makefile

@@ -1,10 +1,10 @@
-REBAR = ./rebar
+REBAR = rebar
 DIALYZER = dialyzer
 
 DIALYZER_WARNINGS = -Wunmatched_returns -Werror_handling \
                     -Wrace_conditions -Wunderspecs
 
-.PHONY: all compile test clean get-deps build-plt dialyze
+.PHONY: all compile test qc clean get-deps build-plt dialyze
 
 all: compile
 
@@ -23,10 +23,11 @@ clean:
 get-deps:
 	@$(REBAR) get-deps
 
-build-plt:
+.dialyzer_plt:
 	@$(DIALYZER) --build_plt --output_plt .dialyzer_plt \
 	    --apps kernel stdlib
 
-dialyze: compile
-	@$(DIALYZER) --src src --plt .dialyzer_plt $(DIALYZER_WARNINGS) | \
-	    fgrep -vf .dialyzer-ignore-warnings
+build-plt: .dialyzer_plt
+
+dialyze: build-plt
+	@$(DIALYZER) --src src --plt .dialyzer_plt $(DIALYZER_WARNINGS)

README.md

@@ -2,6 +2,9 @@
 
 [![Build Status](https://secure.travis-ci.org/basho/poolboy.png?branch=master)](http://travis-ci.org/basho/poolboy)
 
+Poolboy is a **lightweight**, **generic** pooling library for Erlang with a
+focus on **simplicity**, **performance**, and **rock-solid** disaster recovery.
+
 ## Usage
 
 ```erl-sh
@@ -113,6 +116,7 @@ start_link(Args) ->
     gen_server:start_link(?MODULE, Args, []).
 
 init(Args) ->
+    process_flag(trap_exit, true),
     Hostname = proplists:get_value(hostname, Args),
     Database = proplists:get_value(database, Args),
     Username = proplists:get_value(username, Args),
@@ -161,3 +165,6 @@ code_change(_OldVsn, State, _Extra) ->
 Poolboy is available in the public domain (see `UNLICENSE`).
 Poolboy is also optionally available under the Apache License (see `LICENSE`),
 meant especially for jurisdictions that do not recognize public domain works.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/devinus/poolboy/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

VERSION

@@ -0,0 +1 @@
+1.3.0

package.exs

@@ -0,0 +1,19 @@
+defmodule Poolboy.Mixfile do
+  use Mix.Project
+
+  @version File.read!("VERSION") |> String.strip
+
+  def project do
+    [app: :poolboy,
+     version: @version,
+     description: "A hunky Erlang worker pool factory",
+     package: package]
+  end
+
+  defp package do
+    [files: ~w(src rebar.config README.md LICENSE UNLICENSE VERSION),
+     contributors: ["Devin Torres", "Andrew Thompson", "Kurt Williams"],
+     licenses: ["Unlicense", "Apache 2.0"],
+     links: [{"GitHub", "https://github.com/devinus/poolboy"}]]
+  end
+end

rebar.config

@@ -1,3 +1,7 @@
-{erl_opts, [debug_info, warnings_as_errors]}.
+{erl_opts, [
+  debug_info,
+  {platform_define, "^R", pre17}
+]}.
+
 {eunit_opts, [verbose]}.
 {cover_enabled, true}.

src/poolboy.app.src

@@ -1,6 +1,6 @@
 {application, poolboy, [
     {description, "A hunky Erlang worker pool factory"},
-    {vsn, git},
+    {vsn, {cmd, "echo `cat VERSION`"}},
     {applications, [kernel, stdlib]},
     {registered, [poolboy]}
 ]}.