add git service option to all commands and get its defaul value from repo's url

Author: dana-yaish

codecov_cli/commands/upload.py

@@ -147,6 +147,20 @@ def _turn_env_vars_into_dict(ctx, params, value):
 @click.option(
     "--plugin", "plugin_names", multiple=True, default=["xcode", "gcov", "pycoverage"]
 )
+@click.option(
+    "-Z",
+    "--fail-on-error",
+    "fail_on_error",
+    is_flag=True,
+    help="Exit with non-zero code in case of error uploading.",
+)
+@click.option(
+    "-d",
+    "--dry-run",
+    "dry_run",
+    is_flag=True,
+    help="Don't upload files to Codecov",
+)
 @click.option("--use-new-uploader", "is_using_new_uploader", default=False)
 @click.option(
     "--git-service",
@@ -175,6 +189,8 @@ def do_upload(
     slug: typing.Optional[str],
     pull_request_number: typing.Optional[str],
     is_using_new_uploader: bool,
+    fail_on_error: bool,
+    dry_run: bool,
     git_service: typing.Optional[str],
 ):
     versioning_system = ctx.obj["versioning_system"]
@@ -228,5 +244,7 @@ def do_upload(
         slug=slug,
         pull_request_number=pull_request_number,
         is_using_new_uploader=is_using_new_uploader,
-        git_service=git_service
+        fail_on_error=fail_on_error,
+        dry_run=dry_run,
+        git_service=git_service,
     )

codecov_cli/helpers/ci_adapters/__init__.py

@@ -14,6 +14,7 @@
 from codecov_cli.helpers.ci_adapters.jenkins import JenkinsAdapter
 from codecov_cli.helpers.ci_adapters.local import LocalAdapter
 from codecov_cli.helpers.ci_adapters.teamcity import TeamcityAdapter
+from codecov_cli.helpers.ci_adapters.travis_ci import TravisCIAdapter
 from codecov_cli.helpers.ci_adapters.woodpeckerci import WoodpeckerCIAdapter
 
 logger = logging.getLogger("codecovcli")
@@ -23,12 +24,14 @@ def get_ci_adapter(provider_name: str = None):
     if provider_name:
         for provider in get_ci_providers_list():
             if provider.get_service_name().lower() == provider_name.lower():
+                logger.debug(f"Using ci service from provider name: {provider_name}")
                 return provider
     else:
         for provider in get_ci_providers_list():
             if provider.detect():
-                logger.info(f"Found ci service {provider._get_service()}")
+                logger.info(f"ci service found: {provider._get_service()}")
                 return provider
+    logger.warning("No ci adapter found")
     return None
 
 
@@ -48,6 +51,7 @@ def get_ci_providers_list():
         JenkinsAdapter(),
         CirrusCIAdapter(),
         TeamcityAdapter(),
+        TravisCIAdapter(),
         # local adapter should always be the last one
         LocalAdapter(),
     ]

codecov_cli/helpers/ci_adapters/base.py

