Changeset 80

Timestamp:

07/17/09 13:31:39 (3 years ago)

Author:

dom

Message:

Fixed more bugs in directory_watcher.

Location:

trunk

Files:

• doc/TODO (modified) (1 diff)
• src/adlib.erl (added)
• src/adlib_test.erl (added)
• src/compiler_test.erl (modified) (2 diffs)
• src/directory_watcher.erl (modified) (3 diffs)
• src/directory_watcher_test.erl (modified) (3 diffs)
• src/shells_tests.erl (modified) (1 diff)
• src/tests_test.erl (modified) (2 diffs)
• src/text_printer_test.erl (modified) (1 diff)

trunk/doc/TODO

@@ -1 +1 @@
 -*- mode: text -*-
 
-Known bugs:
-----------
+Known issues:
+------------
 
-text_printer probably prints too many \n when two errors in a row.
+- text_printer doesn't yet handle file removals.
+- fixtures:make_tree doesn't like {file, "a", "a"} in tree.
 
 Check for possible bugs:

trunk/src/compiler_test.erl

@@ -16 +16 @@
 
 compiles_and_reports_progress_warnings_and_errors () ->
-    Compiler = spawn_link (compiler, init, [notify_me (), "fix"]),
+    Compiler = spawn_link (compiler, init, [notify_me (), "/home/dom/forge/fix"]),
     Compiler ! check,
     Ms = receive_all (),
@@ -23 +23 @@
 
 stops () ->
-    Compiler = spawn_link (compiler, init, [notify_me (), "fix"]),
+    Compiler = spawn_link (compiler, init, [notify_me (), "/home/com/forge/fix"]),
     Compiler ! check,
     receive_all (),

trunk/src/directory_watcher.erl

@@ -6 +6 @@
 -export ([init/2]).
 -export ([init_recursive/2]).
--export([start_io/2]).
--export([start_io/0]).
 -include_lib ("kernel/include/file.hrl").
 
-start_io () ->
-    start_io (".", 3000).
-
-start_io (Dir, Interval) ->
-    Watcher = spawn_link (?MODULE, init_recursive, [Dir, self ()]),
-    io_loop (Interval, Watcher).
-
-io_loop (Interval, Watcher) ->
-    Watcher ! check,
-    receive
-        {directory_watcher, _, Event} ->
-            io: fwrite ("~p~n", [Event]),
-            io_loop (Interval, Watcher);
-        stop ->
-            bye
-    after Interval ->
-            io_loop (Interval, Watcher)
-    end.
-
 init (Directory, F) ->
-    check (Directory, F, []).
+    D = filename: absname (Directory),
+    check (D, F, []).
 
 init_recursive (Directory, F) ->
+    D = filename: absname (Directory),
     Self = self (),
-    Watcher = spawn_link (?MODULE, init, [Directory, send (Self)]),
-    loop_recursive (Directory, F, [Watcher]).
+    Watcher = spawn_link (?MODULE, init, [D, send (Self)]),
+    loop_recursive (D, F, [Watcher]).
 
 check (Directory, F, State) ->
     New_state = list_dir (Directory, F),
-    compare (F, State, New_state),
+    sort_and_compare (F, State, New_state),
     loop (Directory, F, New_state).
 
@@ -99 +80 @@
     end.
 
-compare (_, State, State) ->
-    done;
-compare (Fun, [X | Xs], [X | Ys]) ->
-    compare (Fun, Xs, Ys);
-compare (Fun, [{F, {regular, _}} | Xs], [{F, {regular, _}} | Ys]) ->
-    report_changed (Fun, F),
-    compare (Fun, Xs, Ys);
-compare (Fun, [{F, _}=X | Xs], [{F, _} | Ys]) ->
-    report_lost (Fun, X),
-    report_found (Fun, F),
-    compare (Fun, Xs, Ys);
-compare (Fun, [X, {F, V} | Xs], [{F, W} | Ys]) ->
-    report_lost (Fun, X),
-    compare (Fun, [{F, V} | Xs], [{F, W} | Ys]);
-compare (Fun, [{F, V} | Xs], [Y, {F, W} | Ys]) ->
-    {Filename, _} = Y,
-    report_found (Fun, Filename),
-    compare (Fun, [{F, V} | Xs], [{F, W} | Ys]);
-compare (Fun, [], [Y | Ys]) ->
-    {Filename, _} = Y,
-    report_found (Fun, Filename),
-    compare (Fun, [], Ys);
-compare (Fun, [X | Xs], []) ->
-    report_lost (Fun, X),
-    compare (Fun, Xs, []);
-compare (Fun, [X], [Y]) ->
-    report_lost (Fun, X),
-    {File, _} = Y,
-    report_found (Fun, File),
-    done;
-compare (_, [], []) ->
+sort_and_compare (F, Old, New) ->
+    Original = dict: from_list (Old),
+    Modified = dict: from_list (New),
+    Compared = adlib: compare_dict (Modified, Original),
+    dict: fold (fun notify_new/3, F, dict: fetch (new, Compared)),
+    dict: fold (fun notify_lost/3, F, dict: fetch (lost, Compared)),
+    dict: fold (fun notify_changed/3, F, dict: fetch (changed, Compared)),
     done.
+    
+notify_new (File_name, _, Fun) ->
+    report_found (Fun, File_name),
+    Fun.
 
 report_found (F, Filename) ->
     F ({type (Filename), Filename, found}).
+
+notify_lost (File_name, Value, Fun) ->
+    report_lost (Fun, {File_name, Value}),
+    Fun.
 
 report_lost (F, {Filename, directory}) ->
