crowdin-cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f6bb76e96af25bd099e35327e0affba41a15d99
-  data.tar.gz: 42379e5aefbf2d76b2650fff116ed5e89f609098
+  metadata.gz: 1a40088adbb46116f854dd825f0ab1ee5878d519
+  data.tar.gz: 85e6f9ac041ebf563ec341b445b0c3255eb3bdff
 SHA512:
-  metadata.gz: 0efaaa136de06a8915600bd6c60d7ba6fb48ef5ecb7406c15e0206442577bbb08fe639a910c8a181a0cdef615cfe72ee1e33d0676312341675dcfe40ef1f017d
-  data.tar.gz: 585990c4a380dcda6caee000d2b50f7ec949202a00487c2e0092c96e46a7f85de50764f17a2fb1d89c5ca082937f81a476b5ec938f4feb75b9c03dc83f2d2a4b
+  metadata.gz: 86edeaa994d9fd05d9bee7e6cb6dbb8dad84aed51fd3327f0ee993bf05c0660d5581898503e00bb0b405d73d624973d99bb24c8fe0a1f3633753c411ea596482
+  data.tar.gz: 3857ea6a1abf25fe55f0c34a257a0fe3f856db5c556ee06baf11c615b1399e0ad6ce01dc4a23bb9c496112e0d03f49a4a723e4e090f15d479676ce700f998592

data/README.md

@@ -87,12 +87,24 @@ 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`. 
+ 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 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::
@@ -140,8 +152,9 @@ You can also override language codes for other placeholders like `%android_code%
 
 ### Ignoring directories
 
-From time to time there are directories you don't want translate on Crowdin.
+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:
   -
@@ -149,8 +162,24 @@ files:
     translation: /locale/%two_letters_code%/**/%original_file_name%
     ignore:
       - /locale/en/templates
