diff -Nru launch-control-tool-0.2.0~alpha1+102/COPYING launch-control-tool-0.2~0ubuntu3+106.3~maverick1/COPYING --- launch-control-tool-0.2.0~alpha1+102/COPYING 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/COPYING 2010-12-16 02:53:02.000000000 +0000 @@ -1,35 +1,165 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: Launch Control Tool -Maintainer: Linaro Infrastructure Team -Source: http://launchpad.net/launch-control/ - -Files: * -Copyright: 2010, Linaro Limited -License: LGPL-3 - -Files: launch_control_tool/mocker.py -Copyright: 2007-2010, Gustavo Niemeyer -License: - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - . - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff -Nru launch-control-tool-0.2.0~alpha1+102/COPYING.LGPL-3 launch-control-tool-0.2~0ubuntu3+106.3~maverick1/COPYING.LGPL-3 --- launch-control-tool-0.2.0~alpha1+102/COPYING.LGPL-3 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/COPYING.LGPL-3 1970-01-01 00:00:00.000000000 +0000 @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff -Nru launch-control-tool-0.2.0~alpha1+102/debian/bzr-builder.manifest launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/bzr-builder.manifest --- launch-control-tool-0.2.0~alpha1+102/debian/bzr-builder.manifest 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/bzr-builder.manifest 2010-12-16 02:53:02.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.2 deb-version {debupstream}+102-0ubuntu1~zyga1 -lp:launch-control-tool revid:zygmunt.krynicki@linaro.org-20101116125546-bvovkczis054omtu -nest packaging lp:~linaro-infrastructure/launch-control-tool/packaging debian revid:zygmunt.krynicki@linaro.org-20101116125853-bqr6pvgq7b7hnpr7 +# bzr-builder format 0.3 deb-version {debupstream}+106.3 +lp:launch-control-tool revid:zygmunt.krynicki@linaro.org-20101215154432-63o7iiwzicvc1mkq +nest packaging lp:~linaro-infrastructure/launch-control-tool/packaging debian revid:zygmunt.krynicki@linaro.org-20101210115622-7ukj2f1ylfvrp0rz diff -Nru launch-control-tool-0.2.0~alpha1+102/debian/changelog launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/changelog --- launch-control-tool-0.2.0~alpha1+102/debian/changelog 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/changelog 2010-12-16 02:53:02.000000000 +0000 @@ -1,8 +1,29 @@ -launch-control-tool (0.2.0~alpha1+102-0ubuntu1~zyga1~maverick1) maverick; urgency=low +launch-control-tool (0.2~0ubuntu3+106.3~maverick1) maverick; urgency=low * Auto build. - -- Zygmunt Krynicki Tue, 16 Nov 2010 15:00:40 +0000 + -- Launchpad Package Builder Thu, 16 Dec 2010 02:53:02 +0000 + +launch-control-tool (0.2~0ubuntu3) maverick; urgency=low + + * Shorter version string + + -- Zygmunt Krynicki Fri, 10 Dec 2010 12:54:08 +0100 + +launch-control-tool (0.2.0~0ubuntu2) maverick; urgency=low + + * Add python-argparse to dependencies + + -- Zygmunt Krynicki Thu, 25 Nov 2010 13:47:10 +0100 + +launch-control-tool (0.2.0~0ubuntu1) maverick; urgency=low + + * First public release + * Change debian/copyright to use released version of DEP5 + * Re-enable export DH_OPTIONS=--buildsystem=python_distutils + * Run unit tests while building + + -- Zygmunt Krynicki Thu, 25 Nov 2010 13:07:12 +0100 launch-control-tool (0.2.0~alpha1-0ubuntu1~zyga1) maverick; urgency=low diff -Nru launch-control-tool-0.2.0~alpha1+102/debian/control launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/control --- launch-control-tool-0.2.0~alpha1+102/debian/control 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/control 2010-12-16 02:53:02.000000000 +0000 @@ -2,11 +2,11 @@ Maintainer: Zygmunt Krynicki Section: utils Priority: optional -Build-Depends: python-setuptools (>= 0.6b3), debhelper (>= 7), python-support (>= 0.8.4) +Build-Depends: python-setuptools (>= 0.6b3), debhelper (>= 7), python-support (>= 0.8.4), python-argparse Standards-Version: 3.8.4 Package: launch-control-tool Architecture: all -Depends: ${misc:Depends}, ${python:Depends} +Depends: ${misc:Depends}, ${python:Depends}, python-argparse XB-Python-Version: ${python:Versions} Description: Command line utility for launch-control diff -Nru launch-control-tool-0.2.0~alpha1+102/debian/copyright launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/copyright --- launch-control-tool-0.2.0~alpha1+102/debian/copyright 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/copyright 2010-12-16 02:53:02.000000000 +0000 @@ -1,5 +1,5 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: Launch Control Tool +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: launch-control-tool Maintainer: Linaro Infrastructure Team Source: http://launchpad.net/launch-control/ diff -Nru launch-control-tool-0.2.0~alpha1+102/debian/rules launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/rules --- launch-control-tool-0.2.0~alpha1+102/debian/rules 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/debian/rules 2010-12-16 02:53:02.000000000 +0000 @@ -13,8 +13,10 @@ unexport LDFLAGS #exports specified using stdeb Setup-Env-Vars: -# export DH_OPTIONS=--buildsystem=python_distutils +export DH_OPTIONS=--buildsystem=python_distutils +override_dh_auto_test: + ./setup.py test %: dh $@ diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/commands/dashboard.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/commands/dashboard.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/commands/dashboard.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/commands/dashboard.py 2010-12-16 02:53:02.000000000 +0000 @@ -2,19 +2,19 @@ # # Author: Zygmunt Krynicki # -# This file is part of Launch Control. +# This file is part of launch-control-tool. # -# Launch Control is free software: you can redistribute it and/or modify +# launch-control-tool is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 3 # as published by the Free Software Foundation # -# Launch Control is distributed in the hope that it will be useful, +# launch-control-tool is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . +# along with launch-control-tool. If not, see . """ Module with command-line tool commands that interact with the dashboard @@ -269,9 +269,6 @@ socket and XML-RPC errors and prints a pretty error message. """ - __abstract__ = True - - @staticmethod def _construct_xml_rpc_url(url): """ @@ -343,8 +340,6 @@ Display dashboard server version """ - __abstract__ = False - def invoke_remote(self): print "Dashboard server version: %s" % (self.server.version(),) @@ -353,7 +348,6 @@ """ Upload a bundle on the server """ - __abstract__ = False @classmethod def register_arguments(cls, parser): @@ -386,7 +380,6 @@ """ Download a bundle from the server """ - __abstract__ = False @classmethod def register_arguments(cls, parser): @@ -431,7 +424,6 @@ """ Deserialize a bundle on the server """ - __abstract__ = False @classmethod def register_arguments(cls, parser): @@ -461,7 +453,6 @@ """ Show streams you have access to """ - __abstract__ = False renderer = DataSetRenderer( order = ('pathname', 'bundle_count', 'name'), @@ -485,7 +476,6 @@ """ Show bundles in the specified stream """ - __abstract__ = False renderer = DataSetRenderer( column_map = { diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/commands/__init__.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/commands/__init__.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/commands/__init__.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/commands/__init__.py 2010-12-16 02:53:02.000000000 +0000 @@ -2,24 +2,20 @@ # # Author: Zygmunt Krynicki # -# This file is part of Launch Control. +# This file is part of launch-control-tool. # -# Launch Control is free software: you can redistribute it and/or modify +# launch-control-tool is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 3 # as published by the Free Software Foundation # -# Launch Control is distributed in the hope that it will be useful, +# launch-control-tool is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . +# along with launch-control-tool. If not, see . """ Package with command line commands """ - -# Trigger command registration -from launch_control_tool.commands import misc -from launch_control_tool.commands import dashboard diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/commands/misc.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/commands/misc.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/commands/misc.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/commands/misc.py 2010-12-16 02:53:02.000000000 +0000 @@ -2,19 +2,19 @@ # # Author: Zygmunt Krynicki # -# This file is part of Launch Control. +# This file is part of launch-control-tool. # -# Launch Control is free software: you can redistribute it and/or modify +# launch-control-tool is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 3 # as published by the Free Software Foundation # -# Launch Control is distributed in the hope that it will be useful, +# launch-control-tool is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . +# along with launch-control-tool. If not, see . """ Module with miscellaneous commands (such as help and version) diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/dispatcher.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/dispatcher.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/dispatcher.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/dispatcher.py 2010-12-16 02:53:02.000000000 +0000 @@ -2,28 +2,26 @@ # # Author: Zygmunt Krynicki # -# This file is part of Launch Control. +# This file is part of launch-control-tool. # -# Launch Control is free software: you can redistribute it and/or modify +# launch-control-tool is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 3 # as published by the Free Software Foundation # -# Launch Control is distributed in the hope that it will be useful, +# launch-control-tool is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . +# along with launch-control-tool. If not, see . """ Module with LaunchControlDispatcher - the command dispatcher """ import argparse -import sys - -from launch_control_tool.interface import Command +import pkg_resources class LaunchControlDispatcher(object): @@ -34,7 +32,7 @@ def __init__(self): self.parser = argparse.ArgumentParser( description=""" - Command line tool for interacting with Launch Control + Command line tool for interacting with Launch Control """, epilog=""" Please report all bugs using the Launchpad bug tracker: @@ -43,9 +41,8 @@ add_help=False) self.subparsers = self.parser.add_subparsers( title="Sub-command to invoke") - for command_cls in Command.get_subclasses(): - if getattr(command_cls, '__abstract__', False): - continue + for entrypoint in pkg_resources.iter_entry_points("launch_control_tool.commands"): + command_cls = entrypoint.load() sub_parser = self.subparsers.add_parser( command_cls.get_name(), help=command_cls.get_help()) @@ -59,5 +56,6 @@ def main(): - sys.exit(LaunchControlDispatcher().dispatch()) + raise SystemExit( + LaunchControlDispatcher().dispatch()) diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/__init__.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/__init__.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/__init__.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/__init__.py 2010-12-16 02:53:02.000000000 +0000 @@ -2,35 +2,38 @@ # # Author: Zygmunt Krynicki # -# This file is part of Launch Control. +# This file is part of launch-control-tool. # -# Launch Control is free software: you can redistribute it and/or modify +# launch-control-tool is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 3 # as published by the Free Software Foundation # -# Launch Control is distributed in the hope that it will be useful, +# launch-control-tool is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . +# along with launch-control-tool. If not, see . """ -Launch Control +Launch Control Tool package """ -__version__ = (0, 2, 0, "alpha", 0) +__version__ = (0, 3, 0, "dev", 0) def get_version(): """ - Return a string representing the version of launch_control_tool package + Return a string representing the version of this package """ + # XXX: I should get this code in a common library someday major, minor, micro, releaselevel, serial = __version__ - assert releaselevel in ('alpha', 'beta', 'candidate', 'final') - base_version = "%s.%s.%s" % (major, minor, micro) + assert releaselevel in ('dev', 'alpha', 'beta', 'candidate', 'final') + base_version = "%s.%s" % (major, minor) + if micro != 0: + base_version += ".%s" % micro if releaselevel != 'final': base_version += "-%s" % releaselevel return base_version diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/interface.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/interface.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/interface.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/interface.py 2010-12-16 02:53:02.000000000 +0000 @@ -2,19 +2,19 @@ # # Author: Zygmunt Krynicki # -# This file is part of Launch Control. +# This file is part of launch-control-tool. # -# Launch Control is free software: you can redistribute it and/or modify +# launch-control-tool is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 3 # as published by the Free Software Foundation # -# Launch Control is distributed in the hope that it will be useful, +# launch-control-tool is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . +# along with launch-control-tool. If not, see . """ Interface for all launch-control-tool commands @@ -22,10 +22,8 @@ import inspect -from launch_control_tool.registry import RegistryBase - -class Command(RegistryBase): +class Command(object): """ Base class for all command line tool sub-commands. """ diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/registry.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/registry.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/registry.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/registry.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -# Copyright (C) 2010 Linaro Limited -# -# Author: Zygmunt Krynicki -# -# This file is part of Launch Control. -# -# Launch Control is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# as published by the Free Software Foundation -# -# Launch Control is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . - -""" -Module with RegistryMeta and RegistryBase -""" - -class RegistryMeta(type): - """ - Meta class for handling automatic registration of implementing - classes. Allows to query for all sub-classes of any class in the - inheritance chain. - - Since people don't like to use meta-classes directly there is a - class with convenience API called RegistryBase. - """ - - def __new__(mcls, name, bases, namespace): - cls = super(RegistryMeta, mcls).__new__(mcls, name, bases, namespace) - cls._subclasses = [] - for base_cls in bases: - if hasattr(base_cls, '_subclasses'): - base_cls._subclasses.append(cls) - return cls - - -class RegistryBase(object): - """ - Convenience class for using RegistryMeta meta-class. - - All sub-classes of this class gain two methods: - get_direct_subclasses() - get_subclasses() - """ - __metaclass__ = RegistryMeta - - @classmethod - def get_direct_subclasses(cls): - """ - Return all direct subclasses of this class - - Example: - >>> class A(RegistryBase): pass - >>> class B(A): pass - >>> A.get_direct_subclasses() - [] - """ - return cls._subclasses - - @classmethod - def get_subclasses(cls): - """ - Return all subclasses of this class - - Example: - >>> class A(RegistryBase): pass - >>> class B(A): pass - >>> class C(B): pass - >>> A.get_subclasses() - [, ] - """ - result = list(cls._subclasses) - for scls in cls._subclasses: - result.extend(scls.get_subclasses()) - return result diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/tests/__init__.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/tests/__init__.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/tests/__init__.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/tests/__init__.py 2010-12-16 02:53:02.000000000 +0000 @@ -2,19 +2,19 @@ # # Author: Zygmunt Krynicki # -# This file is part of Launch Control. +# This file is part of launch-control-tool. # -# Launch Control is free software: you can redistribute it and/or modify +# launch-control-tool is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 3 # as published by the Free Software Foundation # -# Launch Control is distributed in the hope that it will be useful, +# launch-control-tool is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . +# along with launch-control-tool. If not, see . """ Package with unit tests for launch_control_tool @@ -31,14 +31,12 @@ 'launch_control_tool.commands.misc', 'launch_control_tool.dispatcher', 'launch_control_tool.interface', - 'launch_control_tool.registry', ] def test_modules(): return [ 'launch_control_tool.tests.test_commands', - 'launch_control_tool.tests.test_registry', ] diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/tests/test_commands.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/tests/test_commands.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/tests/test_commands.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/tests/test_commands.py 2010-12-16 02:53:02.000000000 +0000 @@ -2,19 +2,19 @@ # # Author: Zygmunt Krynicki # -# This file is part of Launch Control. +# This file is part of launch-control-tool. # -# Launch Control is free software: you can redistribute it and/or modify +# launch-control-tool is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 3 # as published by the Free Software Foundation # -# Launch Control is distributed in the hope that it will be useful, +# launch-control-tool is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . +# along with launch-control-tool. If not, see . """ Unit tests for the launch_control.commands package @@ -76,40 +76,6 @@ class DispatcherTestCase(MockerTestCase): - def test_command_registration(self): - TestCmd = self.mocker.mock() - Command = self.mocker.replace('launch_control_tool.interface.Command') - expect(Command.get_subclasses()).result([TestCmd]) - expect(TestCmd.__abstract__).result(False) - expect(TestCmd.get_name()).result("TestCmd") - expect(TestCmd.get_help()).result("test command") - expect(TestCmd.register_arguments(ANY)) - self.mocker.replay() - lcd = LaunchControlDispatcher() - - def test_command_registration_skips_abstract_classes(self): - TestCmd = self.mocker.mock() - Command = self.mocker.replace('launch_control_tool.interface.Command') - expect(Command.get_subclasses()).result([TestCmd]) - expect(TestCmd.__abstract__).result(True) - self.mocker.replay() - lcd = LaunchControlDispatcher() - - def test_command_dispatch(self): - TestCmd = self.mocker.mock() - test_cmd_obj = self.mocker.mock() - Command = self.mocker.replace('launch_control_tool.interface.Command') - expect(Command.get_subclasses()).result([TestCmd]) - expect(TestCmd.__abstract__).result(False) - expect(TestCmd.get_name()).result("TestCmd") - expect(TestCmd.get_help()).result("test command") - expect(TestCmd.register_arguments(ANY)) - expect(TestCmd(ANY, ANY)).result(test_cmd_obj) - expect(test_cmd_obj.invoke()) - self.mocker.replay() - lcd = LaunchControlDispatcher() - lcd.dispatch(["TestCmd"]) - def test_main(self): LaunchControlDispatcher = self.mocker.replace('launch_control_tool.dispatcher.LaunchControlDispatcher') LaunchControlDispatcher().dispatch() diff -Nru launch-control-tool-0.2.0~alpha1+102/launch_control_tool/tests/test_registry.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/tests/test_registry.py --- launch-control-tool-0.2.0~alpha1+102/launch_control_tool/tests/test_registry.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/launch_control_tool/tests/test_registry.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -# Copyright (C) 2010 Linaro Limited -# -# Author: Zygmunt Krynicki -# -# This file is part of Launch Control. -# -# Launch Control is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# as published by the Free Software Foundation -# -# Launch Control is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . - -""" -Unit tests for launch_control.utils.registry module -""" - -from unittest import TestCase - -from launch_control_tool.registry import RegistryBase - - -class AutoRegisterTypeTestCase(TestCase): - def test_registeration(self): - class A(RegistryBase): - pass - self.assertEqual(A.get_direct_subclasses(), []) - self.assertEqual(A.get_subclasses(), []) - class B(A): - pass - self.assertEqual(A.get_direct_subclasses(), [B]) - self.assertEqual(A.get_subclasses(), [B]) - self.assertEqual(B.get_direct_subclasses(), []) - self.assertEqual(B.get_subclasses(), []) - class C(B): - pass - self.assertEqual(A.get_direct_subclasses(), [B]) - self.assertEqual(A.get_subclasses(), [B, C]) - self.assertEqual(B.get_direct_subclasses(), [C]) - self.assertEqual(B.get_subclasses(), [C]) - self.assertEqual(C.get_direct_subclasses(), []) - self.assertEqual(C.get_subclasses(), []) diff -Nru launch-control-tool-0.2.0~alpha1+102/lc-tool.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/lc-tool.py --- launch-control-tool-0.2.0~alpha1+102/lc-tool.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/lc-tool.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -#!/usr/bin/python -# lc-tool - command line interface for validation dashboard -# -# Copyright (C) 2010 Linaro Limited -# -# Author: Zygmunt Krynicki -# -# This file is part of Launch Control. -# -# Launch Control is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# as published by the Free Software Foundation -# -# Launch Control is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . - - -if __name__ == '__main__': - try: - import launch_control_tool.commands - from launch_control_tool.dispatcher import main - except ImportError: - print "Unable to import launch_control.commands.dispatcher" - print "Your installation is probably faulty" - raise - else: - main() diff -Nru launch-control-tool-0.2.0~alpha1+102/setup.py launch-control-tool-0.2~0ubuntu3+106.3~maverick1/setup.py --- launch-control-tool-0.2.0~alpha1+102/setup.py 2010-11-16 15:00:40.000000000 +0000 +++ launch-control-tool-0.2~0ubuntu3+106.3~maverick1/setup.py 2010-12-16 02:53:02.000000000 +0000 @@ -4,19 +4,19 @@ # # Author: Zygmunt Krynicki # -# This file is part of Launch Control. +# This file is part of launch-control-tool. # -# Launch Control is free software: you can redistribute it and/or modify +# launch-control-tool is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License version 3 # as published by the Free Software Foundation # -# Launch Control is distributed in the hope that it will be useful, +# launch-control-tool is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU Lesser General Public License -# along with Launch Control. If not, see . +# along with launch-control-tool. If not, see . from setuptools import setup, find_packages @@ -24,17 +24,29 @@ setup( - name = 'launch_control_tool', + name = 'launch-control-tool', version = get_version(), author = "Zygmunt Krynicki", author_email = "zygmunt.krynicki@linaro.org", packages = find_packages(), - scripts = ['lc-tool.py'], - description = "Command line utility for launch-control", + description = "Command line utility for Launch Control", url='https://launchpad.net/launch-control-tool', test_suite='launch_control_tool.tests.test_suite', + entry_points = """ + [console_scripts] + lc-tool = launch_control_tool.dispatcher:main + [launch_control_tool.commands] + bundles = launch_control_tool.commands.dashboard:bundles + deserialize = launch_control_tool.commands.dashboard:deserialize + get = launch_control_tool.commands.dashboard:get + help = launch_control_tool.commands.misc:help + put = launch_control_tool.commands.dashboard:put + server_version = launch_control_tool.commands.dashboard:server_version + streams = launch_control_tool.commands.dashboard:streams + version = launch_control_tool.commands.misc:version + """, classifiers=[ - "Development Status :: 3 - Alpha", + "Development Status :: 4 - Beta", "Intended Audience :: Developers", "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)", "Operating System :: OS Independent",