@@ -139 +104 @@
 report_lost (F, {Filename, {regular, _}}) ->
     F ({{file, filename: extension (Filename)}, Filename, lost}).
+
+notify_changed (File_name, {{regular, _}, {regular, _}}, Fun) ->
+    report_changed (Fun, File_name),
+    Fun;
+notify_changed (File_name, {_, Original}, Fun) ->
+    report_lost (Fun, {File_name, Original}),
+    report_found (Fun, File_name),
+    Fun.
 
 report_changed (F, Filename) ->

trunk/src/directory_watcher_test.erl

@@ -17 +17 @@
 -export ([change_from_file_to_directory_when_recursive/0]).
 -export ([remove_and_add_in_same_check/0]).
+-export ([insensitive_to_cwd/0]).
+-export ([can_replace_all_in_same_check/0]).
+-export ([can_find_two_at_a_time/0]).
+-export([tree/0]).
 
 tests_from_empty () ->
@@ -71 +75 @@
 remove_and_add_in_same_check () ->    
     F = fun remove_and_add_in_same_check/2,
+    ok = fixtures: use_tree ([{file, "foo", "foo"}], F).
+
+insensitive_to_cwd () ->
+    Watcher = spawn_link (directory_watcher, init, ["/home/dom/forge/fix", send_me ()]),
+    receive_all (),
+    ok = file: set_cwd ("/tmp"),
+    Watcher ! check,
+    true = is_process_alive (Watcher),
+    [] = receive_all (),
+    ok.
+
+can_replace_all_in_same_check () ->
+    Tree = [{file, X, X} || X <- ["foo", "bar", "baz"]],
+    F = fun can_replace_all_in_same_check/2,
+    ok = fixtures: use_tree (Tree, F).
+
+can_find_two_at_a_time () ->
+    F = fun can_find_two_at_a_time/2,
     ok = fixtures: use_tree ([{file, "foo", "foo"}], F).
 
@@ -267 +289 @@
     ok = file: write_file (Bar, list_to_binary ("bar")),
     Watcher ! check,
-    [{{file, ""}, Foo, lost},
-     {{file, ""}, Bar, found}] = receive_all (),
-    ok.
-    
+    [{{file, ""}, Bar, found},
+     {{file, ""}, Foo, lost}] = receive_all (),
+    ok.
+    
+can_replace_all_in_same_check (Root, Tree) ->
+    Watcher = spawn_link (directory_watcher, init, [Root, send_me ()]),
+    receive_all (),
+    Replace = fun ({file, F, _}) ->
+                     Old = filename: join (Root, F),
+                     ok = file: delete (Old),
+                      New = filename: join (Root, F ++ F),
+                      ok = file: write_file (New, "hello")
+             end,
+    ok = lists: foreach (Replace, Tree),
+    Watcher ! check,
+    Lost_files = [filename: join (Root, X) || {file, X, _} <- Tree],
+    Found_files = [filename: join (Root, X++X) || {file, X, _} <- Tree],
+    Lost = [{{file, ""}, X, lost} || X <- Lost_files],
+    Found = [{{file, ""}, X, found} || X <- Found_files],
+    Expected = lists: sort (Lost ++ Found),
+    Received = lists: sort (receive_all ()),
+    {Expected, Expected} = {Expected, Received},
+    ok.
+
+can_find_two_at_a_time (Root, _) ->
+    Watcher = spawn_link (directory_watcher, init, [Root, send_me ()]),
+    receive_all (),
+    [Bar, Baz] = [filename: join (Root, X) || X <- ["bar", "baz"]],
+    ok = file: write_file (Bar, "bar"),
+    ok = file: write_file (Baz, "baz"),
+    Watcher ! check,
+    Found = [{{file, ""}, X, found} || X <- [Bar, Baz]],
+    Expected = lists: sort (Found),
+    Received = lists: sort (receive_all ()),
+    {Expected, Expected} = {Expected, Received},
+    ok.
 
 send_me () ->

trunk/src/shells_tests.erl

@@ -15 +15 @@
                compiler_test, compiler,
                modules_test, modules,
-               text_printer_test, text_printer],
+               text_printer_test, text_printer,
+               adlib_test, adlib],
     ok = hand_send_to_tester (Modules, Test_node),
     Caller ! {Caller, done}.

trunk/src/tests_test.erl

@@ -14 +14 @@
 
 non_tests_returns_empty_list () ->
-    Binary = modules: to_binary ("../fix/eg_code.erl"),
+    Binary = modules: to_binary ("/home/dom/forge/fix/eg_code.erl"),
     {_, eg_code, []} = tests: filter_by_attribute (Binary).
 
 test_exports_returns_list_of_tests_from_unloaded_binary () ->
-    File = "../fix/eg_test.erl",
+    File = "/home/dom/forge/fix/eg_test.erl",
     Binary = modules: to_binary (File),
     false = code: is_loaded (eg_test),
@@ -25 +25 @@
 
 test_non_exports_also () ->
-    File = "../fix/eg_test_not_exports.erl",
+    File = "/home/dom/forge/fix/eg_test_not_exports.erl",
     Binary = modules: to_binary (File),
     false = code: is_loaded (eg_test_not_exports),

trunk/src/text_printer_test.erl

@@ -24 +24 @@
     P ! {self (), compiler, {4, 4, 3}},
     <<".\n3/4 successfully compiled.\nCannot run tests.\n">> = receive_io_request (P),
-    P ! {self (), compiler, {4, 3, 3}},
+    P ! {self (), compiler, {4, 3, 2}},
     <<"Compiling 1: ">> = receive_io_request (P),
     P ! {self (), compiler, {4, 4, 4}},