diff --git a/collects/planet2/main.rkt b/collects/planet2/main.rkt index 4123907b34..6ea113c536 100644 --- a/collects/planet2/main.rkt +++ b/collects/planet2/main.rkt @@ -85,9 +85,11 @@ (config-cmd set key+vals)))] [create "Bundle a new package" - [(#:str "plt") format () + [(#:str #f) format () ("Select the format of the package to be created." "Options are: tgz, zip, plt")] [#:bool manifest () "Creates a manifest file for a directory, rather than an archive"] #:args (maybe-dir) + (unless (or manifest format) + (error 'planet2 "You must specify an archive format.")) (create-cmd (if manifest "MANIFEST" format) maybe-dir)]) diff --git a/collects/planet2/scribblings/planet2.scrbl b/collects/planet2/scribblings/planet2.scrbl index f2c867c2c8..639ab9b798 100644 --- a/collects/planet2/scribblings/planet2.scrbl +++ b/collects/planet2/scribblings/planet2.scrbl @@ -208,7 +208,7 @@ this command fails atomically. It accepts the following options: @item{@exec{create package-directory} -- Bundles a package. It accepts the following options: @itemlist[ - @item{@DFlag{format str} -- Specifies the archive format. The options are: @exec{tgz}, @exec{zip}, and @exec{plt} (default.)} + @item{@DFlag{format str} -- Specifies the archive format. The options are: @exec{tgz}, @exec{zip}, and @exec{plt}. This must be specified if @DFlag{manifest} is not present.} @item{@DFlag{manifest} -- Creates a manifest file for a directory, rather than an archive.} ] } diff --git a/collects/tests/planet2/tests-conflicts.rkt b/collects/tests/planet2/tests-conflicts.rkt index b31f92042d..977f231650 100644 --- a/collects/tests/planet2/tests-conflicts.rkt +++ b/collects/tests/planet2/tests-conflicts.rkt @@ -17,8 +17,8 @@ (shelly-begin (initialize-indexes) - $ "raco pkg create test-pkgs/planet2-test1" - $ "raco pkg create test-pkgs/planet2-test1-not-conflict" + $ "raco pkg create --format plt test-pkgs/planet2-test1" + $ "raco pkg create --format plt test-pkgs/planet2-test1-not-conflict" (shelly-install "only modules are considered for conflicts" "test-pkgs/planet2-test1.plt" $ "raco pkg install test-pkgs/planet2-test1-not-conflict.plt") diff --git a/collects/tests/planet2/tests-create.rkt b/collects/tests/planet2/tests-create.rkt index b4d342b04b..f18a93de15 100644 --- a/collects/tests/planet2/tests-create.rkt +++ b/collects/tests/planet2/tests-create.rkt @@ -24,6 +24,8 @@ $ "raco pkg create --format tgz test-pkgs/does-not-exist" =exit> 1 $ "test -f test-pkgs/does-not-exist.tgz" =exit> 1) + $ "raco pkg create planet2-test1" =exit> 1 + (define-syntax-rule (shelly-create pkg fmt) (shelly-case (format "create format ~a" fmt) diff --git a/collects/tests/planet2/tests-raco.rkt b/collects/tests/planet2/tests-raco.rkt index 861801c5f4..072e412a91 100644 --- a/collects/tests/planet2/tests-raco.rkt +++ b/collects/tests/planet2/tests-raco.rkt @@ -6,7 +6,7 @@ (with-fake-root (shelly-case "raco install/update uses raco setup, unless you turn it off (cmdline)" - $ "raco pkg create test-pkgs/raco-pkg" + $ "raco pkg create --format plt test-pkgs/raco-pkg" $ "raco raco-pkg" =exit> 1 $ "raco pkg install --dont-setup test-pkgs/raco-pkg.plt" $ "raco raco-pkg" =exit> 1)) @@ -15,7 +15,7 @@ (shelly-case "raco install/update uses raco setup, unless you turn it off (env)" (putenv "PLT_PLANET2_DONTSETUP" "1") - $ "raco pkg create test-pkgs/raco-pkg" + $ "raco pkg create --format plt test-pkgs/raco-pkg" $ "raco raco-pkg" =exit> 1 $ "raco pkg install --dont-setup test-pkgs/raco-pkg.plt" $ "raco raco-pkg" =exit> 1 @@ -24,7 +24,7 @@ (with-fake-root (shelly-case "raco install/update uses raco setup" - $ "raco pkg create test-pkgs/raco-pkg" + $ "raco pkg create --format plt test-pkgs/raco-pkg" $ "raco raco-pkg" =exit> 1 $ "raco pkg install test-pkgs/raco-pkg.plt" $ "raco raco-pkg" =exit> 0))) diff --git a/collects/tests/planet2/tests-update-auto.rkt b/collects/tests/planet2/tests-update-auto.rkt index c5493eff9c..988b68956e 100644 --- a/collects/tests/planet2/tests-update-auto.rkt +++ b/collects/tests/planet2/tests-update-auto.rkt @@ -27,9 +27,9 @@ (pkg-tests (shelly-case "create packages" - $ "raco pkg create test-pkgs/pkg-b-second" - $ "raco pkg create test-pkgs/pkg-a-first" - $ "raco pkg create test-pkgs/pkg-a-second") + $ "raco pkg create --format plt test-pkgs/pkg-b-second" + $ "raco pkg create --format plt test-pkgs/pkg-a-first" + $ "raco pkg create --format plt test-pkgs/pkg-a-second") (with-fake-root (shelly-case diff --git a/collects/tests/planet2/tests-update-deps.rkt b/collects/tests/planet2/tests-update-deps.rkt index 1378f76510..1b2f9bd8cf 100644 --- a/collects/tests/planet2/tests-update-deps.rkt +++ b/collects/tests/planet2/tests-update-deps.rkt @@ -27,11 +27,11 @@ (pkg-tests (shelly-case "create packages" - $ "raco pkg create test-pkgs/pkg-b-first" - $ "raco pkg create test-pkgs/pkg-b-second" - $ "raco pkg create test-pkgs/pkg-a-first" - $ "raco pkg create test-pkgs/pkg-a-second" - $ "raco pkg create test-pkgs/pkg-a-third") + $ "raco pkg create --format plt test-pkgs/pkg-b-first" + $ "raco pkg create --format plt test-pkgs/pkg-b-second" + $ "raco pkg create --format plt test-pkgs/pkg-a-first" + $ "raco pkg create --format plt test-pkgs/pkg-a-second" + $ "raco pkg create --format plt test-pkgs/pkg-a-third") (with-fake-root (shelly-case