crowdin-cli 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fae28d331be3e5cf9041a957ee91975650aa0996
-  data.tar.gz: f02916073ce264318ea11eab1655d14b404711f7
+  metadata.gz: 7bd2f204296c8196c211cd9a575b8bf00595cb82
+  data.tar.gz: e08994a523db83bf8b033f2839c2da8cdc8309ef
 SHA512:
-  metadata.gz: 93d8a24010797eaeff3b862b74861e7e994450d76fd0f99bb7317fc4550309fa06c09aed00f9939ff9ff10385e747e3ff696aca77a5aef561b07425a53bb846f
-  data.tar.gz: beb712ce0fafd91181c842f1fe75cfb21504c08caf235bfae0b15c6a35b05aac097dc2c8624221c61dbfcd9bdc15a22e17f4c3a5681bdf4ab974553ee1ad5f40
+  metadata.gz: 30e1900a5015424aaba07cd7462fc749b5c826fe8afb80b86115664e183fb76a0051c5ec8173801c780c5210a4d4394f2442239e403a8f930fffda87dbefd6c4
+  data.tar.gz: c2d0becec299aaec690a6947eb35d1c6b97e644515df761e968aa08e5bdb582bc94df12bf503720cf20dc34db0e37c6d4bdc5c63881d081151bdc3f8fcc957e8

data/README.md

