crowdin-cli 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c8c5c019062f19c359479358118e10573fddc1d
-  data.tar.gz: d6889a079c07e20094d36f257ce151c113a5545c
+  metadata.gz: c178a88fbbd85d28ee2bbc8e3b88a79eb4d0cd46
+  data.tar.gz: d5032076e80d9bc7fff12c3cf9a40ad27759018d
 SHA512:
-  metadata.gz: 713ece1d9226a909ce6a4a9325aebc7fafc32e7e335b4a39339109c21f807b88ec5d6f6afd9e0d20d63c119186286a2293e514e5c2d7349f1024509c4161a60d
-  data.tar.gz: 25f10f64608b8ca072882ed73dbcd4b652b21a104718a1dd02d8f06aab9ba15c11259fa3d59178af6bc9291c2e953684a33387841aaa30b9fcd9e4872798b415
+  metadata.gz: c6d09b538ad1efc838e1abe5b1d6ae7da6336ef954a505fbc5cf3a9804c7cbb37bbde3dd15ad090c33026c86ae9500b1304aadd9a6cc7aaebcdb69146afdf002
+  data.tar.gz: aab99a8aeeff33da9f056d4816109be366379cd8d57a3c8f48c1a578eaec3323d74c7c5ff74709cc251532f7e760f8a09092291ebabc93be88583c38afe516d2

data/bin/crowdin-cli

@@ -87,7 +87,7 @@ end
 #
 def construct_export_pattern(path, source, translation)
   pattern_regexp = translate_pattern_to_regexp(source)
-  if path.match(pattern_regexp)
+  if pattern_regexp.names.include?('double_asterisk') and path.match(pattern_regexp)
     double_asterisk = path.match(pattern_regexp)['double_asterisk']
     translation = translation.sub('**', double_asterisk)
   end
@@ -97,19 +97,22 @@ def construct_export_pattern(path, source, translation)
   return export_pattern
 end
 
-# Translate a glob pattern to a regular expression
+# Provides a partial implementation of translate a glob +pattern+ to a regular expression
+# NOTE:
+# `**` surrounded by backslashes `/` in the +pattern+
+# `**` used only once in the +pattern+
 #
-def translate_pattern_to_regexp(pat)
+def translate_pattern_to_regexp(pattern)
   i = 0
-  n = pat.size
+  n = pattern.size
   res = ''
   while i < n
-    c = pat[i]
+    c = pattern[i]
     i = i + 1
     if c == '*'
       j = i
-      if j < n and pat[j] == '*'
-        res << '(?<double_asterisk>.*)'
+      if j < n and pattern[j] == '*'
+        res[-1] = '(\/)?(?<double_asterisk>.*)?'
         i = j + 1
       else
         res << '(.*)'
@@ -174,7 +177,7 @@ def unzip_file(zip, dest, files_list)
 
   Zip::ZipFile.open(zip) do |zip_file|
     zip_file.select{ |f| f.file? }.each do |f|
-      file = files_list[f.name]
+      file = files_list['/' + f.name]
       if file
         f_path = File.join(dest, file)
         FileUtils.mkdir_p(File.dirname(f_path))
@@ -247,9 +250,10 @@ EOS
         end
 
         if File.exist?("#{@base_path}#{file['source']}")
-          dest_files << file['source']
+          dest = file['source']
+          dest_files << dest
 
-          local_file = { dest: file['source'], source: "#{@base_path}#{file['source']}", export_pattern: file['translation'] }
+          local_file = { dest: dest, source: "#{@base_path}#{file['source']}", export_pattern: file['translation'] }
           # Used only when uploading CSV file to define data columns mapping.
           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')
@@ -275,7 +279,7 @@ EOS
         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)
+      common_dir = @preserve_hierarchy ? '' : find_common_directory_path(dest_files)
 
       local_project_tree = get_local_files_hierarchy(local_files.collect{ |h| h[:dest].sub(common_dir, '') })
 
@@ -296,7 +300,7 @@ EOS
         update_files = local_project_tree[:files] & remote_project_tree[:files]
         files_for_upload = local_files.select{ |file| update_files.include?(file[:dest]) }
         files_for_upload.each do |file|
-          print "Updating file `#{file[:dest]}'"
+          print "Updating source file `#{file[:dest]}'"
 
           params = {}
           params[:scheme] = file.delete(:sheme)
