alox-gandalf 0.0.8 → 0.0.9

data/aloxec/_gandalf

@@ -2,13 +2,13 @@
 
 if [[ "$#" > 0 ]]; then
   GANDALF="$1"; shift
-else
-  : ${GANDALF:="$(cd -P -- "$(dirname -- "${BASH_SOURCE}")/.." && pwd -P)"}
-fi  
+fi
 
-export GANDALF
+if [[ -z "${GANDALF:-}" ]]; then
+  GANDALF="$(pwd -P)"
+fi
 
-PATH="$PATH:$(dirname $BASH_SOURCE)"
+export GANDALF
 
 if [[ ! -x "$(type -P gpg 2>&-)" ]]; then
   echo "ERROR: could not find gpg tool" 1>&2

data/aloxec/edit-secrets

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+#/ NAME
+#/     edit bundle -- edit a password bundle
+#/
+#/ SYNOPSIS
+#/     edit bundle name
+
+# figure out the project root under which bin, lib live
+shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
+
+# load a jason bourne library
+source _jason
+require _gandalf "${GANDALF:-}"
+require _gandalf_
+
+readonly cfg_gandalf="$GANDALF/config/gandalf.yml"
+
+# entry point
+function main {
+  if [[ "$#" = 0 ]]; then
+    local default_bundle="$(ryaml $cfg_gandalf bundle default)"
+    if [[ -n "$default_bundle" ]]; then
+      set -- "$default_bundle" "$@"
+    fi
+  fi
+
+  if [[ "$#" = 0 ]]; then
+    logger_fatal "missing name of secrets bundle"
+    exit 1
+  fi
+
+  readonly local nm_bundle="$1"; shift
+  readonly local tmp_keyring="$(mktemp -t XXXXXXXXX)"
+
+  set +f
+  gpg --no-default-keyring --keyring "$tmp_keyring" --import "$(keys_path)/"*
+  set -f
+
+  readonly local tmp_container="$(mktemp -d -t XXXXXXXXX)"
+  readonly local tmp_buffer="$(TMPDIR="$tmp_container" mktemp -t XXXXXXXXX)"
+
+  git pull
+  gpg -a -d "$(secrets_path)/${nm_bundle}.gpg" > "$tmp_buffer"
+  "${EDITOR:-vim}" "$tmp_buffer"
+
+  readonly local tmp_bundle="$(mktemp -t XXXXXXXXX)"
+  if gpg --yes --trust-model always --no-default-keyring --keyring "$tmp_keyring" -a -e -o "$tmp_bundle" $(recipients) "$tmp_buffer"; then
+    mv -f "$tmp_bundle" "$(secrets_path)/$nm_bundle.gpg"
+  else
+    rm -f "$tmp_bundle"
+  fi
+
+  rm -f "$tmp_keyring" "$tmp_buffer"
+  rmdir "$tmp_container"
+}
+
+require _sub "$BASH_SOURCE" "$@"

data/aloxec/new-key

@@ -11,7 +11,7 @@ shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
 
 # load a jason bourne library
 source _jason
-require _gandalf "${GANDALF:-$shome}"
+require _gandalf "${GANDALF:-}"
 require _gandalf_
 
 readonly cfg_gandalf="$GANDALF/config/gandalf.yml"
@@ -40,7 +40,7 @@ EOF
   rm -f "$tmp_genkey"
   gpg --edit-key "$email" passwd save
 
-  gpg --export -a "$email" > "$(keys_path)/gpg/$email"
+  gpg --export -a "$email" > "$(keys_path)/$email"
 }
 
 require _sub "$BASH_SOURCE" "$@"

data/aloxec/new-secrets

@@ -11,7 +11,7 @@ shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
 
 # load a jason bourne library
 source _jason
-require _gandalf "${GANDALF:-$shome}"
+require _gandalf "${GANDALF:-}"
 require _gandalf_
 
 readonly cfg_gandalf="$GANDALF/config/gandalf.yml"
