zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add -d option for edit command (#6416)

Browse Source 
* add -d option for edit command and improve suffix extrapolation from '.py' to use glob
This commit is contained in:
becker33 2017-12-11 16:17:53 -08:00 committed by GitHub
parent e19aa80734
commit 9d8ea00966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/spack/spack/cmd/edit.py
View File

@ -23,9 +23,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import os import os
import glob
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.filesystem import join_path
import spack import spack
import spack.cmd import spack.cmd
@ -80,6 +80,10 @@ def setup_parser(subparser):
'-c', '--command', dest='path', action='store_const', '-c', '--command', dest='path', action='store_const',
const=spack.cmd.command_path, const=spack.cmd.command_path,
help="edit the command with the supplied name") help="edit the command with the supplied name")
excl_args.add_argument(
'-d', '--docs', dest='path', action='store_const',
const=os.path.join(spack.lib_path, 'docs'),
help="edit the docs with the supplied name")
excl_args.add_argument( excl_args.add_argument(
'-t', '--test', dest='path', action='store_const', '-t', '--test', dest='path', action='store_const',
const=spack.test_path, const=spack.test_path,
@ -112,9 +116,23 @@ def edit(parser, args):
if args.path: if args.path:
path = args.path path = args.path
if name: if name:
path = join_path(path, name + ".py") path = os.path.join(path, name)
if not os.path.exists(path): if not os.path.exists(path):
tty.die("No command for '{0}' was found.".format(name)) files = glob.glob(path + '*')
blacklist = ['.pyc', '~'] # blacklist binaries and backups
files = filter(lambda x: all(s not in x for s in blacklist),
files)
if len(files) > 1:
m = 'Multiple files exist with the name {0}.'.format(name)
m += ' Please specify a suffix. Files are:\n\n'
for f in files:
m += ' ' + os.path.basename(f) + '\n'
tty.die(m)
if not files:
tty.die("No file for '{0}' was found in {1}".format(name,
path))
path = files[0] # already confirmed only one entry in files
spack.editor(path) spack.editor(path)
elif name: elif name:
edit_package(name, args.repo, args.namespace) edit_package(name, args.repo, args.namespace)