Bump yconf version

diff --git a/rebar.config b/rebar.config
index 08042444d333412e4fbd18717c4f000dcbfc0e54..e4ea9bd946137b91bf5f94d65dc75f8aa6692a38 100644 (file)
--- a/rebar.config
+++ b/rebar.config
@@ -26,7 +26,7 @@
         {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", "7fd02f3a2f"}},
         {xmpp, ".*", {git, "https://github.com/processone/xmpp", "b704d84"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.19"}}},
-       {yconf, ".*", {git, "https://github.com/processone/yconf", "99fb668"}},
+       {yconf, ".*", {git, "https://github.com/processone/yconf", "dfeaa7e"}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.5"}}},
         {pkix, ".*", {git, "https://github.com/processone/pkix", {tag, "1.0.2"}}},

diff --git a/src/econf.erl b/src/econf.erl
index 1f67b5bf62af6c5f98e8a51248867fe74ac95a85..a2c22a43e1075d4fecca18d486e5c5928c2349fc 100644 (file)
--- a/src/econf.erl
+++ b/src/econf.erl
@@ -27,7 +27,7 @@
 %% Simple types
 -export([pos_int/0, pos_int/1, non_neg_int/0, non_neg_int/1]).
 -export([int/0, int/2, number/1, octal/0]).
--export([binary/0, binary/1]).
+-export([binary/0, binary/1, binary/2]).
 -export([string/0, string/1]).
 -export([enum/1, bool/0, atom/0, any/0]).
 %% Complex types
@@ -35,7 +35,7 @@
 -export([file/0, file/1]).
 -export([directory/0, directory/1]).
 -export([ip/0, ipv4/0, ipv6/0, ip_mask/0, port/0]).
--export([re/0, glob/0]).
+-export([re/0, re/1, glob/0, glob/1]).
 -export([path/0, binary_sep/1]).
 -export([beam/0, beam/1]).
 -export([timeout/1, timeout/2]).
@@ -254,6 +254,9 @@ binary() ->
 binary(Re) ->
     yconf:binary(Re).
 
+binary(Re, Opts) ->
+    yconf:binary(Re, Opts).
+
 enum(L) ->
     yconf:enum(L).
 
@@ -308,9 +311,15 @@ port() ->
 re() ->
     yconf:re().
 
+re(Opts) ->
+    yconf:re(Opts).
+
 glob() ->
     yconf:glob().
 
+glob(Opts) ->
+    yconf:glob(Opts).
+
 path() ->
     yconf:path().