Merge branch 'skyl-source_control-executable' into devel

library/source_control/bzr

@@ -50,6 +50,13 @@ options:
         description:
             - If C(yes), any modified files in the working
               tree will be discarded.
+    executable:
+        required: false
+        default: null
+        version_added: "1.4"
+        description:
+            - Path to bzr executable to use. If not supplied,
+            the normal mechanism for resolving binary paths will be used.
 '''
 
 EXAMPLES = '''
@@ -58,67 +65,79 @@ EXAMPLES = '''
 '''
 
 import re
-import tempfile
+
-
+
-def get_version(dest):
+class Bzr(object):
-    ''' samples the version of the bzr branch'''
+    def __init__(self, module, parent, dest, version, bzr_path):
-    os.chdir(dest)
+        self.module = module
-    cmd = "bzr revno"
+        self.parent = parent
-    revno = os.popen(cmd).read().strip()
+        self.dest = dest
-    return revno
+        self.version = version
-
+        self.bzr_path = bzr_path
-def clone(module, parent, dest, version):
+
-    ''' makes a new bzr branch if it does not already exist '''
+    def _command(self, args_list, **kwargs):
-    dest_dirname = os.path.dirname(dest)
+        (rc, out, err) = self.module.run_command(
-    try:
+            [self.bzr_path] + args_list, **kwargs)
-        os.makedirs(dest_dirname)
+        return (rc, out, err)
-    except:
+
-        pass
+    def get_version(self):
-    os.chdir(dest_dirname)
+        '''samples the version of the bzr branch'''
-    if version.lower() != 'head':
+        os.chdir(self.dest)
-        cmd = "bzr branch -r %s %s %s" % (version, parent, dest)
+        cmd = "%s revno" % self.bzr_path
-    else:
+        revno = os.popen(cmd).read().strip()
-        cmd = "bzr branch %s %s" % (parent, dest)
+        return revno
-    return module.run_command(cmd, check_rc=True)
+
-
+    def clone(self):
-def has_local_mods(dest):
+        '''makes a new bzr branch if it does not already exist'''
-    os.chdir(dest)
+        dest_dirname = os.path.dirname(self.dest)
-    cmd = "bzr status -S"
+        try:
-    lines = os.popen(cmd).read().splitlines()
+            os.makedirs(dest_dirname)
-    lines = filter(lambda c: not re.search('^\\?\\?.*$', c), lines)
+        except:
-    return len(lines) > 0
+            pass
-
+        os.chdir(dest_dirname)
-def reset(module,dest,force):
+        if self.version.lower() != 'head':
-    '''
+            args_list = ["branch", "-r", self.version, self.parent, self.dest]
-    Resets the index and working tree to head.
+        else:
-    Discards any changes to tracked files in the working
+            args_list = ["branch", self.parent, self.dest]
-    tree since that commit.
+        return self._command(args_list, check_rc=True)
-    '''
+
-    os.chdir(dest)
+    def has_local_mods(self):
-    if not force and has_local_mods(dest):
+        os.chdir(self.dest)
-        module.fail_json(msg="Local modifications exist in branch (force=no).")
+        cmd = "%s status -S" % self.bzr_path
-    return module.run_command("bzr revert", check_rc=True)
+        lines = os.popen(cmd).read().splitlines()
-
+        lines = filter(lambda c: not re.search('^\\?\\?.*$', c), lines)
-def fetch(module, dest, version):
+        return len(lines) > 0
-    ''' updates branch from remote sources '''
+
-    os.chdir(dest)
+    def reset(self, force):
-    if version.lower() != 'head':
+        '''
-        (rc, out, err) = module.run_command("bzr pull -r %s" % version)
+        Resets the index and working tree to head.
-    else:
+        Discards any changes to tracked files in the working
-        (rc, out, err) = module.run_command("bzr pull")
+        tree since that commit.
-    if rc != 0:
+        '''
-        module.fail_json(msg="Failed to pull")
+        os.chdir(self.dest)
-    return (rc, out, err)
+        if not force and self.has_local_mods():
-
+            self.module.fail_json(msg="Local modifications exist in branch (force=no).")
-def switch_version(module, dest, version):
+        return self._command(["revert"], check_rc=True)
-    ''' once pulled, switch to a particular revno or revid'''
+
-    os.chdir(dest)
+    def fetch(self):
-    cmd = ''
+        '''updates branch from remote sources'''
-    if version.lower() != 'head':
+        os.chdir(self.dest)
-        cmd = "bzr revert -r %s" % version
+        if self.version.lower() != 'head':
-    else:
+            (rc, out, err) = self._command(["pull", "-r", self.version])
-        cmd = "bzr revert"
+        else:
-    return module.run_command(cmd, check_rc=True)
+            (rc, out, err) = self._command(["pull"])
+        if rc != 0:
+            self.module.fail_json(msg="Failed to pull")
+        return (rc, out, err)
+
+    def switch_version(self):
+        '''once pulled, switch to a particular revno or revid'''
+        os.chdir(self.dest)
+        if self.version.lower() != 'head':
+            args_list = ["revert", "-r", self.version]
+        else:
+            args_list = ["revert"]
+        return self._command(args_list, check_rc=True)
 
 # ===========================================
 
