From fdcd030e54cb7a1b39d405a35c334302d2f778af Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 21 Dec 2012 15:48:39 -0700 Subject: [PATCH] raco pkg show: tweak output format --- collects/planet2/lib.rkt | 28 +++++++++++--------- collects/tests/planet2/tests-remove.rkt | 14 +++++----- collects/tests/planet2/tests-update-auto.rkt | 8 +++--- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/collects/planet2/lib.rkt b/collects/planet2/lib.rkt index cdf73915c4..2382a362fe 100644 --- a/collects/planet2/lib.rkt +++ b/collects/planet2/lib.rkt @@ -1014,19 +1014,21 @@ (let () (define db (read-pkg-db)) (define pkgs (sort (hash-keys db) string-ci<=?)) - (table-display - (list* - (list (format "~aPackage(auto?)" indent) "Checksum" "Source") - (for/list ([pkg (in-list pkgs)]) - (match-define (pkg-info orig-pkg checksum auto?) (hash-ref db pkg)) - (list (format "~a~a~a" - indent - pkg - (if auto? - "*" - "")) - (format "~a" checksum) - (format "~a" orig-pkg))))))) + (if (null? pkgs) + (printf " [none]\n") + (table-display + (list* + (list (format "~aPackage[*=auto]" indent) "Checksum" "Source") + (for/list ([pkg (in-list pkgs)]) + (match-define (pkg-info orig-pkg checksum auto?) (hash-ref db pkg)) + (list (format "~a~a~a" + indent + pkg + (if auto? + "*" + "")) + (format "~a" checksum) + (format "~a" orig-pkg)))))))) (define (config-cmd config:set key+vals) (cond diff --git a/collects/tests/planet2/tests-remove.rkt b/collects/tests/planet2/tests-remove.rkt index 99c697399a..6d3a3d70b6 100644 --- a/collects/tests/planet2/tests-remove.rkt +++ b/collects/tests/planet2/tests-remove.rkt @@ -20,18 +20,18 @@ (shelly-case "remove and show" (shelly-case "remove of not installed package fails" - $ "raco pkg show -u" =stdout> "Package(auto?) Checksum Source\n" + $ "raco pkg show -u" =stdout> " [none]\n" $ "raco pkg remove not-there" =exit> 1) (shelly-install "remove test" "test-pkgs/planet2-test1.zip") (shelly-install "remove of dep fails" "test-pkgs/planet2-test1.zip" - $ "raco pkg show -u" =stdout> #rx"Package\\(auto\\?\\) +Checksum +Source\nplanet2-test1 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test1.zip\\)\n" + $ "raco pkg show -u" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\nplanet2-test1 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test1.zip\\)\n" $ "raco pkg install test-pkgs/planet2-test2.zip" - $ "raco pkg show -u" =stdout> #rx"Package\\(auto\\?\\) +Checksum +Source\nplanet2-test1 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test1.zip\\)\nplanet2-test2 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test2.zip\\)\n" + $ "raco pkg show -u" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\nplanet2-test1 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test1.zip\\)\nplanet2-test2 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test2.zip\\)\n" $ "raco pkg remove planet2-test1" =exit> 1 $ "raco pkg remove planet2-test2" - $ "raco pkg show -u" =stdout> #rx"Package\\(auto\\?\\) +Checksum +Source\nplanet2-test1 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test1.zip\\)\n") + $ "raco pkg show -u" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\nplanet2-test1 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test1.zip\\)\n") (shelly-install "remove of dep can be forced" "test-pkgs/planet2-test1.zip" $ "raco pkg install test-pkgs/planet2-test2.zip" @@ -59,14 +59,14 @@ $ "racket -e '(require planet2-test1)'" =exit> 1 $ "racket -e '(require planet2-test2)'" =exit> 1 $ "raco pkg install --deps search-auto test-pkgs/planet2-test2.zip" =exit> 0 - $ "raco pkg show -u" =stdout> #rx"Package\\(auto\\?\\) +Checksum +Source\nplanet2-test1\\* +[a-f0-9]+ +\\(pnr planet2-test1\\)\nplanet2-test2 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test2.zip\\)\n" + $ "raco pkg show -u" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\nplanet2-test1\\* +[a-f0-9]+ +\\(pnr planet2-test1\\)\nplanet2-test2 +[a-f0-9]+ +\\(file .+tests/planet2/test-pkgs/planet2-test2.zip\\)\n" $ "racket -e '(require planet2-test1)'" =exit> 0 $ "racket -e '(require planet2-test2)'" =exit> 0 $ "racket -e '(require planet2-test2/contains-dep)'" =exit> 0 $ "raco pkg remove planet2-test2" - $ "raco pkg show -u" =stdout> #rx"Package\\(auto\\?\\) +Checksum +Source\nplanet2-test1\\* +[a-f0-9]+ +\\(pnr planet2-test1\\)\n" + $ "raco pkg show -u" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\nplanet2-test1\\* +[a-f0-9]+ +\\(pnr planet2-test1\\)\n" $ "racket -e '(require planet2-test1)'" =exit> 0 $ "raco pkg remove --auto" - $ "raco pkg show -u" =stdout> "Package(auto?) Checksum Source\n" + $ "raco pkg show -u" =stdout> " [none]\n" $ "racket -e '(require planet2-test1)'" =exit> 1 $ "racket -e '(require planet2-test2)'" =exit> 1))))) diff --git a/collects/tests/planet2/tests-update-auto.rkt b/collects/tests/planet2/tests-update-auto.rkt index dbcc8460a0..ec1a2c5155 100644 --- a/collects/tests/planet2/tests-update-auto.rkt +++ b/collects/tests/planet2/tests-update-auto.rkt @@ -46,12 +46,12 @@ 'source "http://localhost:9999/pkg-a-first.plt")) $ "raco pkg install --deps search-auto pkg-b" =exit> 0 #rx"Package\\(auto\\?\\) Checksum Source\npkg-a\\* [a-f0-9]+ \\(pnr pkg-a\\)\npkg-b [a-f0-9]+ \\(pnr pkg-b\\)\n" + $ "raco pkg show -u" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9]+ \\(pnr pkg-a\\)\npkg-b +[a-f0-9]+ +\\(pnr pkg-b\\)\n" $ "racket -e '(require pkg-b)'" =exit> 43 $ "racket -e '(require pkg-a)'" =exit> 0 ;; remove auto doesn't do anything because everything is needed $ "raco pkg remove --auto" - $ "raco pkg show -u" =stdout> #rx"Package\\(auto\\?\\) Checksum Source\npkg-a\\* [a-f0-9]+ \\(pnr pkg-a\\)\npkg-b [a-f0-9]+ \\(pnr pkg-b\\)\n" + $ "raco pkg show -u" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9]+ \\(pnr pkg-a\\)\npkg-b +[a-f0-9]+ +\\(pnr pkg-b\\)\n" $ "racket -e '(require pkg-b)'" =exit> 43 $ "racket -e '(require pkg-a)'" =exit> 0 ;; pkg-a is now an auto @@ -63,9 +63,9 @@ $ "raco pkg update -a" =exit> 0 $ "racket -e '(require pkg-a)'" =exit> 43 $ "raco pkg remove pkg-b" - $ "raco pkg show -u" =stdout> #rx"Package\\(auto\\?\\) Checksum Source\npkg-a\\* [a-f0-9]+ \\(pnr pkg-a\\)\n" + $ "raco pkg show -u" =stdout> #rx"Package\\[\\*=auto\\] +Checksum +Source\npkg-a\\* +[a-f0-9]+ +\\(pnr pkg-a\\)\n" $ "racket -e '(require pkg-b)'" =exit> 1 ;; pkg-a is now not needed $ "raco pkg remove --auto" - $ "raco pkg show -u" =stdout> "Package(auto?) Checksum Source\n" + $ "raco pkg show -u" =stdout> " [none]\n" $ "racket -e '(require pkg-a)'" =exit> 1)))