Request 2346 (accepted)

erlang-erlware_commons.spec Changed

debian.changelog Changed

debian.rules Changed

erlang-erlware-commons.dsc Changed

erlware_commons.tar.gz/priv/ec_semver_parser.peg Changed

erlware_commons.tar.gz/rebar.config Changed

erlware_commons.tar.gz/rebar.config.script Changed

erlware_commons.tar.gz/rebar.lock Changed

erlware_commons.tar.gz/rebar3 Changed

erlware_commons.tar.gz/src/ec_cmd_log.erl Changed

@@ -52,7 +52,7 @@
 
 -record(state_t, {log_level=0 :: int_log_level(),
                   caller=api :: caller(),
-                  intensity=low :: low | high}).
+                  intensity=low :: none | low | high}).
 
 %%============================================================================
 %% types
@@ -72,7 +72,7 @@
 
 -type atom_log_level() :: error | warn | info | debug.
 
--type intensity() :: low | high.
+-type intensity() :: none | low | high.
 
 -type log_fun() :: fun(() -> iolist()).
 
@@ -94,7 +94,8 @@
 
 
 -spec new(log_level(), caller(), intensity()) -> t().
-new(LogLevel, Caller, Intensity) when (Intensity =:= low orelse
+new(LogLevel, Caller, Intensity) when (Intensity =:= none orelse
+                                       Intensity =:= low orelse
                                        Intensity =:= high),
                                       LogLevel >= 0, LogLevel =< 3 ->
     #state_t{log_level=LogLevel, caller=Caller,
@@ -237,7 +238,8 @@
         C =:= $R orelse C =:= $G orelse C =:= $Y orelse
         C =:= $B orelse C =:= $M orelse C =:= $C).
 
