forks/geef
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'config'

Browse Source
This commit is contained in:
Carlos Martín Nieto
2014-05-19 17:08:08 +02:00
parent 29d468c90a 8ade44a868
commit 3cafc28a35
6 changed files with 163 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
c_src/config.c
View File

@@ -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))
@@ -67,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[])
{
@@ -92,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;
}

3
c_src/config.h
View File

@@ -7,6 +7,9 @@
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;

3
c_src/geef.c
View File

@@ -218,6 +218,9 @@ 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},
};
ERL_NIF_INIT(geef_nif, geef_funcs, load, NULL, upgrade, unload)

36
src/geef_config.erl
View File

@@ -12,8 +12,10 @@
%% API
-export([start_link/1]).
-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]).
@@ -36,9 +38,27 @@
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}).
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
@@ -64,6 +84,18 @@ 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};
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}.
%%--------------------------------------------------------------------

12
src/geef_nif.erl
View File

@@ -213,6 +213,18 @@ 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.
nif_error(Line) ->
erlang:nif_error({nif_not_loaded,module,?MODULE,line,Line}).

30
test/config_test.erl Normal file
View File

@@ -0,0 +1,30 @@
-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,
fun string_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, 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">>,
[?_assertEqual(ok, geef_config:set(Config, Var, Val)),
?_assertEqual({ok, Val}, geef_config:get_string(Config, Var))].
stop({_, Path}) ->
ok = file:delete(Path).