@@ -128,7 +147,8 @@ def main():
             dest=dict(required=True),
             name=dict(required=True, aliases=['parent']),
             version=dict(default='head'),
-            force=dict(default='yes', type='bool')
+            force=dict(default='yes', type='bool'),
+            executable=dict(default=None),
         )
     )
 
@@ -136,34 +156,38 @@ def main():
     parent  = module.params['name']
     version = module.params['version']
     force   = module.params['force']
+    bzr_path = module.params['executable'] or module.get_bin_path('bzr', True)
 
     bzrconfig = os.path.join(dest, '.bzr', 'branch', 'branch.conf')
 
     rc, out, err, status = (0, None, None, None)
 
+    bzr = Bzr(module, parent, dest, version, bzr_path)
+
     # if there is no bzr configuration, do a branch operation
     # else pull and switch the version
     before = None
     local_mods = False
     if not os.path.exists(bzrconfig):
-        (rc, out, err) = clone(module, parent, dest, version)
+        (rc, out, err) = bzr.clone()
+
     else:
         # else do a pull
-        local_mods = has_local_mods(dest)
+        local_mods = bzr.has_local_mods()
-        before = get_version(dest)
+        before = bzr.get_version()
-        (rc, out, err) = reset(module, dest, force)
+        (rc, out, err) = bzr.reset(force)
         if rc != 0:
             module.fail_json(msg=err)
-        (rc, out, err) = fetch(module, dest, version)
+        (rc, out, err) = bzr.fetch()
         if rc != 0:
             module.fail_json(msg=err)
 
     # switch to version specified regardless of whether
     # we cloned or pulled
-    (rc, out, err) = switch_version(module, dest, version)
+    (rc, out, err) = bzr.switch_version()
 
     # determine if we changed anything
-    after = get_version(dest)
+    after = bzr.get_version()
     changed = False
 
     if before != after or local_mods:

library/source_control/git

@@ -73,6 +73,13 @@ options:
             - If C(yes), repository will be updated using the supplied
               remote.  Otherwise the repo will be left untouched.
               Prior to 1.2, this was always 'yes' and could not be disabled.
+    executable:
+        required: false
+        default: null
+        version_added: "1.4"
+        description:
+            - Path to git executable to use. If not supplied,
+            the normal mechanism for resolving binary paths will be used.
 notes:
     - If the task seems to be hanging, first verify remote host is in C(known_hosts).
       SSH will prompt user to authorize the first contact with a remote host. One solution is to add
@@ -304,6 +311,7 @@ def main():
             force=dict(default='yes', type='bool'),
             depth=dict(default=None, type='int'),
             update=dict(default='yes', type='bool'),
+            executable=dict(default=None),
         ),
         supports_check_mode=True
     )
@@ -315,8 +323,8 @@ def main():
     force   = module.params['force']
     depth   = module.params['depth']
     update  = module.params['update']
+    git_path = module.params['executable'] or module.get_bin_path('git', True)
 
-    git_path = module.get_bin_path('git', True)
     gitconfig = os.path.join(dest, '.git', 'config')
 
     rc, out, err, status = (0, None, None, None)

library/source_control/hg

@@ -22,10 +22,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
-import shutil
 import ConfigParser