-
+colorize(#state_t{intensity=none}, _, _, Msg) ->
+                Msg;
 %% When it is suposed to be bold and we already have a uppercase
 %% (bold color) we don't need to modify the color
 colorize(State, Color, true, Msg)  when ?VALID_COLOR(Color),
@@ -285,4 +287,14 @@
     ?assertEqual(?EC_DEBUG, log_level(DebugLogState)),
     ?assertEqual(debug, atom_log_level(DebugLogState)).
 
+
+no_color_test() ->
+    LogState = new(debug, command_line, none),
+    ?assertEqual("test",
+                 colorize(LogState, ?RED, true, "test")).
+
+color_test() ->
+    LogState = new(debug, command_line, high),
+    ?assertEqual("\e[1;31m===> test\e[0m",
+                 colorize(LogState, ?RED, true, "test")).
 -endif.

erlware_commons.tar.gz/src/ec_date.erl Changed

@@ -54,11 +54,11 @@
 -type hour() :: 0..23.
 -type minute() :: 0..59.
 -type second() :: 0..59.
--type microsecond() :: 0..1000000.
+-type microsecond() :: 0..999999.
 
 -type daynum() :: 1..7.
 -type date() :: {year(),month(),day()}.
--type time() :: {hour(),minute(),second()} |{hour(),minute(),second(), microsecond()}.
+-type time() :: {hour(),minute(),second()} | {hour(),minute(),second(),microsecond()}.
 -type datetime() :: {date(),time()}.
 -type now() :: {integer(),integer(),integer()}.
 
@@ -101,7 +101,7 @@
     do_parse(Date, Now, []).
 
 do_parse(Date, Now, Opts) ->
-    case filter_hints(parse(tokenise(string:to_upper(Date), []), Now, Opts)) of
+    case filter_hints(parse(tokenise(uppercase(Date), []), Now, Opts)) of
         {error, bad_date} ->
             erlang:throw({?MODULE, {bad_date, Date}});
         {D1, T1} = {{Y, M, D}, {H, M1, S}}
@@ -149,16 +149,34 @@
 %% LOCAL FUNCTIONS
 %%
 
+parse([Year, X, Month, X, Day, Hour, $:, Min, $:, Sec, $., Micros, $Z ], _Now, _Opts)
+  when ?is_world_sep(X)
+       andalso (Micros >= 0 andalso Micros < 1000000)
+       andalso Year > 31 ->
+    {{Year, Month, Day}, {hour(Hour, []), Min, Sec}, {Micros}};
+
 parse([Year, X, Month, X, Day, Hour, $:, Min, $:, Sec, $Z ], _Now, _Opts)
   when  (?is_us_sep(X) orelse ?is_world_sep(X))
         andalso Year > 31 ->
-    {{Year, Month, Day}, {hour(Hour, []), Min, Sec}, { 0}};
+    {{Year, Month, Day}, {hour(Hour, []), Min, Sec}};
+
+parse([Year, X, Month, X, Day, Hour, $:, Min, $:, Sec, $., Micros, $+, Off | _Rest ], _Now, _Opts)
+  when  (?is_us_sep(X) orelse ?is_world_sep(X))
+        andalso (Micros >= 0 andalso Micros < 1000000)
+        andalso Year > 31 ->
+    {{Year, Month, Day}, {hour(Hour, []) - Off, Min, Sec}, {Micros}};
 
 parse([Year, X, Month, X, Day, Hour, $:, Min, $:, Sec, $+, Off | _Rest ], _Now, _Opts)
   when  (?is_us_sep(X) orelse ?is_world_sep(X))
         andalso Year > 31 ->
     {{Year, Month, Day}, {hour(Hour, []) - Off, Min, Sec}, {0}};
 
+parse([Year, X, Month, X, Day, Hour, $:, Min, $:, Sec, $., Micros, $-, Off | _Rest ], _Now, _Opts)
+  when  (?is_us_sep(X) orelse ?is_world_sep(X))
+        andalso (Micros >= 0 andalso Micros < 1000000)
+        andalso Year > 31 ->
+    {{Year, Month, Day}, {hour(Hour, []) + Off, Min, Sec}, {Micros}};
+
 parse([Year, X, Month, X, Day, Hour, $:, Min, $:, Sec, $-, Off | _Rest ], _Now, _Opts)
   when  (?is_us_sep(X) orelse ?is_world_sep(X))
         andalso Year > 31 ->
@@ -306,6 +324,23 @@
 tokenise([], Acc) ->
     lists:reverse(Acc);
 
+%% ISO 8601 fractions of a second
+tokenise([$., N1, N2, N3, N4, N5, N6 | Rest], Acc)
+  when ?is_num(N1), ?is_num(N2), ?is_num(N3), ?is_num(N4), ?is_num(N5), ?is_num(N6) ->
+    tokenise(Rest, [ ltoi([N1, N2, N3, N4, N5, N6]), $. | Acc]);
+tokenise([$., N1, N2, N3, N4, N5 | Rest], Acc)
+  when ?is_num(N1), ?is_num(N2), ?is_num(N3), ?is_num(N4), ?is_num(N5) ->
+    tokenise(Rest, [ ltoi([N1, N2, N3, N4, N5]) * 10, $. | Acc]);
+tokenise([$., N1, N2, N3, N4 | Rest], Acc)
+  when ?is_num(N1), ?is_num(N2), ?is_num(N3), ?is_num(N4) ->
+    tokenise(Rest, [ ltoi([N1, N2, N3, N4]) * 100, $. | Acc]);
+tokenise([$., N1, N2, N3 | Rest], Acc) when ?is_num(N1), ?is_num(N2), ?is_num(N3) ->
+    tokenise(Rest, [ ltoi([N1, N2, N3]) * 1000, $. | Acc]);
+tokenise([$., N1, N2 | Rest], Acc) when ?is_num(N1), ?is_num(N2) ->
+    tokenise(Rest, [ ltoi([N1, N2]) * 10000, $. | Acc]);
+tokenise([$., N1 | Rest], Acc) when ?is_num(N1) ->
+    tokenise(Rest, [ ltoi([N1]) * 100000, $. | Acc]);
+
 tokenise([N1, N2, N3, N4, N5, N6 | Rest], Acc)
   when ?is_num(N1), ?is_num(N2), ?is_num(N3), ?is_num(N4), ?is_num(N5), ?is_num(N6) ->
     tokenise(Rest, [ ltoi([N1, N2, N3, N4, N5, N6]) | Acc]);
@@ -405,7 +440,6 @@
 tokenise("OF"++Rest, Acc) -> tokenise(Rest, Acc);
 tokenise("T"++Rest, Acc) -> tokenise(Rest, Acc);  % 2012-12-12T12:12:12 ISO formatting.
 tokenise([$Z | Rest], Acc) -> tokenise(Rest, [$Z | Acc]);  % 2012-12-12T12:12:12Zulu
-tokenise([$. |  Rest], Acc) -> tokenise(Rest, [$. | Acc]);  % 2012-12-12T12:12:12.xxxx ISO formatting.
 tokenise([$+, H1,H2,M1,M2| Rest], Acc) when ?is_tz_offset(H1,H2,M1,M2) -> tokenise(Rest, Acc);  % Tue Nov 11 15:03:18 +0000 2014 Twitter format
 tokenise([$+| Rest], Acc) -> tokenise(Rest, [$+ | Acc]);  % 2012-12-12T12:12:12.xxxx+ ISO formatting.
 
@@ -488,7 +522,7 @@
 format([$g|T], {_,{H,_,_}}=Dt, Acc) ->
     format(T, Dt, [itol(H)|Acc]);
 format([$G|T], {_,{H,_,_}}=Dt, Acc) ->
-    format(T, Dt, [itol(H)|Acc]);
+    format(T, Dt, [pad2(H)|Acc]);
 format([$h|T], {_,{H,_,_}}=Dt, Acc) when H > 12 ->
     format(T, Dt, [pad2(H-12)|Acc]);
 format([$h|T], {_,{H,_,_}}=Dt, Acc) ->
@@ -518,7 +552,7 @@
 format([$g|T], {_,{H,_,_,_}}=Dt, Acc) ->
     format(T, Dt, [itol(H)|Acc]);
 format([$G|T], {_,{H,_,_,_}}=Dt, Acc) ->
-    format(T, Dt, [itol(H)|Acc]);
+    format(T, Dt, [pad2(H)|Acc]);
 format([$h|T], {_,{H,_,_,_}}=Dt, Acc) when H > 12 ->
     format(T, Dt, [pad2(H-12)|Acc]);
 format([$h|T], {_,{H,_,_,_}}=Dt, Acc) ->
@@ -530,7 +564,7 @@
 format([$s|T], {_,{_,_,S,_}}=Dt, Acc) ->
     format(T, Dt, [pad2(S)|Acc]);
 format([$f|T], {_,{_,_,_,Ms}}=Dt, Acc) ->
-    format(T, Dt, [itol(Ms)|Acc]);
+    format(T, Dt, [pad6(Ms)|Acc]);
 
 %% Whole Dates
 format([$c|T], {{Y,M,D},{H,Min,S}}=Dt, Acc) ->
@@ -680,16 +714,26 @@
 itol(X) ->
     integer_to_list(X).
 
--spec pad2(integer()) -> list().
+-spec pad2(integer() | float()) -> list().
 %% @doc int padded with 0 to make sure its 2 chars
 pad2(X) when is_integer(X) ->
     io_lib:format("~2.10.0B",[X]);
 pad2(X) when is_float(X) ->
     io_lib:format("~2.10.0B",[trunc(X)]).
 
+-spec pad6(integer()) -> list().
+pad6(X) when is_integer(X) ->
+    io_lib:format("~6.10.0B",[X]).
+
 ltoi(X) ->
     list_to_integer(X).
 
+-ifdef(unicode_str).
+uppercase(Str) -> string:uppercase(Str).
+-else.
+uppercase(Str) -> string:to_upper(Str).
+-endif.
+
 %%%===================================================================
 %%% Tests
 %%%===================================================================
@@ -933,7 +977,8 @@
 ms_test_() ->
     Now=os:timestamp(),
     [
-     ?_assertEqual({{2012,12,12}, {12,12,12,1234}}, parse("2012-12-12T12:12:12.1234")),
+     ?_assertEqual({{2012,12,12}, {12,12,12,1234}}, parse("2012-12-12T12:12:12.001234")),
+     ?_assertEqual({{2012,12,12}, {12,12,12,123000}}, parse("2012-12-12T12:12:12.123")),
      ?_assertEqual(format("H:m:s.f \\m \\i\\s \\m\\o\\n\\t\\h",?DATEMS),
                    "17:03:17.123456 m is month"),
      ?_assertEqual(format("Y-m-d\\TH:i:s.f",?DATEMS),
@@ -944,6 +989,8 @@
                    "2001-03-10T05:16:17.123456"),
      ?_assertEqual(format("Y-m-d\\TH:i:s.f",nparse("2001-03-10T15:16:17.123456")),
                    "2001-03-10T15:16:17.123456"),
+     ?_assertEqual(format("Y-m-d\\TH:i:s.f",nparse("2001-03-10T15:16:17.000123")),
+                   "2001-03-10T15:16:17.000123"),
      ?_assertEqual(Now, nparse(format("Y-m-d\\TH:i:s.f", Now)))
     ].
 
@@ -965,8 +1012,94 @@
 
 format_iso8601_test_() ->
     [
-     ?_assertEqual("2001-03-10T17:16:17Z", format_iso8601(?DATE)),
-     ?_assertEqual("2001-03-10T17:16:17.123456Z", format_iso8601(?DATEMS))
+     ?_assertEqual("2001-03-10T17:16:17Z",
+                   format_iso8601({{2001,3,10},{17,16,17}})),
+     ?_assertEqual("2001-03-10T17:16:17.000000Z",
+                   format_iso8601({{2001,3,10},{17,16,17,0}})),
+     ?_assertEqual("2001-03-10T17:16:17.100000Z",
+                   format_iso8601({{2001,3,10},{17,16,17,100000}})),
+     ?_assertEqual("2001-03-10T17:16:17.120000Z",
+                   format_iso8601({{2001,3,10},{17,16,17,120000}})),
+     ?_assertEqual("2001-03-10T17:16:17.123000Z",
+                   format_iso8601({{2001,3,10},{17,16,17,123000}})),
+     ?_assertEqual("2001-03-10T17:16:17.123400Z",
+                   format_iso8601({{2001,3,10},{17,16,17,123400}})),
+     ?_assertEqual("2001-03-10T17:16:17.123450Z",
+                   format_iso8601({{2001,3,10},{17,16,17,123450}})),
+     ?_assertEqual("2001-03-10T17:16:17.123456Z",
+                   format_iso8601({{2001,3,10},{17,16,17,123456}})),
+     ?_assertEqual("2001-03-10T17:16:17.023456Z",
+                   format_iso8601({{2001,3,10},{17,16,17,23456}})),
+     ?_assertEqual("2001-03-10T17:16:17.003456Z",
+                   format_iso8601({{2001,3,10},{17,16,17,3456}})),
+     ?_assertEqual("2001-03-10T17:16:17.000456Z",
+                   format_iso8601({{2001,3,10},{17,16,17,456}})),
+     ?_assertEqual("2001-03-10T17:16:17.000056Z",
+                   format_iso8601({{2001,3,10},{17,16,17,56}})),
+     ?_assertEqual("2001-03-10T17:16:17.000006Z",
+                   format_iso8601({{2001,3,10},{17,16,17,6}})),
+    ?_assertEqual("2001-03-10T07:16:17Z",
+                   format_iso8601({{2001,3,10},{07,16,17}})),
+     ?_assertEqual("2001-03-10T07:16:17.000000Z",
+                   format_iso8601({{2001,3,10},{07,16,17,0}})),
+     ?_assertEqual("2001-03-10T07:16:17.100000Z",
+                   format_iso8601({{2001,3,10},{07,16,17,100000}})),
+     ?_assertEqual("2001-03-10T07:16:17.120000Z",
+                   format_iso8601({{2001,3,10},{07,16,17,120000}})),
+     ?_assertEqual("2001-03-10T07:16:17.123000Z",
+                   format_iso8601({{2001,3,10},{07,16,17,123000}})),
+     ?_assertEqual("2001-03-10T07:16:17.123400Z",
+                   format_iso8601({{2001,3,10},{07,16,17,123400}})),
+     ?_assertEqual("2001-03-10T07:16:17.123450Z",
+                   format_iso8601({{2001,3,10},{07,16,17,123450}})),
+     ?_assertEqual("2001-03-10T07:16:17.123456Z",
+                   format_iso8601({{2001,3,10},{07,16,17,123456}})),
+     ?_assertEqual("2001-03-10T07:16:17.023456Z",
+                   format_iso8601({{2001,3,10},{07,16,17,23456}})),
+     ?_assertEqual("2001-03-10T07:16:17.003456Z",
+                   format_iso8601({{2001,3,10},{07,16,17,3456}})),
+     ?_assertEqual("2001-03-10T07:16:17.000456Z",
+                   format_iso8601({{2001,3,10},{07,16,17,456}})),
+     ?_assertEqual("2001-03-10T07:16:17.000056Z",
+                   format_iso8601({{2001,3,10},{07,16,17,56}})),
+     ?_assertEqual("2001-03-10T07:16:17.000006Z",
+                   format_iso8601({{2001,3,10},{07,16,17,6}}))
+    ].
+
+parse_iso8601_test_() ->
+    [
+     ?_assertEqual({{2001,3,10},{17,16,17}},
+                   parse("2001-03-10T17:16:17Z")),
+     ?_assertEqual({{2001,3,10},{17,16,17,0}},
+                   parse("2001-03-10T17:16:17.000Z")),
+     ?_assertEqual({{2001,3,10},{17,16,17,0}},
+                   parse("2001-03-10T17:16:17.000000Z")),
+     ?_assertEqual({{2001,3,10},{17,16,17,100000}},
+                   parse("2001-03-10T17:16:17.1Z")),
+     ?_assertEqual({{2001,3,10},{17,16,17,120000}},
+                   parse("2001-03-10T17:16:17.12Z")),
+     ?_assertEqual({{2001,3,10},{17,16,17,123000}},
+                   parse("2001-03-10T17:16:17.123Z")),
+     ?_assertEqual({{2001,3,10},{17,16,17,123400}},
+                   parse("2001-03-10T17:16:17.1234Z")),
+     ?_assertEqual({{2001,3,10},{17,16,17,123450}},
+                   parse("2001-03-10T17:16:17.12345Z")),
+     ?_assertEqual({{2001,3,10},{17,16,17,123456}},
+                   parse("2001-03-10T17:16:17.123456Z")),
+
+     ?_assertEqual({{2001,3,10},{15,16,17,100000}},
+                   parse("2001-03-10T16:16:17.1+01:00")),
+     ?_assertEqual({{2001,3,10},{15,16,17,123456}},
+                   parse("2001-03-10T16:16:17.123456+01:00")),
+     ?_assertEqual({{2001,3,10},{17,16,17,100000}},
+                   parse("2001-03-10T16:16:17.1-01:00")),
+     ?_assertEqual({{2001,3,10},{17,16,17,123456}},
+                   parse("2001-03-10T16:16:17.123456-01:00")),
+
+     ?_assertEqual({{2001,3,10},{17,16,17,456}},
+                   parse("2001-03-10T17:16:17.000456Z")),
+     ?_assertEqual({{2001,3,10},{17,16,17,123000}},
+                   parse("2001-03-10T17:16:17.123000Z"))
     ].
 
 -endif.

erlware_commons.tar.gz/src/ec_file.erl Changed

@@ -11,6 +11,7 @@
          exists/1,
          copy/2,
          copy/3,
+         copy_file_info/3,
          insecure_mkdtemp/0,
          mkdir_path/1,
          mkdir_p/1,
@@ -40,7 +41,8 @@
 %%============================================================================
 %% Types
 %%============================================================================
--type option() :: recursive.
+-type file_info() :: mode | time | owner | group.
+-type option() :: recursive | {file_info, [file_info()]}.
 
 %%%===================================================================
 %%% API
@@ -57,36 +59,79 @@
 %% @doc copy an entire directory to another location.
 -spec copy(file:name(), file:name(), Options::[option()]) -> ok | {error, Reason::term()}.
 copy(From, To, []) ->
-    copy(From, To);
-copy(From, To, [recursive] = Options) ->
-    case is_dir(From) of
-        false ->
-            copy(From, To);
+    copy_(From, To, []);
+copy(From, To, Options) ->
+    case proplists:get_value(recursive,  Options, false) of
         true ->
-            make_dir_if_dir(To),
-            copy_subfiles(From, To, Options)
+            case is_dir(From) of
+                false ->
+                    copy_(From, To, Options);
+                true ->
+                    make_dir_if_dir(To),
+                    copy_subfiles(From, To, Options)
+            end;
+        false ->
+            copy_(From, To, Options)
     end.
 
 %% @doc copy a file including timestamps,ownership and mode etc.
 -spec copy(From::file:filename(), To::file:filename()) -> ok | {error, Reason::term()}.
 copy(From, To) ->
+    copy_(From, To, [{file_info, [mode, time, owner, group]}]).
+
+copy_(From, To, Options) ->
     case file:copy(From, To) of
         {ok, _} ->
-            case file:read_file_info(From) of
-                {ok, FileInfo} ->
-                    case file:write_file_info(To, FileInfo) of
-                        ok ->
-                            ok;
-                        {error, WFError} ->
-                            {error, {write_file_info_failed, WFError}}
-                    end;
-                {error, RFError} ->
-                    {error, {read_file_info_failed, RFError}}
-            end;
+            copy_file_info(To, From, proplists:get_value(file_info, Options, []));
         {error, Error} ->
             {error, {copy_failed, Error}}
     end.
 
+copy_file_info(To, From, FileInfoToKeep) ->
+    case file:read_file_info(From) of
+        {ok, FileInfo} ->
+            case write_file_info(To, FileInfo, FileInfoToKeep) of
+                [] ->
+                    ok;
+                Errors ->
+                    {error, {write_file_info_failed_for, Errors}}
+            end;
+        {error, RFError} ->
+            {error, {read_file_info_failed, RFError}}
+    end.
+
+write_file_info(To, FileInfo, FileInfoToKeep) ->
+    WriteInfoFuns = [{mode, fun try_write_mode/2},
+                     {time, fun try_write_time/2},
+                     {group, fun try_write_group/2},
+                     {owner, fun try_write_owner/2}],
+    lists:foldl(fun(Info, Acc) ->
+                        case proplists:get_value(Info, WriteInfoFuns, undefined) of
+                            undefined ->
+                                Acc;
+                            F ->
+                                case F(To, FileInfo) of
+                                    ok ->
+                                        Acc;
+                                    {error, Reason} ->
+                                        [{Info, Reason} | Acc]
+                                end
+                        end
+                end, [], FileInfoToKeep).
+
+
+try_write_mode(To, #file_info{mode=Mode}) ->
+    file:write_file_info(To, #file_info{mode=Mode}).
+
+try_write_time(To, #file_info{atime=Atime, mtime=Mtime}) ->
+    file:write_file_info(To, #file_info{atime=Atime, mtime=Mtime}).
+
+try_write_owner(To, #file_info{uid=OwnerId}) ->
+    file:write_file_info(To, #file_info{uid=OwnerId}).
+
+try_write_group(To, #file_info{gid=OwnerId}) ->
+    file:write_file_info(To, #file_info{gid=OwnerId}).
+
 %% @doc return an md5 checksum string or a binary. Same as unix utility of
 %%      same name.
 -spec md5sum(string() | binary()) -> string().
@@ -277,9 +322,15 @@
 tmp() ->
     case erlang:system_info(system_architecture) of
         "win32" ->
-            "./tmp";
+            case os:getenv("TEMP") of
+                false -> "./tmp";
+                Val -> Val
+            end;
         _SysArch ->
-            "/tmp"
+            case os:getenv("TMPDIR") of
+                false -> "/tmp";
+                Val -> Val
+            end
     end.
 
 %% Copy the subfiles of the From directory to the to directory.

erlware_commons.tar.gz/src/ec_git_vsn.erl Changed

@@ -52,7 +52,7 @@
     RawCount =
         case Tag of
             undefined ->
-                os:cmd("git rev-list HEAD | wc -l");
+                os:cmd("git rev-list --count HEAD");
             _ ->
                 get_patch_count(Tag)
         end,
@@ -80,23 +80,28 @@
 
 get_patch_count(RawRef) ->
     Ref = re:replace(RawRef, "\\s", "", [global]),
-    Cmd = io_lib:format("git rev-list ~s..HEAD | wc -l",
+    Cmd = io_lib:format("git rev-list --count ~s..HEAD",
                          [Ref]),
     os:cmd(Cmd).
 
 -spec parse_tags(t()) -> {string()|undefined, ec_semver:version_string()}.
-parse_tags(_) ->
-    first_valid_tag(os:cmd("git log --oneline --decorate  | grep -F \"tag: \"")).
-    %% TODO: The following command sould be able to get the version
-    %% number directly, without a re:run. Should be checked for POSIX
-    %% "git log --oneline --decorate | grep -F \"tag: \" --color=never | head -n 1 | sed  \"s/.*tag: v?$[^,)]*$.*/\1/\"".
+parse_tags({}) ->
+    parse_tags("");
+parse_tags(Pattern) ->
+    Cmd = io_lib:format("git describe --abbrev=0 --tags --match \"~s*\"", [Pattern]),
+    Tag = os:cmd(Cmd),
+    Vsn = slice(Tag, len(Pattern)),
+    Vsn1 = trim(trim(Vsn, left, "v"), right, "\n"),
+    {Tag, Vsn1}.
 
--spec first_valid_tag(string()) -> {string()|undefined, ec_semver:version_string()}.
-first_valid_tag(Line) ->
-    RE = "(\$|\\s)tag:\\s(v?([^,\$]+))",
-    case re:run(Line, RE, [{capture, [2, 3], list}]) of
-        {match,[Tag, Vsn]} ->
-            {Tag, Vsn};
-        nomatch ->
-            {undefined, "0.0.0"}
-    end.
+-ifdef(unicode_str).
+len(Str) -> string:length(Str).
+trim(Str, right, Chars) -> string:trim(Str, trailing, Chars);
+trim(Str, left, Chars) -> string:trim(Str, leading, Chars);
+trim(Str, both, Chars) -> string:trim(Str, both, Chars).
+slice(Str, Len) -> string:slice(Str, Len).
+-else.
+len(Str) -> string:len(Str).
+trim(Str, Dir, [Chars|_]) -> string:strip(Str, Dir, Chars).
+slice(Str, Len) -> string:substr(Str, Len + 1).
+-endif.

erlware_commons.tar.gz/src/ec_plists.erl Changed

@@ -822,20 +822,7 @@
                            Parent ! {erlang:self(), fuse, FuseFunc(R1, R2)}
                    end
     end,
-    Fun3 = fun () ->
-                   try
-                       Fun2()
-                   catch
-                       exit:siblingdied ->
-                           ok;
-                       exit:Reason ->
-                           Parent ! {erlang:self(), error, Reason};
-                       error:R ->
-                           Parent ! {erlang:self(), error, {R, erlang:get_stacktrace()}};
-                       throw:R ->
-                           Parent ! {erlang:self(), error, {{nocatch, R}, erlang:get_stacktrace()}}
-                   end
-           end,
+    Fun3 = fun() -> runmany_wrap(Fun2, Parent) end,
     Pid = proc_lib:spawn(N, Fun3),
     erlang:monitor(process, Pid),
     cluster_runmany(Fun, Fuse, TaskList, Nodes, [{Pid, N, Task}|Running], Results);
@@ -885,6 +872,36 @@
 %% We have data, but no nodes either available or occupied
     erlang:exit(allnodescrashed).
 
+-ifdef(fun_stacktrace).
+runmany_wrap(Fun, Parent) ->
+    try
+        Fun
+    catch
+        exit:siblingdied ->
+            ok;
+        exit:Reason ->
+            Parent ! {erlang:self(), error, Reason};
+        error:R ->
+            Parent ! {erlang:self(), error, {R, erlang:get_stacktrace()}};
+        throw:R ->
+            Parent ! {erlang:self(), error, {{nocatch, R}, erlang:get_stacktrace()}}
+    end.
+-else.
+runmany_wrap(Fun, Parent) ->
+    try
+        Fun
+    catch
+        exit:siblingdied ->
+            ok;
+        exit:Reason ->
+            Parent ! {erlang:self(), error, Reason};
+        error:R:Stacktrace ->
+            Parent ! {erlang:self(), error, {R, Stacktrace}};
+        throw:R:Stacktrace ->
+            Parent ! {erlang:self(), error, {{nocatch, R}, Stacktrace}}
+    end.
+-endif.
+
 delete_running(Pid, [{Pid, Node, List}|Running], Acc) ->
     {Running ++ Acc, Node, List};
 delete_running(Pid, [R|Running], Acc) ->

erlware_commons.tar.gz/src/ec_semver_parser.erl Changed

erlware_commons.tar.gz/src/ec_talk.erl Changed

@@ -127,7 +127,7 @@
                                                            Default ->
                                                                [" (", io_lib:format("~p", [Default]) , ")"]
                                                        end, "> "])),
-    Data = string:strip(string:strip(io:get_line(NewPrompt)), both, $\n),
+    Data = trim(trim(io:get_line(NewPrompt)), both, [$\n]),
     Ret = TransFun(Data),
     case Ret of
         no_data ->
@@ -197,6 +197,16 @@
             no_clue
     end.
 
+-ifdef(unicode_str).
+trim(Str) -> string:trim(Str).
+trim(Str, right, Chars) -> string:trim(Str, trailing, Chars);
+trim(Str, left, Chars) -> string:trim(Str, leading, Chars);
+trim(Str, both, Chars) -> string:trim(Str, both, Chars).
+-else.
+trim(Str) -> string:strip(Str).
+trim(Str, Dir, [Chars|_]) -> string:strip(Str, Dir, Chars).
+-endif.
+
 %%%====================================================================
 %%% tests
 %%%====================================================================

erlware_commons.tar.gz/src/erlware_commons.app.src Changed

Overview

Request 2346 (accepted)

Request History