Request 2286 (accepted)

erlang-eimap.spec Changed

@@ -8,8 +8,8 @@
 %define lock_version() %{1}%{?_isa} = %(rpm -q --queryformat "%%{VERSION}" %{1})
 
 Name:           erlang-%{realname}
-Version:        0.2.5
-Release:        5%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Erlang IMAP client
 Group:          Development/Libraries
 License:        GPLv3+
@@ -17,14 +17,14 @@
 %if 0%{?el7}%{?fedora}
 VCS:            scm:git:https://git.kolab.org/diffusion/EI/%{realname}.git
 %endif
-Source0:        erlang-eimap-0.2.5.tar.gz
+Source0:        erlang-eimap-%{version}.tar.gz
 
-Patch1:         rebar-deps.patch
-Patch2:         untagged-commands.patch
+Patch1:         untagged-commands.patch
+Patch2:         make-things-easy-for-rebar3.patch
 
-BuildRequires:	erlang-goldrush >= 0.1.7
-BuildRequires:	erlang-lager >= 2.2.0
-BuildRequires:	erlang-rebar >= 2.5.1
+BuildRequires:	erlang-goldrush
+BuildRequires:	erlang-lager
+BuildRequires:	erlang-rebar3 >= 3.3.2
 
 Requires:       %lock_version erlang-erts
 Requires:       %lock_version erlang-stdlib
@@ -34,23 +34,38 @@
 
 %prep
 %setup -q -n eimap-%{version}
+
 %patch1 -p1
 %patch2 -p1
 
 %build
-rebar compile -v
+DEBUG=1
+export DEBUG
+
+HEX_OFFLINE=true
+export HEX_OFFLINE
+
+rebar3 release \
+    --dev-mode false \
+    --relname %{realname} \
+    --relvsn %{version} \
+    --verbose
 
 %check
 # BEWARE rebar needs bootstrapped getopt in case of an API change
-rebar eunit -v
+rebar3 eunit -v
 
 %install
+find -type f | sort
+
 mkdir -p \
     %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/ \
     %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/src/
 