@@ -305,9 +309,9 @@ EOS
           resp = @crowdin.update_file([] << file, params)
           case resp['files'].first[1]
           when 'skipped'
-            puts "\rUpdating file `#{file[:dest]}' - Skipped"
+            puts "\rUpdating source file `#{file[:dest]}' - Skipped"
           when 'updated'
-            puts "\rUpdating file `#{file[:dest]}' - OK"
+            puts "\rUpdating source file `#{file[:dest]}' - OK"
           end
         end
       end
@@ -317,14 +321,14 @@ EOS
       add_files = local_project_tree[:files] - remote_project_tree[:files]
       files_for_add = local_files.select{ |file| add_files.include?(file[:dest]) }
       files_for_add.each do |file|
-        print "Uploading file `#{file[:dest]}'"
+        print "Uploading source file `#{file[:dest]}'"
 
         params = {}
         params[:scheme] = file.delete(:sheme)
         params[:first_line_contains_header] = file.delete(:first_line_contains_header)
 
         resp = @crowdin.add_file([] << file, params)
-        puts "\rUploading file `#{file[:dest]}' - OK"
+        puts "\rUploading source file `#{file[:dest]}' - OK"
       end
 
     end # action
@@ -416,7 +420,7 @@ EOS
         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)
+      common_dir = @preserve_hierarchy ? '' : find_common_directory_path(dest_files)
 
       translated_files.each do |language, files|
         files.each do |file|
@@ -424,14 +428,14 @@ EOS
 
           if remote_project_tree[:files].include?(file[:dest])
             if File.exist?(file[:source])
-              print "Uploading `#{file[:source].sub(@base_path, '')}'"
+              print "Uploading translation file `#{file[:source].sub(@base_path, '')}'"
 
               resp = @crowdin.upload_translation([] << file, language, params)
               case resp['files'].first[1]
               when 'skipped'
-                puts "\rUploading `#{file[:source].sub(@base_path, '')}' - Skipped"
+                puts "\rUploading translation `#{file[:source].sub(@base_path, '')}' - Skipped"
               when 'uploaded'
-                puts "\rUploading `#{file[:source].sub(@base_path, '')}' - OK"
+                puts "\rUploading translation `#{file[:source].sub(@base_path, '')}' - OK"
               end
             else
               puts "Warning: Local file `#{file[:source]}' does not exists"
@@ -559,7 +563,7 @@ 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-client#configuration-file for more details
+See http://crowdin.net/page/cli-tool#configuration-file for more details
 EOS
   end
 
@@ -567,17 +571,26 @@ EOS
     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.
+    if file['source'].include?('**')
+      if file['source'].scan('**').size > 1
+        exit_now! <<EOS
+Source 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.
+      elsif file['source'].scan('**').size == 1 and !file['source'].match(/\/\*\*\//)
+        exit_now! <<EOS
+Source pattern `#{file['source']}` is not valid. The mask `**` must be surrounded by backslashes `/` in the source pattern.
 EOS
+      end
+    else
+      if file['translation'].include?('**')
+        exit_now! <<EOS
+Translation pattern `#{file['translation']}` is not valid. The mask `**` can't be used.
+When using `**` in 'translation' pattern it will always contain sub-path from 'source' for certain file.
+EOS
+      end
     end
 
-  end
+  end # @config['files']
 
   if @config['base_path']
     @base_path = @config['base_path']
@@ -588,6 +601,26 @@ Warning: Configuration file misses parameter `base_path` that defines your proje
 EOS
   end
 
+  if @config['target_path']
+    @target_path = @config['target_path']
+  else
+    @target_path = ''
+  end
+
+  @preserve_hierarchy = false
+  if @config['preserve_hierarchy']
+    @preserve_hierarchy = case @config['preserve_hierarchy']
+      when true
+        true
+      when false
+        false
+      else
+        exit_now! <<EOS
+Parameter `preserve_hierarchy` allows values of true or false.
+EOS
+    end
+  end
+
   Crowdin::API.log = Logger.new($stderr) if global[:v]
   @crowdin = Crowdin::API.new(api_key: @config['api_key'], project_id: @config['project_identifier'], base_url: @config['base_url'] || 'http://api.crowdin.net')
   begin

data/lib/crowdin-cli/version.rb

@@ -1,5 +1,5 @@
 module Crowdin
   module CLI
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

metadata

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