@@ -1,346 +1,357 @@
-# Crowdin-CLI
-
-[Crowdin Integration Utility Homepage](http://crowdin.net/page/cli-tool) | 
-[Support](http://crowdin.net/contacts) | 
-[Crowdin.net Homepage](http://crowdin.net) | 
-[crowdin-api RubyDoc](http://rubydoc.info/github/crowdin/crowdin-api/)
-
-A Command-Line Interface to sync files between local computer/server and [Crowdin](crowdin.net).
-
-It is cross-platform and can be run in a terminal (Linux, MacOS X) or in cmd.exe (Windows).
-
-![ScreenShot](https://raw.github.com/crowdin/crowdin-cli/master/screenshot.png)
-
-> **WARNING**: This is a development version: It contains the latest changes, but may also have several known issues, including crashes and data loss situations. In fact, it may not work at all.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```
-gem 'crowdin-cli'
-```
-
-And then execute:
-```
-$ bundle
-```
-
-Or install it manually as:
-```
-$ gem install crowdin-cli
-```
-
-## Configuration
-
-When the tool is installed, you would have to configure your project. Basically, `crowdin-cli` go through project directory, and looks for `crowdin.yaml` file that contains project information.
-
-Create `crowdin.yaml` YAML file in your root project directory with the following structure:
-
-```
----
-project_idenfier: test
-api_key: KeepTheAPIkeySecret
-base_url: http://api.crowdin.net
-base_path: /path/to/your/project
-
-files:
-  -
-    source: /locale/en/LC_MESSAGES/messages.po
-    translation: /locale/%two_letters_code%/LC_MESSAGES/%original_file_name%
-```
-
-* `api_key` - Crowdin Project API key
-* `project_identifier` - Crowdin project name
-* `base_url` - (default: http://api.crowdin.net)
-* `base_path` - defines what directory have to be scaned(default: current directory)
-* `files`
-  * `source` - defines only files that should be uploaded as sources
-  * `translation` - defines where translations should be placed after downloading (also the path have to be checked to detect and upload existing translations)
-
-        Use the following placeholders to put appropriate variables into the resulting file name:
-      * `%language%` - Language name (i.e. Ukrainian)
-      * `%two_letters_code%` - Language code ISO 639-1 (i.e. uk)
-      * `%three_letters_code%` - Language code ISO 639-2/T (i.e. ukr)
-      * `%locale%` - Locale (like uk-UA)
-      * `%locale_with_underscore%` - Locale (i.e. uk_UA)
-      * `%original_file_name%` - Original file name
-      * `%android_code%` - Android Locale identifier used to name "values-" directories
-      * `%original_path%` - Take parent folders names in Crowdin project to build file path in resulted bundle
-      * `%file_extension%` - Original file extension
-      * `%file_name%` - File name without extension
-
-         Example for Android projects:
-          ```
-          /values-%android_code%/%original_file_name%
-          ```
-         Example for Gettext projects:
-          ```
-          /locale/%two_letters_code%/LC_MESSAGES/%original_file_name%
-          ```
-
-Also you can add and upload all directories matching the pattern, including all nested files and localizable files.
-
-Configuration example provided above has 'source' and 'translation' attributes containing standard wildcards (also known as globbing patterns) to make it easier to work with multiple files. 
-
-Here's patterns you can use:
-
-* `*` (asterisk)
-
- Match zero or more characters in file name. A glob consisting of only the asterisk and no other characters will match all files in the directory. If you specified a `*.json` it will include all files like `messages.json`, `about_us.json` and anything that ends with `.json`.c* will match all files beginning with c; `*c` will match all files ending with c; and `*c*` will match all files that have c in them (including at the beginning or end). Equivalent to `/ .* /x` in regexp.
-
-* `**` (doubled asterisk)
-
- Match all the directories recursively. Note that you can use `**` in `source` and in `translation` pattern. When using `**` in `translation` pattern it will always contain sub-path from `source` for certain file. The mask `**` can be used only once in the pattern and must be surrounded by backslashes `/`.
-
-* `?` (question mark)
-
- Matches any one character.
-
-* `[set]`
-
- Matches any one character in set. Behaves exactly like character sets in `Regexp`, including set negation (`[^a-z]`).
-
-* `\` (backslash)
-
- Escapes the next metacharacter.
-
- Say, you can have source: `/en/**/*.po` to upload all `*.po` files to Crowdin recursively. `translation` pattern will be `/translations/%two_letters_code%/**/%original_file_name%'`.
-
-See sample configuration below::
-```
----
-project_identifier: test
-api_key: KeepTheAPIkeySecret
-base_url: http://api.crowdin.net
-base_path: /path/to/your/project
-
-files:
-  -
-    source: /locale/en/**/*.po
-    translation: /locale/%two_letters_code%/**/%original_file_name%
-```
-
-### Languages mapping
-
-Often software projects have custom names for locale directories. `crowdin-cli` allows you to map your own languages to understandable by Crowdin. 
-
-Let's say your locale directories named 'en', 'uk', 'fr', 'de'. All of them can be represented by `%two_letters_code%` placeholder. Still, you have one directory named 'zh_CH'. In order to make it work with `crowdin-cli` without changes in your project you can add `languages_mapping` section to your files set. See sample configuration below:
-
-```
----
-project_identifier: test
-api_key: KeepTheAPIkeySecret
-base_url: http://api.crowdin.net
-base_path: /path/to/your/project
-
-files:
-  -
-    source: /locale/en/**/*.po
-    translation: /locale/%two_letters_code%/**/%original_file_name%
-    languages_mapping:
-      two_letters_code:
-        # crowdin_language_code: local_name
-        ru: ros
-        uk: ukr
-```
-Mapping format is the following: `crowdin_language_code : code_use_use`.
-
-Check [complete list of Crowdin language codes](http://crowdin.net/page/api/language-codes) that can be used for mapping.
-
-You can also override language codes for other placeholders like `%android_code%`, `%locale%` etc...
-
-### Ignoring directories
-
-From time to time there are files and directories you don't want translate on Crowdin.
-Local per-file rules can be added to the config file in your project.
-
-```
-files:
-  -
-    source: /locale/en/**/*.po
-    translation: /locale/%two_letters_code%/**/%original_file_name%
-    ignore:
-      - /locale/en/templates
-      - /locale/en/**/test-*.po
-      - /locale/en/**/[^abc]*.po
-
-```
-
-### Preserving directories hierarchy
-
-By default CLI tool tries to optimize your Crowdin project hierarchy and do not repeats complete path of local files online. In case you need to keep directories structure same at Crowdin and locally you can add `preserve_hierarchy: true` option in main section of the configuration file. 
-
-Configuration sample is below:
-
-```
----
-project_identifier: test
-api_key: KeepTheAPIkeySecret
-base_url: http://api.crowdin.net
-base_path: /path/to/your/project
-preserve_hierarchy: true
-```
-
-### Uploading CSV files via API
-
-```
----
-project_identifier: test
-api_key: KeepTheAPIkeySecret
-base_url: http://api.crowdin.net
-base_path: /path/to/your/project
-
-files:
-  -
-   source: '/*.csv'
-   translation: '%two_letters_code%/%original_file_name%'
-   # Defines whether first line should be imported or it contains columns headers
-   first_line_contains_header: true
-   # Used only when uploading CSV file to define data columns mapping.
-   scheme: "identifier,source_phrase,translation,context,max_length"
-```
-
-#### Multicolumn CSV
-
-In case CSV file contains translations to all target languages you can use per-file option `multilingual_spreadsheet`.
-
-CSV file example:
-```
-identifier,source_phrase,context,Ukrainian,Russian,French
-ident1,Source 1,Context 1,,,
-ident2,Source 2,Context 2,,,
-ident3,Source 3,Context 3,,,
-```
-
-Configuration file example:
-```
-files:
-  -
-    source: multicolumn.csv
-    translation: multicolumn.csv
-    first_line_contains_header: true
-    scheme: "identifier,source_phrase,context,uk,ru,fr"
-    multilingual_spreadsheet: true
-
-```
-
-
-## Configurations Examples
-
-### GetText Project
-
-```
----
-project_identifier: test
-api_key: KeepTheAPIkeySecret
-base_url: http://api.crowdin.net
-base_path: /path/to/your/project
-
-files:
-  -
-    source: '/locale/en/**/*.po'
-    translation: '/locale/%two_letters_code%/LC_MESSAGES/%original_file_name%'
-    languages_mapping:
-      two_letters_code:
-        'zh-CN': 'zh_CH'
-        'fr-QC': 'fr'
-```
-
-### Android Project
-
-```
----
-project_identifier: test
-api_key: KeepTheAPIkeySecret
-base_url: http://api.crowdin.net
-base_path: /path/to/your/project
-
-files:
-  -
-   source: '/res/values/*.xml'
-   translation: '/res/values-%android_code%/%original_file_name%'
-   languages_mapping:
-     android_code:
-       # we need this mapping since Crowdin expects directories
-       # to be named like "values-uk-rUA"
-       # acording to specification instead of just "uk"
-       de: de
-       ru: ru
-```
-
-## Usage
-
-When the configuration file is created, you are ready to start using `crowdin-cli` to manage your localization resources and automate files synchronization. 
-
-We listed most typical commands that crowdin-cli is used for:
-
-Upload your source files to Crowdin:
-```
-$ crowdin-cli upload sources
-```
-
-Upload existing translations to Crowdin project (translations will be synchronized):
-```
-$ crowdin-cli upload translations
-```
-
-Download latest translations from Crowdin:
-```
-$ crowdin-cli download
-```
-
-List information about the files that already exists in current project:
-```
-$ crowdin-cli list project
-```
-
-List information about the sources files in current project that match the wild-card pattern:
-```
-$ crowdin-cli list sources
-```
-
-List information about the translations files in current project that match the wild-card pattern:
-```
-$ crowdin-cli list translations
-```
-
-By default, `list` command print a list of all the files
-Also, `list` accept `-tree` optional argument to list contents in a tree-like format.
-
-
-Get help on `upload` command:
-```
-$ crowdin-cli help upload
-```
-
-Get help on `upload sources` command:
-```
-$ crowdin-cli help upload sources
-```
-
-Use help provided with an application to get more information about available commands and options:
-
-
-## Supported Rubies
-
-Tested with the following Ruby versions:
-
-- MRI 1.9.3
-- JRuby 1.7.0
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## License and Author
-
-Author: Anton Maminov (anton.maminov@gmail.com)
-
-Copyright: 2012-2014 [Crowdin.net](http://crowdin.net/)
-
-This project is licensed under the MIT license, a copy of which can be found in the LICENSE file.
+# Crowdin-CLI
+
+[Crowdin Integration Utility Homepage](http://crowdin.net/page/cli-tool)
+ | [Support](http://crowdin.net/contacts)
+ | [Crowdin.net Homepage](http://crowdin.net)
+ | [crowdin-api RubyDoc](http://rubydoc.info/github/crowdin/crowdin-api/)
+
+A Command-Line Interface to sync files between local computer/server and [Crowdin](crowdin.net).
+
+It is cross-platform and can be run in a terminal (Linux, MacOS X) or in cmd.exe (Windows).
+
+![ScreenShot](https://raw.github.com/crowdin/crowdin-cli/master/screenshot.png)
+
+> **WARNING**: This is a development version: It contains the latest changes, but may also have several known issues, including crashes and data loss situations. In fact, it may not work at all.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```
+gem 'crowdin-cli'
+```
+
+And then execute:
+```
+$ bundle
+```
+
+Or install it manually as:
+```
+$ gem install crowdin-cli
+```
+
+## Configuration
+
+When the tool is installed, you would have to configure your project. Basically, `crowdin-cli` go through project directory, and looks for `crowdin.yaml` file that contains project information.
+
+Create `crowdin.yaml` YAML file in your root project directory with the following structure:
+
+```
+---
+project_idenfier: test
+api_key: KeepTheAPIkeySecret
+base_url: http://api.crowdin.net
+base_path: /path/to/your/project
+
+files:
+  -
+    source: /locale/en/LC_MESSAGES/messages.po
+    translation: /locale/%two_letters_code%/LC_MESSAGES/%original_file_name%
+```
+
+* `api_key` - Crowdin Project API key
+* `project_identifier` - Crowdin project name
+* `base_url` - (default: http://api.crowdin.net)
+* `base_path` - defines what directory have to be scaned(default: current directory)
+* `files`
+  * `source` - defines only files that should be uploaded as sources
+  * `translation` - defines where translations should be placed after downloading (also the path have to be checked to detect and upload existing translations)
+
+        Use the following placeholders to put appropriate variables into the resulting file name:
+      * `%language%` - Language name (i.e. Ukrainian)
+      * `%two_letters_code%` - Language code ISO 639-1 (i.e. uk)
+      * `%three_letters_code%` - Language code ISO 639-2/T (i.e. ukr)
+      * `%locale%` - Locale (like uk-UA)
+      * `%locale_with_underscore%` - Locale (i.e. uk_UA)
+      * `%original_file_name%` - Original file name
+      * `%android_code%` - Android Locale identifier used to name "values-" directories
+      * `%original_path%` - Take parent folders names in Crowdin project to build file path in resulted bundle
+      * `%file_extension%` - Original file extension
+      * `%file_name%` - File name without extension
+
+         Example for Android projects:
+          ```
+          /values-%android_code%/%original_file_name%
+          ```
+         Example for Gettext projects:
+          ```
+          /locale/%two_letters_code%/LC_MESSAGES/%original_file_name%
+          ```
+
+Also you can add and upload all directories matching the pattern, including all nested files and localizable files.
+
+Configuration example provided above has 'source' and 'translation' attributes containing standard wildcards (also known as globbing patterns) to make it easier to work with multiple files.
+
+Here's patterns you can use:
+
+* `*` (asterisk)
+
+ Match zero or more characters in file name. A glob consisting of only the asterisk and no other characters will match all files in the directory. If you specified a `*.json` it will include all files like `messages.json`, `about_us.json` and anything that ends with `.json`.c* will match all files beginning with c; `*c` will match all files ending with c; and `*c*` will match all files that have c in them (including at the beginning or end). Equivalent to `/ .* /x` in regexp.
+
+* `**` (doubled asterisk)
+
+ Match all the directories recursively. Note that you can use `**` in `source` and in `translation` pattern. When using `**` in `translation` pattern it will always contain sub-path from `source` for certain file. The mask `**` can be used only once in the pattern and must be surrounded by backslashes `/`.
+
+* `?` (question mark)
+
+ Matches any one character.
+
+* `[set]`
+
+ Matches any one character in set. Behaves exactly like character sets in `Regexp`, including set negation (`[^a-z]`).
+
+* `\` (backslash)
+
+ Escapes the next metacharacter.
+
+ Say, you can have source: `/en/**/*.po` to upload all `*.po` files to Crowdin recursively. `translation` pattern will be `/translations/%two_letters_code%/**/%original_file_name%'`.
+
+See sample configuration below::
+```
+---
+project_identifier: test
+api_key: KeepTheAPIkeySecret
+base_url: http://api.crowdin.net
+base_path: /path/to/your/project
+
+files:
+  -
+    source: /locale/en/**/*.po
+    translation: /locale/%two_letters_code%/**/%original_file_name%
+```
+
+### Split project configuration and user credentials
+
+The `crowdin.yaml` file contains project-specific configuration and user credentials(`api_key`, `project_identifier`).
+This means that you can't commit this file in the code repository, because the API key would leak to other users. `crowdin-cli` allow 2 configuration files:
+
+* a project-specific, residing in the project directory (required)
+* a user-specific, probably residing in `$HOME/.crowdin.yaml` (optional)
+
+**NOTE**: user credentials in user-specific configuration file is higher priority than project-specific.
+
+### Languages mapping
+
+Often software projects have custom names for locale directories. `crowdin-cli` allows you to map your own languages to understandable by Crowdin.
+
+Let's say your locale directories named 'en', 'uk', 'fr', 'de'. All of them can be represented by `%two_letters_code%` placeholder. Still, you have one directory named 'zh_CH'. In order to make it work with `crowdin-cli` without changes in your project you can add `languages_mapping` section to your files set. See sample configuration below:
+
+```
+---
+project_identifier: test
+api_key: KeepTheAPIkeySecret
+base_url: http://api.crowdin.net
+base_path: /path/to/your/project
+
+files:
+  -
+    source: /locale/en/**/*.po
+    translation: /locale/%two_letters_code%/**/%original_file_name%
+    languages_mapping:
+      two_letters_code:
+        # crowdin_language_code: local_name
+        ru: ros
+        uk: ukr
+```
+Mapping format is the following: `crowdin_language_code : code_use_use`.
+
+Check [complete list of Crowdin language codes](http://crowdin.net/page/api/language-codes) that can be used for mapping.
+
+You can also override language codes for other placeholders like `%android_code%`, `%locale%` etc...
+
+### Ignoring directories
+
+From time to time there are files and directories you don't want translate on Crowdin.
+Local per-file rules can be added to the config file in your project.
+
+```
+files:
+  -
+    source: /locale/en/**/*.po
+    translation: /locale/%two_letters_code%/**/%original_file_name%
+    ignore:
+      - /locale/en/templates
+      - /locale/en/**/test-*.po
+      - /locale/en/**/[^abc]*.po
+
+```
+
+### Preserving directories hierarchy
+
+By default CLI tool tries to optimize your Crowdin project hierarchy and do not repeats complete path of local files online.
+In case you need to keep directories structure same at Crowdin and locally you can add `preserve_hierarchy: true` option in main section of the configuration file.
+
+Configuration sample is below:
+
+```
+---
+project_identifier: test
+api_key: KeepTheAPIkeySecret
+base_url: http://api.crowdin.net
+base_path: /path/to/your/project
+preserve_hierarchy: true
+```
+
+### Uploading CSV files via API
+
+```
+---
+project_identifier: test
+api_key: KeepTheAPIkeySecret
+base_url: http://api.crowdin.net
+base_path: /path/to/your/project
+
+files:
+  -
+   source: '/*.csv'
+   translation: '%two_letters_code%/%original_file_name%'
+   # Defines whether first line should be imported or it contains columns headers
+   first_line_contains_header: true
+   # Used only when uploading CSV file to define data columns mapping.
+   scheme: "identifier,source_phrase,translation,context,max_length"
+```
+
+#### Multicolumn CSV
+
+In case CSV file contains translations to all target languages you can use per-file option `multilingual_spreadsheet`.
+
+CSV file example:
+```
+identifier,source_phrase,context,Ukrainian,Russian,French
+ident1,Source 1,Context 1,,,
+ident2,Source 2,Context 2,,,
+ident3,Source 3,Context 3,,,
+```
+
+Configuration file example:
+```
+files:
+  -
+    source: multicolumn.csv
+    translation: multicolumn.csv
+    first_line_contains_header: true
+    scheme: "identifier,source_phrase,context,uk,ru,fr"
+    multilingual_spreadsheet: true
+
+```
+
+
+## Configurations Examples
+
+### GetText Project
+
+```
+---
+project_identifier: test
+api_key: KeepTheAPIkeySecret
+base_url: http://api.crowdin.net
+base_path: /path/to/your/project
+
+files:
+  -
+    source: '/locale/en/**/*.po'
+    translation: '/locale/%two_letters_code%/LC_MESSAGES/%original_file_name%'
+    languages_mapping:
+      two_letters_code:
+        'zh-CN': 'zh_CH'
+        'fr-QC': 'fr'
+```
+
+### Android Project
+
+```
+---
+project_identifier: test
+api_key: KeepTheAPIkeySecret
+base_url: http://api.crowdin.net
+base_path: /path/to/your/project
+
+files:
+  -
+   source: '/res/values/*.xml'
+   translation: '/res/values-%android_code%/%original_file_name%'
+   languages_mapping:
+     android_code:
+       # we need this mapping since Crowdin expects directories
+       # to be named like "values-uk-rUA"
+       # acording to specification instead of just "uk"
+       de: de
+       ru: ru
+```
+
+## Usage
+
+When the configuration file is created, you are ready to start using `crowdin-cli` to manage your localization resources and automate files synchronization.
+
+We listed most typical commands that crowdin-cli is used for:
+
+Upload your source files to Crowdin:
+```
+$ crowdin-cli upload sources
+```
+
+Upload existing translations to Crowdin project (translations will be synchronized):
+```
+$ crowdin-cli upload translations
+```
+
+Download latest translations from Crowdin:
+```
+$ crowdin-cli download
+```
+
+List information about the files that already exists in current project:
+```
+$ crowdin-cli list project
+```
+
+List information about the sources files in current project that match the wild-card pattern:
+```
+$ crowdin-cli list sources
+```
+
+List information about the translations files in current project that match the wild-card pattern:
+```
+$ crowdin-cli list translations
+```
+
+By default, `list` command print a list of all the files
+Also, `list` accept `-tree` optional argument to list contents in a tree-like format.
+
+
+Get help on `upload` command:
+```
+$ crowdin-cli help upload
+```
+
+Get help on `upload sources` command:
+```
+$ crowdin-cli help upload sources
+```
+
+Use help provided with an application to get more information about available commands and options:
+
+
+## Supported Rubies
+
+Tested with the following Ruby versions:
+
+- MRI 1.9.3
+- JRuby 1.7.0
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## License and Author
+
+Author: Anton Maminov (anton.maminov@gmail.com)
+
+Copyright: 2012-2014 [Crowdin.net](http://crowdin.net/)
+
+This project is licensed under the MIT license, a copy of which can be found in the LICENSE file.

data/bin/crowdin-cli

@@ -325,6 +325,12 @@ default_value File.join(Dir.pwd, 'crowdin.yaml')
 arg_name '<s>'
 flag [:c, :config]
 
+desc I18n.t('app.flags.identity.desc')
+default_value File.join(Dir.home, '.crowdin.yaml')
+arg_name '<s>'
+flag [:identity]
+
+
 desc I18n.t('app.commands.upload.desc')
 long_desc I18n.t('app.commands.upload.long_desc')
 command :upload do |c|
@@ -364,9 +370,9 @@ command :upload do |c|
 
           local_file = { dest: dest, source: File.join(@base_path, file['source']), export_pattern: file['translation'] }
 
-          local_file.merge!({ sheme: file['scheme'] }) if file.has_key?('scheme')
-          local_file.merge!({ first_line_contains_header: file['first_line_contains_header'] }) if file.has_key?('first_line_contains_header')
-          local_file.merge!({ update_option: file['update_option'] }) if file.has_key?('update_option')
+          @allowed_options.each do |option|
+            local_file.merge!({ option.to_sym => file[option] }) if file.has_key?(option)
+          end
 
           local_files << local_file
         else
@@ -388,9 +394,9 @@ command :upload do |c|
 
               local_file = { dest: dest, source: source_path, export_pattern: export_pattern }
 
-              local_file.merge!({ sheme: file['scheme'] }) if file.has_key?('scheme')
-              local_file.merge!({ first_line_contains_header: file['first_line_contains_header'] }) if file.has_key?('first_line_contains_header')
-              local_file.merge!({ update_option: file['update_option'] }) if file.has_key?('update_option')
+              @allowed_options.each do |option|
+                local_file.merge!({ option.to_sym => file[option] }) if file.has_key?(option)
+              end
 
               local_files << local_file
             end
@@ -431,9 +437,9 @@ EOS
           print "Updating source file `#{file[:dest]}'"
 
           params = {}
-          params[:scheme] = file.delete(:sheme)
-          params[:first_line_contains_header] = file.delete(:first_line_contains_header)
-          params[:update_option] = file.delete(:update_option) # 'update_without_changes' or 'update_as_unapproved'
+          @allowed_options.each do |option|
+            params[option.to_sym] = file.delete(option.to_sym)
+          end
 
           resp = @crowdin.update_file([] << file, params)
 
@@ -454,8 +460,9 @@ EOS
         print "Uploading source file `#{file[:dest]}'"
 
         params = {}
-        params[:scheme] = file.delete(:sheme)
-        params[:first_line_contains_header] = file.delete(:first_line_contains_header)
+        @allowed_options.each do |option|
+          params[option.to_sym] = file.delete(option.to_sym)
+        end
 
         resp = @crowdin.add_file([] << file, params)
 
@@ -767,9 +774,9 @@ command :list do |ls_cmd|
 
           local_file = { dest: dest, source: File.join(@base_path, file['source']), export_pattern: file['translation'] }
 
-          local_file.merge!({ sheme: file['scheme'] }) if file.has_key?('scheme')
-          local_file.merge!({ first_line_contains_header: file['first_line_contains_header'] }) if file.has_key?('first_line_contains_header')
-          local_file.merge!({ update_option: file['update_option'] }) if file.has_key?('update_option')
+          @allowed_options.each do |option|
+            local_file.merge!({ option.to_sym => file[option] }) if file.has_key?(option)
+          end
 
           local_files << local_file
         else
@@ -791,9 +798,9 @@ command :list do |ls_cmd|
 
               local_file = { dest: dest, source: source_path, export_pattern: export_pattern }
 
-              local_file.merge!({ sheme: file['scheme'] }) if file.has_key?('scheme')
-              local_file.merge!({ first_line_contains_header: file['first_line_contains_header'] }) if file.has_key?('first_line_contains_header')
-              local_file.merge!({ update_option: file['update_option'] }) if file.has_key?('update_option')
+              @allowed_options.each do |option|
+                local_file.merge!({ option.to_sym => file[option] }) if file.has_key?(option)
+              end
 
               local_files << local_file
             end
@@ -839,7 +846,7 @@ command :list do |ls_cmd|
 
           translation_languages.each do |lang|
             local_file  = export_pattern_to_path(dest, file['translation'], lang, languages_mapping)
-            translations_files <<  local_file
+            translation_files <<  local_file
           end
 
         else
@@ -887,8 +894,34 @@ pre do |globals ,command, options, args|
   # Use skips_pre before a command to skip this block
   # on that command only
 
-  if File.exists?(globals[:config])
-    @config = YAML.load_file(globals[:config])
+  @allowed_options = [
+    # CSV files only
+    'scheme',
+    'first_line_contains_header',
+    'update_option',
+    # XML files only
+    'translate_content',
+    'translate_attributes',
+    'content_segmentations',
+    'translate_elements',
+  ]
+
+  unless File.exists?(globals[:config])
+    exit_now! <<EOS
+Can't find configuration file (default `crowdin.yaml').
+Type `crowdin-cli help` to know how to specify custom configuration file
+
+See http://crowdin.net/page/cli-tool#configuration-file for more details
+EOS
+  else
+    @config = YAML.load_file(globals[:config]) || {}
+
+    if File.exists?(globals[:identity])
+      identity = YAML.load_file(globals[:identity]) || {}
+      ['api_key', 'project_identifier'].each do |key|
+        @config[key] = identity[key] if identity[key]
+      end
+    end
 
     ['api_key', 'project_identifier'].each do |key|
       unless @config[key]
@@ -907,14 +940,6 @@ Configuration file misses required section `files`
 See http://crowdin.net/page/cli-tool#configuration-file for more details
 EOS
     end
-
-  else
-    exit_now! <<EOS
-Can't find configuration file (default `crowdin.yaml').
-Type `crowdin-cli help` to know how to specify custom configuration file
-
-See http://crowdin.net/page/cli-tool#configuration-file for more details
-EOS
   end
 
   @config['files'].each do |file|

data/lib/crowdin-cli/version.rb

@@ -1,5 +1,5 @@
 module Crowdin
   module CLI
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

data/locales/en.yml

@@ -6,7 +6,9 @@ en:
       See http://crowdin.net/page/cli-tool#configuration-file for more details.
     flags:
       config:
-        desc: The configuration file
+        desc: Project-specific configuration file
+      identity:
+        desc: User-specific configuration file with API credentials
     switches:
       verbose:
         desc: Be verbose

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Crowdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake