commit a688bb058312a8a7a08d91ef89b49217c48e3220
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Oct 3 14:19:59 2013 +0200
mvn_package: assume __default when package name is not provided
From now on mvn_package will by default set artifact to be installed into main
package (__default) if subpackage name is not provided on commandline
java-utils/mvn_package.py | 11 ++++++++---
test/data/mvn_package/single_00001.xml | 16 ++++++++++++++++
test/mvn_package_test.py | 11 +++++++++--
3 files changed, 33 insertions(+), 5 deletions(-)
---
diff --git a/java-utils/mvn_package.py b/java-utils/mvn_package.py
index 8effce0..2662ae5 100644
--- a/java-utils/mvn_package.py
+++ b/java-utils/mvn_package.py
@@ -41,7 +41,7 @@ class SaneParser(optparse.OptionParser):
def format_epilog(self, formatter):
return self.epilog
-usage="usage: %prog [options] <MVN spec> <package>"
+usage="usage: %prog [options] <MVN spec> [<package>]"
epilog="""
MVN spec:
Specification of Maven artifact in following format:
@@ -65,8 +65,13 @@ if __name__ == "__main__":
sys.argv[index] = arg.decode(sys.getfilesystemencoding())
(options, args) = parser.parse_args()
- if len(args) != 2:
- parser.error("Exactly 2 arguments are required")
+
+ if len(args) == 0:
+ parser.error("At least one argument required")
+ elif len(args) > 2:
+ parser.error("At most 2 arguments are expected")
+ elif len(args) == 1:
+ args.append("__default")
try:
orig = Artifact.from_mvn_str(args[0])
diff --git a/test/data/mvn_package/single_00001.xml
b/test/data/mvn_package/single_00001.xml
new file mode 100644
index 0000000..2fe49d9
--- /dev/null
+++ b/test/data/mvn_package/single_00001.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<configuration
xmlns="http://fedorahosted.org/xmvn/CONFIG/0.6.0">
+
+
+
+ <!--XMvn configuration file generated by javapackages.xmvn_config (part of
javapackages-tools)-->
+ <artifactManagement>
+ <rule>
+ <artifactGlob>
+ <artifactId>bbb</artifactId>
+ <groupId>aaa</groupId>
+ </artifactGlob>
+ <targetPackage>__default</targetPackage>
+ </rule>
+ </artifactManagement>
+</configuration>
diff --git a/test/mvn_package_test.py b/test/mvn_package_test.py
index 95de076..7b17e3a 100644
--- a/test/mvn_package_test.py
+++ b/test/mvn_package_test.py
@@ -107,8 +107,15 @@ class TestMvnmvn_package(unittest.TestCase):
@xmvnconfig('mvn_package',['aaa:bbb', ])
def test_single(self, stdout, stderr, return_value):
- self.assertNotEqual(return_value, 0)
- self.assertTrue(stderr)
+ self.assertEqual(return_value, 0)
+ filelist = get_config_file_list()
+ self.assertEquals(len(filelist), get_expected_file_count('mvn_package',
+ 'single'))
+ for file in filelist:
+ self.assertEquals(get_actual_config(file),
+ get_expected_config(file,
+ 'mvn_package',
+ 'single'))
@xmvnconfig('mvn_package',['aaa:bbb', 'pack', 'evil',
])
def test_more(self, stdout, stderr, return_value):