Ori.livneh has submitted this change and it was merged.
Change subject: update my (=ori) dotfiles
......................................................................
update my (=ori) dotfiles
Change-Id: I0cfe48ee81396db6db3b79841b78d73e045bfd29
---
M modules/admin/files/home/ori/.bash_profile
A modules/admin/files/home/ori/.binned/ps_mem.py
A modules/admin/files/home/ori/.hosts/palladium
A modules/admin/files/home/ori/.pythonrc
A modules/admin/files/home/ori/.quiltrc
A modules/admin/files/home/ori/.vim/ftdetect/puppet.vim
A modules/admin/files/home/ori/.vim/ftplugin/puppet.vim
A modules/admin/files/home/ori/.vim/indent/puppet.vim
A modules/admin/files/home/ori/.vim/syntax/puppet.vim
M modules/admin/files/home/ori/.vimrc
10 files changed, 890 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/admin/files/home/ori/.bash_profile
b/modules/admin/files/home/ori/.bash_profile
index 6e01c94..c24cb03 100644
--- a/modules/admin/files/home/ori/.bash_profile
+++ b/modules/admin/files/home/ori/.bash_profile
@@ -27,6 +27,8 @@
export BLOCKSIZE=1024 CLICOLOR=1
export
PS1='\[$BRIGHT\]\[$BLACK\][\[$HOSTCOLOR\]${HOSTNAME}\[$GREY\]:\[$RESET\]\[$GREY\]\w\[$BRIGHT\]\[$BLACK\]]\[$RESET\]
$ '
export PATH="${PATH}:${HOME}/.bin"
+export DEBFULLNAME="Ori Livneh" DEBEMAIL="[email protected]"
+export PYTHONSTARTUP="${HOME}/.pythonrc"
#
@@ -51,6 +53,10 @@
puppetd() { sudo puppt-agent "${@}"; }
warn() { printf "$(tput setaf 1)%s$(tput sgr0)\n" "$1" >&2; }
notice() { printf "$(tput setaf 4)%s$(tput sgr0)\n" "$1"; }
+repackage() { sudo dpkg-buildpackage -b -uc; }
+psmem() { sudo ps_mem.py "${@}"; }
+where() { find . -iname \*"$*"\* ; }
+
localcurl() {
for var; do [[ $var == */* ]] && url="${var#*//}" || args+=("$var"); done
curl -H "host: ${url%%/*}" "${args[@]}" "localhost/${url#*/}"
diff --git a/modules/admin/files/home/ori/.binned/ps_mem.py
b/modules/admin/files/home/ori/.binned/ps_mem.py
new file mode 100755
index 0000000..b23e31a
--- /dev/null
+++ b/modules/admin/files/home/ori/.binned/ps_mem.py
@@ -0,0 +1,517 @@
+#!/usr/bin/env python
+
+# Try to determine how much RAM is currently being used per program.
+# Note per _program_, not per process. So for example this script
+# will report RAM used by all httpd process together. In detail it reports:
+# sum(private RAM for program processes) + sum(Shared RAM for program
+# processes) The shared RAM is problematic to calculate, and this script
+# automatically selects the most accurate method available for your kernel.
+
+# Licence: LGPLv2
+# Author: [email protected]
+# Source: http://www.pixelbeat.org/scripts/ps_mem.py
+
+# V1.0 06 Jul 2005 Initial release
+# V1.1 11 Aug 2006 root permission required for accuracy
+# V1.2 08 Nov 2006 Add total to output
+# Use KiB,MiB,... for units rather than K,M,...
+# V1.3 22 Nov 2006 Ignore shared col from /proc/$pid/statm for
+# 2.6 kernels up to and including 2.6.9.
+# There it represented the total file backed extent
+# V1.4 23 Nov 2006 Remove total from output as it's meaningless
+# (the shared values overlap with other programs).
+# Display the shared column. This extra info is
+# useful, especially as it overlaps between programs.
+# V1.5 26 Mar 2007 Remove redundant recursion from human()
+# V1.6 05 Jun 2007 Also report number of processes with a given name.
+# Patch from [email protected]
+# V1.7 20 Sep 2007 Use PSS from /proc/$pid/smaps if available, which
+# fixes some over-estimation and allows totalling.
+# Enumerate the PIDs directly rather than using ps,
+# which fixes the possible race between reading
+# RSS with ps, and shared memory with this program.
+# Also we can show non truncated command names.
+# V1.8 28 Sep 2007 More accurate matching for stats in
+# /proc/$pid/smaps as otherwise could match libraries
+# causing a crash.
+# Patch from [email protected]
+# V1.9 20 Feb 2008 Fix invalid values reported when PSS is available.
+# Reported by Andrey Borzenkov <[email protected]>
+# V3.3 24 Jun 2014
+# http://github.com/pixelb/scripts/commits/master/scripts/ps_mem.py
+
+# Notes:
+#
+# All interpreted programs where the interpreter is started
+# by the shell or with env, will be merged to the interpreter
+# (as that's what's given to exec). For e.g. all python programs
+# starting with "# !/usr/bin/env python" will be grouped under python.
+# You can change this by using the full command line but that will
+# have the undesirable affect of splitting up programs started with
+# differing parameters (for e.g. mingetty tty[1-6]).
+#
+# For 2.6 kernels up to and including 2.6.13 and later 2.4 redhat kernels
+# (rmap vm without smaps) it can not be accurately determined how many pages
+# are shared between processes in general or within a program in our case:
+# http://lkml.org/lkml/2005/7/6/250
+# A warning is printed if overestimation is possible.
+# In addition for 2.6 kernels up to 2.6.9 inclusive, the shared
+# value in /proc/$pid/statm is the total file-backed extent of a process.
+# We ignore that, introducing more overestimation, again printing a warning.
+# Since kernel 2.6.23-rc8-mm1 PSS is available in smaps, which allows
+# us to calculate a more accurate value for the total RAM used by programs.
+#
+# Programs that use CLONE_VM without CLONE_THREAD are discounted by assuming
+# they're the only programs that have the same /proc/$PID/smaps file for
+# each instance. This will fail if there are multiple real instances of a
+# program that then use CLONE_VM without CLONE_THREAD, or if a clone changes
+# its memory map while we're checksumming each /proc/$PID/smaps.
+#
+# I don't take account of memory allocated for a program
+# by other programs. For e.g. memory used in the X server for
+# a program could be determined, but is not.
+#
+# FreeBSD is supported if linprocfs is mounted at /compat/linux/proc/
+# FreeBSD 8.0 supports up to a level of Linux 2.6.16
+
+import getopt
+import time
+import errno
+import os
+import sys
+
+try:
+ # md5 module is deprecated on python 2.6
+ # so try the newer hashlib first
+ import hashlib
+ md5_new = hashlib.md5
+except ImportError:
+ import md5
+ md5_new = md5.new
+
+
+# The following exits cleanly on Ctrl-C or EPIPE
+# while treating other exceptions as before.
+def std_exceptions(etype, value, tb):
+ sys.excepthook = sys.__excepthook__
+ if issubclass(etype, KeyboardInterrupt):
+ pass
+ elif issubclass(etype, IOError) and value.errno == errno.EPIPE:
+ pass
+ else:
+ sys.__excepthook__(etype, value, tb)
+sys.excepthook = std_exceptions
+
+#
+# Define some global variables
+#
+
+PAGESIZE = os.sysconf("SC_PAGE_SIZE") / 1024 # KiB
+our_pid = os.getpid()
+
+have_pss = 0
+help_msg = """Usage: ps_mem [OPTION]...
+Show program core memory usage
+
+ -h, -help Show this help
+ -p <pid>[,pid2,...pidN] Only show memory usage PIDs in the specified list
+ -s, --split-args Show and separate by, all command line arguments
+ -t, --total Show only the total value
+ -w <N> Measure and show process memory every N seconds
+
+"""
+
+
+class Proc:
+
+ def __init__(self):
+ uname = os.uname()
+ if uname[0] == "FreeBSD":
+ self.proc = '/compat/linux/proc'
+ else:
+ self.proc = '/proc'
+
+ def path(self, *args):
+ return os.path.join(self.proc, *(str(a) for a in args))
+
+ def open(self, *args):
+ try:
+ return open(self.path(*args))
+ except (IOError, OSError):
+ val = sys.exc_info()[1]
+ if (val.errno == errno.ENOENT or # kernel thread or process gone
+ val.errno == errno.EPERM):
+ raise LookupError
+ raise
+
+proc = Proc()
+
+
+#
+# Functions
+#
+
+def parse_options():
+ try:
+ long_options = ['split-args', 'help', 'total']
+ opts, args = getopt.getopt(sys.argv[1:], "shtp:w:", long_options)
+ except getopt.GetoptError:
+ sys.stderr.write(help())
+ sys.exit(3)
+
+ if len(args):
+ sys.stderr.write("Extraneous arguments: %s\n" % args)
+ sys.exit(3)
+
+ # ps_mem.py options
+ split_args = False
+ pids_to_show = None
+ watch = None
+ only_total = False
+
+ for o, a in opts:
+ if o in ('-s', '--split-args'):
+ split_args = True
+ if o in ('-t', '--total'):
+ only_total = True
+ if o in ('-h', '--help'):
+ sys.stdout.write(help())
+ sys.exit(0)
+ if o in ('-p',):
+ try:
+ pids_to_show = [int(x) for x in a.split(',')]
+ except:
+ sys.stderr.write(help())
+ sys.exit(3)
+ if o in ('-w',):
+ try:
+ watch = int(a)
+ except:
+ sys.stderr.write(help())
+ sys.exit(3)
+
+ return (split_args, pids_to_show, watch, only_total)
+
+
+def help():
+ global help_msg
+ return help_msg
+
+# (major,minor,release)
+
+
+def kernel_ver():
+ kv = proc.open('sys/kernel/osrelease').readline().split(".")[:3]
+ last = len(kv)
+ if last == 2:
+ kv.append('0')
+ last -= 1
+ while last > 0:
+ for char in "-_":
+ kv[last] = kv[last].split(char)[0]
+ try:
+ int(kv[last])
+ except:
+ kv[last] = 0
+ last -= 1
+ return (int(kv[0]), int(kv[1]), int(kv[2]))
+
+
+# return Private,Shared
+# Note shared is always a subset of rss (trs is not always)
+def getMemStats(pid):
+ global have_pss
+ mem_id = pid # unique
+ Private_lines = []
+ Shared_lines = []
+ Pss_lines = []
+ Rss = (int(proc.open(pid, 'statm').readline().split()[1])
+ * PAGESIZE)
+ if os.path.exists(proc.path(pid, 'smaps')): # stat
+ digester = md5_new()
+ for line in proc.open(pid, 'smaps').readlines(): # open
+ # Note we checksum smaps as maps is usually but
+ # not always different for separate processes.
+ digester.update(line.encode('latin1'))
+ if line.startswith("Shared"):
+ Shared_lines.append(line)
+ elif line.startswith("Private"):
+ Private_lines.append(line)
+ elif line.startswith("Pss"):
+ have_pss = 1
+ Pss_lines.append(line)
+ mem_id = digester.hexdigest()
+ Shared = sum([int(line.split()[1]) for line in Shared_lines])
+ Private = sum([int(line.split()[1]) for line in Private_lines])
+ # Note Shared + Private = Rss above
+ # The Rss in smaps includes video card mem etc.
+ if have_pss:
+ pss_adjust = 0.5 # add 0.5KiB as this avg error due to trunctation
+ Pss = sum(
+ [float(line.split()[1]) + pss_adjust for line in Pss_lines])
+ Shared = Pss - Private
+ elif (2, 6, 1) <= kernel_ver() <= (2, 6, 9):
+ Shared = 0 # lots of overestimation, but what can we do?
+ Private = Rss
+ else:
+ Shared = int(proc.open(pid, 'statm').readline().split()[2])
+ Shared *= PAGESIZE
+ Private = Rss - Shared
+ return (Private, Shared, mem_id)
+
+
+def getCmdName(pid, split_args):
+ cmdline = proc.open(pid, 'cmdline').read().split("\0")
+ if cmdline[-1] == '' and len(cmdline) > 1:
+ cmdline = cmdline[:-1]
+
+ path = proc.path(pid, 'exe')
+ try:
+ path = os.readlink(path)
+ # Some symlink targets were seen to contain NULs on RHEL 5 at least
+ # https://github.com/pixelb/scripts/pull/10, so take string up to NUL
+ path = path.split('\0')[0]
+ except OSError:
+ val = sys.exc_info()[1]
+ if (val.errno == errno.ENOENT or val.errno == errno.EPERM):
+ raise LookupError
+ raise
+
+ if split_args:
+ return " ".join(cmdline)
+ if path.endswith(" (deleted)"):
+ path = path[:-10]
+ if os.path.exists(path):
+ path += " [updated]"
+ else:
+ # The path could be have prelink stuff so try cmdline
+ # which might have the full path present.
+ if os.path.exists(cmdline[0]):
+ path = cmdline[0] + " [updated]"
+ else:
+ path += " [deleted]"
+ exe = os.path.basename(path)
+ cmd = proc.open(pid, 'status').readline()[6:-1]
+ if exe.startswith(cmd):
+ cmd = exe # show non truncated version
+ # Note because we show the non truncated name
+ # one can have separated programs as follows:
+ # 584.0 KiB + 1.0 MiB = 1.6 MiB mozilla-thunder (exe -> bash)
+ # 56.0 MiB + 22.2 MiB = 78.2 MiB mozilla-thunderbird-bin
+ return cmd
+
+
+# The following matches "du -h" output
+# see also human.py
+def human(num, power="Ki", units=None):
+ if units is None:
+ powers = ["Ki", "Mi", "Gi", "Ti"]
+ while num >= 1000: # 4 digits
+ num /= 1024.0
+ power = powers[powers.index(power) + 1]
+ return "%.1f %sB" % (num, power)
+ else:
+ return "%.f" % ((num * 1024) / units)
+
+
+def cmd_with_count(cmd, count):
+ if count > 1:
+ return "%s (%u)" % (cmd, count)
+ else:
+ return cmd
+
+# Warn of possible inaccuracies
+# 2 = accurate & can total
+# 1 = accurate only considering each process in isolation
+# 0 = some shared mem not reported
+# -1= all shared mem not reported
+
+
+def shared_val_accuracy():
+ """http://wiki.apache.org/spamassassin/TopSharedMemoryBug""";
+ kv = kernel_ver()
+ if kv[:2] == (2, 4):
+ if proc.open('meminfo').read().find("Inact_") == -1:
+ return 1
+ return 0
+ elif kv[:2] == (2, 6):
+ pid = os.getpid()
+ if os.path.exists(proc.path(pid, 'smaps')):
+ if proc.open(pid, 'smaps').read().find("Pss:") != -1:
+ return 2
+ else:
+ return 1
+ if (2, 6, 1) <= kv <= (2, 6, 9):
+ return -1
+ return 0
+ elif kv[0] > 2:
+ return 2
+ else:
+ return 1
+
+
+def show_shared_val_accuracy(possible_inacc, only_total=False):
+ level = ("Warning", "Error")[only_total]
+ if possible_inacc == -1:
+ sys.stderr.write(
+ "%s: Shared memory is not reported by this system.\n" % level
+ )
+ sys.stderr.write(
+ "Values reported will be too large, and totals are not reported\n"
+ )
+ elif possible_inacc == 0:
+ sys.stderr.write(
+ "%s: Shared memory is not reported accurately by this system.\n" %
+ level)
+ sys.stderr.write(
+ "Values reported could be too large, and totals are not reported\n"
+ )
+ elif possible_inacc == 1:
+ sys.stderr.write(
+ "%s: Shared memory is slightly over-estimated by this system\n"
+ "for each program, so totals are not reported.\n" % level
+ )
+ sys.stderr.close()
+ if only_total and possible_inacc != 2:
+ sys.exit(1)
+
+
+def get_memory_usage(
+ pids_to_show,
+ split_args,
+ include_self=False,
+ only_self=False):
+ cmds = {}
+ shareds = {}
+ mem_ids = {}
+ count = {}
+ for pid in os.listdir(proc.path('')):
+ if not pid.isdigit():
+ continue
+ pid = int(pid)
+
+ # Some filters
+ if only_self and pid != our_pid:
+ continue
+ if pid == our_pid and not include_self:
+ continue
+ if pids_to_show is not None and pid not in pids_to_show:
+ continue
+
+ try:
+ cmd = getCmdName(pid, split_args)
+ except LookupError:
+ # operation not permitted
+ # kernel threads don't have exe links or
+ # process gone
+ continue
+
+ try:
+ private, shared, mem_id = getMemStats(pid)
+ except RuntimeError:
+ continue # process gone
+ if shareds.get(cmd):
+ if have_pss: # add shared portion of PSS together
+ shareds[cmd] += shared
+ elif shareds[cmd] < shared: # just take largest shared val
+ shareds[cmd] = shared
+ else:
+ shareds[cmd] = shared
+ cmds[cmd] = cmds.setdefault(cmd, 0) + private
+ if cmd in count:
+ count[cmd] += 1
+ else:
+ count[cmd] = 1
+ mem_ids.setdefault(cmd, {}).update({mem_id: None})
+
+ # Add shared mem for each program
+ total = 0
+ for cmd in cmds:
+ cmd_count = count[cmd]
+ if len(mem_ids[cmd]) == 1 and cmd_count > 1:
+ # Assume this program is using CLONE_VM without CLONE_THREAD
+ # so only account for one of the processes
+ cmds[cmd] /= cmd_count
+ if have_pss:
+ shareds[cmd] /= cmd_count
+ cmds[cmd] = cmds[cmd] + shareds[cmd]
+ total += cmds[cmd] # valid if PSS available
+
+ sorted_cmds = sorted(cmds.items(), key=lambda x: x[1])
+ sorted_cmds = [x for x in sorted_cmds if x[1]]
+
+ return sorted_cmds, shareds, count, total
+
+
+def print_header():
+ sys.stdout.write(" Private + Shared = RAM used\tProgram\n\n")
+
+
+def print_memory_usage(sorted_cmds, shareds, count, total):
+ for cmd in sorted_cmds:
+ sys.stdout.write("%9s + %9s = %9s\t%s\n" %
+ (human(cmd[1] - shareds[cmd[0]]),
+ human(shareds[cmd[0]]), human(cmd[1]),
+ cmd_with_count(cmd[0], count[cmd[0]])))
+ if have_pss:
+ sys.stdout.write("%s\n%s%9s\n%s\n" %
+ ("-" * 33, " " * 24, human(total), "=" * 33))
+
+
+def verify_environment():
+ if os.geteuid() != 0:
+ sys.stderr.write("Sorry, root permission required.\n")
+ if __name__ == '__main__':
+ sys.stderr.close()
+ sys.exit(1)
+
+ try:
+ kv = kernel_ver()
+ except (IOError, OSError):
+ val = sys.exc_info()[1]
+ if val.errno == errno.ENOENT:
+ sys.stderr.write(
+ "Couldn't access " + proc.path('') + "\n"
+ "Only GNU/Linux and FreeBSD (with linprocfs) are supported\n")
+ sys.exit(2)
+ else:
+ raise
+
+if __name__ == '__main__':
+ split_args, pids_to_show, watch, only_total = parse_options()
+ verify_environment()
+
+ if not only_total:
+ print_header()
+
+ if watch is not None:
+ try:
+ sorted_cmds = True
+ while sorted_cmds:
+ sorted_cmds, shareds, count, total = get_memory_usage(
+ pids_to_show, split_args)
+ if only_total and have_pss:
+ sys.stdout.write(human(total, units=1) + '\n')
+ elif not only_total:
+ print_memory_usage(sorted_cmds, shareds, count, total)
+ time.sleep(watch)
+ else:
+ sys.stdout.write('Process does not exist anymore.\n')
+ except KeyboardInterrupt:
+ pass
+ else:
+ # This is the default behavior
+ sorted_cmds, shareds, count, total = get_memory_usage(
+ pids_to_show, split_args)
+ if only_total and have_pss:
+ sys.stdout.write(human(total, units=1) + '\n')
+ elif not only_total:
+ print_memory_usage(sorted_cmds, shareds, count, total)
+
+ # We must close explicitly, so that any EPIPE exception
+ # is handled by our excepthook, rather than the default
+ # one which is reenabled after this script finishes.
+ sys.stdout.close()
+
+ vm_accuracy = shared_val_accuracy()
+ show_shared_val_accuracy(vm_accuracy, only_total)
diff --git a/modules/admin/files/home/ori/.hosts/palladium
b/modules/admin/files/home/ori/.hosts/palladium
new file mode 100755
index 0000000..1ef59fa
--- /dev/null
+++ b/modules/admin/files/home/ori/.hosts/palladium
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+PYBAL_CONFIG="/srv/pybal-config/pybal"
+
+
+# Echo the current state of a host.
+_pybal_query() { (
+ cd "$PYBAL_CONFIG"
+ enabled=$(git grep "$1" | grep -Po '(True|False)')
+ case "$enabled" in
+ True) echo "$1 is $(tput setaf 7; tput bold)pooled$(tput sgr0)." ;;
+ False) echo "$1 is $(tput setaf 0; tput bold)depooled$(tput sgr0)." ;;
+ esac
+) }
+
+
+# Verify that a string corresponds to a hostname with a single entry.
+_pybal_validate_host() { (
+ cd "$PYBAL_CONFIG"
+ [ "$(git grep -c "$1" | awk -F: '{s+=$2}END{print s}')" -eq 1 ]
+) }
+
+
+# Pool/depool a host.
+_pybal_set() { (
+ local command="$1" host="$2"
+
+ cd "$PYBAL_CONFIG"
+
+ case "$command" in
+ pool|repool) replace=False with=True ;;
+ depool) replace=True with=False ;;
+ *) echo >&2 "Invalid command."; return 1 ;;
+ esac
+
+ local match=$(git grep -n "$host" | cut -d: -f-2)
+ local line="${match##*:}"
+ local file="${PYBAL_CONFIG}/${match%%:*}"
+
+ sudo sed -i -e "${line}s/${replace}/${with}/" "$file"
+) }
+
+
+pybal() {
+ local command="$1" host="$2"
+
+ _pybal_validate_host "$host" || {
+ echo >&2 "'$1' is ambiguous."
+ return 1
+ }
+
+ case "$command" in
+ pool|repool|depool) _pybal_set "$command" "$host" ;;
+ esac
+
+ _pybal_query "$host"
+}
diff --git a/modules/admin/files/home/ori/.pythonrc
b/modules/admin/files/home/ori/.pythonrc
new file mode 100644
index 0000000..1a19c6e
--- /dev/null
+++ b/modules/admin/files/home/ori/.pythonrc
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+import sys
+reload(sys)
+sys.setdefaultencoding('utf-8')
+
+import datetime
+import json
+import os
+import re
+import socket
+import subprocess
+import time
diff --git a/modules/admin/files/home/ori/.quiltrc
b/modules/admin/files/home/ori/.quiltrc
new file mode 100644
index 0000000..ed50f76
--- /dev/null
+++ b/modules/admin/files/home/ori/.quiltrc
@@ -0,0 +1,5 @@
+# config file for quilt(1)
+QUILT_PATCHES=debian/patches
+QUILT_NO_DIFF_INDEX=1
+QUILT_NO_DIFF_TIMESTAMPS=1
+QUILT_REFRESH_ARGS="-p ab"
diff --git a/modules/admin/files/home/ori/.vim/ftdetect/puppet.vim
b/modules/admin/files/home/ori/.vim/ftdetect/puppet.vim
new file mode 100644
index 0000000..c9d15ea
--- /dev/null
+++ b/modules/admin/files/home/ori/.vim/ftdetect/puppet.vim
@@ -0,0 +1,2 @@
+" detect puppet filetype
+au BufRead,BufNewFile *.pp set filetype=puppet
diff --git a/modules/admin/files/home/ori/.vim/ftplugin/puppet.vim
b/modules/admin/files/home/ori/.vim/ftplugin/puppet.vim
new file mode 100644
index 0000000..b649155
--- /dev/null
+++ b/modules/admin/files/home/ori/.vim/ftplugin/puppet.vim
@@ -0,0 +1,94 @@
+" Vim filetype plugin
+" Language: Puppet
+" Maintainer: Todd Zullinger <[email protected]>
+" Last Change: 2009 Aug 19
+" vim: set sw=4 sts=4:
+
+if exists("b:did_ftplugin")
+ finish
+endif
+let b:did_ftplugin = 1
+
+if !exists("no_plugin_maps") && !exists("no_puppet_maps")
+ if !hasmapto("<Plug>AlignRange")
+ map <buffer> <LocalLeader>= <Plug>AlignRange
+ endif
+endif
+
+noremap <buffer> <unique> <script> <Plug>AlignArrows :call
<SID>AlignArrows()<CR>
+noremap <buffer> <unique> <script> <Plug>AlignRange :call <SID>AlignRange()<CR>
+
+iabbrev => =><C-R>=<SID>AlignArrows('=>')<CR>
+iabbrev +> +><C-R>=<SID>AlignArrows('+>')<CR>
+
+if exists('*s:AlignArrows')
+ finish
+endif
+
+let s:arrow_re = '[=+]>'
+let s:selector_re = '[=+]>\s*\$.*\s*?\s*{\s*$'
+
+function! s:AlignArrows(op)
+ let cursor_pos = getpos('.')
+ let lnum = line('.')
+ let line = getline(lnum)
+ if line !~ s:arrow_re
+ return
+ endif
+ let pos = stridx(line, a:op)
+ let start = lnum
+ let end = lnum
+ let pnum = lnum - 1
+ while 1
+ let pline = getline(pnum)
+ if pline !~ s:arrow_re || pline =~ s:selector_re
+ break
+ endif
+ let start = pnum
+ let pnum -= 1
+ endwhile
+ let cnum = end
+ while 1
+ let cline = getline(cnum)
+ if cline !~ s:arrow_re ||
+ \ (indent(cnum) != indent(cnum+1) && getline(cnum+1) !~ '\s*}')
+ break
+ endif
+ let end = cnum
+ let cnum += 1
+ endwhile
+ call s:AlignSection(start, end)
+ let cursor_pos[2] = stridx(getline('.'), a:op) + strlen(a:op) + 1
+ call setpos('.', cursor_pos)
+ return ''
+endfunction
+
+function! s:AlignRange() range
+ call s:AlignSection(a:firstline, a:lastline)
+endfunction
+
+" AlignSection and AlignLine are from the vim wiki:
+" http://vim.wikia.com/wiki/Regex-based_text_alignment
+function! s:AlignSection(start, end)
+ let extra = 1
+ let sep = s:arrow_re
+ let maxpos = 0
+ let section = getline(a:start, a:end)
+ for line in section
+ let pos = match(line, ' *'.sep)
+ if maxpos < pos
+ let maxpos = pos
+ endif
+ endfor
+ call map(section, 's:AlignLine(v:val, sep, maxpos, extra)')
+ call setline(a:start, section)
+endfunction
+
+function! s:AlignLine(line, sep, maxpos, extra)
+ let m = matchlist(a:line, '\(.\{-}\) \{-}\('.a:sep.'.*\)')
+ if empty(m)
+ return a:line
+ endif
+ let spaces = repeat(' ', a:maxpos - strlen(m[1]) + a:extra)
+ return m[1] . spaces . m[2]
+endfunction
diff --git a/modules/admin/files/home/ori/.vim/indent/puppet.vim
b/modules/admin/files/home/ori/.vim/indent/puppet.vim
new file mode 100644
index 0000000..689e068
--- /dev/null
+++ b/modules/admin/files/home/ori/.vim/indent/puppet.vim
@@ -0,0 +1,76 @@
+" Vim indent file
+" Language: Puppet
+" Maintainer: Todd Zullinger <[email protected]>
+" Last Change: 2009 Aug 19
+" vim: set sw=4 sts=4:
+
+if exists("b:did_indent")
+ finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent smartindent
+setlocal indentexpr=GetPuppetIndent()
+setlocal indentkeys+=0],0)
+
+if exists("*GetPuppetIndent")
+ finish
+endif
+
+" Check if a line is part of an include 'block', e.g.:
+" include foo,
+" bar,
+" baz
+function! s:PartOfInclude(lnum)
+ let lnum = a:lnum
+ while lnum
+ let lnum = lnum - 1
+ let line = getline(lnum)
+ if line !~ ',$'
+ break
+ endif
+ if line =~ '^\s*include\s\+[^,]\+,$'
+ return 1
+ endif
+ endwhile
+ return 0
+endfunction
+
+function! s:OpenBrace(lnum)
+ call cursor(a:lnum, 1)
+ return searchpair('{\|\[\|(', '', '}\|\]\|)', 'nbW')
+endfunction
+
+function! GetPuppetIndent()
+ let pnum = prevnonblank(v:lnum - 1)
+ if pnum == 0
+ return 0
+ endif
+
+ let line = getline(v:lnum)
+ let pline = getline(pnum)
+ let ind = indent(pnum)
+
+ if pline =~ '^\s*#'
+ return ind
+ endif
+
+ if pline =~ '\({\|\[\|(\|:\)$'
+ let ind += &sw
+ elseif pline =~ ';$' && pline !~ '[^:]\+:.*[=+]>.*'
+ let ind -= &sw
+ elseif pline =~ '^\s*include\s\+.*,$'
+ let ind += &sw
+ endif
+
+ if pline !~ ',$' && s:PartOfInclude(pnum)
+ let ind -= &sw
+ endif
+
+ " Match } }, }; ] ]: )
+ if line =~ '^\s*\(}\(,\|;\)\?$\|]:\?$\|)\)'
+ let ind = indent(s:OpenBrace(v:lnum))
+ endif
+
+ return ind
+endfunction
diff --git a/modules/admin/files/home/ori/.vim/syntax/puppet.vim
b/modules/admin/files/home/ori/.vim/syntax/puppet.vim
new file mode 100644
index 0000000..9605210
--- /dev/null
+++ b/modules/admin/files/home/ori/.vim/syntax/puppet.vim
@@ -0,0 +1,115 @@
+" puppet syntax file
+" Filename: puppet.vim
+" Language: puppet configuration file
+" Maintainer: Luke Kanies <[email protected]>
+" URL:
+" Last Change:
+" Version:
+"
+
+" Copied from the cfengine, ruby, and perl syntax files
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+ syntax clear
+elseif exists("b:current_syntax")
+ finish
+endif
+
+" match class/definition/node declarations
+syn region puppetDefine start="^\s*\(class\|define\|node\)\s" end="{"
contains=puppetDefType,puppetDefName,puppetDefArguments,puppetNodeRe
+syn keyword puppetDefType class define node inherits contained
+syn region puppetDefArguments start="(" end=")" contained
contains=puppetArgument,puppetString
+syn match puppetArgument "\w\+" contained
+syn match puppetArgument "\$\w\+" contained
+syn match puppetArgument "'[^']+'" contained
+syn match puppetArgument '"[^"]+"' contained
+syn match puppetDefName "\w\+" contained
+syn match puppetNodeRe "/.*/" contained
+
+" match 'foo' in 'class foo { ...'
+" match 'foo::bar' in 'class foo::bar { ...'
+" match 'Foo::Bar' in 'Foo::Bar["..."]
+"FIXME: "Foo-bar" doesn't get highlighted as expected, although "foo-bar" does.
+syn match puppetInstance "[A-Za-z0-9_-]\+\(::[A-Za-z0-9_-]\+\)*\s*{"
contains=puppetTypeName,puppetTypeDefault
+syn match puppetInstance "[A-Z][a-z_-]\+\(::[A-Z][a-z_-]\+\)*\s*[[{]"
contains=puppetTypeName,puppetTypeDefault
+syn match puppetInstance "[A-Z][a-z_-]\+\(::[A-Z][a-z_-]\+\)*\s*<\?<|"
contains=puppetTypeName,puppetTypeDefault
+syn match puppetTypeName "[a-z]\w*" contained
+syn match puppetTypeDefault "[A-Z]\w*" contained
+
+" match 'foo' in 'foo => "bar"'
+syn match puppetParam "\w\+\s*[=+]>" contains=puppetParamName
+syn match puppetParamName "\w\+" contained
+
+" match 'present' in 'ensure => present'
+" match '2755' in 'mode => 2755'
+" don't match 'bar' in 'foo => bar'
+syn match puppetParam "\w\+\s*[=+]>\s*[a-z0-9]\+"
contains=puppetParamString,puppetParamName
+syn match puppetParamString "[=+]>\s*\w\+"
contains=puppetParamKeyword,puppetParamSpecial,puppetParamDigits contained
+syn keyword puppetParamKeyword present absent purged latest installed running
stopped mounted unmounted role configured file directory link contained
+syn keyword puppetParamSpecial true false undef contained
+syn match puppetParamDigits "[0-9]\+"
+
+" match 'template' in 'content => template("...")'
+syn match puppetParam "\w\+\s*[=+]>\s*\w\+\s*("
contains=puppetFunction,puppetParamName
+" statements
+syn region puppetFunction
start="^\s*\(alert\|crit\|debug\|emerg\|err\|fail\|include\|info\|notice\|realize\|require\|search\|tag\|warning\)\s*("
end=")" contained contains=puppetString
+" rvalues
+syn region puppetFunction
start="^\s*\(defined\|file\|fqdn_rand\|generate\|inline_template\|regsubst\|sha1\|shellquote\|split\|sprintf\|tagged\|template\|versioncmp\)\s*("
end=")" contained contains=puppetString
+
+syn match puppetVariable "$[a-zA-Z0-9_:]\+"
+syn match puppetVariable "${[a-zA-Z0-9_:]\+}"
+
+" match anything between simple/double quotes.
+" don't match variables if preceded by a backslash.
+syn region puppetString start=+'+ skip=+\\\\\|\\'+ end=+'+
+syn region puppetString start=+"+ skip=+\\\\\|\\"+ end=+"+
contains=puppetVariable,puppetNotVariable
+syn match puppetString "/[^/]*/"
+syn match puppetNotVariable "\\$\w\+" contained
+syn match puppetNotVariable "\\${\w\+}" contained
+
+syn keyword puppetKeyword import inherits include
+syn keyword puppetControl case default if else elsif
+syn keyword puppetSpecial true false undef
+
+" comments last overriding everything else
+syn match puppetComment "\s*#.*$" contains=puppetTodo
+syn region puppetComment start="/\*" end="\*/" contains=puppetTodo
extend
+syn keyword puppetTodo TODO NOTE FIXME XXX BUG HACK contained
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_puppet_syn_inits")
+ if version < 508
+ let did_puppet_syn_inits = 1
+ command -nargs=+ HiLink hi link <args>
+ else
+ command -nargs=+ HiLink hi def link <args>
+ endif
+
+ HiLink puppetVariable Identifier
+ HiLink puppetType Identifier
+ HiLink puppetKeyword Define
+ HiLink puppetComment Comment
+ HiLink puppetString String
+ HiLink puppetParamKeyword String
+ HiLink puppetParamDigits String
+ HiLink puppetNotVariable String
+ HiLink puppetParamSpecial Special
+ HiLink puppetSpecial Special
+ HiLink puppetTodo Todo
+ HiLink puppetControl Statement
+ HiLink puppetDefType Define
+ HiLink puppetDefName Type
+ HiLink puppetNodeRe Type
+ HiLink puppetTypeName Statement
+ HiLink puppetTypeDefault Type
+ HiLink puppetParamName Identifier
+ HiLink puppetArgument Identifier
+ HiLink puppetFunction Function
+
+ delcommand HiLink
+endif
+
+let b:current_syntax = "puppet"
diff --git a/modules/admin/files/home/ori/.vimrc
b/modules/admin/files/home/ori/.vimrc
index 643bcf5..cac0b3ee 100644
--- a/modules/admin/files/home/ori/.vimrc
+++ b/modules/admin/files/home/ori/.vimrc
@@ -82,10 +82,14 @@
"""" Backups
set backupdir=$HOME/.vim/backup,$TMPDIR
set directory=$HOME/.vim/backup,$TMPDIR
-set undodir=$HOME/.vim/undo,$TMPDIR
set writebackup
set backup
-set undofile
+
+if has('persistent_undo')
+ set undofile
+ set undodir=$HOME/.vim/undo,$TMPDIR
+ set undolevels=1000
+endif
"""" Menus
set gdefault " Regexes are global by default.
--
To view, visit https://gerrit.wikimedia.org/r/168998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cfe48ee81396db6db3b79841b78d73e045bfd29
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