-      - /locale/en/workflow
+      - /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. 
+
+Sample configuration 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
@@ -295,4 +324,4 @@ Author: Anton Maminov (anton.maminov@gmail.com)
 
 Copyright: 2012-2013 [Crowdin.net](http://crowdin.net/)
 
-This project is licensed under the MIT license, a copy of which can be found in the LICENSE file.
+This project is licensed under the MIT license, a copy of which can be found in the LICENSE file.

data/bin/crowdin-cli

@@ -104,34 +104,72 @@ def construct_export_pattern(path, source, translation)
   return export_pattern
 end
 
-# Provides a partial implementation of translate a glob +pattern+ to a regular expression
+# This is a partial translation of the algorithm defined in fnmatch.py
+# https://github.com/python-git/python/blob/master/Lib/fnmatch.py
+# Provides a partial implementation of translate a glob +pat+ to a regular expression
+#
+# Patterns are Unix shell style:
+# *       matches everything
+# ?       matches any single character
+# [seq]   matches any character in seq
+# [^seq]  matches any char not in seq
+#
 # NOTE:
-# `**` surrounded by backslashes `/` in the +pattern+
-# `**` used only once in the +pattern+
+# `**` surrounded by backslashes `/` in the +pat+
+# `**` used only once in the +pat+
 #
-def translate_pattern_to_regexp(pattern)
+def translate_pattern_to_regexp(pat)
   i = 0
-  n = pattern.size
+  n = pat.size
   res = ''
   while i < n
-    c = pattern[i]
+    c = pat[i]
     i = i + 1
     if c == '*'
       j = i
-      if j < n and pattern[j] == '*'
+      if j < n and pat[j] == '*'
         res[-1] = '(\/)?(?<double_asterisk>.*)?'
         i = j + 1
       else
-        res << '(.*)'
+        res = res + '.*'
       end
     elsif c == '?'
-      res << '.'
+      res = res + '.'
+    elsif c == '['
+      j = i
+      # The following two statements check if the sequence we stumbled
+      # upon is '[]' or '[^]' because those are not valid character
+      # classes.
+      if j < n and pat[j] == '^'
+        j = j + 1
+      end
+      if j < n and pat[j] == ']'
+        j = j + 1
+      end
+      # Look for the closing ']' right off the bat. If one is not found,
+      # escape the opening '[' and continue.  If it is found, process
+      # he contents of '[...]'.
+      while j < n and pat[j] != ']'
+        j = j + 1
+      end
+      if j >= n
+        res = res + '\\['
+      else
+        stuff = pat[i...j].gsub('\\', '\\\\')
+        i = j + 1
+        #if stuff[0] == '!'
+        #  stuff = '^' + stuff[1..-1]
+        #elsif stuff[0] == '^'
+        #  stuff = '\\' + stuff
+        #end
+        res = "#{res}[#{stuff}]"
+      end
     else
-      res << Regexp.escape(c)
+      res = res + Regexp.escape(c)
     end
   end
 
-  return Regexp.new(res)
+  return Regexp.new(res + '$')
 end
 
 def android_locale_code(locale_code)
@@ -262,6 +300,8 @@ command :upload do |c|
           puts "Warning: #{placeholder} is not valid variable supported by Crowdin. See http://crowdin.net/page/cli-tool#configuration-file for more details."
         end
 
+        ignores = file['ignore'] || []
+
         if File.exist?(File.join(@base_path, file['source']))
           dest = file['source']
           dest_files << dest
@@ -277,13 +317,14 @@ command :upload do |c|
             dest = source_path.sub(@base_path, '') # relative path in Crowdin
 
             if File.directory?(source_path)
-              ignores = file['ignore'] || []
-              if ignores.include?(dest)
+              if ignores.any?{ |pattern| File.fnmatch?(pattern, dest, File::FNM_PATHNAME) }
                 Find.prune # Don't look any further into this directory
               else
                 next
               end
             elsif File.fnmatch?(file['source'], dest, File::FNM_PATHNAME)
+              next if ignores.any?{ |pattern| File.fnmatch?(pattern, dest, File::FNM_PATHNAME) }
+              
               dest_files << dest
 
               export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
@@ -416,6 +457,8 @@ EOS
           puts "Warning: #{placeholder} is not valid variable supported by Crowdin. See http://crowdin.net/page/cli-tool#configuration-file for more details."
         end
 
+        ignores = file['ignore'] || []
+
         languages_mapping = file['languages_mapping']
 
         # CSV files only (default: false)
@@ -440,13 +483,14 @@ EOS
             dest = source_path.sub(@base_path, '') # relative path in Crowdin
 
             if File.directory?(source_path)
-              ignores = file['ignore'] || []
-              if ignores.include?(dest)
+              if ignores.any?{ |pattern| File.fnmatch?(pattern, dest, File::FNM_PATHNAME) }
                 Find.prune # Don't look any further into this directory
               else
                 next
               end
             elsif File.fnmatch?(file['source'], dest, File::FNM_PATHNAME)
+              next if ignores.any?{ |pattern| File.fnmatch?(pattern, dest, File::FNM_PATHNAME) }
+
               dest_files << dest
 
               export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
@@ -543,6 +587,8 @@ command :download do |c|
     @config['files'].each do |file|
       languages_mapping = file['languages_mapping'] # Hash or NilClass
 
+      ignores = file['ignore'] || []
+
       # CSV files only (default: false)
       multilingual_spreadsheet = file['multilingual_spreadsheet'] || false
 
@@ -567,13 +613,14 @@ command :download do |c|
           dest = source_path.sub(@base_path, '') # relative path in Crowdin
 
           if File.directory?(source_path)
-            ignores = file['ignore'] || []
-            if ignores.include?(dest)
+            if ignores.any?{ |pattern| File.fnmatch?(pattern, dest, File::FNM_PATHNAME) }
               Find.prune # Don't look any further into this directory
             else
               next
             end
           elsif File.fnmatch?(file['source'], dest, File::FNM_PATHNAME)
+            next if ignores.any?{ |pattern| File.fnmatch?(pattern, dest, File::FNM_PATHNAME) }
+
             export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
 
             file_translation_languages.each do |lang|

data/lib/crowdin-cli/version.rb

@@ -1,5 +1,5 @@
 module Crowdin
   module CLI
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Crowdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake