Merge pull request #406 from natural-law/skip-agreement

Add argument "--agreement" for skip the shown of agreement.

Author: Bin Zhang

bin/cocos.py

@@ -32,7 +32,7 @@
 # FIXME: MultiLanguage should be deprecated in favor of gettext
 from MultiLanguage import MultiLanguage
 
-COCOS2D_CONSOLE_VERSION = '2.2'
+COCOS2D_CONSOLE_VERSION = '2.3'
 
 
 class Cocos2dIniParser:
@@ -337,13 +337,17 @@ def change_agree_stat(cls, agreed):
         f.close()
 
     @classmethod
-    def show_stat_agreement(cls):
+    def show_stat_agreement(cls, skip_agree_value=None):
         if cls.is_agreement_shown():
             return
 
-        # show the agreement
-        input_value = raw_input(MultiLanguage.get_string('COCOS_AGREEMENT'))
-        agreed = (input_value.lower() != 'n' and input_value.lower() != 'no')
+        if skip_agree_value is None:
+            # show the agreement
+            input_value = raw_input(MultiLanguage.get_string('COCOS_AGREEMENT'))
+            agreed = (input_value.lower() != 'n' and input_value.lower() != 'no')
+        else:
+            # --agreement is used to skip the input
+            agreed = skip_agree_value
         cls.change_agree_stat(agreed)
 
     # change the last time statistics status in local config file.
@@ -963,6 +967,25 @@ def _check_python_version():
         sys.argv.pop(idx)
         sys.argv.pop(idx)
 
+    agreement_arg = '--agreement'
+    skip_agree_value = None
+    if agreement_arg in sys.argv:
+        idx = sys.argv.index(agreement_arg)
+        if idx == (len(sys.argv) - 1):
+            Logging.error(MultiLanguage.get_string('COCOS_ERROR_AGREEMENT_NO_VALUE'))
+            sys.exit(CCPluginError.ERROR_WRONG_ARGS)
+
+        # get the argument value
+        agree_value = sys.argv[idx+1]
+        if agree_value.lower() == 'n':
+            skip_agree_value = False
+        else:
+            skip_agree_value = True
+
+        # remove the argument '--agreement' & the value
+        sys.argv.pop(idx)
+        sys.argv.pop(idx)
+
     # Get the engine version for the DataStat
     cur_path = get_current_path()
     engine_path = os.path.normpath(os.path.join(cur_path, '../../../'))
@@ -973,7 +996,7 @@ def _check_python_version():
     if match:
         STAT_VERSION = match.group(1)
 
-    DataStatistic.show_stat_agreement()
+    DataStatistic.show_stat_agreement(skip_agree_value)
     DataStatistic.stat_event('cocos', 'start', 'invoked')
 
     if not _check_python_version():

bin/strings.json

@@ -4,13 +4,14 @@
         "COCOS_PARSE_PLUGIN_WARNING_FMT" : "Warning: plugin '%s' does not return a plugin name.",
         "COCOS_HELP_BRIEF_FMT" : "\n%s %s - cocos console: A command line tool for Cocos2d-x.",
         "COCOS_HELP_AVAILABLE_CMD" : "\nAvailable commands:",
-        "COCOS_HELP_AVAILABLE_ARGS_FMT" : "\nAvailable arguments:\n\t-h, --help\t\t\tShow this help information.\n\t-v, --version\t\t\tShow the version of this command tool.\n\t--ol %s\tSpecify the language of output messages.",
+        "COCOS_HELP_AVAILABLE_ARGS_FMT" : "\nAvailable arguments:\n\t-h, --help\t\t\tShow this help information.\n\t-v, --version\t\t\tShow the version of this command tool.\n\t--ol %s\tSpecify the language of output messages.\n\t--agreement ['y', 'n']\t\tSkip the agreement with specified value.",
         "COCOS_HELP_EXAMPLE" : "\nExample:\n\tcocos new --help\n\tcocos run --help",
         "COCOS_HELP_ARG_SRC" : "Specify the path of the project.",
         "COCOS_HELP_ARG_QUIET" : "Less output",
         "COCOS_HELP_ARG_PLATFORM" : "Specify the target platform.",
         "COCOS_HELP_ARG_PROJ_DIR" : "Specify the directory for target platform.",
         "COCOS_ERROR_OL_NO_VALUE" : "Please specify the value of argument '--ol'.",
