new command to support more options

docs/cli.md

@@ -102,6 +102,13 @@ my-package
 ### Options
 
 * `--name`: Set the resulting package name.
+* `--description`: Description of the package.
+* `--package-version`: Set the version of the package.
+* `--author`: Author of the package.
+* `--python`: Compatible Python versions.
+* `--license`: License of the package.
+* `--dependency`: Package to require with an optional version constraint, e.g. `requests:^2.10.0` or `requests=2.11.1`. (see [add]({{< relref "#add" >}})).
+* `--dev-dependency`: Development requirements, see `--dependency`.
 * `--src`: Use the src layout for the project.
 * `--readme`: Specify the readme file format. One of `md` (default) or `rst`.
 
@@ -122,9 +129,9 @@ poetry init
 * `--name`: Name of the package.
 * `--description`: Description of the package.
 * `--author`: Author of the package.
-* `--python` Compatible Python versions.
-* `--dependency`: Package to require with a version constraint. Should be in format `foo:1.0.0`.
-* `--dev-dependency`: Development requirements, see `--require`.
+* `--python`: Compatible Python versions.
+* `--dependency`: Package to require with an optional version constraint, e.g. `requests:^2.10.0` or `requests=2.11.1`. (see [add]({{< relref "#add" >}})).
+* `--dev-dependency`: Development requirements, see `--dependency`.
 
 
 ## install

src/poetry/console/commands/new.py

@@ -3,21 +3,47 @@
 import sys
 
 from contextlib import suppress
+from typing import TYPE_CHECKING
 
 from cleo.helpers import argument
 from cleo.helpers import option
 
-from poetry.console.commands.command import Command
+from poetry.console.commands.init import InitCommand
 
 
-class NewCommand(Command):
+if TYPE_CHECKING:
+    from poetry.console.commands.init import Requirements
+
+
+class NewCommand(InitCommand):
 
     name = "new"
     description = "Creates a new Python project at <path>."
 
     arguments = [argument("path", "The path to create the project at.")]
     options = [
         option("name", None, "Set the resulting package name.", flag=False),
+        option("description", None, "Description of the package.", flag=False),
+        option("package-version", None, "Set the version of the package.", flag=False),
+        option("author", None, "Author name of the package.", flag=False),
+        option("python", None, "Compatible Python versions.", flag=False),
+        option(
+            "dependency",
+            None,
+            "Package to require, with an optional version constraint, "
+            "e.g. requests:^2.10.0 or requests=2.11.1.",
+            flag=False,
+            multiple=True,
+        ),
+        option(
+            "dev-dependency",
+            None,
+            "Package to require for development, with an optional version constraint, "
+            "e.g. requests:^2.10.0 or requests=2.11.1.",
+            flag=False,
+            multiple=True,
+        ),
+        option("license", "l", "License of the package.", flag=False),
         option("src", None, "Use the src layout for the project."),
         option(
             "readme",
@@ -27,7 +53,7 @@ class NewCommand(Command):
         ),
     ]
 
-    def handle(self) -> None:
+    def handle(self) -> int:
         from pathlib import Path
 
         from poetry.core.vcs.git import GitConfig
@@ -50,6 +76,10 @@ def handle(self) -> None:
         if not name:
             name = path.name
 
+        description = self.option("description") or ""
+        license = self.option("license") or ""
+        version = self.option("package-version") or "0.1.0"
+
         if path.exists() and list(path.glob("*")):
             # Directory is not empty. Aborting.
             raise RuntimeError(
@@ -59,22 +89,41 @@ def handle(self) -> None:
         readme_format = self.option("readme") or "md"
 
         config = GitConfig()
-        author = None
-        if config.get("user.name"):
+        author = self.option("author")
+        if not author and config.get("user.name"):
             author = config["user.name"]
             author_email = config.get("user.email")
             if author_email:
                 author += f" <{author_email}>"
 
         current_env = SystemEnv(Path(sys.executable))
-        default_python = "^" + ".".join(str(v) for v in current_env.version_info[:2])
+
+        python = self.option("python")
+        if not python:
+            python = "^" + ".".join(str(v) for v in current_env.version_info[:2])
+
+        requirements: Requirements = {}
+        if self.option("dependency"):
+            requirements = self._format_requirements(
+                self._determine_requirements(self.option("dependency"))
+            )
+
+        dev_requirements: Requirements = {}
+        if self.option("dev-dependency"):
+            dev_requirements = self._format_requirements(
+                self._determine_requirements(self.option("dev-dependency"))
+            )
 
         layout_ = layout_cls(
             name,
-            "0.1.0",
+            version,
+            description=description,
             author=author,
+            license=license,
+            python=python,
+            dependencies=requirements,
+            dev_dependencies=dev_requirements,
             readme_format=readme_format,
-            python=default_python,
         )
         layout_.create(path)
 
@@ -87,3 +136,5 @@ def handle(self) -> None:
             f"Created package <info>{layout_._package_name}</> in"
             f" <fg=blue>{path.as_posix()}</>"
         )
+
+        return 0

tests/console/commands/test_new.py

@@ -6,12 +6,14 @@
 import pytest
 
 from poetry.factory import Factory
+from tests.helpers import get_package
 
 
 if TYPE_CHECKING:
     from cleo.testers.command_tester import CommandTester
 
     from poetry.poetry import Poetry
+    from tests.helpers import TestRepository
     from tests.types import CommandTesterFactory
 
 
@@ -21,7 +23,10 @@ def tester(command_tester_factory: CommandTesterFactory) -> CommandTester:
 
 
 def verify_project_directory(
-    path: Path, package_name: str, package_path: str, include_from: str | None = None
+    path: Path,
+    package_name: str,
+    package_path: str,
+    include_from: str | None = None,
 ) -> Poetry:
     package_path = Path(package_path)
     assert path.is_dir()
@@ -170,3 +175,45 @@ def test_command_new_with_readme(fmt: str | None, tester: CommandTester, tmp_dir
 
     poetry = verify_project_directory(path, package, package, None)
     assert poetry.local_config.get("readme") == f"README.{fmt or 'md'}"
+
+
+def test_command_new_with_dependencies(
+    tester: CommandTester, repo: TestRepository, tmp_dir: str
+):
+    repo.add_package(get_package("pendulum", "2.0.0"))
+    repo.add_package(get_package("pytest", "3.6.0"))
+
+    package_path = "custompackage"
+    path = Path(tmp_dir) / package_path
+    options = [
+        path.as_posix(),
+        "--name custompackage",
+        "--package-version 1.2.3",
+        "--description 'My Description'",
+        "--author 'Your Name <[email protected]>' ",
+        "--license 'My License'",
+        "--python '^3.8' ",
+        "--dependency pendulum",
+        "--dev-dependency pytest",
+    ]
+    tester.execute(" ".join(options))
+    poetry = verify_project_directory(path, "custompackage", package_path, None)
+
+    expected = """\
+[tool.poetry]
+name = "custompackage"
+version = "1.2.3"
+description = "My Description"
+authors = ["Your Name <[email protected]>"]
+license = "My License"
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.8"
+pendulum = "^2.0.0"
+
+[tool.poetry.group.dev.dependencies]
+pytest = "^3.6.0"
+"""
+    # Replacing possible \r\n because as_string adds them on Windows
+    assert expected in poetry.pyproject.data.as_string().replace("\r\n", "\n")