crowdin-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66ad927a1e1132fbcd7e3423ea92d67ab4fcf9ee
-  data.tar.gz: b82bd71053c5d79e1c710a0f24a272aae0d99289
+  metadata.gz: 9f6bb76e96af25bd099e35327e0affba41a15d99
+  data.tar.gz: 42379e5aefbf2d76b2650fff116ed5e89f609098
 SHA512:
-  metadata.gz: 8bb8e237425d2bf49a2647e4006191cfbdb646b05f144dd96f2dc730bffb285b6d771493dfa2034e7ae86a8cb9c08effa92dad7d908991c8b7159acb729af857
-  data.tar.gz: c5126f6fc09657b5a67808cdbf2492f515b8a28d421f8fd91b074c931e6e39e202c87cbc1129cb78f0e4bedbcc766e90e654f856e83e8e7a47871ccf0a9ac8d9
+  metadata.gz: 0efaaa136de06a8915600bd6c60d7ba6fb48ef5ecb7406c15e0206442577bbb08fe639a910c8a181a0cdef615cfe72ee1e33d0676312341675dcfe40ef1f017d
+  data.tar.gz: 585990c4a380dcda6caee000d2b50f7ec949202a00487c2e0092c96e46a7f85de50764f17a2fb1d89c5ca082937f81a476b5ec938f4feb75b9c03dc83f2d2a4b

data/README.md

@@ -153,6 +153,50 @@ files:
 
 ```
 
+### 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 when CSV file should 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
+
+```
+
+
 ## Example Configurations
 
 ### GetText Project
@@ -196,25 +240,6 @@ files:
        ru: ru
 ```
 
-### 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"
-```
-
 ## Usage
 
 When the configuration file is created you are ready to start using `crowdin-cli` to manage your localization resources and automate files synchronization. 
@@ -270,4 +295,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

@@ -57,22 +57,22 @@ end
 # @option lang [String] :locale
 #
 def export_pattern_to_path(path, export_pattern, lang, languages_mapping = nil)
-  original_path      = File.dirname(path)
+  original_path      = File.dirname(path)[1..-1]
   original_file_name = File.basename(path)
   file_extension     = File.extname(path)[1..-1]
   file_name          = File.basename(path, File.extname(path))
 
   pattern = {
+    '%original_file_name%'     => original_file_name,
+    '%original_path%'          => original_path,
+    '%file_extension%'         => file_extension,
+    '%file_name%'              => file_name,
     '%language%'               => lang['name'],
     '%two_letters_code%'       => lang['iso_639_1'],
     '%three_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_name,
   }
 
   placeholders = pattern.inject([]){ |memo, h| memo << h.first[/%(.*)%/, 1] }
@@ -98,7 +98,8 @@ def construct_export_pattern(path, source, translation)
     translation = translation.sub('**', double_asterisk)
   end
 
-  export_pattern = translation.split('/').reject(&:empty?).join('/').insert(0, '/')
+  export_pattern = translation.split('/').reject(&:empty?).join('/')
+  export_pattern.insert(0, '/') if translation.start_with?('/')
 
   return export_pattern
 end
@@ -182,14 +183,16 @@ end
 #
 def unzip_file_with_translations(zipfile_name, dest_path, files_list)
   # overwrite files if they already exist inside of the extracted path
-  Zip.options[:on_exists_proc] = true
+  Zip.on_exists_proc = true
 
   # files that exists in archive and doesn't match current project configuration
   unmatched_files = []
 
-  Zip::ZipFile.open(zipfile_name) do |zipfile|
+  Zip::File.open(zipfile_name) do |zipfile|
     zipfile.select{ |zip_entry| zip_entry.file? }.each do |f|
-      file = files_list['/' + f.name]
+      # XXX
+      # `f' - relative path in archive
+      file = files_list[f.name]
       if file
         fpath = File.join(dest_path, file)
         FileUtils.mkdir_p(File.dirname(fpath))
@@ -221,12 +224,12 @@ sort_help :manually # help commands are ordered in the order declared
 wrap_help_text :to_terminal
 
 desc I18n.t('app.switches.verbose.desc')
-switch [:verbose, :v], :negatable => false
+switch [:v, :verbose], :negatable => false
 
 desc I18n.t('app.flags.config.desc')
 default_value File.join(Dir.pwd, 'crowdin.yaml')
 arg_name '<s>'
