Merge pull request #4 from lukin0110/v0.0.4

V0.0.4

Author: lukin0110

.travis.yml

@@ -0,0 +1,10 @@
+language: python
+
+python:
+  - "2.7"
+
+install:
+  - "pip install . --use-mirrors"
+
+script:
+  - ./run_tests.py

README.md

@@ -1,5 +1,7 @@
 poeditor-client
 ===============
+[![Build Status](https://travis-ci.org/lukin0110/poeditor-client.svg)](https://travis-ci.org/lukin0110/poeditor-client)
+
 A command line tool which downloads translations from [POEditor](https://poeditor.com) based on a configuration file.
 
 1. Install
@@ -33,7 +35,6 @@ terms = App/src/main/res/values/strings.xml
 trans.en = App/src/main/res/values/strings.xml
 trans.nl = App/src/main/res/values-nl/strings.xml
 trans.fr = App/src/main/res/values-fr/strings.xml
-trans.pl = App/src/poland/res/values-pl/strings.xml
 ```
 
 Parameter       | Description
@@ -60,11 +61,21 @@ Download translations:
 poeditor pull
 ```
 
+Upload languages:
+```
+poeditor push
+```
+
 Add terms:
 ```
 poeditor pushTerms
 ```
 
+Check project status:
+```
+poeditor status
+```
+
 License
 =======
 

main.py

@@ -0,0 +1,7 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+
+# Run cmd.main() locally. Once installed through pip you'll have to use the 'poeditor' cmd.
+if __name__ == "__main__":
+    from poeditor_client import cmd
+    cmd.main()

poeditor_client/__init__.py

@@ -1 +1 @@
-__author__ = 'maartenhuijsmans'
+__version__ = '0.0.4'

poeditor_client/cmd.py

@@ -86,7 +86,7 @@ def init(config):
                     print(" - Language added: {}".format(lang))
 
 
-def pull(config):
+def pull(config, languages=None):
     """
     Pulls translations from the POEditor API.
     """
@@ -103,15 +103,57 @@ def pull(config):
 
             for o in options:
                 if o.startswith("trans."):
+                    language = o[6:]
+                    if languages and language not in languages:
+                        continue
+
                     export_path = config.get(s, o)
                     parent_dir = os.path.dirname(export_path)
                     if not os.path.exists(parent_dir):
                         os.makedirs(parent_dir)
-                    language = o[6:]
+
                     print("Language: {}".format(language))
                     client.export(project_id, language_code=language, file_type=file_type, local_file=export_path)
 
 
+def push(config, languages=None, overwrite=False, sync_terms=False):
+    """
+    Push terms and languages
+    """
+    assert config
+    client = POEditorAPI(api_token=config.get("main", "apikey"))
+    sections = config.sections()
+
+    for section in sections:
+        if not section.startswith("project."):
+            continue
+
+        print("Project: {}".format(section))
+        project_id = config.get(section, "project_id")
+        options = config.options(section)
+
+        for option in options:
+            if option.startswith("trans."):
+                import_path = config.get(section, option)
+                language = option.split('.', 1)[-1]
+                if languages and language not in languages:
+                    continue
+
+                if not os.path.exists(import_path):
+                    print("Error: {path} doesn't exist: ignoring language '{language}'"
+                          .format(path=import_path, language=language))
+                    continue
+
+                print("    Pushing language '{}'...".format(language))
+                client.update_terms_definitions(
+                    project_id,
+                    language_code=language,
+                    file_path=import_path,
+                    overwrite=overwrite,
+                    sync_terms=sync_terms
+                )
+
+
 def pushTerms(config):
     """
     Pushes new terms to POEditor
@@ -129,29 +171,71 @@ def pushTerms(config):
                 client.update_terms(project_id, terms)
 
 
+def status(config):
+    """
+    Status is a simple task that displays the existing project configuration in a more human readable format.
+    It lists all resources that have been initialized under the local project and all their associated translation
+    files.
+    """
+    assert config
+    client = POEditorAPI(api_token=config.get("main", "apikey"))
+    sections = config.sections()
+
+    print("Api key: {}".format(config.get("main", "apikey")))
+
+    for s in sections:
+        if s.startswith("project."):
+            project_id = config.get(s, "project_id")
+            details = client.view_project_details(project_id)
+            terms = config.get(s, 'terms', None) if config.has_option(s, 'terms') else None
+            options = config.options(s)
+
+            print("\nProject: {0} ({1})".format(details['name'], details['id']))
+            print("Terms: {0}".format(terms))
+
+            for option in options:
+                if option.startswith("trans."):
+                    import_path = config.get(s, option)
+                    language = option.split('.', 1)[-1]
+                    print(" - Language {0}: {1}".format(language, import_path))
+
+
 def main():
     """
     ./test.py init -f examples/.poeditor0
     """
     parser = argparse.ArgumentParser()
     parser.add_argument('--config-file', '-f', default=FILENAME)
-    parser.add_argument('command', choices=('init', 'generate', 'pull', 'pushTerms'))
+    parser.add_argument('--overwrite', default=False, action="store_true",
+                        help="Overwrites definitions when pushing a file.")
+    parser.add_argument('--sync-terms', default=False, action="store_true",
+                        help="Syncing terms deletes terms that are not found in the pushed file and adds new ones.")
+    parser.add_argument('command', choices=('init', 'generate', 'pull', 'push', 'pushTerms', 'status'))
+    parser.add_argument('languages', default=None, nargs="*")
 
     args = parser.parse_args()
     config = _load_config(args.config_file)
+    languages = args.languages[1:] if args.languages else None
 
     if "init" == args.command:
         print("Initialize project")
         init(config)
 
     if 'generate' == args.command:
-        print("Generate configuration file")
+        print("Generate example configuration file")
         generate()
 
     elif "pull" == args.command:
         print("Download translations")
-        pull(config)
+        pull(config, languages=languages)
+
+    elif "push" == args.command:
+        print("Push languages")
+        push(config, languages=languages, overwrite=args.overwrite, sync_terms=args.sync_terms)
 
     elif "pushTerms" == args.command:
         print("Push terms")
         pushTerms(config)
+
+    elif "status" == args.command:
+        status(config)

run_tests.py

@@ -0,0 +1,5 @@
+#!/usr/bin/env python
+import unittest
+
+if __name__ == '__main__':
+    unittest.main()

setup.py

@@ -1,5 +1,6 @@
 from setuptools import setup, find_packages
 
+
 long_description = """
 The POEditor Client is a command line tool that enables you to easily manage your translation files within a project.
 """
@@ -10,9 +11,11 @@
 Fork: https://github.com/lukin0110/python-poeditor
 '''
 
+import poeditor_client
+
 setup(
     name="poeditor_client",
-    version="0.0.3",
+    version=poeditor_client.__version__,
     url='https://github.com/lukin0110/poeditor-client',
     license='LICENSE.txt',
     description='The POEditor Client',