From f568955a958684afcd1a2245361e58912928fbf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Mon, 19 May 2014 12:37:29 +0200 Subject: [PATCH 1/4] config: test for setting and getting bool --- c_src/config.c | 28 ++++++++++++++++++++++++++++ c_src/config.h | 1 + c_src/geef.c | 1 + src/geef_config.erl | 10 ++++++++++ src/geef_nif.erl | 4 ++++ test/config_test.erl | 22 ++++++++++++++++++++++ 6 files changed, 66 insertions(+) create mode 100644 test/config_test.erl diff --git a/c_src/config.c b/c_src/config.c index 974d669..1118e5a 100644 --- a/c_src/config.c +++ b/c_src/config.c @@ -8,6 +8,34 @@ void geef_config_free(ErlNifEnv *env, void *cd) git_config_free(cfg->config); } +ERL_NIF_TERM +geef_config_open(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) +{ + geef_config *cfg; + ErlNifBinary bin; + ERL_NIF_TERM term_cfg; + int error; + + if (!enif_inspect_iolist_as_binary(env, argv[0], &bin)) + return enif_make_badarg(env); + + if (!geef_terminate_binary(&bin)) + return geef_oom(env); + + cfg = enif_alloc_resource(geef_config_type, sizeof(geef_config)); + error = git_config_open_ondisk(&cfg->config, (char *) bin.data); + enif_release_binary(&bin); + + if (error < 0) + return geef_error(env); + + term_cfg = enif_make_resource(env, cfg); + enif_release_resource(cfg); + + return enif_make_tuple2(env, atoms.ok, term_cfg); + +} + static ERL_NIF_TERM extract(geef_config **cfg, ErlNifBinary *bin, ErlNifEnv *env, const ERL_NIF_TERM argv[]) { if (!enif_get_resource(env, argv[0], geef_config_type, (void **) cfg)) diff --git a/c_src/config.h b/c_src/config.h index c91a2a9..215f1da 100644 --- a/c_src/config.h +++ b/c_src/config.h @@ -7,6 +7,7 @@ void geef_config_free(ErlNifEnv *env, void *cd); ERL_NIF_TERM geef_config_set_bool(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]); ERL_NIF_TERM geef_config_get_bool(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]); +ERL_NIF_TERM geef_config_open(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]); extern ErlNifResourceType *geef_config_type; diff --git a/c_src/geef.c b/c_src/geef.c index dbd708b..3758d79 100644 --- a/c_src/geef.c +++ b/c_src/geef.c @@ -218,6 +218,7 @@ static ErlNifFunc geef_funcs[] = {"revparse_single", 2, geef_revparse_single}, {"config_set_bool", 3, geef_config_set_bool}, {"config_get_bool", 2, geef_config_get_bool}, + {"config_open", 1, geef_config_open}, }; ERL_NIF_INIT(geef_nif, geef_funcs, load, NULL, upgrade, unload) diff --git a/src/geef_config.erl b/src/geef_config.erl index 6b86e2e..8f3bb7f 100644 --- a/src/geef_config.erl +++ b/src/geef_config.erl @@ -36,6 +36,16 @@ start_link(Handle) -> gen_server:start_link(?MODULE, Handle, []). +%% @doc Open a configuration file +-spec open(iolist()) -> {ok, pid()} | {error, term()}. +open(Path) -> + case geef_nif:config_open(Path) of + {ok, Handle} -> + start_link(Handle); + Error -> + Error + end. + %% @doc Set a value in the configuration set(Pid, Name, Val) when is_boolean(Val) -> gen_server:call(Pid, {set_bool, Name, Val}). diff --git a/src/geef_nif.erl b/src/geef_nif.erl index bcbc7eb..ae15834 100644 --- a/src/geef_nif.erl +++ b/src/geef_nif.erl @@ -213,6 +213,10 @@ config_set_bool(_Handle, _Name, _Val) -> config_get_bool(_Handle, _Name) -> ?NIF_FN. +-spec config_open(iolist()) -> {ok, term()} | {error, term()}. +config_open(_Path) -> + ?NIF_FN. + nif_error(Line) -> erlang:nif_error({nif_not_loaded,module,?MODULE,line,Line}). diff --git a/test/config_test.erl b/test/config_test.erl new file mode 100644 index 0000000..21851c4 --- /dev/null +++ b/test/config_test.erl @@ -0,0 +1,22 @@ +-module(config_test). +-compile([export_all]). +-include_lib("eunit/include/eunit.hrl"). +-include("src/geef_records.hrl"). + +config_test() -> + {foreach, fun start/0, fun stop/1, [fun bool_test/1]}. + +start() -> + {A, B, C} = now(), + N = node(), + TmpFile = io_lib:format("/tmp/geef-~p~p~p~p.gitconfig", [N, A, B, C]), + {ok, Config} = geef_config:open(TmpFile), + {Config, TmpFile}. + +bool_test({Config, _}) -> + Var = "core.logallrefupdates", + ok = geef_config:set(Config, Var, true), + [?_assertEqual({ok, true}, geef_config:get_bool(Config, Var))]. + +stop({_, Path}) -> + ok = file:delete(Path). From d6ad01836f6bbd402bde2093776c508b5c193e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Mon, 19 May 2014 12:50:53 +0200 Subject: [PATCH 2/4] config: another failing test --- src/geef_config.erl | 1 + test/config_test.erl | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/geef_config.erl b/src/geef_config.erl index 8f3bb7f..ff8423b 100644 --- a/src/geef_config.erl +++ b/src/geef_config.erl @@ -12,6 +12,7 @@ %% API -export([start_link/1]). +-export([open/1]). -export([set/3]). %% gen_server callbacks diff --git a/test/config_test.erl b/test/config_test.erl index 21851c4..1ec160a 100644 --- a/test/config_test.erl +++ b/test/config_test.erl @@ -3,8 +3,9 @@ -include_lib("eunit/include/eunit.hrl"). -include("src/geef_records.hrl"). -config_test() -> - {foreach, fun start/0, fun stop/1, [fun bool_test/1]}. +config_test_() -> + {foreach, fun start/0, fun stop/1, [fun bool_test/1, + fun string_test/1]}. start() -> {A, B, C} = now(), @@ -16,7 +17,14 @@ start() -> bool_test({Config, _}) -> Var = "core.logallrefupdates", ok = geef_config:set(Config, Var, true), - [?_assertEqual({ok, true}, geef_config:get_bool(Config, Var))]. + [?_assertEqual(ok, geef_config:set(Config, Var, true)), + ?_assertEqual({ok, true}, geef_config:get_bool(Config, Var))]. + +string_test({Config, _}) -> + Var = "user.name", + Val = <<"Random J. Hacker">>, + ok = geef_config:set(Config, Var, Val), + [?_assertEqual({ok, Val}, geef_config:get(Config, Var))]. stop({_, Path}) -> ok = file:delete(Path). From 4b0379f3ee37e45b2ac63ab3b809eddfe822bda5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Mon, 19 May 2014 12:55:12 +0200 Subject: [PATCH 3/4] config: expose get_bool/2 --- src/geef_config.erl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/geef_config.erl b/src/geef_config.erl index ff8423b..bcbd014 100644 --- a/src/geef_config.erl +++ b/src/geef_config.erl @@ -14,6 +14,7 @@ -export([start_link/1]). -export([open/1]). -export([set/3]). +-export([get_bool/2]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, @@ -51,6 +52,9 @@ open(Path) -> set(Pid, Name, Val) when is_boolean(Val) -> gen_server:call(Pid, {set_bool, Name, Val}). +get_bool(Pid, Name) -> + gen_server:call(Pid, {get_bool, Name}). + %%%=================================================================== %%% gen_server callbacks %%%=================================================================== @@ -75,6 +79,10 @@ init(Handle) -> %%-------------------------------------------------------------------- handle_call({set_bool, Name, Val}, _From, State = #state{handle=Handle}) -> Reply = geef_nif:config_set_bool(Handle, Name, Val), + {reply, Reply, State}; + +handle_call({get_bool, Name}, _From, State = #state{handle=Handle}) -> + Reply = geef_nif:config_get_bool(Handle, Name), {reply, Reply, State}. %%-------------------------------------------------------------------- From 8ade44a86894e86c30e0caefdc68790179db4cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Mon, 19 May 2014 13:11:55 +0200 Subject: [PATCH 4/4] config: string get/set --- c_src/config.c | 54 +++++++++++++++++++++++++++++++++++++++++++- c_src/config.h | 2 ++ c_src/geef.c | 2 ++ src/geef_config.erl | 17 ++++++++++++-- src/geef_nif.erl | 8 +++++++ test/config_test.erl | 4 ++-- 6 files changed, 82 insertions(+), 5 deletions(-) diff --git a/c_src/config.c b/c_src/config.c index 1118e5a..41dabbb 100644 --- a/c_src/config.c +++ b/c_src/config.c @@ -95,7 +95,6 @@ geef_config_get_bool(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) return enif_make_tuple2(env, atoms.ok, ret); } - ERL_NIF_TERM geef_config_set_int(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) { @@ -120,3 +119,56 @@ geef_config_set_int(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) return atoms.ok; } + +ERL_NIF_TERM +geef_config_get_string(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) +{ + geef_config *cfg; + ErlNifBinary bin, result; + int error; + const char *val; + ERL_NIF_TERM ret; + + ret = extract(&cfg, &bin, env, argv); + if (ret != atoms.ok) + return ret; + + error = git_config_get_string(&val, cfg->config, (char *) bin.data); + enif_release_binary(&bin); + + if (error < 0) + return geef_error(env); + + if (geef_string_to_bin(&result, val) < 0) + return geef_error(env); + + return enif_make_tuple2(env, atoms.ok, enif_make_binary(env, &result)); +} + +ERL_NIF_TERM +geef_config_set_string(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) +{ + geef_config *cfg; + ErlNifBinary bin, val; + int error; + ERL_NIF_TERM ret; + + ret = extract(&cfg, &bin, env, argv); + if (ret != atoms.ok) + return ret; + + if (!enif_inspect_iolist_as_binary(env, argv[2], &val)) + return enif_make_badarg(env); + + if (!geef_terminate_binary(&val)) + return geef_oom(env); + + error = git_config_set_string(cfg->config, (char *) bin.data, (char *) val.data); + enif_release_binary(&bin); + enif_release_binary(&val); + + if (error < 0) + return geef_error(env); + + return atoms.ok; +} diff --git a/c_src/config.h b/c_src/config.h index 215f1da..6043ceb 100644 --- a/c_src/config.h +++ b/c_src/config.h @@ -8,6 +8,8 @@ void geef_config_free(ErlNifEnv *env, void *cd); ERL_NIF_TERM geef_config_set_bool(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]); ERL_NIF_TERM geef_config_get_bool(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]); ERL_NIF_TERM geef_config_open(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]); +ERL_NIF_TERM geef_config_set_string(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]); +ERL_NIF_TERM geef_config_get_string(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]); extern ErlNifResourceType *geef_config_type; diff --git a/c_src/geef.c b/c_src/geef.c index 3758d79..060b749 100644 --- a/c_src/geef.c +++ b/c_src/geef.c @@ -218,6 +218,8 @@ static ErlNifFunc geef_funcs[] = {"revparse_single", 2, geef_revparse_single}, {"config_set_bool", 3, geef_config_set_bool}, {"config_get_bool", 2, geef_config_get_bool}, + {"config_set_string", 3, geef_config_set_string}, + {"config_get_string", 2, geef_config_get_string}, {"config_open", 1, geef_config_open}, }; diff --git a/src/geef_config.erl b/src/geef_config.erl index bcbd014..ff13767 100644 --- a/src/geef_config.erl +++ b/src/geef_config.erl @@ -15,7 +15,7 @@ -export([open/1]). -export([set/3]). -export([get_bool/2]). - +-export([get_string/2]). %% gen_server callbacks -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -50,11 +50,16 @@ open(Path) -> %% @doc Set a value in the configuration set(Pid, Name, Val) when is_boolean(Val) -> - gen_server:call(Pid, {set_bool, Name, Val}). + gen_server:call(Pid, {set_bool, Name, Val}); +set(Pid, Name, Val) when is_list(Val) or is_binary(Val) -> + gen_server:call(Pid, {set_string, Name, Val}). get_bool(Pid, Name) -> gen_server:call(Pid, {get_bool, Name}). +get_string(Pid, Name) -> + gen_server:call(Pid, {get_string, Name}). + %%%=================================================================== %%% gen_server callbacks %%%=================================================================== @@ -83,6 +88,14 @@ handle_call({set_bool, Name, Val}, _From, State = #state{handle=Handle}) -> handle_call({get_bool, Name}, _From, State = #state{handle=Handle}) -> Reply = geef_nif:config_get_bool(Handle, Name), + {reply, Reply, State}; + +handle_call({set_string, Name, Val}, _From, State = #state{handle=Handle}) -> + Reply = geef_nif:config_set_string(Handle, Name, Val), + {reply, Reply, State}; + +handle_call({get_string, Name}, _From, State = #state{handle=Handle}) -> + Reply = geef_nif:config_get_string(Handle, Name), {reply, Reply, State}. %%-------------------------------------------------------------------- diff --git a/src/geef_nif.erl b/src/geef_nif.erl index ae15834..9a9b6a6 100644 --- a/src/geef_nif.erl +++ b/src/geef_nif.erl @@ -213,6 +213,14 @@ config_set_bool(_Handle, _Name, _Val) -> config_get_bool(_Handle, _Name) -> ?NIF_FN. +-spec config_set_string(term(), iolist(), iolist()) -> ok | {error, term()}. +config_set_string(_Handle, _Name, _Val) -> + ?NIF_FN. + +-spec config_get_string(term(), iolist()) -> {ok, binary()} | {error, term()}. +config_get_string(_Handle, _Name) -> + ?NIF_FN. + -spec config_open(iolist()) -> {ok, term()} | {error, term()}. config_open(_Path) -> ?NIF_FN. diff --git a/test/config_test.erl b/test/config_test.erl index 1ec160a..6db03fe 100644 --- a/test/config_test.erl +++ b/test/config_test.erl @@ -23,8 +23,8 @@ bool_test({Config, _}) -> string_test({Config, _}) -> Var = "user.name", Val = <<"Random J. Hacker">>, - ok = geef_config:set(Config, Var, Val), - [?_assertEqual({ok, Val}, geef_config:get(Config, Var))]. + [?_assertEqual(ok, geef_config:set(Config, Var, Val)), + ?_assertEqual({ok, Val}, geef_config:get_string(Config, Var))]. stop({_, Path}) -> ok = file:delete(Path).