TheThing/node-bunyan-lite
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Wiki Activity

latest cutarelease has support for scripts

Browse source
This commit is contained in:
Trent Mick 2012-02-02 15:49:23 -08:00
parent aecc04f1c1
commit e75bbb11cc
3 changed files with 60 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -8,5 +8,5 @@ versioncheck:
@echo Version check ok. @echo Version check ok.
cutarelease: versioncheck cutarelease: versioncheck
./tools/cutarelease.py -p bunyan -f package.json -f lib/bunyan.js ./tools/cutarelease.py -p bunyan -f package.json -f lib/bunyan.js -f bin/bunyan

1
TODO.md
View file

@ -1,4 +1,3 @@
- cutarelease -f bin/bunyan (doesn't work right now)
- expand set of fields: from dap - expand set of fields: from dap
time, hostname time, hostname
<https://github.com/Graylog2/graylog2-docs/wiki/GELF> <https://github.com/Graylog2/graylog2-docs/wiki/GELF>

79
tools/cutarelease.py
View file

@ -13,7 +13,7 @@ Conventions:
- XXX - XXX
""" """
__version_info__ = (1, 0, 1) __version_info__ = (1, 0, 4)
__version__ = '.'.join(map(str, __version_info__)) __version__ = '.'.join(map(str, __version_info__))
import sys import sys
@ -120,9 +120,9 @@ def cutarelease(project_name, version_files, dry_run=False):
raise Error("'%s' not found" % changes_path) raise Error("'%s' not found" % changes_path)
changes_txt = changes_txt_before = codecs.open(changes_path, 'r', 'utf-8').read() changes_txt = changes_txt_before = codecs.open(changes_path, 'r', 'utf-8').read()
changes_parser = re.compile(r'^## (?:%s )?(?P<ver>[\d\.abc]+)' changes_parser = re.compile(r'^##\s+(?:.*?\s+)?v?(?P<ver>[\d\.abc]+)'
r'(?P<nyr>\s+\(not yet released\))?' r'(?P<nyr>\s+\(not yet released\))?'
r'(?P<body>.*?)(?=^##|\Z)' % project_name, re.M | re.S) r'(?P<body>.*?)(?=^##|\Z)', re.M | re.S)
changes_sections = changes_parser.findall(changes_txt) changes_sections = changes_parser.findall(changes_txt)
try: try:
top_ver = changes_sections[0][0] top_ver = changes_sections[0][0]
@ -166,12 +166,12 @@ def cutarelease(project_name, version_files, dry_run=False):
run('git push --tags') run('git push --tags')
# Optionally release. # Optionally release.
if version_file_type == "package.json": if exists("package.json"):
answer = query_yes_no("\n* * *\nPublish to npm?", default="yes") answer = query_yes_no("\n* * *\nPublish to npm?", default="yes")
print "* * *" print "* * *"
if answer == "yes": if answer == "yes":
run('npm publish') run('npm publish')
elif version_file_type == "python" and exists("setup.py"): elif exists("setup.py"):
answer = query_yes_no("\n* * *\nPublish to pypi?", default="yes") answer = query_yes_no("\n* * *\nPublish to pypi?", default="yes")
print "* * *" print "* * *"
if answer == "yes": if answer == "yes":
@ -200,7 +200,7 @@ def cutarelease(project_name, version_files, dry_run=False):
for i, ver_file in enumerate(version_files): for i, ver_file in enumerate(version_files):
ver_content = codecs.open(ver_file, 'r', 'utf-8').read() ver_content = codecs.open(ver_file, 'r', 'utf-8').read()
ver_file_type, ver_info = parsed_version_files[i] ver_file_type, ver_info = parsed_version_files[i]
if ver_file_type == "package.json": if ver_file_type == "json":
marker = '"version": "%s"' % version marker = '"version": "%s"' % version
if marker not in ver_content: if marker not in ver_content:
raise Error("couldn't find `%s' version marker in `%s' " raise Error("couldn't find `%s' version marker in `%s' "
@ -288,31 +288,70 @@ def _version_info_from_version(version):
def _parse_version_file(version_file): def _parse_version_file(version_file):
"""Get version info from the given file. It can be any of: """Get version info from the given file. It can be any of:
- package.json with "version" field Supported version file types (i.e. types of files from which we know
- VERSION.txt or VERSION file with just the version string how to parse the version string/number -- often by some convention):
- python file with __version_info__ - json: use the "version" key
- .js file with `var VERSION = "1.2.3";` - javascript: look for a `var VERSION = "1.2.3";`
- python: Python script/module with `__version_info__ = (1, 2, 3)`
- version: a VERSION.txt or VERSION file where the whole contents are
the version string
@param version_file {str} Can be a path or "type:path", where "type"
is one of the supported types.
""" """
# Get version file *type*.
version_file_type = None
match = re.compile("^([a-z]+):(.*)$").search(version_file)
if match:
version_file = match.group(2)
version_file_type = match.group(1)
aliases = {
"js": "javascript"
}
if version_file_type in aliases:
version_file_type = aliases[version_file_type]
f = codecs.open(version_file, 'r', 'utf-8') f = codecs.open(version_file, 'r', 'utf-8')
content = f.read() content = f.read()
f.close() f.close()
if basename(version_file) == "package.json": if not version_file_type:
version_file_type = "package.json" # Guess the type.
base = basename(version_file)
ext = splitext(base)[1]
if ext == ".json":
version_file_type = "json"
elif ext == ".py":
version_file_type = "python"
elif ext == ".js":
version_file_type = "javascript"
elif content.startswith("#!"):
shebang = content.splitlines(False)[0]
shebang_bits = re.split(r'[/ \t]', shebang)
for name, typ in {"python": "python", "node": "javascript"}.items():
if name in shebang_bits:
version_file_type = typ
break
elif base in ("VERSION", "VERSION.txt"):
version_file_type = "version"
if not version_file_type:
raise RuntimeError("can't extract version from '%s': no idea "
"what type of file it it" % version_file)
if version_file_type == "json":
obj = json.loads(content) obj = json.loads(content)
version_info = _version_info_from_version(obj["version"]) version_info = _version_info_from_version(obj["version"])
elif splitext(version_file)[1] == ".py": elif version_file_type == "python":
version_file_type = "python"
m = re.search(r'^__version_info__ = (.*?)$', content, re.M) m = re.search(r'^__version_info__ = (.*?)$', content, re.M)
version_info = eval(m.group(1)) version_info = eval(m.group(1))
elif splitext(version_file)[1] == ".js": elif version_file_type == "javascript":
version_file_type = "javascript"
m = re.search(r'^var VERSION = "(.*?)";$', content, re.M) m = re.search(r'^var VERSION = "(.*?)";$', content, re.M)
version_info = _version_info_from_version(m.group(1)) version_info = _version_info_from_version(m.group(1))
else: elif version_file_type == "version":
# Presume a text file with just the version.
version_file_type = "version"
version_info = _version_info_from_version(content.strip()) version_info = _version_info_from_version(content.strip())
else:
raise RuntimeError("unexpected version_file_type: %r"
% version_file_type)
return version_file_type, version_info return version_file_type, version_info
@ -409,7 +448,7 @@ def main(argv):
parser.add_option("-p", "--project-name", metavar="NAME", parser.add_option("-p", "--project-name", metavar="NAME",
help='the name of this project (default is the base dir name)', help='the name of this project (default is the base dir name)',
default=basename(os.getcwd())) default=basename(os.getcwd()))
parser.add_option("-f", "--version-file", metavar="PATH", parser.add_option("-f", "--version-file", metavar="[TYPE:]PATH",
action='append', dest="version_files", action='append', dest="version_files",
help='The path to the project file holding the version info. Can be ' help='The path to the project file holding the version info. Can be '
'specified multiple times if more than one file should be updated ' 'specified multiple times if more than one file should be updated '