crowdin-cli 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ec73f4c28abfe7a1ef6f57b3e4d555c9bade3e0
-  data.tar.gz: 18cbf8100e6d2c8acc39f6246257c599f5947111
+  metadata.gz: 0a2b8da800c4eb8b7ac83fae71c4f5a367e2957f
+  data.tar.gz: f20547149f0303af7281561df18d4553ee588999
 SHA512:
-  metadata.gz: b8f62d0b51d1a2010545ffe5c98908c384a0c1b02150e7d5832f3fbd3719d2d7a4130cc1ccbed96e613c4964ad5cc2accda8217168b3458fc1c8f4bb66b3e8e6
-  data.tar.gz: 9ac87f661fc3a37617edf2c5520721cd0d7fee29b5c970e6d3ad938f91108b83c30414389940807a2391e2b01bb3c0db942b98ccb51c44155686c4a14911a7b6
+  metadata.gz: 65f49b368609972c0f7fd26f92b96fa194ea105eb681fb766f2232f40e178a9e2b190ddbbfa40c121881d58e13c76a6ca52b682665f2396b803a6aafcd50273f
+  data.tar.gz: e2ddd67bca8e0786add4e9f23f98bf81299b8dab6cb8bf3cea7e04300c647ff0cb8fcb5bb1cc7c8a4ac0cc849c05fdcc3d11415499696404c16738377df55351

data/README.md

@@ -87,13 +87,13 @@ Here's patterns you can use:
 
 * `*` (asterisk)
 