-from subprocess import Popen, PIPE
 
 DOCUMENTATION = '''
 ---
@@ -68,6 +65,13 @@ options:
         required: false
         default: "no"
         choices: [ "yes", "no" ]
+    executable:
+        required: false
+        default: null
+        version_added: "1.4"
+        description:
+            - Path to hg executable to use. If not supplied,
+            the normal mechanism for resolving binary paths will be used.
 notes:
     - If the task seems to be hanging, first verify remote host is in C(known_hosts).
       SSH will prompt user to authorize the first contact with a remote host. One solution is to add
@@ -98,6 +102,7 @@ def _set_hgrc(hgrc, vals):
     parser.write(f)
     f.close()
 
+
 def _undo_hgrc(hgrc, vals):
     parser = ConfigParser.SafeConfigParser()
     parser.read(hgrc)
@@ -111,94 +116,105 @@ def _undo_hgrc(hgrc, vals):
     parser.write(f)
     f.close()
 
-def _hg_command(module, args_list):
-    (rc, out, err) = module.run_command(['hg'] + args_list)
-    return (rc, out, err)
-
-def _hg_list_untracked(module, dest):
-    return _hg_command(module, ['purge', '-R', dest, '--print'])
-
-def get_revision(module, dest):
-    """
-    hg id -b -i -t returns a string in the format:
-       "<changeset>[+] <branch_name> <tag>" 
-    This format lists the state of the current working copy,
-    and indicates whether there are uncommitted changes by the
-    plus sign. Otherwise, the sign is omitted.
-
-    Read the full description via hg id --help
-    """
-    (rc, out, err) = _hg_command(module, ['id', '-b', '-i', '-t', '-R', dest])
-    if rc != 0:
-        module.fail_json(msg=err)
-    else:
-        return out.strip('\n')
 
-def has_local_mods(module, dest):
+class Hg(object):
-    now = get_revision(module, dest)
+
-    if '+' in now:
+    def __init__(self, module, dest, repo, revision, hg_path):
-        return True
+        self.module = module
-    else:
+        self.dest = dest
-        return False
+        self.repo = repo
+        self.revision = revision
+        self.hg_path = self.hg_path
+
+    def _command(self, args_list):
+        (rc, out, err) = self.module.run_command([self.hg_path] + args_list)
+        return (rc, out, err)
+
+    def _list_untracked(self):
+        return self._command(['purge', '-R', self.dest, '--print'])
+
+    def get_revision(self):
+        """
+        hg id -b -i -t returns a string in the format:
+           "<changeset>[+] <branch_name> <tag>"
+        This format lists the state of the current working copy,
+        and indicates whether there are uncommitted changes by the
+        plus sign. Otherwise, the sign is omitted.
+
+        Read the full description via hg id --help
+        """
+        (rc, out, err) = self._command(['id', '-b', '-i', '-t', '-R', self.dest])
+        if rc != 0:
+            self.module.fail_json(msg=err)
+        else:
+            return out.strip('\n')
 
-def hg_discard(module, dest):
+    def has_local_mods(self):
-    before = has_local_mods(module, dest)
+        now = self.get_revision()
-    if not before:
+        if '+' in now:
-        return False
+            return True
+        else:
+            return False
+
+    def discard(self):
+        before = self.has_local_mods()
+        if not before:
+            return False
 
-    (rc, out, err) = _hg_command(module, ['update', '-C', '-R', dest])
+        (rc, out, err) = self._command(['update', '-C', '-R', self.dest])
-    if rc != 0:
+        if rc != 0:
-        module.fail_json(msg=err)
+            self.module.fail_json(msg=err)
 
-    after = has_local_mods(module, dest)
+        after = self.has_local_mods()
-    if before != after and not after:   # no more local modification
+        if before != after and not after:   # no more local modification
-        return True
+            return True
             
-def hg_purge(module, dest):
+    def purge(self):
-    hgrc = os.path.join(dest, '.hg/hgrc')
+        hgrc = os.path.join(self.dest, '.hg/hgrc')
-    purge_option = [('extensions', 'purge', '')]
+        purge_option = [('extensions', 'purge', '')]
-    _set_hgrc(hgrc, purge_option)   # enable purge extension
+        _set_hgrc(hgrc, purge_option)   # enable purge extension
-    
+        
-    # before purge, find out if there are any untracked files
+        # before purge, find out if there are any untracked files
-    (rc1, out1, err1) = _hg_list_untracked(module, dest)
+        (rc1, out1, err1) = self._list_untracked()
-    if rc1 != 0:
+        if rc1 != 0:
-        module.fail_json(msg=err)
+            self.module.fail_json(msg=err1)
-    
+        
-    # there are some untrackd files
+        # there are some untrackd files
-    if out1 != '':
+        if out1 != '':
-        (rc2, out2, err2) = _hg_command(module, ['purge', '-R', dest])
+            (rc2, out2, err2) = self._command(['purge', '-R', self.dest])
-        if rc2 == 0:
+            if rc2 == 0:
-            _undo_hgrc(hgrc, purge_option)
+                _undo_hgrc(hgrc, purge_option)
+            else:
+                self.module.fail_json(msg=err2)
+            return True
         else:
-            module.fail_json(msg=err)
+            return False
-        return True
+
-    else:
+    def cleanup(self, force, purge):
-        return False
+        discarded = False
-
+        purged = False
-def hg_cleanup(module, dest, force, purge):
-    discarded = False
-    purged = False
-
-    if force:
-        discarded = hg_discard(module, dest)
-    if purge:
-        purged = hg_purge(module, dest)
-    if discarded or purged:
-        return True
-    else:
-        return False
 
-def hg_pull(module, dest, revision, repo):
+        if force:
-    return _hg_command(module, ['pull', '-r', revision, '-R', dest, repo])
+            discarded = self.discard()
+        if purge:
+            purged = self.purge()
+        if discarded or purged:
+            return True
+        else:
+            return False
+
+    def pull(self):
+        return self._command(
+            ['pull', '-r', self.revision, '-R', self.dest, self.repo])
 
-def hg_update(module, dest, revision):
+    def update(self):
-    return _hg_command(module, ['update', '-R', dest])
+        return self._command(['update', '-R', self.dest])
 
-def hg_clone(module, repo, dest, revision):
+    def clone(self):
-    return _hg_command(module, ['clone', repo, dest, '-r', revision])
+        return self._command(['clone', self.repo, self.dest, '-r', self.revision])
 
-def switch_version(module, dest, revision):
+    def switch_version(self):
-    return _hg_command(module, ['update', '-r', revision, '-R', dest])
+        return self._command(['update', '-r', self.revision, '-R', self.dest])
 
 # ===========================================
 
@@ -209,7 +225,8 @@ def main():
             dest = dict(required=True),
             revision = dict(default="default", aliases=['version']),
             force = dict(default='yes', type='bool'),
-            purge = dict(default='no', type='bool')
+            purge = dict(default='no', type='bool'),
+            executable = dict(default=None),
         ),
     )
     repo = module.params['repo']
@@ -217,6 +234,7 @@ def main():
     revision = module.params['revision']
     force = module.params['force']
     purge = module.params['purge']
+    hg_path = module.parames['executable'] or module.get_bin_path('hg', True)
     hgrc = os.path.join(dest, '.hg/hgrc')
    
     # initial states
@@ -224,29 +242,31 @@ def main():
     changed = False
     cleaned = False
 
+    hg = Hg(module, dest, repo, revision, hg_path)
+
     # If there is no hgrc file, then assume repo is absent
     # and perform clone. Otherwise, perform pull and update.
     if not os.path.exists(hgrc):
-        (rc, out, err) = hg_clone(module, repo, dest, revision)
+        (rc, out, err) = hg.clone()
         if rc != 0:
             module.fail_json(msg=err)
     else:
         # get the current state before doing pulling
-        before = get_revision(module, dest)
+        before = hg.get_revision()
 
         # can perform force and purge
-        cleaned = hg_cleanup(module, dest, force, purge)
+        cleaned = hg.cleanup(force, purge)
 
-        (rc, out, err) = hg_pull(module, dest, revision, repo)
+        (rc, out, err) = hg.pull()
         if rc != 0:
             module.fail_json(msg=err)
 
-        (rc, out, err) = hg_update(module, dest, revision)
+        (rc, out, err) = hg.update()
         if rc != 0:
             module.fail_json(msg=err)
 
-    switch_version(module, dest, revision)
+    hg.switch_version()
-    after = get_revision(module, dest)
+    after = hg.get_revision()
     if before != after or cleaned:
         changed = True
     module.exit_json(before=before, after=after, changed=changed, cleaned=cleaned)

library/source_control/subversion

@@ -63,6 +63,13 @@ options:
       - --password parameter passed to svn.
     required: false
     default: null
+  executable:
+    required: false
+    default: null
+    version_added: "1.4"
+    description:
+      - Path to svn executable to use. If not supplied,
+      the normal mechanism for resolving binary paths will be used.
 '''
 
 EXAMPLES = '''
@@ -71,19 +78,27 @@ EXAMPLES = '''
 '''
 
 import re
+import tempfile
 
 
 class Subversion(object):
-    def __init__(self, module, dest, repo, revision, username, password):
+    def __init__(
+            self, module, dest, repo, revision, username, password, svn_path):
         self.module = module
         self.dest = dest
         self.repo = repo
         self.revision = revision
         self.username = username
         self.password = password
+        self.svn_path = svn_path
 
     def _exec(self, args):
-        bits = ["svn --non-interactive --trust-server-cert --no-auth-cache", ]
+        bits = [
+            self.svn_path,
+            '--non-interactive',
+            '--trust-server-cert',
+            '--no-auth-cache',
+        ]
         if self.username:
             bits.append("--username '%s'" % self.username)
         if self.password:
@@ -147,6 +162,7 @@ def main():
             force=dict(default='yes', type='bool'),
             username=dict(required=False),
             password=dict(required=False),
+            executable=dict(default=None),
         ),
         supports_check_mode=True
     )
@@ -157,8 +173,9 @@ def main():
     force = module.params['force']
     username = module.params['username']
     password = module.params['password']
+    svn_path = module.params['executable'] or module.get_bin_path('svn', True)
 
-    svn = Subversion(module, dest, repo, revision, username, password)
+    svn = Subversion(module, dest, repo, revision, username, password, svn_path)
 
     if not os.path.exists(dest):
         before = None