Commit 3e1bf30dec04bad9d62206184c7a7d0221ad995e
2022-12-11T01:22:05
store index in repo
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275
diff --git a/repo.lisp b/repo.lisp
index fc32c13..467e2fa 100644
--- a/repo.lisp
+++ b/repo.lisp
@@ -17,7 +17,6 @@
(:use :common-lisp)
(:export #:boot
#:clear-repos
- #:*dir*
#:find-repo
#:find-repo-by-package
#:git
@@ -25,6 +24,7 @@
#:index
#:index!
#:*index*
+ #:index-repos
#:install
#:kmx
#:repo
@@ -34,6 +34,7 @@
#:sh
#:sh-quote
#:str
+ #:sysdef
#:update))
(defpackage :repo-user
@@ -41,9 +42,11 @@
(in-package :repo)
-;; config
+;; variables
-(defvar *dir* "~/common-lisp")
+(defvar *index*)
+
+(defvar *repos* ())
;; string functions
@@ -241,13 +244,11 @@
;; generic functions
-(defgeneric install (obj))
-(defgeneric update (obj))
+(defgeneric install (repo))
+(defgeneric update (repo))
;; repo
-(defvar *repos* ())
-
(defgeneric repo-asd (repo &optional package))
(defgeneric repo-dir/name (repo))
(defgeneric repo-head (repo))
@@ -263,11 +264,12 @@
(defmethod repo-asd ((repo repo) &optional
(package (first (repo-packages repo))))
- (namestring
- (first
- (directory
- (str (translate-home (repo-local-dir repo)) "/**/"
- (string-downcase package) ".asd")))))
+ (let ((found (first
+ (directory
+ (str (translate-home (repo-local-dir repo)) "/**/"
+ (string-downcase package) ".asd")))))
+ (when found
+ (namestring found))))
(defmethod repo-dir/name ((repo repo))
(str (repo-dir repo) "/" (repo-name repo)))
@@ -348,7 +350,7 @@
(when (probe-dir (repo-local-dir repo))
($git-pull repo)))
-(defun git-repo-uri-handler (uri)
+(defun git-repo-uri-handler (uri &key dir &allow-other-keys)
(let ((uri (first (string-split "#" uri))))
(let ((start (or (string-starts-with "git://" uri)
(string-starts-with "http://" uri)
@@ -357,16 +359,21 @@
(let* ((dot (search ".git" uri :from-end t))
(slash (position #\/ uri :end dot :from-end t))
(slash2 (position #\/ uri :end slash :from-end t))
- (dir (subseq uri (1+ slash2) slash))
+ (dir (or dir (subseq uri (1+ slash2) slash)))
(name (subseq uri (1+ slash) dot)))
- `(git-repo :dir ,dir :name ,name
+ `(git-repo :dir ,dir
+ :index ,*index*
+ :name ,name
:uri ,uri
:url ,uri))))))
(defun git (url &rest initargs)
(or (repo-by-url url)
(let ((repo (apply #'make-instance
- (append (git-repo-uri-handler url) initargs))))
+ (append (apply #'git-repo-uri-handler
+ url
+ initargs)
+ initargs))))
(push repo *repos*)
repo)))
@@ -385,7 +392,7 @@
(defun github-url (user name)
(str "https://github.com/" user "/" name ".git"))
-(defun github-repo-uri-handler (uri)
+(defun github-repo-uri-handler (uri &key dir &allow-other-keys)
(let ((uri (first (string-split "#" uri))))
(let ((start (or (string-starts-with "github:" uri)
(string-starts-with "git://github.com/" uri)
@@ -399,15 +406,19 @@
(string-ends-with "/" uri)))
(user (subseq uri start slash))
(name (subseq uri (1+ slash) dot)))
- `(github-repo :dir ,user :name ,name
+ `(github-repo :dir ,(or dir user)
+ :index ,*index*
+ :name ,name
:uri ,(github-uri user name)
:url ,(github-url user name)))))))
-(defun github (user name &rest initargs)
+(defun github (user name &rest initargs &key dir &allow-other-keys)
(let ((uri (github-uri user name)))
(or (repo-by-uri uri)
(let ((repo (apply #'make-instance 'github-repo
- :dir user :name name
+ :dir (or dir user)
+ :index *index*
+ :name name
:uri uri
:url (github-url user name)
initargs)))
@@ -433,7 +444,9 @@
(let ((uri (kmx-uri dir name)))
(or (repo-by-uri uri)
(let ((repo (apply #'make-instance 'kmx-repo
- :dir dir :name name
+ :dir dir
+ :index *index*
+ :name name
:uri uri
:url (kmx-url dir name)
initargs)))
@@ -507,8 +520,6 @@
;; index
-(defvar *index*)
-
(defgeneric index-file (index))
(defgeneric reload-index (index))
(defgeneric maybe-reload-index (index))
@@ -523,13 +534,15 @@
(str (index-dir index) "/repo-index.lisp"))
(defun index-from-file (pathname)
- (let ((*repos* nil)
- (write-date (file-write-date pathname)))
+ (let* ((*repos* nil)
+ (write-date (file-write-date pathname))
+ (*index* (make-instance 'index
+ :write-date write-date
+ :dir (dirname pathname)
+ :repos *repos*)))
(load pathname)
- (make-instance 'index
- :write-date write-date
- :dir (dirname pathname)
- :repos *repos*)))
+ (setf (index-repos *index*) *repos*)
+ *index*))
(defmethod reload-index ((index index))
(let* ((pathname (index-file index))
@@ -548,14 +561,12 @@
(defmethod install ((index index))
(let ((index (maybe-reload-index index)))
- (let ((*dir* (index-dir index))
- (*repos* (index-repos index)))
+ (let ((*repos* (index-repos index)))
(install *repos*))))
(defmethod update ((index index))
(let ((index (maybe-reload-index index)))
- (let ((*dir* (index-dir index))
- (*repos* (index-repos index)))
+ (let ((*repos* (index-repos index)))
(update *repos*))))
;; index uri handlers
@@ -567,8 +578,8 @@
(defun local-index-uri-handler (x)
(let ((end (string-ends-with "/repo-index.lisp" x)))
(when end
- (let* ((*dir* (subseq x 0 end))
- (index (str *dir* "/repo-index.lisp")))
+ (let* ((dir (subseq x 0 end))
+ (index (str dir "/repo-index.lisp")))
(when (probe-file index)
(index-from-file index))))))
@@ -600,8 +611,8 @@
(defmethod install ((x string))
(when *index*
- (maybe-reload-index *index*))
- (setq *repos* (index-repos *index*))
+ (maybe-reload-index *index*)
+ (setq *repos* (index-repos *index*)))
(if (index-file-p x)
(install (index! x))
(install (repo! x))))
@@ -611,14 +622,14 @@
(defmethod install ((x symbol))
(when *index*
- (maybe-reload-index *index*))
- (setq *repos* (index-repos *index*))
+ (maybe-reload-index *index*)
+ (setq *repos* (index-repos *index*)))
(install (repo! x)))
(defmethod update ((x string))
(when *index*
- (maybe-reload-index *index*))
- (setq *repos* (index-repos *index*))
+ (maybe-reload-index *index*)
+ (setq *repos* (index-repos *index*)))
(if (index-file-p x)
(update (index! x))
(update (repo! x))))
@@ -628,8 +639,8 @@
(defmethod update ((x symbol))
(when *index*
- (maybe-reload-index *index*))
- (setq *repos* (index-repos *index*))
+ (maybe-reload-index *index*)
+ (setq *repos* (index-repos *index*)))
(update (repo! x)))
;; system-definition
@@ -637,8 +648,8 @@
(defun sysdef (x sysdef-file)
(declare (type function sysdef-file))
(when *index*
- (maybe-reload-index *index*))
- (setq *repos* (index-repos *index*))
+ (maybe-reload-index *index*)
+ (setq *repos* (index-repos *index*)))
(let ((repo (or (find-repo-by-package x)
(repo x))))
(when repo
@@ -650,8 +661,8 @@
;; start repo : load index and link with ASDF
-(defun boot ()
- (let ((index-file (str *dir* "/repo-index.lisp")))
+(defun boot (&optional (dir "~/common-lisp"))
+ (let ((index-file (str dir "/repo-index.lisp")))
(when (probe-file index-file)
(setq *index* (index index-file))
(setq *repos* (index-repos *index*))