- This wildcard represents any character in file or directory name. If you specified a `*.json` it will include all files like `messages.json`, `about_us.json` and anything that ends with `.json`. 
+ 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`. 
 
 * `**` (doubled asterisk)
 
- Matches any string recursively (including sub-directories). 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.
+ Match all 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 `/`.
 
- Say, you can have source: `/en/**/*.po` to upload all `*.po` files to Crowdin recursively. `translation` pattern will be `/%two_letters_code%/**/%original_file_name%'`.
+ 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::
 ```

data/bin/crowdin-cli

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'pp'
 require 'crowdin-cli'
 
 # GLI_DEBUG=true bundle exec bin/crowdin-cli
@@ -80,6 +81,49 @@ def export_pattern_to_path(path, export_pattern, lang, languages_mapping = nil)
   export_pattern.gsub(/%(#{placeholders.join('|')})%/, pattern)
 end
 
+# @param [String] path relative path to file in Crowdin project
+# @param [String] source basically, is a file['source'] from crowdin.yaml
+# @param [String] translation basically, is a file['translation'] from crowdin.yaml
+#
+def construct_export_pattern(path, source, translation)
+  pattern_regexp = translate_pattern_to_regexp(source)
+  if path.match(pattern_regexp)
+    double_asterisk = path.match(pattern_regexp)['double_asterisk']
+    translation = translation.sub('**', double_asterisk)
+  end
+
+  export_pattern = translation.split('/').reject(&:empty?).join('/').insert(0, '/')
+
+  return export_pattern
+end
+
+# Translate a glob pattern to a regular expression
+#
+def translate_pattern_to_regexp(pat)
+  i = 0
+  n = pat.size
+  res = ''
+  while i < n
+    c = pat[i]
+    i = i + 1
+    if c == '*'
+      j = i
+      if j < n and pat[j] == '*'
+        res << '(?<double_asterisk>.*)'
+        i = j + 1
+      else
+        res << '(.*)'
+      end
+    elsif c == '?'
+      res << '.'
+    else
+      res << Regexp.escape(c)
+    end
+  end
+
+  return Regexp.new(res)
+end
+
 def android_locale_code(locale_code)
   locale_code = case locale_code
     when 'he-IL' then 'iw-IL'
@@ -155,7 +199,7 @@ include GLI::App
 version Crowdin::CLI::VERSION
 
 program_desc 'is a command line tool that allows you to manage and synchronize your localization resources with Crowdin project'
-program_long_desc 'This tool requires configuration file to be created. See http://crowdin.net/page/cli-client for more details.'
+program_long_desc 'This tool requires configuration file to be created. See http://crowdin.net/page/cli-tool#configuration-file for more details.'
 sort_help :manually # help commands are ordered in the order declared
 wrap_help_text :to_terminal
 
@@ -199,7 +243,7 @@ EOS
 
       @config['files'].each do |file|
         get_invalid_placeholders(file['translation']).each do |placeholder|
-          puts "Warning: #{placeholder} is not valid variable supported by Crowdin. See http://crowdin.net/page/cli-client#configuration-file for more details."
+          puts "Warning: #{placeholder} is not valid variable supported by Crowdin. See http://crowdin.net/page/cli-tool#configuration-file for more details."
         end
 
         if File.exist?("#{@base_path}#{file['source']}")
@@ -216,10 +260,7 @@ EOS
             dest = source.sub("#{@base_path}", '') # relative path in Crowdin
             dest_files << dest
 
-            file_pattern = export_pattern_to_path(dest, file['translation'], source_language)
-
-            diff = (dest.split('/') - file_pattern.split('/')).join('/')
-            export_pattern = file['translation'].sub('**', diff)
+            export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
 
             local_file = { dest: dest, source: source, export_pattern: export_pattern }
             local_file.merge!({ sheme: file['scheme'] }) if file.has_key?('scheme')
@@ -231,7 +272,7 @@ EOS
       end # @config['files']
 
       if dest_files.empty?
-        exit_now!("nothing to upload. See http://crowdin.net/page/cli-client#configuration-file for more details.")
+        exit_now!("nothing to upload. See http://crowdin.net/page/cli-tool#configuration-file for more details.")
       end
 
       common_dir = find_common_directory_path(dest_files)
@@ -313,7 +354,6 @@ EOS
     c.desc 'Automatically approve uploaded translations'
     c.switch ['auto-approve-imported']
 
-
     c.action do |global_options, options, args|
       params = {}
       params[:import_duplicates]     = options['import-dublicates']     ? 1 : 0
@@ -343,7 +383,7 @@ EOS
 
       @config['files'].each do |file|
         get_invalid_placeholders(file['translation']).each do |placeholder|
-          puts "Warning: #{placeholder} is not valid variable supported by Crowdin. See http://crowdin.net/page/cli-client#configuration-file for more details."
+          puts "Warning: #{placeholder} is not valid variable supported by Crowdin. See http://crowdin.net/page/cli-tool#configuration-file for more details."
         end
 
         languages_mapping = file['languages_mapping']
@@ -361,10 +401,7 @@ EOS
             dest = source.sub("#{@base_path}", '') # relative path in Crowdin
             dest_files << dest
 
-            file_pattern = export_pattern_to_path(dest, file['translation'], source_language)
-
-            diff = (dest.split('/') - file_pattern.split('/')).join('/')
-            export_pattern = file['translation'].sub('**', diff) # !!!
+            export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
 
             translation_languages.each do |lang|
               source = export_pattern_to_path(dest, export_pattern, lang, languages_mapping)
@@ -376,7 +413,7 @@ EOS
       end # @config['files']
 
       if dest_files.empty?
-        exit_now!("Warning: nothing to upload. See http://crowdin.net/page/cli-client#configuration-file for more details.")
+        exit_now!("Warning: nothing to upload. See http://crowdin.net/page/cli-tool#configuration-file for more details.")
       end
 
       common_dir = find_common_directory_path(dest_files)
@@ -462,11 +499,8 @@ command :download do |c|
         Dir.glob("#{@base_path}#{file['source']}").each do |source|
           dest = source.sub("#{@base_path}", '') # relative path in Crowdin
 
-          file_pattern = export_pattern_to_path(dest, file['translation'], source_language)
-
-          diff = (dest.split('/') - file_pattern.split('/')).join('/')
-          export_pattern = file['translation'].sub('**', diff)
-
+          export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
+          
           translation_languages.each do |lang|
             zipped_file = export_pattern_to_path(dest, export_pattern, lang)
             local_file  = export_pattern_to_path(dest, export_pattern, lang, languages_mapping)
@@ -507,7 +541,7 @@ pre do |global ,command, options, args|
         exit_now! <<EOS
 Configuration file misses required option `#{key}`
 
-See http://crowdin.net/page/cli-client#configuration-file for more details
+See http://crowdin.net/page/cli-tool#configuration-file for more details
 EOS
       end
     end
@@ -516,7 +550,7 @@ EOS
       exit_now! <<EOS
 Configuration file misses required section `files`
 
-See http://crowdin.net/page/cli-client#configuration-file for more details
+See http://crowdin.net/page/cli-tool#configuration-file for more details
 EOS
     end
 
@@ -532,6 +566,17 @@ EOS
   @config['files'].each do |file|
     file['source'] = '/' + file['source'] unless file['source'].start_with?('/')
     file['translation'] = '/' + file['translation'] unless file['translation'].start_with?('/')
+
+    if file['source'].scan('**').size > 1
+      exit_now! <<EOS
+Pattern `#{file['source']}` is not valid. The mask `**` can be used only once in the source pattern.
+EOS
+    elsif file['source'].scan('**').size == 1 and !file['source'].match(/\/\*\*\//)
+      exit_now! <<EOS
+Pattern `#{file['source']}` is not valid. The mask `**` must be surrounded by backslashes `/` in the source pattern.
+EOS
+    end
+
   end
 
   if @config['base_path']

data/lib/crowdin-cli/version.rb

@@ -1,5 +1,5 @@
 module Crowdin
   module CLI
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Crowdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
 description: 
 email:
 - support@crowdin.net