+        "COCOS_ERROR_AGREEMENT_NO_VALUE" : "Please specify the value of argument '--agreement'.",
         "COCOS_WARNING_LANG_NOT_SUPPORT_FMT" : "Language '%s' is not support now.",
         "COCOS_PYTHON_VERSION_TIP_FMT" : "The Python version is %d.%d. But Python 2.7 is required.\nDownload it here: https://www.python.org/",
         "COCOS_WARNING_INVALID_DIR_IN_INI_FMT" : "Warning: Invalid directory defined in cocos2d.ini: %s",
@@ -346,13 +347,14 @@
         "COCOS_PARSE_PLUGIN_WARNING_FMT" : "警告：'%s' 不是可用的命令。",
         "COCOS_HELP_BRIEF_FMT" : "\n%s %s - cocos console: cocos2d-x 的命令行工具集。",
         "COCOS_HELP_AVAILABLE_CMD" : "\n可用的命令：",
-        "COCOS_HELP_AVAILABLE_ARGS_FMT" : "\n可用的参数：\n\t-h, --help\t\t\t显示帮助信息。\n\t-v, --version\t\t\t显示命令行工具的版本号。\n\t--ol %s\t指定输出信息的语言。",
+        "COCOS_HELP_AVAILABLE_ARGS_FMT" : "\n可用的参数：\n\t-h, --help\t\t\t显示帮助信息。\n\t-v, --version\t\t\t显示命令行工具的版本号。\n\t--ol %s\t指定输出信息的语言。\n\t--agreement ['y', 'n']\t\t使用指定的值来同意或拒绝协议。",
         "COCOS_HELP_EXAMPLE" : "\n示例：\n\tcocos new --help\n\tcocos run --help",
         "COCOS_HELP_ARG_SRC" : "指定工程路径。",
         "COCOS_HELP_ARG_QUIET" : "较少的输出。",
         "COCOS_HELP_ARG_PLATFORM" : "指定目标平台。",
         "COCOS_HELP_ARG_PROJ_DIR" : "指定目标平台路径。",
         "COCOS_ERROR_OL_NO_VALUE" : "参数 '--ol' 未指定值。",
+        "COCOS_ERROR_AGREEMENT_NO_VALUE" : "参数 '--agreement' 未指定值。",
         "COCOS_WARNING_LANG_NOT_SUPPORT_FMT" : "目前不支持 '%s' 语言。",
         "COCOS_PYTHON_VERSION_TIP_FMT" : "当前 python 版本为：%d.%d。要求使用 Python 2.7。\n下载地址：https://www.python.org/",
         "COCOS_WARNING_INVALID_DIR_IN_INI_FMT" : "警告：cocos2d.ini 中使用了无效的路径 %s",
@@ -688,12 +690,13 @@
         "COCOS_PARSE_PLUGIN_WARNING_FMT" : "警告：'%s' 不是可用的命令。",
         "COCOS_HELP_BRIEF_FMT" : "\n%s %s - cocos console: cocos2d-x 的命令行工具集。",
         "COCOS_HELP_AVAILABLE_CMD" : "\n可用的命令：",
-        "COCOS_HELP_AVAILABLE_ARGS_FMT" : "\n可用的參數：\n\t-h, --help\t\t\t顯示幫助資訊。\n\t-v, --version\t\t\t顯示命令行工具的版本號。\n\t--ol %s\t指定輸出資訊的語言。",
+        "COCOS_HELP_AVAILABLE_ARGS_FMT" : "\n可用的參數：\n\t-h, --help\t\t\t顯示幫助資訊。\n\t-v, --version\t\t\t顯示命令行工具的版本號。\n\t--ol %s\t指定輸出資訊的語言。\n\t--agreement ['y', 'n']\t\t使用指定的值來同意或拒絕協議。",
         "COCOS_HELP_EXAMPLE" : "\n示例：\n\tcocos new --help\n\tcocos run --help",
         "COCOS_HELP_ARG_SRC" : "指定工程路徑。",
         "COCOS_HELP_ARG_QUIET" : "較少的輸出。",
         "COCOS_HELP_ARG_PLATFORM" : "指定目標平臺。",
         "COCOS_ERROR_OL_NO_VALUE" : "參數 '--ol' 未指定值。",
+        "COCOS_ERROR_AGREEMENT_NO_VALUE" : "參數 '--agreement' 未指定值。",
         "COCOS_WARNING_LANG_NOT_SUPPORT_FMT" : "目前不支持 '%s' 語言。",
         "COCOS_PYTHON_VERSION_TIP_FMT" : "當前 python 版本為：%d.%d。要求使用 Python 2.7。\n下載地址：https://www.python.org/",
         "COCOS_WARNING_INVALID_DIR_IN_INI_FMT" : "警告：cocos2d.ini 中使用了無效的路徑 %s",