Skip to content

Allow non-interactive updates #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jatinderjit wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow non-interactive updates #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68d8cd1
Add non-interactive option (--noinput) to update
jatinderjit Sep 3, 2019
2395be7
Update version
jatinderjit Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 55 additions & 48 deletions gsub/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@ def locate_git():


def show_help():
print("""usage: gsub [--version] [--help] <command> <args>
print(
"""usage: gsub [--version] [--help] <command> <args>

Commands:

list List all gsub folders.
freeze Update gsub files based on content of managed folders.
update Create/update managed folders based on gsub files.
vendor PATH Add a new gsub file.""")
list List all gsub folders.
freeze Update gsub files based on content of managed folders.
update Create/update managed folders based on gsub files.
update --noinput Create/update without user confirmation.
vendor PATH Add a new gsub file.
"""
)
sys.exit(1)


Expand Down Expand Up @@ -114,13 +118,13 @@ def handle_list(root):
print("No .gsub files found in %s." % root)
return

maxsize = max(len(x[0]) for x in output)+1
maxsize = max(len(x[0]) for x in output) + 1
for x in output:
print(("%-" + str(maxsize) + "s %s") % (x[0] + ":", x[1]))
print(("%-" + str(maxsize) + "s Expected: %s@%s.") % ("", x[2], x[3][:10]))


def update_it(folder, name):
def update_it(folder, name, interactive):
fullname = os.path.join(folder, name)
base = name[:-5]
fbase = os.path.join(folder, base)
Expand All @@ -132,31 +136,31 @@ def update_it(folder, name):
return rel, str(e)

if os.path.isdir(fbase) and not os.path.isdir(os.path.join(fbase, ".git")):
print("%s is not a git folder. What to do?" % fbase)
if six.moves.input("Nuke %s? [y/N]: " % fbase).lower() == "y":
try:
shutil.rmtree(fbase)
except Exception as e:
return rel, "Error: failed to remove (%s)." % e
else:
return rel, "Not upto date."
if interactive:
print("%s is not a git folder. What to do?" % fbase)
if six.moves.input("Nuke %s? [Y/N]: " % fbase).lower() != "y":
return rel, "Not upto date."
try:
print("Nuking %s" % fbase)
shutil.rmtree(fbase)
except Exception as e:
return rel, "Error: failed to remove (%s)." % e

if os.path.isdir(os.path.join(folder, base)):
cgit, code = o(fbase, "git config --get remote.origin.url")
if code != 0:
return "Error: failed to git url (%s)." % cgit

if cgit != git:
print(
"%s contains %s, expected %s, what to do?" % (rel, cgit, git)
)
if six.moves.input("Nuke %s [y/N]: " % fbase).lower() == "y":
try:
shutil.rmtree(fbase)
except Exception as e:
return rel, "Error: failed to remove (%s)." % e
else:
return rel, "Not upto date."
if interactive:
print("%s contains %s, expected %s, what to do?" % (rel, cgit, git))
if six.moves.input("Nuke %s [Y/N]: " % fbase).lower() != "y":
return rel, "Not upto date."
try:
print("Nuking %s" % fbase)
shutil.rmtree(fbase)
except Exception as e:
return rel, "Error: failed to remove (%s)." % e

cloned = False
if not os.path.isdir(os.path.join(folder, base)):
Expand Down Expand Up @@ -187,33 +191,32 @@ def update_it(folder, name):
return rel, "Error: could not checkout (%s)." % err.strip()
return rel, "Cloned %s @%s, latest was %s." % (git, commit, version)

