close #3: refactored common functions down to utilities module

extensions/add.py

@@ -1,5 +1,4 @@
import subprocess
from utilities import isGit, isMercurial, isBazaar
from utilities import execute, isGit, isMercurial, isBazaar
def add(arguments):
    '''
@@ -14,21 +13,14 @@ def add(arguments):
        command = ["git", "add"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isMercurial():
        command = ["hg", "add"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isBazaar():
        command = ["bzr", "add"]
        command.extend(arguments)
        executeCommand(command)
def executeCommand(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command)
        execute(command)

extensions/clone.py

@@ -1,6 +1,4 @@
import os
import subprocess
from utilities import isGit, isMercurial, isBazaar
from utilities import executeAndReturnResponse
def clone(arguments):
    '''
@@ -16,25 +14,10 @@ def clone(arguments):
    for commandSet in commandSets:
        command = commandSet
        command.extend(arguments)
        out, err = executeCommandWithResponse(command)
        out, err = executeAndReturnResponse(command)
        if err:
            print("{0}: repository not found".format(command[0]))
        else:
            print("{0}: repository cloned!".format(command[0]))
            break
def executeCommand(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command, stderr=subprocess.STDOUT)
def executeCommandWithResponse(command):
    '''
    Execute the given command and return the output and errors.
    '''
    proc = subprocess.Popen(command, stdin=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
    return proc.communicate()

extensions/incoming.py

@@ -1,6 +1,4 @@
import os
import subprocess
from utilities import isGit, isMercurial, isBazaar
from utilities import execute, executeAndReturnResponse, isGit, isMercurial, isBazaar
def incoming(arguments):
    '''
@@ -8,32 +6,17 @@ def incoming(arguments):
    '''
    
    if isGit():
        out, err = executeCommandWithResponse(["git", "remote"])
        out, err = executeAndReturnResponse(["git", "remote"])
        if not err and out:
            executeCommandWithResponse(["git", "remote", "update", "-p"])
            executeCommand(["git", "log", "..@{u}"])
            executeAndReturnResponse(["git", "remote", "update", "-p"])
            execute(["git", "log", "..@{u}"])
    if isMercurial():
        out, err = executeCommandWithResponse(["git", "paths"])
        out, err = executeAndReturnResponse(["git", "paths"])
        if not err and out:
            executeCommand(["hg", "incoming"])
            execute(["hg", "incoming"])
    if isBazaar():
        out, err = executeCommandWithResponse(["bzr", "missing"])
        out, err = executeAndReturnResponse(["bzr", "missing"])
        if not err and out:
            executeCommand(["bzr", "missing"])
def executeCommand(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command, stderr=subprocess.STDOUT)
def executeCommandWithResponse(command):
    '''
    Execute the given command and return the output and errors.
    '''
    proc = subprocess.Popen(command, stderr=open(os.devnull, 'w'), stdout=subprocess.PIPE)
    return proc.communicate()
            execute(["bzr", "missing"])

extensions/init.py

@@ -1,5 +1,4 @@
import subprocess
from utilities import isGit, isMercurial, isBazaar
from utilities import execute, isGit, isMercurial, isBazaar
def init(arguments):
    '''
@@ -7,17 +6,10 @@ def init(arguments):
    '''
    
    if "git" in arguments or isGit():
        executeCommand(["git", "init"])
        execute(["git", "init"])
    if "hg" in arguments or isMercurial():
        executeCommand(["hg", "init"])
        execute(["hg", "init"])
    if "bzr" in arguments or isBazaar():
        executeCommand(["bzr", "init"])
def executeCommand(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command)
        execute(["bzr", "init"])

extensions/merge.py

@@ -1,5 +1,4 @@
import subprocess
from utilities import isGit, isMercurial, isBazaar
from utilities import execute, isGit, isMercurial, isBazaar
def merge(arguments):
    '''
@@ -9,21 +8,14 @@ def merge(arguments):
    if isGit():
        command = ["git", "merge"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isMercurial():
        command = ["hg", "merge"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isBazaar():
        command = ["bzr", "merge"]
        command.extend(arguments)
        executeCommand(command)
def executeCommand(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command)
        execute(command)

extensions/mv.py

@@ -1,5 +1,4 @@
import subprocess
from utilities import isGit, isMercurial, isBazaar
from utilities import execute, isGit, isMercurial, isBazaar
def mv(arguments):
    '''
@@ -9,21 +8,14 @@ def mv(arguments):
    if isGit():
        command = ["git", "mv"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isMercurial():
        command = ["hg", "mv"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isBazaar():
        command = ["bzr", "mv"]
        command.extend(arguments)
        executeCommand(command)
def executeCommand(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command)
        execute(command)

extensions/pull.py

@@ -1,5 +1,4 @@
import subprocess
from utilities import isGit, isMercurial, isBazaar
from utilities import execute, isGit, isMercurial, isBazaar
def pull(arguments):
    '''
@@ -9,21 +8,14 @@ def pull(arguments):
    if isGit():
        command = ["git", "fetch"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isMercurial():
        command = ["hg", "pull"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isBazaar():
        command = ["bzr", "pull"]
        command.extend(arguments)
        executeCommand(command)
def executeCommand(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command)
        execute(command)

extensions/push.py

@@ -1,5 +1,4 @@
import subprocess
from utilities import isGit, isMercurial, isBazaar
from utilities import execute, isGit, isMercurial, isBazaar
def push(arguments):
    '''
@@ -9,21 +8,14 @@ def push(arguments):
    if isGit():
        command = ["git", "push"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isMercurial():
        command = ["hg", "push"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isBazaar():
        command = ["bzr", "push"]
        command.extend(arguments)
        executeCommand(command)
def executeCommand(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command)
        execute(command)

extensions/rm.py

@@ -1,5 +1,4 @@
import subprocess
from utilities import isGit, isMercurial, isBazaar
from utilities import execute, isGit, isMercurial, isBazaar
def rm(arguments):
    '''
@@ -9,21 +8,14 @@ def rm(arguments):
    if isGit():
        command = ["git", "rm"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isMercurial():
        command = ["hg", "rm"]
        command.extend(arguments)
        executeCommand(command)
        execute(command)
    if isBazaar():
        command = ["bzr", "rm"]
        command.extend(arguments)
        executeCommand(command)
def executeCommand(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command)
        execute(command)

utilities.py

@@ -6,21 +6,40 @@ def isGit():
    Determine if the current directory is part of a Git repository.
    '''
    return testRepository(["git", "branch"])
    return executeCheckingForErrors(["git", "branch"])
def isMercurial():
    '''
    Determine if the current directory is part of a Mercurial repository.
    '''
    return testRepository(["hg", "branch"])
    return executeCheckingForErrors(["hg", "branch"])
def isBazaar():
    '''
    Determine if the current directory is part of the Bazaar repository.
    '''
    return testRepository(["bzr", "root"])
    return executeCheckingForErrors(["bzr", "root"])
def execute(command):
    '''
    Execute the given command.
    '''
    subprocess.call(command, stderr=subprocess.STDOUT)
def executeCheckingForErrors(command):
    '''
    Execute the given command and return whether any errors were found.
    '''
def testRepository(command):
    return subprocess.call(command, stderr=subprocess.STDOUT, stdout=open(os.devnull, 'w')) == 0
def executeAndReturnResponse(command):
    '''
    Execute the given command and return the output and errors.
    '''
    proc = subprocess.Popen(command, stdin=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
    return proc.communicate()