From: Jean Privat <jean@pryen.org>
Date: Tue, 22 Apr 2014 20:03:45 +0000 (-0400)
Subject: nitls: can use `--depends` with others options.
X-Git-Tag: v0.6.6~104^2~4
X-Git-Url: http://nitlanguage.org

nitls: can use `--depends` with others options.

~~~
$ nitls ../examples/hello_world.nit ../examples/calculator.nit -d
calculator (../examples/calculator.nit)
gtk (../lib/gtk.nit)
gtk3_4 (../lib/gtk3_4)
hello_world (../examples/hello_world.nit)
standard (../lib/standard)
~~~

~~~
$ nitls ../examples/hello_world.nit ../examples/calculator.nit -d -t -p
../examples/calculator.nit
`--../examples/calculator.nit
../lib/gtk.nit
`--../lib/gtk.nit
../lib/gtk3_4
|--../lib/gtk3_4/gdk_enums.nit
|--../lib/gtk3_4/gtk3_4.nit
|--../lib/gtk3_4/gtk_assistant.nit
|--../lib/gtk3_4/gtk_core.nit
|--../lib/gtk3_4/gtk_dialogs.nit
|--../lib/gtk3_4/gtk_enums.nit
`--../lib/gtk3_4/gtk_widgets_ext.nit
../examples/hello_world.nit
`--../examples/hello_world.nit
../lib/standard
|--../lib/standard/environ.nit
|--../lib/standard/exec.nit
|--../lib/standard/file.nit
|--../lib/standard/gc.nit
|--../lib/standard/kernel.nit
|--../lib/standard/math.nit
|--../lib/standard/posix.nit
|--../lib/standard/standard.nit
|--../lib/standard/stream.nit
|--../lib/standard/string.nit
|--../lib/standard/string_search.nit
|--../lib/standard/time.nit
`--../lib/standard/collection
   |--../lib/standard/collection/abstract_collection.nit
   |--../lib/standard/collection/array.nit
   |--../lib/standard/collection/collection.nit
   |--../lib/standard/collection/hash_collection.nit
   |--../lib/standard/collection/list.nit
   |--../lib/standard/collection/range.nit
   `--../lib/standard/collection/sorter.nit
~~~
---

diff --git a/src/nitls.nit b/src/nitls.nit
index b1598ac..d491e2f 100644
--- a/src/nitls.nit
+++ b/src/nitls.nit
@@ -54,14 +54,14 @@ var opt_recursive = new OptionBool("Process directories recussively", "-r", "--r
 var opt_tree = new OptionBool("List source files in their groups and projects", "-t", "--tree")
 var opt_source = new OptionBool("List source files", "-s", "--source")
 var opt_project = new OptionBool("List projects paths (default)", "-p", "--project")
-var opt_depends = new OptionBool("List dependencies of given modules", "-M", "--depends")
+var opt_depends = new OptionBool("List dependencies of given modules", "-d", "--depends")
 var opt_paths = new OptionBool("List only path (instead of name + path)", "-p", "--path")
 
 tc.option_context.add_option(opt_keep, opt_recursive, opt_tree, opt_source, opt_project, opt_depends, opt_paths)
 tc.tooldescription = "Usage: nitls [OPTION]... <file.nit|directory>...\nLists the projects and/or paths of Nit sources files."
 tc.process_options(args)
 
-var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_project.value.to_i + opt_depends.value.to_i
+var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_project.value.to_i
 if sum > 1 then
 	print "Error: options --tree, --source, and --project are exclusives."
 	print tc.tooldescription
@@ -75,38 +75,35 @@ if opt_depends.value then
 	end
 
 	mb.parse(tc.option_context.rest)
-	for x in model.mmodules do
-		print x.location.file.filename
+else
+	var files
+	if opt_recursive.value then
+		files = new Array[String]
+		for d in tc.option_context.rest do
+			var pipe = new IProcess("find", d, "-name", "*.nit")
+			while not pipe.eof do
+				var l = pipe.read_line
+				if l == "" then break # last line
+				l = l.substring(0,l.length-1) # strip last oef
+				files.add l
+			end
+			pipe.close
+			pipe.wait
+			if pipe.status != 0 and not opt_keep.value then exit 1
+		end
+	else
+		files = tc.option_context.rest
 	end
-end
 
-if sum == 0 then opt_project.value = true
-
-var files
-if opt_recursive.value then
-	files = new Array[String]
-	for d in tc.option_context.rest do
-		var pipe = new IProcess("find", d, "-name", "*.nit")
-		while not pipe.eof do
-			var l = pipe.read_line
-			if l == "" then break # last line
-			l = l.substring(0,l.length-1) # strip last oef
-			files.add l
+	for a in files do
+		var mp = mb.identify_file(a)
+		if mp == null then
+			if not opt_keep.value then tc.check_errors
 		end
-		pipe.close
-		pipe.wait
-		if pipe.status != 0 and not opt_keep.value then exit 1
 	end
-else
-	files = tc.option_context.rest
 end
 
-for a in files do
-	var mp = mb.identify_file(a)
-	if mp == null then
-		if not opt_keep.value then tc.check_errors
-	end
-end
+if sum == 0 then opt_project.value = true
 
 if opt_tree.value then
 	var ot = new ProjTree