-flag [:config,:c]
+flag [:c, :config]
 
 desc I18n.t('app.commands.upload.desc')
 long_desc I18n.t('app.commands.upload.long_desc')
@@ -237,6 +240,7 @@ command :upload do |c|
   c.command :sources do |c|
 
     c.desc I18n.t('app.commands.upload.commands.sources.switches.auto_update.desc')
+    c.default_value true
     c.switch ['auto-update']
 
     c.action do |global_options, options, args|
@@ -258,12 +262,12 @@ 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
 
-        if File.exist?("#{@base_path}#{file['source']}")
+        if File.exist?(File.join(@base_path, file['source']))
           dest = file['source']
           dest_files << dest
 
-          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 = { dest: dest, source: File.join(@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')
 
@@ -279,7 +283,7 @@ command :upload do |c|
               else
                 next
               end
-            elsif File.fnmatch?(file['source'], dest)
+            elsif File.fnmatch?(file['source'], dest, File::FNM_PATHNAME)
               dest_files << dest
 
               export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
@@ -317,7 +321,7 @@ EOS
         @crowdin.add_directory(dir)
       end
 
-      if options['auto-update'].nil? or options['auto-update']
+      if options['auto-update']
         # Update existing files in Crowdin project
         #
         # array containing elements common to the two arrays
@@ -365,7 +369,7 @@ EOS
     c.desc I18n.t('app.commands.upload.commands.translations.flags.language.desc')
     c.default_value 'all'
     c.arg_name 'crowdin_language_code'
-    c.flag [:language, :l]
+    c.flag [:l, :language]
 
     c.desc I18n.t('app.commands.upload.commands.translations.switches.import_duplicates.desc')
     c.switch ['import-duplicates']
@@ -398,11 +402,12 @@ EOS
       end
 
       supported_languages = @crowdin.supported_languages
-      translation_languages = supported_languages.select{ |lang| project_languages.include?(lang['crowdin_code']) }
 
       source_language = project_info['details']['source_language']['code']
       source_language = supported_languages.find{ |lang| lang['crowdin_code'] == source_language }
 
+      translation_languages = supported_languages.select{ |lang| project_languages.include?(lang['crowdin_code']) }
+
       translated_files = Hash.new{ |hash, key| hash[key] = Array.new }
       dest_files = []
 
@@ -413,13 +418,22 @@ EOS
 
         languages_mapping = file['languages_mapping']
 
-        if File.exists?("#{@base_path}#{file['source']}")
+        # CSV files only (default: false)
+        multilingual_spreadsheet = file['multilingual_spreadsheet'] || false
+
+        if multilingual_spreadsheet
+          file_translation_languages = [] << source_language
+        else
+          file_translation_languages = translation_languages
+        end
+
+        if File.exists?(File.join(@base_path, file['source']))
           dest = file['source'].sub("#{@base_path}", '')
           dest_files << dest
 
-          translation_languages.each do |lang|
+          file_translation_languages.each do |lang|
             source = export_pattern_to_path(dest, file['translation'], lang, languages_mapping)
-            translated_files[lang['crowdin_code']] << { source: "#{@base_path}#{source}", dest: dest }
+            translated_files[lang['crowdin_code']] << { source: File.join(@base_path, source), dest: dest }
           end
         else
           Find.find(@base_path) do |source_path|
@@ -432,17 +446,17 @@ EOS
               else
                 next
               end
-            elsif File.fnmatch?(file['source'], dest)
+            elsif File.fnmatch?(file['source'], dest, File::FNM_PATHNAME)
               dest_files << dest
 
               export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
 
-              translation_languages.each do |lang|
+              file_translation_languages.each do |lang|
                 source = export_pattern_to_path(dest, export_pattern, lang, languages_mapping)
-                translated_files[lang['crowdin_code']] << { source: "#{@base_path}#{source}", dest: dest }
+                translated_files[lang['crowdin_code']] << { source: File.join(@base_path, source), dest: dest }
               end
-            end
 
+            end
           end # Find
 
         end # if
@@ -494,7 +508,7 @@ command :download do |c|
 
   c.desc I18n.t('app.commands.download.flags.language.desc')
   c.arg_name 'language_code'
-  c.flag [:language, :l], :default_value => 'all'
+  c.flag [:l, :language], :default_value => 'all'
 
   c.action do |global_options ,options, args|
     language = options[:language]
@@ -516,11 +530,12 @@ command :download do |c|
     @crowdin.export_translations
 
     supported_languages = @crowdin.supported_languages
-    translation_languages = supported_languages.select{ |lang| project_languages.include?(lang['crowdin_code']) }
 
     source_language = project_info['details']['source_language']['code']
     source_language = supported_languages.find{ |lang| lang['crowdin_code'] == source_language }
 
+    translation_languages = supported_languages.select{ |lang| project_languages.include?(lang['crowdin_code']) }
+
     # keys is all possible files in .ZIP archive
     # values is resulted local files
     downloadable_files_hash = {}
@@ -528,15 +543,25 @@ command :download do |c|
     @config['files'].each do |file|
       languages_mapping = file['languages_mapping'] # Hash or NilClass
 
-      if File.exists?("#{@base_path}#{file['source']}")
+      # CSV files only (default: false)
+      multilingual_spreadsheet = file['multilingual_spreadsheet'] || false
+
+      if multilingual_spreadsheet
+        file_translation_languages = [] << source_language
+      else
+        file_translation_languages = translation_languages
+      end
+
+      if File.exists?(File.join(@base_path, file['source']))
         dest = file['source'].sub("#{@base_path}", '')
 
-        translation_languages.each do |lang|
+        file_translation_languages.each do |lang|
           zipped_file = export_pattern_to_path(dest, file['translation'], lang)
+          zipped_file.sub!(/^\//, '')
           local_file  = export_pattern_to_path(dest, file['translation'], lang, languages_mapping)
-
           downloadable_files_hash[zipped_file] = local_file
         end
+
       else
         Find.find(@base_path) do |source_path|
           dest = source_path.sub(@base_path, '') # relative path in Crowdin
@@ -548,19 +573,18 @@ command :download do |c|
             else
               next
             end
-          elsif File.fnmatch?(file['source'], dest)
+          elsif File.fnmatch?(file['source'], dest, File::FNM_PATHNAME)
             export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
 
-            translation_languages.each do |lang|
+            file_translation_languages.each do |lang|
               zipped_file = export_pattern_to_path(dest, export_pattern, lang)
+              zipped_file.sub!(/^\//, '')
               local_file  = export_pattern_to_path(dest, export_pattern, lang, languages_mapping)
-
               downloadable_files_hash[zipped_file] = local_file
             end
-          end
 
+          end
         end # Find
-
       end # if
     end # @config['files']
 
@@ -618,7 +642,7 @@ EOS
 
   @config['files'].each do |file|
     file['source'] = '/' + file['source'] unless file['source'].start_with?('/')
-    file['translation'] = '/' + file['translation'] unless file['translation'].start_with?('/')
+    #file['translation'] = '/' + file['translation'] unless file['translation'].start_with?('/')
 
     if file['source'].include?('**')
       if file['source'].scan('**').size > 1
@@ -650,13 +674,6 @@ Warning: Configuration file misses parameter `base_path` that defines your proje
 EOS
   end
 
-  if @config['remote_path']
-    @remote_path = @config['remote_path']
-    @remote_path = '/' + @remote_path unless @remote_path.start_with?('/')
-  else
-    @remote_path = ''
-  end
-
   @preserve_hierarchy = false
   if @config['preserve_hierarchy']
     @preserve_hierarchy = case @config['preserve_hierarchy']
@@ -672,7 +689,10 @@ EOS
   end
 
   Crowdin::API.log = Logger.new($stderr) if globals[:verbose]
-  @crowdin = Crowdin::API.new(api_key: @config['api_key'], project_id: @config['project_identifier'], base_url: @config['base_url'] || 'http://api.crowdin.net')
+
+  base_url = @config['base_url'] || 'http://api.crowdin.net'
+  @crowdin = Crowdin::API.new(api_key: @config['api_key'], project_id: @config['project_identifier'], base_url: base_url)
+
   begin
     @crowdin.project_info
   rescue Crowdin::API::Errors::Error => err

data/lib/crowdin-cli.rb

@@ -7,6 +7,6 @@ require 'yaml'
 require 'json'
 require 'logger'
 require 'gli'
-require 'zip/zip'
+require 'zip'
 require 'i18n'
 require 'crowdin-api'

data/lib/crowdin-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Crowdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,42 +58,42 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: crowdin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement