Merge lp:~jml/pkgme/drop-matchers into lp:pkgme

[Jonathan Lange]

Remove matchers from pkgme. Now in testtools 0.9.13 or later.

pkgme had some great file-based matchers. These have been submitted to testtools,
landed and released. That release of testtools is now on precise and is thus
available on every OS we care to support.

As such, we can delete the matchers from pkgme and use the ones in testtools.

pkgme-devportal uses these matchers, so this should not land until
https://code.launchpad.net/~jml/pkgme-devportal/matchers-from-testtools/+merge/118352
lands.

=== modified file 'NEWS.txt'
--- NEWS.txt	2012-08-03 15:47:04 +0000
+++ NEWS.txt	2012-08-06 13:33:36 +0000
@@ -1,11 +1,22 @@
+-*- rst -*-
 ==============
 NEWS for pkgme
 ==============
 
+NEXT
+====
+
+Changes
+-------
+
+ * Many matchers were removed from ``pkgme.testing``.  These matchers are now
+   available in `testtools <http://pypi.python.org/pypi/testtools>`_ 0.9.13 or
+   later.
+
 0.3 (2012-08-03)
 ================
 
-  * New release, lots of new features.
+ * New release, lots of new features.
 
 0.2 (201X-XX-XX)
 ================

=== modified file 'pkgme/testing.py'
--- pkgme/testing.py	2011-12-08 21:18:24 +0000
+++ pkgme/testing.py	2012-08-06 13:33:36 +0000
@@ -22,85 +22,6 @@
 from pkgme.write import write_file
 
 
-class PathMismatch(Mismatch):
-
-    def __init__(self, path):
-        self.path = path
-
-
-class PathDoesntExistMismatch(PathMismatch):
-
-    def describe(self):
-        return "%s does not exist." % self.path
-
-
-class PathIsNotDirectoryMismatch(PathMismatch):
-
-    def describe(self):
-        return "%s is not a directory." % self.path
-
-
-class PathExists(Matcher):
-
-    def match(self, path):
-        if not os.path.exists(path):
-            return PathDoesntExistMismatch(path)
-
-    def __str__(self):
-        return "Path exists"
-
-
-class IsDirectory(Matcher):
-
-    def match(self, path):
-        if not os.path.isdir(path):
-            return PathIsNotDirectoryMismatch(path)
-
-
-class DirExists(Matcher):
-
-    def match(self, path):
-        mismatch = PathExists().match(path)
-        if mismatch is not None:
-            return mismatch
-        return IsDirectory().match(path)
-
-    def __str__(self):
-        return "Path exists and is a directory"
-
-
-class DirContains(Matcher):
-
-    def __init__(self, filenames):
-        self.filenames = filenames
-
-    def match(self, path):
-        mismatch = PathExists().match(path)
-        if mismatch is not None:
-            return mismatch
-        mismatch = IsDirectory().match(path)
-        if mismatch is not None:
-            return mismatch
-        return Equals(sorted(self.filenames)).match(sorted(os.listdir(path)))
-
-
-class FileContains(Matcher):
-
-    def __init__(self, contents):
-        self.contents = contents
-
-    def match(self, path):
-        mismatch = PathExists().match(path)
-        if mismatch is not None:
-            return mismatch
-        with open(path) as f:
-            actual_contents = f.read()
-            return Equals(self.contents).match(actual_contents)
-
-    def __str__(self):
-        return "File at path exists and contains %s" % self.contents
-
-
 class TempdirFixture(Fixture):
 
     def setUp(self):

=== modified file 'pkgme/tests/test_script.py'
--- pkgme/tests/test_script.py	2012-07-20 19:24:04 +0000
+++ pkgme/tests/test_script.py	2012-08-06 13:33:36 +0000
@@ -8,7 +8,11 @@
     MonkeyPatch,
     )
 from testtools import TestCase
-from testtools.matchers import Not
+from testtools.matchers import (
+    DirContains,
+    DirExists,
+    Not,
+    )
 
 from pkgme.backend import (
     BackendSelector,
@@ -20,8 +24,6 @@
     )
 from pkgme.project_info import DictInfo
 from pkgme.testing import (
-    DirContains,
-    DirExists,
     TempdirFixture,
     )
 
@@ -106,8 +108,8 @@
     def test_nosign(self):
         tempdir = self.useFixture(TempdirFixture())
         self.create_marker_file(tempdir, prefix='foo')
-        output = self.run_script(tempdir.abspath('foo'), ['--nosign'])
-        changes_file = os.path.join(tempdir.path, 
+        self.run_script(tempdir.abspath('foo'), ['--nosign'])
+        changes_file = os.path.join(tempdir.path,
                                     "foo_0.0.0_source.changes")
         signature = open(changes_file)
         sig_text = signature.readlines()

=== modified file 'pkgme/tests/test_testing.py'
--- pkgme/tests/test_testing.py	2011-07-15 09:22:47 +0000
+++ pkgme/tests/test_testing.py	2012-08-06 13:33:36 +0000
@@ -1,10 +1,12 @@
 import os
 
 from testtools import TestCase
-
-from pkgme.testing import (
+from testtools.matchers import (
     DirExists,
     FileContains,
+    )
+
+from pkgme.testing import (
     TempdirFixture,
     )
 

=== modified file 'pkgme/tests/test_write.py'
--- pkgme/tests/test_write.py	2012-06-19 13:54:19 +0000
+++ pkgme/tests/test_write.py	2012-08-06 13:33:36 +0000
@@ -2,12 +2,14 @@
 
 from fixtures import TestWithFixtures
 from testtools import TestCase
-
-from pkgme.package_files import PackageFile
-from pkgme.testing import (
+from testtools.matchers import (
     DirExists,
     FileContains,
     PathExists,
+    )
+
+from pkgme.package_files import PackageFile
+from pkgme.testing import (
     TempdirFixture,
     )
 from pkgme.write import (