Merge pull request #23 from transtats/devel

merge devel to master branch for 0.3.0 release

Author: pnemade

.travis.yml

@@ -5,6 +5,7 @@ python:
     - "3.4"
     - "3.5"
     - "3.6"
+    - "3.7"
 
 addons:
     apt:

Changlog.rst

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+0.3.0 (2019-08-02)
+-----------------
+- Add new options exist and health to package command (pnemade)
+- update the man page for package command enhancement (pnemade)
+- Added new coverage formats in coverage command (suanand)
+- Changed "graph_rule" to "coverage_rule" (pnemade)
+- Added validation checks to check if server is responding or not (pnemade)
+- Updated test cases to accommodate above changes (pnemade)
+
 0.2.0 (2018-08-04)
 -----------------
 -  Add partial bash-completion support for job command (pnemade)

docs/man/transtats.1

@@ -1,5 +1,5 @@
 .\" transtats - Command line interface for transtats
-.TH "TRANSTATS" "1" "August 2018" "transtats 0.2.0" "User Commands"
+.TH "TRANSTATS" "1" "August 2018-2019" "transtats 0.3.0" "User Commands"
 .SH "NAME"
 transtats \- Command line interface for transtats
 .SH "SYNOPSIS"
@@ -45,16 +45,24 @@ Show this message and exit.
 
 .PP
    \fBTo check the translation status of any partiular package for all the available release branches on transtats server.\fP
-   transtats package anaconda
+   transtats package abrt
+
+.PP
+   \fBTo check the if package exists on the transtats server.\fP
+   transtats package --exist abrt
+
+.PP
+   \fBTo check the translation health of any partiular package for all the available release branches on transtats server.\fP
+   transtats package --health abrt
 
 .PP
    \fBTo check the translation status for available packages in any pre-defined Linux distribution release on transtats server.\fP
-   transtats release fedora-27
+   transtats release fedora-31
 
 .PP
    \fBTo check the translation status for available packages in any pre-defined Linux distribution release on transtats server.\fP
    \fBBut if you need to know this status categorized by individual languages then use --detail\fP
-   transtats release --detail fedora-27
+   transtats release --detail fedora-31
 
 .PP
    \fBTo know the version of this transtats client.\fP
@@ -69,8 +77,8 @@ Show this message and exit.
       These job types are syncupstream, syncdownstream, stringchange.
       Various job type command examples are given below
       transtats job run stringchange anaconda
-      transtats job run syncdownstream anaconda --build-system koji --build-tag f29
-      transtats job run stringchange anaconda --release-slug fedora-29
+      transtats job run syncdownstream anaconda --build-system koji --build-tag f31
+      transtats job run stringchange anaconda --release-slug fedora-31
 
 .SH "NOTES"
    These commands give output in plain text format. If you need the same output

setup.py

@@ -39,8 +39,8 @@
         'Intended Audience :: Developers',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
     ],
 )

tests/test_data.py

@@ -51,30 +51,100 @@ def mock_package_status():
     return mock_rep
 
 