@@ -97,6 +97,6 @@ def get_service_name(self):
         Returns: string
         """
         raise NotImplementedError("`get_service_name()` must be implemented.")
-    
+
     def _get_git_service(self):
         return None

codecov_cli/helpers/ci_adapters/travis_ci.py

@@ -0,0 +1,44 @@
+import os
+
+from codecov_cli.helpers.ci_adapters.base import CIAdapterBase
+
+
+class TravisCIAdapter(CIAdapterBase):
+    # https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
+    def detect(self) -> bool:
+        return (
+            bool(os.getenv("CI"))
+            and bool(os.getenv("TRAVIS"))
+            and not bool(os.getenv("SHIPPABLE"))
+        )
+
+    def _get_commit_sha(self):
+        return os.getenv("TRAVIS_PULL_REQUEST_SHA") or os.getenv("TRAVIS_COMMIT")
+
+    def _get_build_url(self):
+        return os.getenv("TRAVIS_BUILD_WEB_URL")
+
+    def _get_build_code(self):
+        return os.getenv("TRAVIS_JOB_NUMBER")
+
+    def _get_job_code(self):
+        return os.getenv("TRAVIS_JOB_ID")
+
+    def _get_pull_request_number(self):
+        # The pull request number if the current job is a pull request, “false” if it’s not a pull request.
+        pr_num = os.getenv("TRAVIS_PULL_REQUEST")
+        return pr_num if pr_num != "false" else None
+
+    def _get_slug(self):
+        return os.getenv("TRAVIS_REPO_SLUG")
+
+    def _get_branch(self):
+        if os.getenv("TRAVIS_BRANCH") != os.getenv("TRAVIS_TAG"):
+            return os.getenv("TRAVIS_PULL_REQUEST_BRANCH") or os.getenv("TRAVIS_BRANCH")
+        return None
+
+    def _get_service(self):
+        return "travis"
+
+    def get_service_name(self):
+        return "Travis"

codecov_cli/helpers/git.py

@@ -1,7 +1,7 @@
 import logging
 import re
-from urllib.parse import urlparse
 from enum import Enum
+from urllib.parse import urlparse
 
 slug_regex = re.compile(r"[^/\s]+\/[^/\s]+$")
 

codecov_cli/helpers/logging_utils.py

@@ -58,9 +58,12 @@ def emit(self, record):
             self.handleError(record)
 
 
-def configure_logger(logger):
-    ch = ClickHandler()
-    ch.setFormatter(ColorFormatter())
-    logger.addHandler(ch)
+def configure_logger(logger: logging.Logger, log_level=logging.INFO):
+    # This if exists to avoid an issue where extra handlers would be added by tests that use runner.invoke()
+    # Which would cause subsequent tests to failed due to repeated log lines
+    if not logger.hasHandlers():
+        ch = ClickHandler()
+        ch.setFormatter(ColorFormatter())
+        logger.addHandler(ch)
     logger.propagate = False
-    logger.setLevel(logging.DEBUG)
+    logger.setLevel(log_level)

codecov_cli/helpers/request.py

@@ -47,7 +47,13 @@ def request_result(resp):
     )
 
 
-def log_warnings_and_errors_if_any(sending_result: RequestResult, process_desc):
+def log_warnings_and_errors_if_any(
+    sending_result: RequestResult, process_desc: str, fail_on_error: bool = False
+):
+    logger.debug(
+        f"Process {process_desc} complete.",
+        extra=dict(extra_log_attributes=dict(result=sending_result)),
+    )
     if sending_result.warnings:
         number_warnings = len(sending_result.warnings)
         pluralization = "s" if number_warnings > 1 else ""
@@ -58,3 +64,5 @@ def log_warnings_and_errors_if_any(sending_result: RequestResult, process_desc):
             logger.warning(f"Warning {ind + 1}: {w.message}")
     if sending_result.error is not None:
         logger.error(f"{process_desc} failed: {sending_result.error.description}")
+        if fail_on_error:
+            exit(1)

codecov_cli/helpers/versioning_systems.py

@@ -1,12 +1,18 @@
+import logging
 import subprocess
 import typing
 from pathlib import Path
 
 from codecov_cli.fallbacks import FallbackFieldEnum
-from codecov_cli.helpers.git import parse_slug, parse_git_service
+from codecov_cli.helpers.git import parse_git_service, parse_slug
+
+logger = logging.getLogger("codecovcli")
 
 
 class VersioningSystemInterface(object):
+    def __repr__(self) -> str:
+        return str(type(self))
+
     def get_fallback_value(
         self, fallback_field: FallbackFieldEnum
     ) -> typing.Optional[str]:
@@ -24,6 +30,7 @@ def list_relevant_files(
 def get_versioning_system() -> VersioningSystemInterface:
     for klass in [GitVersioningSystem, NoVersioningSystem]:
         if klass.is_available():
+            logger.debug(f"versioning system found: {klass}")
             return klass()
 
 

codecov_cli/main.py

@@ -30,21 +30,27 @@
     type=click.Path(path_type=pathlib.Path),
 )
 @click.option("--enterprise-url")
+@click.option("-v", "--verbose", "verbose", help="Use verbose logging", is_flag=True)
 @click.pass_context
 def cli(
     ctx: click.Context,
     auto_load_params_from: typing.Optional[str],
     codecov_yml_path: pathlib.Path,
     enterprise_url: str,
+    verbose: bool = False,
 ):
-    configure_logger(logger)
+    configure_logger(logger, log_level=(logging.DEBUG if verbose else logging.INFO))
     ctx.obj["ci_adapter"] = get_ci_adapter(auto_load_params_from)
     ctx.obj["versioning_system"] = get_versioning_system()
     ctx.obj["codecov_yaml"] = (
         yaml.safe_load(codecov_yml_path.read())
         if codecov_yml_path is not None
         else None
     )
+    if ctx.obj["codecov_yaml"]:
+        logger.debug(f"Using codecov_yaml from {codecov_yml_path}")
+    else:
+        logger.debug("No codecov_yaml found")
 
 
 cli.add_command(do_upload)

codecov_cli/plugins/__init__.py

@@ -1,3 +1,4 @@
+import logging
 import typing
 from importlib import import_module
 
@@ -7,14 +8,23 @@
 from codecov_cli.plugins.pycoverage import Pycoverage
 from codecov_cli.plugins.xcode import XcodePlugin
 
+logger = logging.getLogger("codecovcli")
+
 
 class NoopPlugin(object):
     def run_preparation(self, collector):
         pass
 
 
 def select_preparation_plugins(cli_config: typing.Dict, plugin_names: typing.List[str]):
-    return [_get_plugin(cli_config, p) for p in plugin_names]
+    plugins = [_get_plugin(cli_config, p) for p in plugin_names]
+    logger.debug(
+        "Selected preparation plugins",
+        extra=dict(
+            extra_log_attributes=dict(selected_plugins=list(map(type, plugins)))
+        ),
+    )
+    return plugins
 
 
 def _load_plugin_from_yaml(plugin_dict: typing.Dict):