Merge lp:~joetalbott/utah/fetch_url into lp:utah

[Joe Talbott]

This update added several VCS related classes to support bzr and git repositories.

[Javier Collado (javier.collado)]

@Joe

I see the new VCSHandler classes, but I don't see where they are used. Is this supposed to be followed by more merge requests that replace fetch_cmd with fetch_url and fetch_type?

Aside from this, I think my only comment is that you can replace None checks like this one:
self.assertTrue(bzr is not None)

with something like:
self.assertIsNotNone(bzr)

review: Needs Information

[lp:~joetalbott/utah/fetch_url]

699. By Joe Talbott on 2012-10-09

vcs tests - Use assertIsNotNone() in place of assertTrie(... is not None)

Suggested-By: Javier Collado <email address hidden>

[Joe Talbott (joetalbott)]

@Javier

Yes this is just the foundation for the upcoming transition to 'fetch_method' and 'fetch_location'. I wanted to get it reviewed before proceeding.

I updated the the assertions. Thanks for the tip.

review: Needs Resubmitting

[Javier Collado (javier.collado)]

@Joe

Ok, I understand now. Looking forward to the next changes.

review: Approve

=== modified file 'utah/client/common.py'
--- utah/client/common.py	2012-10-03 09:09:49 +0000
+++ utah/client/common.py	2012-10-09 15:27:21 +0000
@@ -355,3 +355,69 @@
     match = pattern.match(host_info['media-info'])
 
     return match.group(1) if match else '?'
+
+# VCS Support
+# XXX: This maybe ought to be moved to another file
+REPO_DEFAULT_DIR = "."
+
+class VCSHandler(object):
+    """
+    Base class for Version Ccontrol System support.
+    """
+    repo = ""
+
+    def get(self, directory=REPO_DEFAULT_DIR):
+        """
+        Method to retrieve a copy of the repository
+        """
+        run_cmd(self.get_command, cwd=directory)
+
+    def revision(self, directory=REPO_DEFAULT_DIR):
+        """
+        get the revision number
+        """
+        retval = None
+        result = run_cmd(self.rev_command, cwd=directory)
+
+        if result['returncode'] == 0:
+            retval = result['stdout'].strip()
+        else:
+            print(result)
+
+        return retval
+
+class BzrHandler(VCSHandler):
+    """
+    bazaar handler.
+    """
+
+    def __init__(self, repo, options="", destination=""):
+        self.repo = repo
+        self.options = options
+        self.destination = destination
+
+        self.get_command = "bzr branch {} {} {}".format(
+                options,
+                self.repo,
+                destination,
+                )
+
+        self.rev_command = "bzr revno"
+
+class GitHandler(VCSHandler):
+    """
+    git handler.
+    """
+
+    def __init__(self, repo, options="", destination=""):
+        self.repo = repo
+        self.options = options
+        self.destination = destination
+
+        self.get_command = "git clone {} {} {}".format(
+                options,
+                self.repo,
+                destination,
+                )
+
+        self.rev_command = "git rev-parse HEAD"

=== added file 'utah/client/tests/test_vcs_bzr.py'
--- utah/client/tests/test_vcs_bzr.py	1970-01-01 00:00:00 +0000
+++ utah/client/tests/test_vcs_bzr.py	2012-10-09 15:27:21 +0000
@@ -0,0 +1,53 @@
+import os
+import shutil
+import unittest
+
+from utah.client.common import BzrHandler
+
+class TestBzrHandler(unittest.TestCase):
+    """
+    Test the bazaar VCS handler.
+    """
+
+    def test_init(self):
+        """
+        Test the initial setup.
+        """
+
+        repo = "https://code.launchpad.net/~utah/utah/dev/"
+        bzr = BzrHandler(repo=repo)
+
+        self.assertIsNotNone(bzr)
+        self.assertEqual(bzr.repo, repo)
+        self.assertEqual(bzr.get_command, "bzr branch  {} ".format(repo))
+        self.assertEqual(bzr.rev_command, "bzr revno")
+
+    def test_bzr_get(self):
+        repo = "https://code.launchpad.net/~utah/utah/dev/"
+        dest = "utah-dev"
+        bzr = BzrHandler(repo=repo, destination=dest)
+        directory = "/tmp"
+        path = os.path.join(directory, dest)
+
+        self.assertFalse(os.path.exists(path))
+
+        bzr.get(directory=directory)
+
+        self.assertTrue(os.path.exists(path))
+        shutil.rmtree(path)
+
+    def test_bzr_revision(self):
+        repo = "https://code.launchpad.net/~utah/utah/dev/"
+        dest = "utah-dev"
+        bzr = BzrHandler(repo=repo, destination=dest)
+        directory = "/tmp"
+        path = os.path.join(directory, dest)
+
+        self.assertFalse(os.path.exists(path))
+        bzr.get(directory=directory)
+        self.assertTrue(os.path.exists(path))
+
+        result = bzr.revision(directory=path)
+
+        shutil.rmtree(path)
+        self.assertEqual(type(int(result)), int)

=== added file 'utah/client/tests/test_vcs_git.py'
--- utah/client/tests/test_vcs_git.py	1970-01-01 00:00:00 +0000
+++ utah/client/tests/test_vcs_git.py	2012-10-09 15:27:21 +0000
@@ -0,0 +1,76 @@
+import os
+import shutil
+import unittest
+
+from utah.client.common import GitHandler, run_cmd
+
+GIT_TEST_REPO = "/tmp/utahgittest"
+
+def setUp():
+    """
+    Create a local git repository to test on.
+    """
+
+    # should fail if the repo already exists.
+    os.mkdir(GIT_TEST_REPO)
+
+    run_cmd("git init", cwd=GIT_TEST_REPO)
+    run_cmd("touch test.py", cwd=GIT_TEST_REPO)
+    run_cmd("git add test.py", cwd=GIT_TEST_REPO)
+    run_cmd("git commit -m'Initial import' test.py", cwd=GIT_TEST_REPO)
+
+def tearDown():
+    """
+    Remove the test repo.
+    """
+
+    # We should only ever get here if the repo was created in setUp().
+    shutil.rmtree(GIT_TEST_REPO)
+
+class TestGitHandler(unittest.TestCase):
+    """
+    Test the bazaar VCS handler.
+    """
+
+    def test_init(self):
+        """
+        Test the initial setup.
+        """
+
+        repo = GIT_TEST_REPO
+        git = GitHandler(repo=repo)
+
+        self.assertIsNotNone(git)
+        self.assertEqual(git.repo, repo)
+        self.assertEqual(git.get_command, "git clone  {} ".format(repo))
+        self.assertEqual(git.rev_command, "git rev-parse HEAD")
+
+    def test_git_get(self):
+        repo = GIT_TEST_REPO
+        dest = "utah-dev"
+        git = GitHandler(repo=repo, destination=dest)
+        directory = "/tmp"
+        path = os.path.join(directory, dest)
+
+        self.assertFalse(os.path.exists(path))
+
+        git.get(directory=directory)
+
+        self.assertTrue(os.path.exists(path))
+        shutil.rmtree(path)
+
+    def test_git_revision(self):
+        repo = GIT_TEST_REPO
+        dest = "utah-dev"
+        git = GitHandler(repo=repo, destination=dest)
+        directory = "/tmp"
+        path = os.path.join(directory, dest)
+
+        self.assertFalse(os.path.exists(path))
+        git.get(directory=directory)
+        self.assertTrue(os.path.exists(path))
+
+        result = git.revision(directory=path)
+
+        shutil.rmtree(path)
+        self.assertEqual(type(result), str)