@@ -26,9 +26,13 @@ function main {
   readonly local nm_bundle="$1"; shift
   readonly local tmp_keyring="$(mktemp -t XXXXXXXXX)"
 
+  set -x
+  keys
+  set +x
+
   local _rcpt
   for _rcpt in $(keys); do
-    gpg --no-default-keyring --keyring "$tmp_keyring" --import "$(keys_path)/gpg/$_rcpt"
+    gpg --no-default-keyring --keyring "$tmp_keyring" --import "$(keys_path)/$_rcpt"
   done
 
   echo "---" | gpg --no-default-keyring --keyring "$tmp_keyring" -a -e -o "$(secrets_path)/$nm_bundle.gpg" $(recipients)

data/aloxec/{list-bundle → show-secrets}

@@ -11,7 +11,7 @@ shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
 
 # load a jason bourne library
 source _jason
-require _gandalf "${GANDALF:-$shome}"
+require _gandalf "${GANDALF:-}"
 require _gandalf_
 
 readonly cfg_gandalf="$GANDALF/config/gandalf.yml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alox-gandalf
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -22,11 +22,10 @@ extra_rdoc_files: []
 files:
 - aloxec/_gandalf
 - aloxec/_gandalf_
-- aloxec/list-bundle
-- aloxec/list-secrets
-- aloxec/new-bundle
+- aloxec/edit-secrets
 - aloxec/new-key
 - aloxec/new-secrets
+- aloxec/show-secrets
 homepage: https://github.com/destructuring/gandalf
 licenses: []
 post_install_message: 

data/aloxec/list-secrets

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-#/ NAME
-#/     list bundle -- list the bundle for a bundle
-#/
-#/ SYNOPSIS
-#/     list bundle name
-
-# figure out the project root under which bin, lib live
-shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
-
-# load a jason bourne library
-source _jason
-require _gandalf "${GANDALF:-$shome}"
-require _gandalf_
-
-readonly cfg_gandalf="$GANDALF/config/gandalf.yml"
-
-# entry point
-function main {
-  if [[ "$#" = 0 ]]; then
-    local default_bundle="$(ryaml $cfg_gandalf bundle default)"
-    if [[ -n "$default_bundle" ]]; then
-      set -- "$default_bundle" "$@"
-    fi
-  fi
-
-  if [[ "$#" = 0 ]]; then
-    logger_fatal "missing name of secrets bundle"
-    exit 1
-  fi
-
-  readonly local nm_bundle="$1"; shift
-
-  gpg -a -d "$(secrets_path)/${nm_bundle}.gpg"
-}
-
-require _sub "$BASH_SOURCE" "$@"

data/aloxec/new-bundle

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-#/ NAME
-#/     new bundle -- create a new password bundle
-#/
-#/ SYNOPSIS
-#/     new bundle name
-
-# figure out the project root under which bin, lib live
-shome="$(cd -P -- "$(dirname -- "$BASH_SOURCE")/.." && pwd -P)"
-
-# load a jason bourne library
-source _jason
-require _gandalf "${GANDALF:-$shome}"
-require _gandalf_
-
-readonly cfg_gandalf="$GANDALF/config/gandalf.yml"
-
-# entry point
-function main {
-  if [[ "$#" = 0 ]]; then
-    logger_fatal "missing name of secrets bundle"
-    exit 1
-  fi
-
-  readonly local nm_bundle="$1"; shift
-  readonly local tmp_keyring="$(mktemp -t XXXXXXXXX)"
-
-  local _rcpt
-  for _rcpt in $(keys); do
-    gpg --no-default-keyring --keyring "$tmp_keyring" --import "$(keys_path)/gpg/$_rcpt"
-  done
-
-  echo "---" | gpg --no-default-keyring --keyring "$tmp_keyring" -a -e -o "$(secrets_path)/$nm_bundle.gpg" $(recipients)
-
-  rm -f "$tmp_keyring"
-}
-
-require _sub "$BASH_SOURCE" "$@"