crowdin-cli 0.0.8 → 0.0.9

data/README.md

@@ -38,7 +38,7 @@ base_path: /path/to/your/project
 files:
   -
     source: /locale/en/LC_MESSAGES/messages.po
-    translation: /locale/%two_letter_code%/LC_MESSAGES/%original_file_name%
+    translation: /locale/%two_letters_code%/LC_MESSAGES/%original_file_name%
 ```
 
 * `api_key` - Crowdin Project API key
@@ -51,8 +51,8 @@ files:
     
         Use the following placeholders to put appropriate variables into the resulting file name:
       * `%language%` - Language name (i.e. Ukrainian)
-      * `%two_letter_code%` - Language code ISO 639-1 (i.e. uk)
-      * `%three_letter_code%` - Language code ISO 639-2/T (i.e. ukr)
+      * `%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
@@ -67,7 +67,7 @@ files:
           ```
          Example for Gettext projects:
           ```
-          /locale/%two_letter_code%/LC_MESSAGES/%original_file_name%
+          /locale/%two_letters_code%/LC_MESSAGES/%original_file_name%
           ```
 
 Also you can add and upload all directories mathing the pattern including all nested files and localizable files.
@@ -83,7 +83,7 @@ base_path: /path/to/your/project
 files:
   -
     source: /locale/en/**/*.po
-    translation: /locale/%two_letter_code%/**/%original_file_name%
+    translation: /locale/%two_letters_code%/**/%original_file_name%
 ```
 ## Usage
 

data/bin/crowdin-cli

@@ -40,6 +40,30 @@ def walk_local_tree(files, result = { dirs: [], files: [] })
   return result
 end
 
+# +path_ - relative path to file in Crowdin project
+# +export_pattern+ - basically, is a file['translation'] from crowdin.yaml
+# +lang+ - Hash containing language information
+#
+def export_pattern_to_path(path, export_pattern, lang)
+  original_path      = File.dirname(path)
+  original_file_name = File.basename(path)
+  file_extension     = File.extname(path)[1..-1]
+  file_name          = File.basename(path, file_extension)
+
+  export_pattern.gsub(/%.+?%/, {
+    '%language%'               => lang['name'],
+    '%two_letters_code%'       => lang['iso_639_1'],
+    '%tree_letters_code%'      => lang['iso_639_3'],
+    '%locale%'                 => lang['locale'],
+    '%locale_with_underscore%' => lang['locale'].gsub('-', '_'),
+    '%android_code%'           => android_locale_code(lang['locale']),
+    '%original_file_name%'     => original_file_name,
+    '%original_path%'          => original_path,
+    '%file_extension%'         => file_extension,
+    '%file_name%'              => file_extension,
+  })
+end
+
 def unzip_file(file, dest)
   # overwrite files if they already exist inside of the extracted path
   Zip.options[:on_exists_proc] = true
@@ -119,23 +143,7 @@ command :upload do |c|
         else
           Dir.glob("#{@base_path}#{file['source']}").each do |source|
             dest = source.sub("#{@base_path}", '') # relative path in Crowdin
-            original_path      = File.dirname(dest)
-            original_file_name = File.basename(dest)
-            file_extension     = File.extname(dest)
-            file_name          = File.basename(dest, file_extension)
-
-            file_pattern = file['translation'].gsub(/%.+?%/, {
-              '%language%'               => source_language['name'],
-              '%two_letter_code%'        => source_language['iso_639_1'],
-              '%tree_letter_code%'       => source_language['iso_639_3'],
-              '%locale%'                 => source_language['locale'],
-              '%locale_with_underscore%' => source_language['locale'].gsub('-', '_'),
-              '%original_file_name%'     => original_file_name,
-              '%android_code%'           => android_locale_code(source_language['locale']),
-              '%original_path%'          => original_path,
-              '%file_extension%'         => file_extension,
-              '%file_name%'              => file_extension,
-            })
+            file_pattern = export_pattern_to_path(dest, file['translation'], source_language)
 
             diff = (dest.split('/') - file_pattern.split('/')).join('/')
             export_pattern = file['translation'].sub('**', diff)
@@ -220,64 +228,23 @@ command :upload do |c|
       @config['files'].each do |file|
         if File.exists?("#{@base_path}#{file['source']}")
           dest = file['source'].sub("#{@base_path}", '')
-          original_path      = File.dirname(dest)
-          original_file_name = File.basename(dest)
-          file_extension     = File.extname(dest)[1..-1]
-          file_name          = File.basename(dest, file_extension)
 
           translation_languages.each do |lang|
-            source = file['translation'].gsub(/%.+?%/, {
-              '%language%'               => lang['name'],
-              '%two_letter_code%'        => lang['iso_639_1'],
-              '%tree_letter_code%'       => lang['iso_639_3'],
-              '%locale%'                 => lang['locale'],
-              '%locale_with_underscore%' => lang['locale'].gsub('-', '_'),
-              '%original_file_name%'     => original_file_name,
-              '%android_code%'           => android_locale_code(lang['locale']),
-              '%original_path%'          => original_path,
-              '%file_extension%'         => file_extension,
-              '%file_name%'              => file_extension,
-            })
+            source = export_pattern_to_path(dest, file['translation'], lang)
 
             translated_files[lang['crowdin_code']] << { source: "#{@base_path}#{source}", dest: dest }
           end
         else
           Dir.glob("#{@base_path}#{file['source']}").each do |source|
             dest = source.sub("#{@base_path}", '')
-            original_path      = File.dirname(dest)
-            original_file_name = File.basename(dest)
-            file_extension     = File.extname(dest)
-            file_name          = File.basename(dest, file_extension)
-
-            file_pattern = file['translation'].gsub(/%.+?%/, {
-              '%language%'               => source_language['name'],
-              '%two_letter_code%'        => source_language['iso_639_1'],
-              '%tree_letter_code%'       => source_language['iso_639_3'],
-              '%locale%'                 => source_language['locale'],
-              '%locale_with_underscore%' => source_language['locale'].gsub('-', '_'),
-              '%original_file_name%'     => original_file_name,
-              '%android_code%'           => android_locale_code(source_language['locale']),
-              '%original_path%'          => original_path,
-              '%file_extension%'         => file_extension,
-              '%file_name%'              => file_extension,
-            })
+
+            file_pattern = export_pattern_to_path(dest, file['translation'], source_language)
 
             diff = (dest.split('/') - file_pattern.split('/')).join('/')
             export_pattern = file['translation'].sub('**', diff)
 
             translation_languages.each do |lang|
-              source = export_pattern.gsub(/%.+?%/, {
-                '%language%'               => lang['name'],
-                '%two_letter_code%'        => lang['iso_639_1'],
-                '%tree_letter_code%'       => lang['iso_639_3'],
-                '%locale%'                 => lang['locale'],
-                '%locale_with_underscore%' => lang['locale'].gsub('-', '_'),
-                '%original_file_name%'     => original_file_name,
-                '%android_code%'           => android_locale_code(lang['locale']),
-                '%original_path%'          => original_path,
-                '%file_extension%'         => file_extension,
-                '%file_name%'              => file_extension,
-              })
+              source = export_pattern_to_path(dest, export_pattern, lang)
 
               translated_files[lang['crowdin_code']] << { source: "#{@base_path}#{source}", dest: dest }
             end

data/lib/crowdin-cli/version.rb

@@ -1,5 +1,5 @@
 module Crowdin
   module CLI
-    VERSION = '0.0.8'
+    VERSION = '0.0.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,7 +96,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
@@ -104,7 +104,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.8
 description: