Make scm check support more generic and use gitweb

5 files changed, 35 insertions, 35 deletions

diff --git a/cnucnu.py b/cnucnu.py
index 05d9cd8..a0cd3e0 100755
--- a/cnucnu.py
+++ b/cnucnu.py
@@ -24,7 +24,7 @@ from cnucnu.config import global_config
 from cnucnu.package_list import Repository, PackageList, Package
 from cnucnu.checkshell import CheckShell
 from cnucnu.bugzilla_reporter import BugzillaReporter
-from cnucnu.cvs import CVS
+from cnucnu.scm import SCM
 
 import pprint as pprint_module
 pp = pprint_module.PrettyPrinter(indent=4)
@@ -74,11 +74,11 @@ if __name__ == '__main__':
     elif options.action == "create-bugs":
         br = BugzillaReporter(global_config.bugzilla_config)
         repo = Repository(**global_config.config["repo"])
-        cvs = CVS(**global_config.config["cvs"])
+        scm = SCM(**global_config.config["scm"])
 
         outdated = []
 
-        pl = PackageList(repo=repo, cvs=cvs, br=br, **global_config.config["package list"])
+        pl = PackageList(repo=repo, scm=scm, br=br, **global_config.config["package list"])
         for p in pl:
             if p.name >= options.start_with:
                 print "testing: %s" % p.name
diff --git a/cnucnu/checkshell.py b/cnucnu/checkshell.py
index ba9fc31..bd6aff8 100644
--- a/cnucnu/checkshell.py
+++ b/cnucnu/checkshell.py
@@ -24,7 +24,7 @@ import readline
 from package_list import Package, PackageList, Repository
 from bugzilla_reporter import BugzillaReporter
 from helper import pprint
-from cvs import CVS
+from scm import SCM
 from errors import UpstreamVersionRetrievalError
 
 class CheckShell(cmd.Cmd):
@@ -39,7 +39,7 @@ class CheckShell(cmd.Cmd):
         self.update_prompt()
         self.config = config
         self._br = None
-        self.cvs = CVS()
+        self.scm = SCM()
 
     @property
     def package_list(self):
@@ -130,11 +130,11 @@ class CheckShell(cmd.Cmd):
                 if self.package.name:
                     print "%(repo_name)s Version: %(repo_version)s %(repo_release)s %(status)s" % self.package
 
-#                    sourcefile = self.package.upstream_version_in_cvs
-#                    if sourcefile:
-#                        print "Found in CVS:", sourcefile
-#                    else:
-#                        print "Not Found in CVS"
+                    sourcefile = self.package.upstream_version_in_scm
+                    if sourcefile:
+                        print "Found in SCM:", sourcefile
+                    else:
+                        print "Not Found in SCM"
                     bug = self.package.exact_outdated_bug
                     if bug:
                         print "Exact Bug:", "%s %s:%s" % (self.br.bug_url(bug), bug.bug_status, bug.short_desc)
diff --git a/cnucnu/config.py b/cnucnu/config.py
index 72b266e..feb2654 100755
--- a/cnucnu/config.py
+++ b/cnucnu/config.py
@@ -60,8 +60,8 @@ repo:
     path: 'http://kojipkgs.fedoraproject.org/mash/rawhide/source/SRPMS'
     name: Fedora Rawhide
 
-cvs:
-    viewvc_url: https://cvs.fedoraproject.org/viewvc/rpms/%(name)s/devel/sources?revision=HEAD
+scm:
+    view_scm_url: https://pkgs.fedoraproject.org/gitweb/?p=%(name)s.git;a=blob_plain;f=sources;hb=refs/heads/master
     cainfo: "fedora-server-ca.cert"
 
 package list:
diff --git a/cnucnu/package_list.py b/cnucnu/package_list.py
index 0a4fe4d..0af4f16 100755
--- a/cnucnu/package_list.py
+++ b/cnucnu/package_list.py
@@ -29,7 +29,7 @@ import urllib
 # cnucnu modules
 from bugzilla_reporter import BugzillaReporter
 from config import global_config
-from cvs import CVS
+from scm import SCM
 import errors as cc_errors
 import helper
 from helper import cmp_upstream_repo
@@ -86,7 +86,7 @@ class Repository:
 
 class Package(object):
 
-    def __init__(self, name, regex, url, repo=Repository(), cvs=CVS(), br=BugzillaReporter(), nagging=True):
+    def __init__(self, name, regex, url, repo=Repository(), scm=SCM(), br=BugzillaReporter(), nagging=True):
         # :TODO: add some sanity checks
         self.name = name
 
