Rework aliases for devenv

Change-Id: I0cae47b103e64af9ca5585414d01a5529a4092dd
Mirantis · Apr 7, 2017 · fa111b4 · fa111b4
1 parent aeb058b
commit fa111b4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 40 deletions.
diff --git a/devenv/roles/sarkhipov/tasks/environment.yaml b/devenv/roles/sarkhipov/tasks/environment.yaml
@@ -20,12 +20,20 @@
     dest: "{{ ansible_env.HOME }}/.bashrc"
     marker: "# {mark} ANSIBLE MANAGED SARKHIPOV"
     content: |
-      {% for item in env_vars %}
-      export {{ item.name }}="{{ item.value }}"
+      {% for name, body in env_vars.items() %}
+      export {{ name }}="{{ body }}"
       {% endfor %}
 
-      {% for item in aliases %}
-      alias {{ item.name }}={{ item.value | string | quote }}
+      {% for name, body in aliases.items() %}
+      alias {{ name }}={{ body | string | quote }}
+      {% endfor %}
+
+      {% for name, body in oneliners.items() %}
+      {{ name }}() {
+        {{ body }}
+      }
+      export -f {{ name }}
+
       {% endfor %}
 
 - name: Set local timezone

diff --git a/devenv/roles/sarkhipov/vars/main.yaml b/devenv/roles/sarkhipov/vars/main.yaml
@@ -26,41 +26,29 @@ stow_dotfiles:
   - vim
 
 aliases:
-  - name: g
-    value: git
-  - name: v
-    value: nvim
-  - name: vim
-    value: nvim
-  - name: mkdir
-    value: mkdir -pv
-  - name: gst
-    value: g s
-  - name: gdf
-    value: g df
-  - name: t
-    value: tig
-  - name: ta
-    value: tig --all
-  - name: ag
-    value: ag --color -fS
-  - name: dc
-    value: docker-compose -f /vagrant/docker-compose.yml -p decapod
-  - name: dcd
-    value: docker-compose -f /vagrant/docker-compose.yml -f /vagrant/docker-compose.dev.yml -p decapod
+  g: git
+  v: nvim
+  vim: nvim
+  mkdir: mkdir -pv
+  gst: g s
+  gs: g s
+  gdf: g df
+  t: tig
+  ta: tig --all
+  ag: ag --color -fS
+  dc: docker-compose -f /vagrant/docker-compose.yml -p decapod
+  dcd: docker-compose -f /vagrant/docker-compose.yml -f /vagrant/docker-compose.dev.yml -p decapod
+
+oneliners:
+  dal: dcd exec -T admin decapod execution log "$1" | less
+  dam: dcd exec -T admin decapod-admin migration apply
+  dab: dcd exec admin bash
 
 env_vars:
-  - name: NVIM_TUI_ENABLE_TRUE_COLOR
-    value: 1
-  - name: NVIM_TUI_ENABLE_CURSOR_SHAPE
-    value: 1
-  - name: EDITOR
-    value: nvim
-  - name: PYTHONSTARTUP
-    value: $HOME/.pythonrc
-  - name: DECAPOD_URL
-    value: 'http://127.0.0.1:9999'
-  - name: DECAPOD_LOGIN
-    value: root
-  - name: DECAPOD_PASSWORD
-    value: root
+  NVIM_TUI_ENABLE_CURSOR_SHAPE: 1
+  NVIM_TUI_ENABLE_TRUE_COLOR: 1
+  EDITOR: nvim
+  PYTHONSTARTUP: $HOME/.pythonrc
+  DECAPOD_URL: http://127.0.0.1:9999
+  DECAPOD_LOGIN: root
+  DECAPOD_PASSWORD: root