Browse Source

renaming g.search.module -> g.search.modules

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@66994 15284696-431f-4ddb-bdfa-cd5b030d7da7
Jachym Cepicky 9 năm trước cách đây
mục cha
commit
5f2b302693

+ 1 - 1
scripts/Makefile

@@ -21,7 +21,7 @@ SUBDIRS = \
 	g.extension \
 	g.extension \
 	g.extension.all \
 	g.extension.all \
 	g.manual \
 	g.manual \
-	g.search.module \
+	g.search.modules \
 	i.colors.enhance \
 	i.colors.enhance \
 	i.image.mosaic \
 	i.image.mosaic \
 	i.in.spotvgt \
 	i.in.spotvgt \

+ 1 - 1
scripts/g.search.module/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 MODULE_TOPDIR = ../..
 
 
-PGM = g.search.module
+PGM = g.search.modules
 
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 include $(MODULE_TOPDIR)/include/Make/Script.make
 
 

+ 4 - 4
scripts/g.search.module/g.search.module.html

@@ -5,13 +5,13 @@ description, keywords and optionally manpages too.
 
 
 <h2>NOTES</h2>
 <h2>NOTES</h2>
 
 
-There can be more keywords, <em>g.search.module</em> will search for each of them
+There can be more keywords, <em>g.search.modules</em> will search for each of them
 
 
 <h2>EXAMPLE</h2>
 <h2>EXAMPLE</h2>
 
 
 Search all modules, where keywords <em>buffer</em> OR <em>clip</em> can be found
 Search all modules, where keywords <em>buffer</em> OR <em>clip</em> can be found
 <div class="code"><pre>
 <div class="code"><pre>
-g.search.module keyword=buffer,clip
+g.search.modules keyword=buffer,clip
 
 
 r.circle
 r.circle
     keywords: raster,buffer,geometry,circle
     keywords: raster,buffer,geometry,circle
@@ -33,7 +33,7 @@ r.buffer
 Search all modules, where keywords <em>overlay</em> AND <em>clip</em> can be
 Search all modules, where keywords <em>overlay</em> AND <em>clip</em> can be
 found with some fancy terminal output
 found with some fancy terminal output
 <div class="code"><pre>
 <div class="code"><pre>
-g.search.module keyword=clip,overlay -a -c
+g.search.modules keyword=clip,overlay -a -c
 
 
 v.overlay
 v.overlay
     keywords: vector,geometry,spatial query,intersection,union,clip
     keywords: vector,geometry,spatial query,intersection,union,clip
@@ -42,7 +42,7 @@ v.overlay
 
 
 Search in manual pages too 
 Search in manual pages too 
 <div class="code"><pre>
 <div class="code"><pre>
-g.search.module -m keyword=kapri
+g.search.modules -m keyword=kapri
 
 
 db.execute
 db.execute
     keywords: database,attribute table,SQL
     keywords: database,attribute table,SQL

+ 2 - 2
scripts/g.search.module/g.search.module.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 ############################################################################
 ############################################################################
 #
 #
-# MODULE:	g.search.module
+# MODULE:	g.search.modules
 # AUTHOR(S):	Jachym Cepicky <jachym.cepicky gmail.com>
 # AUTHOR(S):	Jachym Cepicky <jachym.cepicky gmail.com>
-# PURPOSE:	g.search.module in grass modules using keywords
+# PURPOSE:	g.search.modules in grass modules using keywords
 # COPYRIGHT:	(C) 2015-2016 by the GRASS Development Team
 # COPYRIGHT:	(C) 2015-2016 by the GRASS Development Team
 #
 #
 #		This program is free software under the GNU General
 #		This program is free software under the GNU General

+ 7 - 7
scripts/g.search.module/testsuite/test_g_search_module.py

@@ -1,9 +1,9 @@
 """
 """
-TEST:      test_g_search_module.py
+TEST:      test_g.search.modules.py
 
 
 AUTHOR(S): Jachym Cepicky <jachym.cepicky gmail com>
 AUTHOR(S): Jachym Cepicky <jachym.cepicky gmail com>
 
 
-PURPOSE:   Test g.search.module script outputs
+PURPOSE:   Test g.search.modules script outputs
 
 
 COPYRIGHT: (C) 2015 Jachym Ceppicky, and by the GRASS Development Team
 COPYRIGHT: (C) 2015 Jachym Ceppicky, and by the GRASS Development Team
 
 
@@ -25,14 +25,14 @@ class TestSearchModule(TestCase):
 
 
     def test_terminal_output(self):
     def test_terminal_output(self):
         """ """
         """ """
-        module = SimpleModule('g.search.module', keyword="water")
+        module = SimpleModule('g.search.modules', keyword="water")
         self.assertModule(module)
         self.assertModule(module)
         stdout = module.outputs.stdout
         stdout = module.outputs.stdout
         self.assertEqual(stdout.split()[0], 'r.watershed')
         self.assertEqual(stdout.split()[0], 'r.watershed')
 
 
     def test_json_output(self):
     def test_json_output(self):
         import json
         import json
-        module = SimpleModule('g.search.module', keyword="water", flags="j")
+        module = SimpleModule('g.search.modules', keyword="water", flags="j")
         self.assertModule(module)
         self.assertModule(module)
         stdout = json.loads(module.outputs.stdout)
         stdout = json.loads(module.outputs.stdout)
         self.assertEqual(len(stdout), 6, 'Six modules found')
         self.assertEqual(len(stdout), 6, 'Six modules found')
@@ -40,14 +40,14 @@ class TestSearchModule(TestCase):
         self.assertTrue('keywords' in stdout[3]['attributes'])
         self.assertTrue('keywords' in stdout[3]['attributes'])
 
 
     def test_shell_outout(self):
     def test_shell_outout(self):
-        module = SimpleModule('g.search.module', keyword="water", flags="g")
+        module = SimpleModule('g.search.modules', keyword="water", flags="g")
         self.assertModule(module)
         self.assertModule(module)
         stdout = module.outputs.stdout.split()
         stdout = module.outputs.stdout.split()
         self.assertEqual(len(stdout), 6)
         self.assertEqual(len(stdout), 6)
         self.assertEqual(stdout[3], 'r.basins.fill')
         self.assertEqual(stdout[3], 'r.basins.fill')
 
 
     def test_colored_terminal(self):
     def test_colored_terminal(self):
-        module = SimpleModule('g.search.module', keyword="water", flags="c")
+        module = SimpleModule('g.search.modules', keyword="water", flags="c")
         self.assertModule(module)
         self.assertModule(module)
         stdout = module.outputs.stdout.split()
         stdout = module.outputs.stdout.split()
         self.assertEqual(stdout[0],
         self.assertEqual(stdout[0],
@@ -55,7 +55,7 @@ class TestSearchModule(TestCase):
                          attrs=['bold']))
                          attrs=['bold']))
 
 
     def test_manual_pages(self):
     def test_manual_pages(self):
-        module = SimpleModule('g.search.module', keyword="kapri", flags="gm")
+        module = SimpleModule('g.search.modules', keyword="kapri", flags="gm")
         self.assertModule(module)
         self.assertModule(module)
         stdout = module.outputs.stdout.split()
         stdout = module.outputs.stdout.split()
         self.assertEqual(len(stdout), 2)
         self.assertEqual(len(stdout), 2)