print(
"%s contains version %s, expected %s, what to do?" % (
rel, version, commit
if interactive:
print(
"%s contains version %s, expected %s, what to do?" % (rel, version, commit)
)
)
if six.moves.input("Checkout %s [y/N]: " % commit).lower() != "y":
return rel, "Not up to date."

if six.moves.input("Checkout %s [y/N]: " % commit).lower() == "y":
err, code = o(fbase, "git fetch")
if code != 0:
return rel, "Error: could not fetch (%s)." % err.strip()
print("Checking out %s to %s" % (rel, commit))
err, code = o(fbase, "git fetch")
if code != 0:
return rel, "Error: could not fetch (%s)." % err.strip()

err, code = o(fbase, "git checkout %s" % commit)
if code != 0:
return rel, "Error: could not checkout (%s)." % err.strip()
err, code = o(fbase, "git checkout %s" % commit)
if code != 0:
return rel, "Error: could not checkout (%s)." % err.strip()

return rel, "Checked out."
else:
return rel, "Not up to date."
return rel, "Checked out."


def handle_update(root):
def handle_update(root, interactive):
output = []
for pwd, dirs, files in os.walk(root, followlinks=True):
for f in files:
if not f.endswith(".gsub"):
continue
output.append(update_it(pwd, f))
output.append(update_it(pwd, f, interactive))

if not output:
print("No .gsub files found in %s." % root)
Expand All @@ -227,7 +230,7 @@ def handle_update(root):
def handle_vendor(pth):
pth = pth.rstrip("/")

dst = ("vendor/src/%s" % pth)
dst = "vendor/src/%s" % pth
print("mkdir -p", dst)
dstdad = dst.rsplit("/", 1)[0]

Expand All @@ -236,10 +239,7 @@ def handle_vendor(pth):
print(dstdad, pth, giturl, gclone)

if not os.path.isdir("./vendor/src/"):
print(
"There is no vendor folder in this directory. "
"Do I create it? (y/N) "
)
print("There is no vendor folder in this directory. Do I create it? (Y/N) ")

if six.moves.input().lower() != "y":
sys.exit(1)
Expand Down Expand Up @@ -298,7 +298,13 @@ def main():
handle_list(root)

if first == "update":
handle_update(root)
if len(sys.argv) != 3:
interactive = True
elif sys.argv[2] != "--noinput":
show_help()
else:
interactive = False
handle_update(root, interactive)

if first == "vendor":
print(sys.argv)
Expand All @@ -307,5 +313,6 @@ def main():
second = sys.argv[2].replace("https://", "")
handle_vendor(second)

if __name__ == '__main__':

if __name__ == "__main__":
main()
64 changes: 22 additions & 42 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,54 +7,34 @@
setup(
name="gsub",
description="Replacement for git-submodule",

version="0.1.4",

version="0.1.5",
author="Amit Upadhyay",
author_email="code@amitu.com",

url="https://github.com/Coverfox/gsub",
license="BSD",


install_requires=["click==6.6", "six"],

packages=['gsub'],
packages=["gsub"],
zip_safe=True,


keywords=['git', 'git submodule'],


keywords=["git", "git submodule"],
classifiers=[

'Intended Audience :: Developers',
'Intended Audience :: End Users/Desktop',
'Intended Audience :: System Administrators',
'Intended Audience :: Information Technology',
'Intended Audience :: Other Audience',

'Natural Language :: English',

'Operating System :: OS Independent',
'Operating System :: POSIX :: Linux',
'Operating System :: Microsoft :: Windows',
'Operating System :: MacOS :: MacOS X',

'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',

'Topic :: Software Development',

"Intended Audience :: Developers",
"Intended Audience :: End Users/Desktop",
"Intended Audience :: System Administrators",
"Intended Audience :: Information Technology",
"Intended Audience :: Other Audience",
"Natural Language :: English",
"Operating System :: OS Independent",
"Operating System :: POSIX :: Linux",
"Operating System :: Microsoft :: Windows",
"Operating System :: MacOS :: MacOS X",
"Programming Language :: Python",
"Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Topic :: Software Development",
],
entry_points={
'console_scripts': [
'gsub = gsub.main:main',
],
},
entry_points={"console_scripts": ["gsub = gsub.main:main"]},
)