-def mock_rule_coverage():
+def mock_package_status_exist():
+    """
+    package_status_exist mock value
+    """
+    mock_rep = Mock()
+    mock_rep.ok = True
+    mock_rep.json.return_value = {
+        "gnome-shell": True
+    }
+    return mock_rep
+
+
+def mock_package_status_health():
+    """
+    package_status_health mock value
+    """
+    mock_rep = Mock()
+    mock_rep.ok = True
+    mock_rep.json.return_value = {
+     "abrt": {
+        "fedora-30": {
+            "Arabic": 2,
+            "Basque": 3,
+            "Esperanto": 7,
+            "Friulian": 24,
+            "Serbian": 14,
+            "Turkish": 13,
+            "Urdu": 3
+        },
+        "fedora-31": {
+            "Friulian": 24
+        }
+      }
+    }
+    return mock_rep
+
+
+def mock_package_status_health_in_sync():
+    """
+    package_status_health mock value
+    """
+    mock_rep = Mock()
+    mock_rep.ok = True
+    mock_rep.json.return_value = {
+        "authconfig": "Translation platform statistics are in sync with the build system."
+    }
+    return mock_rep
+
+
+def mock_coverage_rule():
     """
     rule_coverage mock value
     """
     mock_rep = Mock()
     mock_rep.ok = True
     mock_rep.json.return_value = {
         "coverage": {
-            "branch": "Fedora 27",
-            "translation_stats": {
-                "Chinese (Simplified)": {
-                    "python-meh": 100.0,
-                    "anaconda": 98.92,
-                    "pykickstart": 100.0,
-                    "blivet": 100.0
+            "evolution": {
+                "translation_platform": {
+                    "German": {
+                        "Total": 5600,
+                        "Translated": 5482,
+                        "Untranslated": 102,
+                        "Remaining": 1.82
+                    },
                 },
-                "German": {
-                    "python-meh": 100.0,
-                    "anaconda": 99.25,
-                    "pykickstart": 93.71,
-                    "blivet": 100.0
+                "build_system": {
+                    "f30": {
+                        "German": {
+                            "Total": 1841,
+                            "Translated": 1841,
+                            "Untranslated": 0,
+                            "Remaining": 0
+                        },
+                    }
                 }
             },
-            "graph_rule": "rhinstaller"
+            "libuser": {
+                "translation_platform": {
+                    "German": {
+                        "Total": 301,
+                        "Translated": 301,
+                        "Untranslated": 0,
+                        "Remaining": 0
+                    },
+                },
+                "build_system": {
+                    "f30": {
+                        "Statistics": "Not Synced with Build System for f30"
+                    }
+                }
+            },
+            "release": "fedora-30",
+            "coverage_rule": "rhinstaller"
         }
     }
     return mock_rep
@@ -175,6 +245,18 @@ def mock_release_workload_detail():
     return mock_rep
 
 
+def mock_package_exists():
+    """
+    package_exists mock value
+    """
+    mock_rep = Mock()
+    mock_rep.ok = True
+    mock_rep.json.return_value = {
+        "iok": True
+    }
+    return mock_rep
+
+
 def mock_job_run():
     """
     job_run mock value

tests/test_tscli.py

@@ -33,7 +33,7 @@ def setUp(self):
     def tearDown(self):
         del os.environ["TRANSTATS_TEST_CONFIG"]
 
-    def test_cli_version(self):
+    def test_version_cli(self):
         """
         transtats version
         """
@@ -60,7 +60,7 @@ def test_server_version(self):
 
     def test_package_status(self):
         """
-        transtats status <package>
+        transtats package <package>
         """
         from tscli import entry_point
 
@@ -74,20 +74,68 @@ def test_package_status(self):
             self.assertIn('Branch', result.output)
             self.assertIn('percentage_calculated_on', result.output)
 
-    def test_rule_coverage(self):
+    def test_package_status_exist(self):
+        """
+        transtats package --exist <package>
+        """
+        from tscli import entry_point
+
+        with patch('requests.get') as mock_request_get:
+            mock_request_get.return_value = \
+                test_data.mock_package_status_exist()
+            runner = CliRunner()
+            result = runner.invoke(entry_point, ['package', '--exist',
+                                                 '--json', 'gnome-shell'])
+            self.assertEqual(result.exit_code, 0)
+            self.assertIn('gnome-shell', result.output)
+            self.assertIn('true', result.output)
+
+    def test_package_status_health(self):
+        """
+        transtats package --health <package>
+        """
+        from tscli import entry_point
+
+        with patch('requests.get') as mock_request_get:
+            mock_request_get.return_value = \
+                test_data.mock_package_status_health()
+            runner = CliRunner()
+            result = runner.invoke(entry_point, ['package', '--health',
+                                                 '--json', 'abrt'])
+            self.assertEqual(result.exit_code, 0)
+            self.assertIn('abrt', result.output)
+            self.assertIn('fedora-30', result.output)
+
+    def test_package_status_health_in_sync(self):
+        """
+        transtats package --health <package>
+        """
+        from tscli import entry_point
+
+        with patch('requests.get') as mock_request_get:
+            mock_request_get.return_value = \
+                test_data.mock_package_status_health_in_sync()
+            runner = CliRunner()
+            result = runner.invoke(entry_point, ['package', '--health',
+                                                 '--json', 'authconfig'])
+            self.assertEqual(result.exit_code, 0)
+            self.assertIn('authconfig', result.output)
+            self.assertIn('are in sync', result.output)
+
+    def test_coverage_rule(self):
         """
         transtats coverage <graph_rule>
         """
         from tscli import entry_point
 
         with patch('requests.get') as mock_request_get:
             mock_request_get.return_value = \
-                test_data.mock_rule_coverage()
+                test_data.mock_coverage_rule()
             runner = CliRunner()
             result = runner.invoke(entry_point, ['coverage', 'rhinstaller'])
             self.assertEqual(result.exit_code, 0)
-            self.assertIn('Branch', result.output)
-            self.assertIn('Graph Rule', result.output)
+            self.assertIn('Branch : fedora-30', result.output)
+            self.assertIn('Coverage Rule : rhinstaller', result.output)
 
     def test_release_status(self):
         """
@@ -161,17 +209,19 @@ def test_job_run(self):
         """
         from tscli import entry_point
 
-        with patch('requests.post') as mock_request_get:
-            mock_request_get.return_value = \
-                test_data.mock_job_run()
-            runner = CliRunner()
-            result = runner.invoke(entry_point,
-                                   ['job', 'run', 'stringchange', 'iok',
-                                    '--release-slug', 'fedora-29'])
-
-            self.assertEqual(result.exit_code, 0)
-            self.assertIn('Success', result.output)
-            self.assertIn('Job_Id', result.output)
+        with patch('requests.get') as mock_request_get:
+            with patch('requests.post') as mock_request_post:
+                mock_request_get.return_value = \
+                    test_data.mock_package_exists()
+                mock_request_post.return_value = \
+                    test_data.mock_job_run()
+                runner = CliRunner()
+                result = runner.invoke(entry_point,
+                                       ['job', 'run', 'stringchange', 'iok',
+                                        '--release-slug', 'fedora-29'])
+                self.assertEqual(result.exit_code, 0)
+                self.assertIn('Success', result.output)
+                self.assertIn('Job_Id', result.output)
 
     def test_job_log(self):
         """

tscli/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2017 Red Hat, Inc.
+# Copyright 2017-2019 Red Hat, Inc.
 # All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -21,7 +21,7 @@
 from tscli.stats import commands as trans
 from tscli.jobs import commands as jobs
 
-APP_VERSION = "0.2.0"
+APP_VERSION = "0.3.0"
 
 
 class AppContext(object):

tscli/common/commands.py

@@ -31,8 +31,7 @@ def version(app_context, server_url, server, json):
     if json:
         version_dict = {"client": "Transtats client %s" % app_context.version}
         if server:
-            response = ConsumeAPIs(server_url or
-                                   app_context.server_url).server_version
+            response = ConsumeAPIs(server_url or app_context.server_url).server_version
             if isinstance(response, dict):
                 version_dict.update(response)
         app_context.print_r(version_dict)

tscli/config.py

@@ -57,7 +57,7 @@ def get_config_item(config, section, item):
     """
     try:
         return config.get(section, item)
-    except (configparser.NoOptionError, configparser.NoSectionError):
-        error_msg = ('The item "{0}" is not set in the "{1}" section '
+    except (configparser.NoOptionError, configparser.NoSectionError, configparser.InterpolationSyntaxError):
+        error_msg = ('The item "{0}" is not set correctly in the "{1}" section '
                      'in your config file.'.format(item, section))
         raise click.ClickException(error_msg)