crowdin-cli 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a101699f9966dada34fbe97383366647f61ea48c
-  data.tar.gz: 3458fcb682ba7a0865af8334bc53afcd379facfa
+  metadata.gz: 66ad927a1e1132fbcd7e3423ea92d67ab4fcf9ee
+  data.tar.gz: b82bd71053c5d79e1c710a0f24a272aae0d99289
 SHA512:
-  metadata.gz: d0c270bc37ac7c063a087388b5108e432cc3a8e193db4886991bc59749a831520742841672808ce1fed4e2450e50a25d49f25502d49113c1ee5004fcd9dc6642
-  data.tar.gz: 98034c0849daa227fe58093f7846db1bf8c153718dbc77732659b452a03ce771c8dcb57e88f7a251f35afa84547ad4b438138e92db0132f750fc72c8ba585fc8
+  metadata.gz: 8bb8e237425d2bf49a2647e4006191cfbdb646b05f144dd96f2dc730bffb285b6d771493dfa2034e7ae86a8cb9c08effa92dad7d908991c8b7159acb729af857
+  data.tar.gz: c5126f6fc09657b5a67808cdbf2492f515b8a28d421f8fd91b074c931e6e39e202c87cbc1129cb78f0e4bedbcc766e90e654f856e83e8e7a47871ccf0a9ac8d9

data/README.md

@@ -138,6 +138,21 @@ Check [complete list of Crowdin language codes](http://crowdin.net/page/api/lang
 
 You can also override language codes for other placeholders like `%android_code%`, `%locale%` etc...
 
+### Ignoring directories
+
+From time to time there are directories you don't want translate on Crowdin.
+Local per-file rules can be added to the config file in your project.
+```
+files:
+  -
+    source: /locale/en/**/*.po
+    translation: /locale/%two_letters_code%/**/%original_file_name%
+    ignore:
+      - /locale/en/templates
+      - /locale/en/workflow
+
+```
+
 ## Example Configurations
 
 ### GetText Project

data/bin/crowdin-cli

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'pp'
+require 'find'
 require 'crowdin-cli'
 
 # GLI_DEBUG=true bundle exec bin/crowdin-cli
@@ -174,20 +175,26 @@ def find_common_directory_path(paths)
   first.slice(0, i).join('/')
 end
 
-def unzip_file(zip, dest, files_list)
+# Extract compressed files +files_list+ in a ZIP archive +zipfile_name+ to +dest_path+
+#
+# +files_list+ is a Hash of key-value pairs. Where key is a posible archive filename based on current project configuration
+# and value is the expanded filename
+#
+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
 
+  # files that exists in archive and doesn't match current project configuration
   unmatched_files = []
 
-  Zip::ZipFile.open(zip) do |zip_file|
-    zip_file.select{ |f| f.file? }.each do |f|
+  Zip::ZipFile.open(zipfile_name) do |zipfile|
+    zipfile.select{ |zip_entry| zip_entry.file? }.each do |f|
       file = files_list['/' + f.name]
       if file
-        f_path = File.join(dest, file)
-        FileUtils.mkdir_p(File.dirname(f_path))
+        fpath = File.join(dest_path, file)
+        FileUtils.mkdir_p(File.dirname(fpath))
         puts "Download: `#{file}'"
-        zip_file.extract(f, f_path)
+        zipfile.extract(f, fpath)
       else
         unmatched_files << f
       end
@@ -262,19 +269,30 @@ command :upload do |c|
 
           local_files << local_file
         else
-          Dir.glob("#{@base_path}#{file['source']}").select{ |fn| File.file?(fn) }.each do |source|
-            dest = source.sub("#{@base_path}", '') # relative path in Crowdin
-            dest_files << dest
+          Find.find(@base_path) do |source_path|
+            dest = source_path.sub(@base_path, '') # relative path in Crowdin
+
+            if File.directory?(source_path)
+              ignores = file['ignore'] || []
+              if ignores.include?(dest)
+                Find.prune # Don't look any further into this directory
+              else
+                next
+              end
+            elsif File.fnmatch?(file['source'], dest)
+              dest_files << dest
 
-            export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
+              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')
-            local_file.merge!({ first_line_contains_header: file['first_line_contains_header'] }) if file.has_key?('first_line_contains_header')
+              local_file = { dest: dest, source: source_path, export_pattern: export_pattern }
+              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')
 
-            local_files << local_file
-          end
-        end # if
+              local_files << local_file
+            end
+          end # Find
+
+        end # if File.exists?
       end # @config['files']
 
       if dest_files.empty?
@@ -360,7 +378,7 @@ EOS
 
     c.action do |global_options, options, args|
       params = {}
-      params[:import_duplicates]     = options['import-dublicates']     ? 1 : 0
+      params[:import_duplicates]     = options['import-duplicates']     ? 1 : 0
       params[:import_eq_suggestions] = options['import-eq-suggestions'] ? 1 : 0
       params[:auto_approve_imported] = options['auto-approve-imported'] ? 1 : 0
 
@@ -404,18 +422,29 @@ EOS
             translated_files[lang['crowdin_code']] << { source: "#{@base_path}#{source}", dest: dest }
           end
         else
-          Dir.glob("#{@base_path}#{file['source']}").select{ |fn| File.file?(fn) }.each do |source|
-            dest = source.sub("#{@base_path}", '') # relative path in Crowdin
-            dest_files << dest
+          Find.find(@base_path) do |source_path|
+            dest = source_path.sub(@base_path, '') # relative path in Crowdin
+
+            if File.directory?(source_path)
+              ignores = file['ignore'] || []
+              if ignores.include?(dest)
+                Find.prune # Don't look any further into this directory
+              else
+                next
+              end
+            elsif File.fnmatch?(file['source'], dest)
+              dest_files << dest
 
-            export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
+              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)
-              translated_files[lang['crowdin_code']] << { source: "#{@base_path}#{source}", dest: dest }
+              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 }
+              end
             end
 
