[Checkins] SVN: z3c.checkversions/trunk/ Added a verbose option which prints old versions as well

Christophe Combelles ccomb at free.fr
Mon May 17 17:04:55 EDT 2010


Log message for revision 112431:
  Added a verbose option which prints old versions as well
  

Changed:
  U   z3c.checkversions/trunk/HISTORY.txt
  U   z3c.checkversions/trunk/z3c/checkversions/base.py
  U   z3c.checkversions/trunk/z3c/checkversions/buildout.py
  U   z3c.checkversions/trunk/z3c/checkversions/buildout.txt
  U   z3c.checkversions/trunk/z3c/checkversions/installed.py
  U   z3c.checkversions/trunk/z3c/checkversions/installed.txt
  U   z3c.checkversions/trunk/z3c/checkversions/main.py

-=-
Modified: z3c.checkversions/trunk/HISTORY.txt
===================================================================
--- z3c.checkversions/trunk/HISTORY.txt	2010-05-17 20:42:18 UTC (rev 112430)
+++ z3c.checkversions/trunk/HISTORY.txt	2010-05-17 21:04:55 UTC (rev 112431)
@@ -4,7 +4,8 @@
 0.2 (unreleased)
 ----------------
 
-- ...
+- added a verbose option to print old versions as well
+- updated metadata, doc and license
 
 0.1 (2010-05-16)
 ----------------

Modified: z3c.checkversions/trunk/z3c/checkversions/base.py
===================================================================
--- z3c.checkversions/trunk/z3c/checkversions/base.py	2010-05-17 20:42:18 UTC (rev 112430)
+++ z3c.checkversions/trunk/z3c/checkversions/base.py	2010-05-17 21:04:55 UTC (rev 112431)
@@ -19,8 +19,9 @@
     """Base class for version checkers
     """
     __custom_url = False
-    def __init__(self, filename=None, index_url=None):
+    def __init__(self, filename=None, index_url=None, verbose=False):
         self.filename = filename
+        self.verbose = verbose
         self.pi = package_index.PackageIndex()
         self._set_index_url(index_url)
         if index_url is not None:
@@ -61,10 +62,18 @@
                 new_dist = dist
                 break
 
-
             if new_dist and new_dist.parsed_version > parsed_version:
-                print("%s=%s" % (name, new_dist.version))
+                if self.verbose:
+                    print("%s=%s # was: %s" % (name, new_dist.version, version))
+                else:
+                    print("%s=%s" % (name, new_dist.version))
+            elif self.verbose:
+                print("%s=%s" % (name, version))
 
 
     def get_versions(self):
+        """Get a dict {'name': 'version', ...} with package versions to check.
+        This should be implemented by derived classes
+        """
         raise NotImplementedError
+

Modified: z3c.checkversions/trunk/z3c/checkversions/buildout.py
===================================================================
--- z3c.checkversions/trunk/z3c/checkversions/buildout.py	2010-05-17 20:42:18 UTC (rev 112430)
+++ z3c.checkversions/trunk/z3c/checkversions/buildout.py	2010-05-17 21:04:55 UTC (rev 112431)
@@ -27,7 +27,7 @@
         if not self.__custom_url:
             self._set_index_url(buildout_index)
 
-        print(u"Checking buildout file %s" % self.filename)
+        print(u"# Checking buildout file %s" % self.filename)
         return buildout['versions']
 
 

Modified: z3c.checkversions/trunk/z3c/checkversions/buildout.txt
===================================================================
--- z3c.checkversions/trunk/z3c/checkversions/buildout.txt	2010-05-17 20:42:18 UTC (rev 112430)
+++ z3c.checkversions/trunk/z3c/checkversions/buildout.txt	2010-05-17 21:04:55 UTC (rev 112431)
@@ -31,10 +31,10 @@
 >>> from z3c.checkversions import buildout
 >>> checker = buildout.Checker(filename=buildout_path)
 >>> checker.get_versions()
-Checking buildout file ...
+# Checking buildout file ...
 {'zope.interface': '3.4.0', 'zope.component': '3.4.0'}
 >>> checker.check()
-Checking buildout file ...
+# Checking buildout file ...
 Reading file:///.../zope.interface/
 zope.interface=3.6.1
 Reading file:///.../zope.component/
@@ -43,19 +43,31 @@
 We can check only the minor versions:
 
 >>> checker.check(level=2)
-Checking buildout file ...
+# Checking buildout file ...
 zope.interface=3.4.1
 
 We can provide a different index url:
 
 >>> checker = buildout.Checker(filename=buildout_path, index_url=testindex2)
 >>> checker.check()
-Checking buildout file ...
+# Checking buildout file ...
 Reading file:///.../zope.interface/
 zope.interface=3.6.2
 Reading file:///.../zope.component/
 zope.component=3.9.3
 
+The verbose mode gives the current and previous versions
+
+>>> checker = buildout.Checker(filename=buildout_path, verbose=True)
+>>> checker.check(level=2)
+# Checking buildout file ...
+Reading file:///.../zope.interface/
+zope.interface=3.4.1 # was: 3.4.0
+Reading file:///.../zope.component/
+zope.component=3.4.0
+
+
+
 console script
 --------------
 

Modified: z3c.checkversions/trunk/z3c/checkversions/installed.py
===================================================================
--- z3c.checkversions/trunk/z3c/checkversions/installed.py	2010-05-17 20:42:18 UTC (rev 112430)
+++ z3c.checkversions/trunk/z3c/checkversions/installed.py	2010-05-17 21:04:55 UTC (rev 112431)
@@ -21,7 +21,7 @@
     def get_versions(self, level=0):
         working_set = pkg_resources.working_set
         versions = dict([(d.key, d.version) for d in working_set])
-        print "Checking your installed distributions"
+        print "# Checking your installed distributions"
         return versions
 
 

Modified: z3c.checkversions/trunk/z3c/checkversions/installed.txt
===================================================================
--- z3c.checkversions/trunk/z3c/checkversions/installed.txt	2010-05-17 20:42:18 UTC (rev 112430)
+++ z3c.checkversions/trunk/z3c/checkversions/installed.txt	2010-05-17 21:04:55 UTC (rev 112431)
@@ -8,7 +8,7 @@
 
 >>> from pprint import pprint
 >>> versions = checker.get_versions()
-Checking your installed distributions
+# Checking your installed distributions
 >>> 'z3c.checkversions' in versions
 True
 

Modified: z3c.checkversions/trunk/z3c/checkversions/main.py
===================================================================
--- z3c.checkversions/trunk/z3c/checkversions/main.py	2010-05-17 20:42:18 UTC (rev 112430)
+++ z3c.checkversions/trunk/z3c/checkversions/main.py	2010-05-17 21:04:55 UTC (rev 112431)
@@ -37,6 +37,11 @@
                       dest='index',
                       help=u"Alternative package index URL")
 
+    parser.add_option('-v', '--verbose',
+                      dest='verbose',
+                      action='store_true',
+                      default=False,
+                      help=u"Verbose mode (prints old versions too)")
     options, args = parser.parse_args()
 
     if len(args) > 1:
@@ -52,10 +57,12 @@
 
     if buildoutcfg:
         import buildout
-        checker = buildout.Checker(filename=buildoutcfg, **kw)
+        checker = buildout.Checker(filename=buildoutcfg,
+                                   verbose=options.verbose,
+                                   **kw)
     else:
         import installed
-        checker = installed.Checker()
+        checker = installed.Checker(verbose=options.verbose)
 
     checker.check(level=options.level)
 



More information about the checkins mailing list