Changeset 95 for trunk/src/directory_tester.erl

Timestamp:

04/11/10 19:19:02 (22 months ago)

Author:

dom

Message:

Two improvements (and new start API): multiple directories watched, and slave started if no node given

File:

• trunk/src/directory_tester.erl (modified) (2 diffs)

trunk/src/directory_tester.erl

@@ -4 +4 @@
 
 -module (directory_tester).
--export ([init/1, init/3]).
--export ([run_once/1, run_once/3]).
+-export ([init/1, init/2, init/3]).
+-export ([run_once/1, run_once/2, run_once/3]).
+-export ([slave_node/1]).
+-export ([read_args/1]).
 
-run_once ([Directory, Node | Include_directories]) when is_list (Node) ->
-    Options = [{i, I} || I <- Include_directories],
-    run_once (Directory, list_to_atom (Node), [{compiler, Options}]).
+run_once (Args) ->
+    {Directories, Options} = read_args (Args),
+    run_once (Directories, Options).
 
-run_once (Directory, Node, Options) ->
-    run (start (Directory, Node, Options)).
+run_once (Directories, All_options) ->
+    Slave_args = proplists: get_value (slave, All_options),
+    Options = proplists: delete (slave, All_options),
+    run_once (Directories, slave (Slave_args), Options).
 
-init ([Directory, Node | Include_directories]) when is_list (Node) ->
-    Options = [{i, I} || I <- Include_directories],
-    init (Directory, list_to_atom (Node), [{compiler, Options}]).
+run_once (Directories, Node, Options) ->
+    run (start (Directories, Node, Options)).
+
+init (Args) ->
+    {Directories, Options} = read_args (Args),
+    init (Directories, Options).
+
+init (Directories, All_options) ->
+    Slave_args = proplists: get_value (slave, All_options),
+    Options = proplists: delete (slave, All_options),
+    init (Directories, slave (Slave_args), Options). 
     
-init (Directory, Node, Options) ->
-    loop (start (Directory, Node, Options)).
+init (Directories, Node, Options) ->
+    loop (start (Directories, Node, Options)).
 
-start (Directory, Node, Options) ->
+slave (undefined) ->
+    {Host, Name} = slave_node (node ()),
+    {ok, Slave} = slave: start_link (Host, Name),
+    Slave;
+slave (Args) when is_list (Args) ->
+    {Host, Name} = slave_node (node ()),
+    {ok, Slave} = slave: start_link (Host, Name, Args),
+    Slave.
+
+start (Directories, Node, Options) ->
     Compiler_options = options (compiler, Options),
-    Compiler_args = [notify_me (compiler), Directory, Compiler_options],
+    Compiler_args = [notify_me (compiler), Directories, Compiler_options],
     Compiler = spawn_link (compiler, init, Compiler_args),
     Tester = spawn_link (tester, init, [notify_me (tester), Node]),
@@ -29 +50 @@
     Printer = spawn_link (text_printer, init, [standard_io]),
     {Compiler, Tester, Printer}.
+
+
+slave_node (nonode@nohost) ->
+    not_alive;
+slave_node (Node) ->
+    Node_string = atom_to_list (Node),
+    [Name, Host_string] = string: tokens (Node_string, "@"),
+    Slave_name_string = Name ++ "_extremeforge_slave",
+    Slave_name = list_to_atom (Slave_name_string),
+    Host = list_to_atom (Host_string),
+    {Host, Slave_name}.
+
+read_args (Args) when length (Args) == 1 ->
+    [Dirs] = read_path_args (Args),
+    {Dirs, []};
+read_args (Args) when length (Args) == 2 ->
+    [Dirs, Incs] = read_path_args (Args),
+    Options = [{compiler, [{i, I} || I <- Incs]}],
+    {Dirs, Options};
+read_args ([Arg1, Arg2, Slave_args]) ->
+    {Dirs, C_options} = read_args ([Arg1, Arg2]),
+    {Dirs, [{slave, Slave_args} | C_options]}.
+
+read_path_args (Paths) ->
+    Dirs = [string: tokens (P, ":") || P <- Paths],
+    Not_dir = [D || D <- lists: concat (Dirs), not filelib: is_dir (D)],
+    {not_dir, []} = {not_dir, Not_dir},
+    Dirs.
 
 notify_me (Atom) ->