Improvements to generate

src/Pkg.jl

@@ -314,7 +314,11 @@ See also [`PackageSpec`](@ref)
 """
 const develop = API.develop
 
-# TODO: Will probably be deprecated for something in PkgDev
+"""
+    Pkg.generate(pkgname::String)
+
+Create a minimal project called `pkgname` in the current folder. For more featureful package creation, please see `PkgTemplates.jl`.
+"""
 const generate = API.generate
 
 """

src/REPLMode/command_declarations.jl

@@ -311,14 +311,14 @@ packages will not be upgraded at all.
 """,
 ],
 PSA[:name => "generate",
-    :api => API.generate_deprecated,
+    :api => API.generate,
     :arg_count => 1 => 1,
     :arg_parser => ((x,y) -> map(expanduser, unwrap(x))),
     :description => "generate files for a new project",
     :help => md"""
     generate pkgname
 
-Create a project called `pkgname` in the current folder.
+Create a minimal project called `pkgname` in the current folder. For more featureful package creation, please see `PkgTemplates.jl`.
 """,
 ],
 PSA[:name => "precompile",

src/generate.jl

@@ -1,31 +1,27 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
-function generate_deprecated(varargs...; kwargs...)
-    Base.depwarn("Pkg.generate is deprecated. Please use PkgTemplates.jl instead.", Symbol("Pkg.generate"))
-    return generate(varargs...; kwargs...)
-end
-
-generate(path::String; kwargs...) = generate(Context(), path; kwargs...)
-function generate(ctx::Context, path::String; kwargs...)
-    Context!(ctx; kwargs...)
-    dir, pkg = dirname(path), basename(path)
+function generate(path::String; io::IO=DEFAULT_IO[])
+    base = basename(path)
+    pkg = endswith(lowercase(base), ".jl") ? chop(base, tail=3) : base
     Base.isidentifier(pkg) || pkgerror("$(repr(pkg)) is not a valid package name")
     isdir(path) && pkgerror("$(abspath(path)) already exists")
-    printpkgstyle(ctx.io, :Generating, " project $pkg:")
-    uuid = project(ctx, pkg, dir)
-    entrypoint(ctx, pkg, dir)
+    printpkgstyle(io, :Generating, " project $pkg:")
+    uuid = project(io, pkg, path)
+    entrypoint(io, pkg, path)
     return Dict(pkg => uuid)
 end
 
-function genfile(f::Function, ctx::Context, pkg::String, dir::String, file::String)
-    path = joinpath(dir, pkg, file)
-    println(ctx.io, "    $(Base.contractuser(path))")
+function genfile(f::Function, io::IO, dir::AbstractString, file::AbstractString)
+    path = joinpath(dir, file)
+    println(io, "    $(Base.contractuser(path))")
     mkpath(dirname(path))
     open(f, path, "w")
     return
 end
 
-function project(ctx::Context, pkg::String, dir::String)
+function project(io::IO, pkg::AbstractString, dir::AbstractString)
+    mkpath(dir)
+
     name = email = nothing
     gitname = LibGit2.getconfig("user.name", "")
     isempty(gitname) || (name = gitname)
@@ -51,26 +47,26 @@ function project(ctx::Context, pkg::String, dir::String)
     authors = ["$name " * (email === nothing ? "" : "<$email>")]
 
     uuid = UUIDs.uuid4()
-    genfile(ctx, pkg, dir, "Project.toml") do io
+    genfile(io, dir, "Project.toml") do file_io
         toml = Dict{String,Any}("authors" => authors,
                                 "name" => pkg,
                                 "uuid" => string(uuid),
                                 "version" => "0.1.0",
                                 )
-        TOML.print(io, toml, sorted=true, by=key -> (Types.project_key_order(key), key))
+        TOML.print(file_io, toml, sorted=true, by=key -> (Types.project_key_order(key), key))
     end
     return uuid
 end
 
-function entrypoint(ctx::Context, pkg::String, dir)
-    genfile(ctx, pkg, dir, "src/$pkg.jl") do io
-        print(io,
+function entrypoint(io::IO, pkg::AbstractString, dir)
+    genfile(io, dir, "src/$pkg.jl") do file_io
+        print(file_io,
            """
             module $pkg
 
-            greet() = print("Hello World!")
+            # module contents
 
-            end # module
+            end
             """
         )
     end

test/new.jl

@@ -1924,7 +1924,7 @@ end
     isolate() do
         Pkg.REPLMode.TEST_MODE[] = true
         api, arg, opts = first(Pkg.pkg"generate Foo")
-        @test api == Pkg.API.generate_deprecated
+        @test api == Pkg.API.generate
         @test arg == "Foo"
         @test isempty(opts)
         mktempdir() do dir