-          end
+          end # Find
+
         end # if
       end # @config['files']
 
@@ -448,7 +477,7 @@ EOS
               puts "Warning: Local file `#{file[:source]}' does not exists"
             end
           else
-            # if source file not exist, don't upload translation
+            # if source file does not exist, don't upload translations
             puts "Warning: Skip `#{file[:source].sub(@base_path, '')}'"
           end
         end
@@ -492,13 +521,12 @@ command :download do |c|
     source_language = project_info['details']['source_language']['code']
     source_language = supported_languages.find{ |lang| lang['crowdin_code'] == source_language }
 
-    # keys is all possible files in zip archive
+    # keys is all possible files in .ZIP archive
     # values is resulted local files
-    # usually they are equal
-    downloadable_files = {}
+    downloadable_files_hash = {}
 
     @config['files'].each do |file|
-      languages_mapping = file['languages_mapping'] #Hash or NilClass
+      languages_mapping = file['languages_mapping'] # Hash or NilClass
 
       if File.exists?("#{@base_path}#{file['source']}")
         dest = file['source'].sub("#{@base_path}", '')
@@ -507,34 +535,45 @@ command :download do |c|
           zipped_file = export_pattern_to_path(dest, file['translation'], lang)
           local_file  = export_pattern_to_path(dest, file['translation'], lang, languages_mapping)
 
-          downloadable_files[zipped_file] = local_file
+          downloadable_files_hash[zipped_file] = local_file
         end
       else
-        Dir.glob("#{@base_path}#{file['source']}").select{ |fn| File.file?(fn) }.each do |source|
-          dest = source.sub("#{@base_path}", '') # relative path in Crowdin
+        Find.find(@base_path) do |source_path|
+          dest = source_path.sub(@base_path, '') # relative path in Crowdin
 
-          export_pattern = construct_export_pattern(dest, file['source'], file['translation'])
+          if File.directory?(source_path)
+            ignores = file['ignore'] || []
+            if ignores.include?(dest)
+              Find.prune # Don't look any further into this directory
+            else
+              next
+            end
+          elsif File.fnmatch?(file['source'], dest)
+            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)
+            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)
 
-            downloadable_files[zipped_file] = local_file
+              downloadable_files_hash[zipped_file] = local_file
+            end
           end
 
-        end
+        end # Find
+
       end # if
     end # @config['files']
 
     ##
-    file = Tempfile.new(language)
-    path = file.path
+    tempfile = Tempfile.new(language)
+    zipfile_name = tempfile.path
     begin
-      @crowdin.download_translation(language, output: path)
-      unzip_file(path, @base_path, downloadable_files)
+      @crowdin.download_translation(language, output: zipfile_name)
+
+      unzip_file_with_translations(zipfile_name, @base_path, downloadable_files_hash)
     ensure
-      file.close
-      file.unlink # delete the temp file
+      tempfile.close
+      tempfile.unlink # delete the tempfile
     end
   end
 

data/lib/crowdin-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crowdin-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Crowdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Crowdin CLI.