Skip to content

A peer-to-peer stack for code collaboration

First issue cleanup (#448)

Merle Breitkreuz25137529be6c
diff --git a/bin/rad-issues b/bin/rad-issues
index 25a96dd..5b76710 100755
--- a/bin/rad-issues
+++ b/bin/rad-issues
@@ -28,13 +28,13 @@
rad-issues list " list-opts-help "
rad-issues new
rad-issues close <issue-number>
- rad-issues make-key <nick>
- rad-issues create-machine
+ rad-issues comment <issue-number> <comment>
rad-issues help
list - Select from issues to view or comment on
new - Create a new issue in $EDITOR
close - Close an issue
+ comment - Shortcut for adding a comment
help - Print this help and exit
"))
@@ -44,6 +44,15 @@
(def comment-divider "---")
+(def verify-issue-number
+ (fn [issue-no machine]
+ (match (lookup-default issue-no #f (list-issues machine))
+ #f (do
+ (put-str! (string-append "ISSUE " (show issue-no) " does not exist."))
+ (exit! 1))
+ 'the-issue the-issue)))
+
+
(def add-comment-md
(fn [x]
(string-append
@@ -93,10 +102,7 @@
(def add-username
(fn [d]
- (def n (catch
- 'any
- (lookup :github-username d)
- (fn [_] "???")))
+ (def n (lookup-default :github-username (lookup-default :git-username "???" d) d))
(insert :username n d)))
(def add-username-issue
@@ -107,18 +113,18 @@
(def mk-key
(fn [v]
(match v
- (/as 'i {:issue {:number 'n :title 'tit}})
+ (/as 'i {:number 'n :title 'tit})
[(string-append "Issue " (show n) " - " tit) i])))
(def filt
(match (map (fn [opt] (read (string-append ":" opt))) (lookup :state options))
[] (fn [x] #t)
- 'args (fn [x] (elem? (lookup :state (lookup :issue x)) args))))
+ 'args (fn [x] (elem? (lookup :state x) args))))
(def items
(map mk-key
(filter filt
- (map (fn [i] {:issue i}) (reverse (values (list-issues machine)))))))
+ (reverse (values (list-issues machine))))))
(def items-dict (dict-from-seq items))
(if (empty-seq? items)
@@ -126,15 +132,14 @@
(if (lookup :fancy options)
(match (fzf-select-with-preview!
(map first items)
- (fn [s] (pretty-issue (add-username-issue (lookup :issue (lookup s items-dict))))))
+ (fn [s] (pretty-issue (add-username-issue (lookup s items-dict)))))
(/just 's)
(do (def selected (lookup s items-dict))
- (def issue-number (match selected {:issue {:number 'n}} n))
+ (def issue-number (match selected {:number 'n} n))
(def pretty-item
(add-comment-md
(pretty-issue
- (add-username-issue
- (lookup :issue selected)))))
+ (add-username-issue selected))))
(def edited-item (edit-in-editor! pretty-item))
(def added-comment
(string/unlines
@@ -143,20 +148,34 @@
(put-str!
(if (eq? added-comment "")
"Item was not updated."
- (do (simple-add-comment! machine issue-number added-comment)
+ (do (simple-add-comment! machine issue-number added-comment (get-git-username!))
(string-append "Sent comment: " added-comment)))))
_ (put-str! "No selection made."))
(map (fn [d] (put-str! (first d))) items)))))
(def close-issue
- (fn [issue-number machine-name]
+ (fn [issue-number machine]
(def n (read issue-number))
(if (number? n)
(if (integral? n)
- (simple-edit-issue! machine n {:state :closed})
+ (do
+ (verify-issue-number n machine)
+ (simple-edit-issue! machine n {:state :closed}))
(cmd-parse-failure "Issue numbers must be whole numbers!"))
(cmd-parse-failure "To close an issue, please provide the issue number."))))
+(def create-comment!
+ "Add a new `comment` to ISSUE."
+ (fn [machine n comment]
+ (if (number? n)
+ (if (integral? n)
+ (do
+ (verify-issue-number n machine)
+ (simple-add-comment! machine n comment (get-git-username!))
+ (put-str! (string-append "Added comment to issue " (show n))))
+ (cmd-parse-failure "Issue numbers must be whole numbers!"))
+ (cmd-parse-failure "To create a comment, please provide the issue number."))))
+
(def new-issue
(fn [machine]
(def template
@@ -167,7 +186,8 @@
}
")
(def i (read (edit-in-editor! template)))
- (create-issue! machine (simple-issue i))))
+ (def author {:git-username (get-git-username!)})
+ (create-issue! machine (simple-issue (<> i author)))))
(def cmd-options
[
@@ -185,10 +205,9 @@
(fn []
(match args
(/list-cmd 'options) (list-items (machine-name) options)
- (/cmd-1 "make-key" 'nick help) (make-key nick)
(/cmd-0 "new" help) (new-issue (machine-name))
- (/cmd-1 "create-machine" 'machine-name help) (create-machine machine-name)
(/cmd-1 "close" 'issue-number help) (close-issue issue-number (machine-name))
+ (/cmd-2 "comment" 'issue-number 'comment help) (create-comment! (machine-name) (read issue-number) comment)
["help"] (put-str! help)
["-h"] (put-str! help)
["--help"] (put-str! help)
diff --git a/rad/monadic/issues.rad b/rad/monadic/issues.rad
index 2134c96..0907427 100644
--- a/rad/monadic/issues.rad
+++ b/rad/monadic/issues.rad
@@ -35,9 +35,10 @@
(def simple-comment
"Create a comment for an issue."
- (fn [issue-number bod]
+ (fn [issue-number bod author-name]
(def t (now!))
{:body bod
+ :git-username author-name
:issue-number issue-number
:created-at t
:modified-at t}))
@@ -69,8 +70,8 @@
(def simple-add-comment!
"Create a remote comment."
- (fn [machine in b]
- (add-comment! machine (simple-comment in b))))
+ (fn [machine in b name]
+ (add-comment! machine (simple-comment in b name))))
(def simple-edit-issue!
(fn [machine n i]
@@ -139,13 +140,13 @@
(use-fake-keys!)
(simple-create-issue! machine "title0" "body0")
(simple-create-issue! machine "title1" "body1")
- (simple-add-comment! machine 0 "comment0")
- (simple-add-comment! machine 1 "comment1")
+ (simple-add-comment! machine 0 "comment0" "name0")
+ (simple-add-comment! machine 1 "comment1" "name1")
(simple-edit-issue! machine 0 {:state :closed})
(simple-edit-comment! machine 0 0 {:body "comment0-edit"})
(simple-create-issue! machine "new" "new")
(simple-create-issue! machine "newer" "newer")
- (simple-add-comment! machine 0 "new")
+ (simple-add-comment! machine 0 "new" "name0")
(def is (list-issues machine)))
]
[ (length (seq is)) ==> 4 ]