+pushd _build/default/lib/eimap/
 install -D -m 644 ebin/%{realname}.app %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/%{realname}.app
 install -D -m 644 ebin/*.beam %{buildroot}%{_libdir}/erlang/lib/%{realname}-%{version}/ebin/.
+popd
 
 %files
 %doc README.md
@@ -61,6 +76,9 @@
 %{_libdir}/erlang/lib/%{realname}-%{version}/ebin/*.beam
 
 %changelog
+* Sun Apr 08 2018 Christoph Erhardt <kolab@sicherha.de> - 0.4.0-1
+- Upstream release 0.4.0
+
 * Tue Nov  7 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.2.5-5
 - Patch untagged commands

make-things-easy-for-rebar3.patch Added

@@ -0,0 +1,34 @@
+diff -ur eimap-0.4.0.orig/rebar.config eimap-0.4.0/rebar.config
+--- eimap-0.4.0.orig/rebar.config	2016-11-11 15:49:11.000000000 +0100
++++ eimap-0.4.0/rebar.config	2016-11-23 10:34:12.227835779 +0100
+@@ -2,7 +2,6 @@
+ %% ex: ft=erlang ts=4 sw=4 et
+ 
+ {erl_opts, [warnings_as_errors, {parse_transform, lager_transform}]}.
+-{deps, [ lager ]}.
+ 
+ { erl_first_files, ["src/eimap_command.erl"] }.
+ {sub_dirs, [
+@@ -15,3 +14,8 @@
+ %%{require_otp_vsn, "17"}.
+ {pre_hooks, [{clean, "rm -rf ebin priv erl_crash.dump"}]}.
+ 
++{ relx, [ { release, { eimap, "0.4.0" }, [eimap]},
++                { dev_mode, false },
++                { include_erts, false }
++         ]
++}.
+diff -ur eimap-0.4.0.orig/src/eimap.app.src eimap-0.4.0/src/eimap.app.src
+--- eimap-0.4.0.orig/src/eimap.app.src	2016-11-11 15:49:11.000000000 +0100
++++ eimap-0.4.0/src/eimap.app.src	2016-11-21 12:35:31.302170628 +0100
+@@ -10,9 +10,7 @@
+                    crypto,
+                    ssl,
+                    compiler,
+-                   syntax_tools,
+-                   goldrush,
+-                   lager
++                   syntax_tools
+                   ]
+   },
+   { env, [ ]},

rebar-deps.patch Deleted

debian.changelog Changed

debian.control Changed

debian.rules Changed

debian.series Changed

erlang-eimap-0.2.5.tar.gz/rebar Deleted

erlang-eimap-0.2.5.tar.gz/.gitignore -> erlang-eimap-0.4.0.tar.gz/.gitignore Changed

erlang-eimap-0.4.0.tar.gz/CHANGELOG.md Added

@@ -0,0 +1,53 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+## [0.4.0] - 2016-11-11
+### Added
+- optional timeout on eimap objects for server delay
+  passing in an integer command_timeout value to eimap:start_link
+  sets the timeout to that number of ms
+
+### Fixed
+- METADATA command parses multiple key/value returns correctly
+
+## [0.3.0] - 2016-07-29
+### Changed
+- moved to rebar3
+
+### Fixed
+- consistency in capabilities response parsing
+
+## [0.2.5] - 2016-07-04
+### Fixed
+- improved the capabilities response parsing
+
+## [0.2.4] - 2016-06-08
+This section contains the changes from 0.2.0 through 0.2.4
+### Added
+- NOOP command
+- support for automated interruption of passthrough state to send structured commands
+- commands receive server responses for commands they put into the queue
+
+### Changed
+- centralize core IMAP response handling and utils in eimap_command
+- support for multi-line, single-line and binary response command types
+- improved TLS support
+
+### Fixed
+- crash in GETMETADATA command when the Folder param is a list
+- Support more variations of the LIST command args in the filter_groupware rule
+- Prevent crashes (while maintaining simplicity) in session FSM by limiting
+  processcommandqueue messages in the mailbox to one
+- support for literals continuation
+- fixes for metadata fetching
+

erlang-eimap-0.2.5.tar.gz/Makefile -> erlang-eimap-0.4.0.tar.gz/Makefile Changed

erlang-eimap-0.2.5.tar.gz/README.md -> erlang-eimap-0.4.0.tar.gz/README.md Changed

erlang-eimap-0.2.5.tar.gz/rebar.config -> erlang-eimap-0.4.0.tar.gz/rebar.config Changed

erlang-eimap-0.4.0.tar.gz/rebar3 Added

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_annotation.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_annotation.erl Changed

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_capability.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_capability.erl Changed

@@ -3,16 +3,16 @@
 %% Aaron Seigo (Kolab Systems) <seigo a kolabsys.com>
 %%
 %% This program is free software: you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
+%% it under the terms of the GNU Library General Public License as published by
 %% the Free Software Foundation, either version 3 of the License, or
 %% (at your option) any later version.
 %%
 %% This program is distributed in the hope that it will be useful,
 %% but WITHOUT ANY WARRANTY; without even the implied warranty of
 %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
+%% GNU Library General Public License for more details.
 %%
-%% You should have received a copy of the GNU General Public License
+%% You should have received a copy of the GNU Library General Public License
 %% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -module(eimap_command_capability).
@@ -45,6 +45,6 @@
     ServerID = binary:part(Data, { End + 2, TextEnd - End  - 2}),
     { fini, { Capabilities, ServerID } };
 parse_oneliner({ _, Reason }, _Data) -> { error, Reason };
-parse_oneliner(_, Data) -> { fini, Data }.
+parse_oneliner(_, Data) -> { fini, { Data, <<>> } }.

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_compress.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_compress.erl Changed

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_getmetadata.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_getmetadata.erl Changed

@@ -3,16 +3,16 @@
 %% Aaron Seigo (Kolab Systems) <seigo a kolabsys.com>
 %%
 %% This program is free software: you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
+%% it under the terms of the GNU Library General Public License as published by
 %% the Free Software Foundation, either version 3 of the License, or
 %% (at your option) any later version.
 %%
 %% This program is distributed in the hope that it will be useful,
 %% but WITHOUT ANY WARRANTY; without even the implied warranty of
 %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
+%% GNU Library General Public License for more details.
 %%
-%% You should have received a copy of the GNU General Public License
+%% You should have received a copy of the GNU Library General Public License
 %% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -module(eimap_command_getmetadata).
@@ -86,6 +86,7 @@
     next_property(Properties, []).
 
 next_property(<<>>, Acc) -> Acc;
+next_property(<<$ ,Rest/binary>>, Acc) -> next_property(Rest, Acc);
 next_property(Buffer, Acc) ->
     { KeyEnd, _ } = binary:match(Buffer, <<" ">>),
     Key = binary:part(Buffer, 0, KeyEnd),

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_login.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_login.erl Changed

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_logout.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_logout.erl Changed

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_namespace.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_namespace.erl Changed

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_noop.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_noop.erl Changed

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_peek_message.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_peek_message.erl Changed

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_starttls.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_starttls.erl Changed

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_status.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_status.erl Changed

erlang-eimap-0.2.5.tar.gz/src/commands/eimap_command_switch_folder.erl -> erlang-eimap-0.4.0.tar.gz/src/commands/eimap_command_switch_folder.erl Changed

erlang-eimap-0.2.5.tar.gz/src/eimap.app.src -> erlang-eimap-0.4.0.tar.gz/src/eimap.app.src Changed

erlang-eimap-0.2.5.tar.gz/src/eimap.erl -> erlang-eimap-0.4.0.tar.gz/src/eimap.erl Changed

@@ -3,16 +3,16 @@
 %% Aaron Seigo (Kolab Systems) <seigo a kolabsys.com>
 %%
 %% This program is free software: you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
+%% it under the terms of the GNU Library General Public License as published by
 %% the Free Software Foundation, either version 3 of the License, or
 %% (at your option) any later version.
 %%
 %% This program is distributed in the hope that it will be useful,
 %% but WITHOUT ANY WARRANTY; without even the implied warranty of
 %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
+%% GNU Library General Public License for more details.
 %%
-%% You should have received a copy of the GNU General Public License
+%% You should have received a copy of the GNU Library General Public License
 %% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -module(eimap).
@@ -49,11 +49,13 @@
                  command_serial = 1, command_queue = queue:new(),
                  current_command, current_mbox,
                  passthrough = false, passthrough_recv, passthrough_send_buffer = <<>>,
-                 inflator, deflator, process_command_queue_guard = false }).
+                 inflator, deflator, process_command_queue_guard = false,
+                 command_timeout = infinity, command_timeout_timer = none }).
 -record(command, { tag, mbox, message, from, response_type, response_token, parse_state }).
 
 -define(SSL_UPGRADE_TIMEOUT, 5000).
 -define(TCP_CONNECT_TIMEOUT, 5000).
+-define(DEFAULT_COMMAND_TIMEOUT, infinity).
 
 %% public API
 start_link(Options) when is_list(Options) -> gen_fsm:start_link(?MODULE, Options, []).
@@ -129,7 +131,8 @@
     Host = proplists:get_value(host, Options, "127.0.0.1"),
     Port = proplists:get_value(port, Options, 143),
     TLS = proplists:get_value(tls, Options, false),
-    State = #state { host = Host, port = Port, tls  = TLS },
+    CommandTimeout = proplists:get_value(command_timeout, Options, ?DEFAULT_COMMAND_TIMEOUT),
+    State = #state { host = Host, port = Port, tls = TLS, command_timeout = CommandTimeout },
     { ok, disconnected, State }.
 
 disconnected({ connect, Receiver, ResponseToken }, #state{ command_queue = CommandQueue, host = Host, port = Port, tls = TLS, socket = undefined } = State) ->
@@ -203,11 +206,13 @@
 wait_response(Command, State) when is_record(Command, command) ->
     { next_state, wait_response, enque_command(Command, State) };
 wait_response({ data, _Data }, #state{ current_command = #command{ parse_state = undefined } } = State) ->
-    { next_state, idle, ensure_process_command_queue(State) };
+    NewState = cancel_timeout(State),
+    { next_state, idle, ensure_process_command_queue(NewState) };
 wait_response({ data, Data }, #state{ current_command = #command{ response_type = ResponseType, parse_state = CommandState , tag = Tag } } = State) ->
     Response = eimap_command:parse_response(ResponseType, Data, Tag, CommandState),
     %%lager:info("Response from parser was ~p ~p, size of queue ~p", [More, Response, queue:len(State#state.command_queue)]),
-    next_command_after_response(Response, State);
+    NewState = cancel_timeout(State),
+    next_command_after_response(Response, NewState);
 wait_response(process_command_queue, State) ->
     % ignore this one, we'll get to it when the response comes
     { next_state, wait_response, State }.
@@ -307,6 +312,8 @@
 handle_info(starttls_complete, StateName, State) ->
     %lager:info("STARTTLS completed successfully"),
     { next_state, StateName, State };
+handle_info(response_timeout, _StateName, State) ->
+    { stop, normal, State };
 handle_info(Info, StateName, State) ->
     lager:debug("handle_info called with unhandled info of ~p", [Info]),
     { next_state, StateName, State }.
@@ -459,7 +466,8 @@
     Data = <<Tag/binary, " ", Message/binary, "\r\n">>,
     %lager:info("Sending command via ~p: ~s", [Fun, Data]),
     SocketFun(Socket, deflated(Data, State)),
-    State#state{ command_serial = Serial + 1, current_command = Command#command{ tag = Tag } }.
+    StateWithTimeout = reset_timeout(State),
+    StateWithTimeout#state{ command_serial = Serial + 1, current_command = Command#command{ tag = Tag } }.
 
 enque_command(Command, State) ->
     %%lager:info("Enqueuing command ~p", [Command]),
@@ -478,4 +486,19 @@
 joined([], Binary) -> Binary;
 joined([H|Rest], Binary) -> joined(Rest, <<Binary/binary, H/binary>>).
 
+reset_timeout(#state{ command_timeout = Timeout } = State) ->
+    cancel_timeout(State),
+    { ok, TimerRef } =
+        case Timeout of
+            Timeout when is_integer(Timeout), Timeout >= 0 ->
+                timer:send_after(Timeout, response_timeout);
+            _ ->
+                { ok, none }
+        end,
+    State#state{ command_timeout_timer = TimerRef }.
+
+cancel_timeout(#state{ command_timeout_timer = none } = State) -> State;
+cancel_timeout(#state{ command_timeout_timer = TimerRef } = State) ->
+    timer:cancel(TimerRef),
+    State#state{ command_timeout_timer = none }.

erlang-eimap-0.2.5.tar.gz/src/eimap_uidset.erl -> erlang-eimap-0.4.0.tar.gz/src/eimap_uidset.erl Changed

@@ -3,20 +3,20 @@
 %% Aaron Seigo (Kolab Systems) <seigo a kolabsys.com>
 %%
 %% This program is free software: you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
+%% it under the terms of the GNU Library General Public License as published by
 %% the Free Software Foundation, either version 3 of the License, or
 %% (at your option) any later version.
 %%
 %% This program is distributed in the hope that it will be useful,
 %% but WITHOUT ANY WARRANTY; without even the implied warranty of
 %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
+%% GNU Library General Public License for more details.
 %%
-%% You should have received a copy of the GNU General Public License
+%% You should have received a copy of the GNU Library General Public License
 %% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -module(eimap_uidset).
--export([uid_list_to_binary/1, parse/1, next_uid/1]).
+-export([uid_list_to_binary/1, empty_uidset/0, parse/1, next_uid/1]).
 
 % for internal use only
 -export([add_uid_as_binary_to_list/2, stitch_bin_list/2]).
@@ -39,6 +39,8 @@
         _:_ -> badarg
     end.
 
+empty_uidset() -> #uidset{}.
+
 next_uid(#uidset{ tokens = Tokens, current = Current }) -> next_uid(Tokens, Current).
 next_uid([], _Current) -> { none, #uidset {} };
 next_uid([{ First, Second }|_] = FullList, Current) -> next_in_range(FullList, First, Second, Current);

erlang-eimap-0.2.5.tar.gz/src/eimap_utils.erl -> erlang-eimap-0.4.0.tar.gz/src/eimap_utils.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_annotation_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_annotation_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_capability_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_capability_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_compress_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_compress_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_getmetadata_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_getmetadata_tests.erl Changed

@@ -3,16 +3,16 @@
 %% Aaron Seigo (Kolab Systems) <seigo a kolabsys.com>
 %%
 %% This program is free software: you can redistribute it and/or modify
-%% it under the terms of the GNU General Public License as published by
+%% it under the terms of the GNU Library General Public License as published by
 %% the Free Software Foundation, either version 3 of the License, or
 %% (at your option) any later version.
 %%
 %% This program is distributed in the hope that it will be useful,
 %% but WITHOUT ANY WARRANTY; without even the implied warranty of
 %% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
+%% GNU Library General Public License for more details.
 %%
-%% You should have received a copy of the GNU General Public License
+%% You should have received a copy of the GNU Library General Public License
 %% along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 -module(eimap_command_getmetadata_tests).
@@ -38,6 +38,11 @@
           { fini, [ { <<"Tasks">>, [ { <<"/shared/vendor/kolab/folder-type">>, <<"task \"sigh\"">> } ] } ] }
         },
         {
+          <<"* METADATA Tasks (/shared/vendor/kolab/folder-type \"task \\\"sigh\\\"\" /private/comment \"My own comment\")\r\nabcd OK Begin TLS negotiation now\r\n">>,
+          <<"abcd">>,
+          { fini, [ { <<"Tasks">>, [ { <<"/private/comment">>, <<"My own comment">> }, { <<"/shared/vendor/kolab/folder-type">>, <<"task \"sigh\"">> } ] } ] }
+        },
+        {
           <<"* METADATA Tasks (/shared/vendor/kolab/folder-type \"task \\\"sigh\\\"\")\r\n* METADATA Archive (/shared/vendor/kolab/folder-type NIL)\r\nabcd OK Begin TLS negotiation now\r\n">>,
           <<"abcd">>,
           { fini, [

erlang-eimap-0.2.5.tar.gz/test/eimap_command_login_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_login_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_logout_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_logout_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_namespace_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_namespace_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_noop_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_noop_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_starttls_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_starttls_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_status_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_status_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_switch_folder_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_switch_folder_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_command_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_command_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_uidset_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_uidset_tests.erl Changed

erlang-eimap-0.2.5.tar.gz/test/eimap_utils_tests.erl -> erlang-eimap-0.4.0.tar.gz/test/eimap_utils_tests.erl Changed

erlang-eimap.dsc Changed

Overview

Request 2286 (accepted)

Request History