@@ -105,7 +105,7 @@ class Package(object):
 
         self.repo = repo
         self.repo_name = repo.name
-        self.cvs = cvs
+        self.scm = scm
         self.br = br
         self.nagging = nagging
 
@@ -312,8 +312,8 @@ class Package(object):
             return ""
 
     @property
-    def upstream_version_in_cvs(self):
-        return self.cvs.has_upstream_version(self)
+    def upstream_version_in_scm(self):
+        return self.scm.has_upstream_version(self)
 
     @property
     def exact_outdated_bug(self):
@@ -329,9 +329,9 @@ class Package(object):
                 print "Upstream of package not newer, report_outdated aborted!" + str(self)
                 return None
 
-#            if self.upstream_version_in_cvs:
-#                print "Upstream Version found in CVS, skipping bug report: %(name)s U:%(latest_upstream)s R:%(repo_version)s" % self
-#                return None
+            if self.upstream_version_in_scm:
+                print "Upstream Version found in SCM, skipping bug report: %(name)s U:%(latest_upstream)s R:%(repo_version)s" % self
+                return None
 
             return self.br.report_outdated(self, dry_run)
         else:
@@ -341,14 +341,14 @@ class Package(object):
 
 
 class PackageList:
-    def __init__(self, repo=Repository(), cvs=CVS(), br=BugzillaReporter(), mediawiki=False, packages=None):
+    def __init__(self, repo=Repository(), scm=SCM(), br=BugzillaReporter(), mediawiki=False, packages=None):
         """ A list of packages to be checked.
 
         :Parameters:
             repo : `cnucnu.Repository`
                 Repository to compare with upstream
-            cvs : `cnucnu.CVS`
-                CVS to compares sources files with upstream version
+            scm : `cnucnu.SCM`
+                SCM to compares sources files with upstream version
             mediawiki : dict
                 Get a list of package names, urls and regexes from a mediawiki page defined in the dict.
             packages : [cnucnu.Package]
@@ -382,7 +382,7 @@ class PackageList:
                 nagging = True
                 if name in ignore_packages:
                     nagging = False
-                packages.append(Package(name, regex, url, repo, cvs, br, nagging=nagging))
+                packages.append(Package(name, regex, url, repo, scm, br, nagging=nagging))
 
         self.packages = packages
         self.append = self.packages.append
diff --git a/cnucnu/scm.py b/cnucnu/scm.py
index d3ba2d0..d103dd6 100755
--- a/cnucnu/scm.py
+++ b/cnucnu/scm.py
@@ -22,23 +22,23 @@
 from helper import secure_download
 from config import global_config
 
-class CVS(object):
+class SCM(object):
     """ cainfo: filename :-/
     """
-    def __init__(self, viewvc_url="", cainfo=""):
-        defaults = global_config.config["cvs"]
+    def __init__(self, view_scm_url="", cainfo=""):
+        defaults = global_config.config["scm"]
 
-        if not viewvc_url:
-            viewvc_url = defaults["viewvc_url"]
+        if not view_scm_url:
+            view_scm_url = defaults["view_scm_url"]
 
         if not cainfo:
             cainfo = defaults["cainfo"]
 
-        self.viewvc_url = viewvc_url
+        self.view_scm_url = view_scm_url
         self.cainfo = cainfo
 
     def get_sources(self, package):
-        return secure_download(self.viewvc_url % package, cainfo=self.cainfo)
+        return secure_download(self.view_scm_url % package, cainfo=self.cainfo)
 
     def get_sourcefiles(self, package):
         sources = self.get_sources(package)
@@ -60,7 +60,7 @@ class CVS(object):
 
 
 if __name__ == '__main__':
-    cvs = CVS(**{"viewvc_url": "https://cvs.fedoraproject.org/viewvc/rpms/%(name)s/devel/sources?revision=HEAD", "cainfo": "fedora-server-ca.cert"})
+    scm = SCM(**{"view_scm_url": "https://pkgs.fedoraproject.org/gitweb/?p=%(name)s.git;a=blob_plain;f=sources;hb=refs/heads/master", "cainfo": "fedora-server-ca.cert"})
 
     from package_list import Package, Repository
 
@@ -69,7 +69,7 @@ if __name__ == '__main__':
     package = Package("crossvc", "", "", Repository())
     package._latest_upstream = "1.5.2-0"
 
-    print cvs.get_sources({"name": "crossvc"})
-    print cvs.get_sourcefiles({"name": "crossvc"})
-    print cvs.has_upstream_version(package)
+    print scm.get_sources({"name": "crossvc"})
+    print scm.get_sourcefiles({"name": "crossvc"})
+    print scm.has_upstream_version(package)