xlocalize 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49c020e414aa5935d3d5613c930196af1ccc3b79
-  data.tar.gz: 43048b71638f80dd8ff958d99800bd59af82cc57
+  metadata.gz: 9e6235a370b56da00174d9c280585088401d844a
+  data.tar.gz: 53876ca5c6a807f01ebe293369ddfa7c887dff84
 SHA512:
-  metadata.gz: 2a48bd0f91385b7e011f6f7fb3b9d5b1ae643d0bc3e4a84cf9be3dc3773b0a7432917efaccc786cc9c951aafd12b3c45acd9d9391764a8f78e38a9d31595a3ef
-  data.tar.gz: b57cdabfaf66d11ee69a6bd73e06075bf5b135d8e5429ed2793b4ab4bec85160b851f367601a0d94a995c700cb46978cfcbf936788d2e26f43219e8a7df138ee
+  metadata.gz: 17522231c3f133253d025bb43b0d2cf6f57d4c66a2aeb09381563f7bff9de7529c7a34cdabbffb495ac6f3c03c4c5bf9e1185aeb4c55e86b4d0b7440e8a94050
+  data.tar.gz: 959b99fbd96815f24709be4ac1d394a9030b21ae3c368bada3c163ab6b2f7606da307f0d7ba6b3376c791166da5db4f61052601512331460edec0beee911d8b2

data/.ruby-version

@@ -0,0 +1 @@
+2.3.3

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 cache: bundler
-rvm: 2.2
 matrix:
   include:
     - {os: osx, osx_image: xcode8.3}
@@ -13,4 +12,4 @@ addons:
     repo_token: b4206ed2b9443314c998e8909dfa31f0ed476ea5ab460b98e102cd20508ff564
 after_success:
   - bundle exec codeclimate-test-reporter
-  
+  

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [v0.4.0](https://github.com/viktorasl/xlocalize/releases/tag/0.4.0)
+
+* [8e2ded3](https://github.com/viktorasl/xlocalize/commit/8e2ded3e9448edca3ed18d88be4c2c0a37122891) Removes redundant files
+* [89afd2c](https://github.com/viktorasl/xlocalize/commit/89afd2c90903b78103199f9702ace16427889572) Option to exclude translation units
+* [529f461](https://github.com/viktorasl/xlocalize/commit/529f4616b542cd29daa6374d74730a878789329d) Unescaping translation units if needed
+* [a24dd76](https://github.com/viktorasl/xlocalize/commit/a24dd768a734a604ebc2125753453cb99d2e06b7) CLI global verbose option
+* [67ae28c](https://github.com/viktorasl/xlocalize/commit/67ae28c320679391d044eb14e8df9ab7c7527ad8) CLI option to skip missing import files
+* [c615725](https://github.com/viktorasl/xlocalize/commit/c615725d7b2c16e0c38df86408224fd7ddc9ee4d) Flag to allow missing files when importing
+
 ## [v0.3.2](https://github.com/viktorasl/xlocalize/releases/tag/0.3.2)
 
 * [d081ce2](https://github.com/viktorasl/xlocalize/commit/d081ce2640d7e8997d6d98a7659f31d571103f36) Bumps nokogiri version

data/lib/xlocalize/executor.rb

@@ -16,25 +16,25 @@ module Xlocalize
       return "#{locale}.xliff"
     end
 
-    def export_master(wti, project, targets, excl_prefix, master_lang)
+    def export_master(wti, project, targets, excl_prefix, master_lang, exclude_units=[])
       master_file_name = locale_file_name(master_lang)
 
       File.delete(master_file_name) if File.exist?(master_file_name)
 
       if Helper.xcode_at_least?(9)
-        system "xcodebuild -exportLocalizations -localizationPath ./ -project #{project}"
+        Kernel.system "xcodebuild -exportLocalizations -localizationPath ./ -project #{project}"
       else
         # hacky way to finish xcodebuild -exportLocalizations script, because
         # since Xcode7.3 & OS X Sierra script hangs even though it produces
         # xliff output
         # http://www.openradar.me/25857436
-        system "xcodebuild -exportLocalizations -localizationPath ./ -project #{project} & sleep 0"
+        Kernel.system "xcodebuild -exportLocalizations -localizationPath ./ -project #{project} & sleep 0"
         while !File.exist?(master_file_name) do
           sleep(1)
         end        
       end
 
-      purelyze(master_lang, targets, excl_prefix, project, filer_ui_duplicates=Helper.xcode_at_least?(9.3))
+      purelyze(master_lang, targets, excl_prefix, project, filer_ui_duplicates=Helper.xcode_at_least?(9.3), exclude_units)
       push_master_file(wti, master_lang, master_file_name) if !wti.nil?
     end
 
@@ -55,9 +55,9 @@ module Xlocalize
       end if !wti.nil?
     end
 
-    def purelyze(locale, targets, excl_prefix, project, filer_ui_duplicates=false)
+    def purelyze(locale, targets, excl_prefix, project, filer_ui_duplicates=false, exclude_units)
       locale_file_name = locale_file_name(locale)
-      doc = Nokogiri::XML(open(locale_file_name))
+      doc = Nokogiri::XML(File.open(locale_file_name))
 
       puts "Removing all files not matching required targets" if $VERBOSE
       doc.filter_not_target_files(targets)
@@ -65,8 +65,13 @@ module Xlocalize
       doc.filter_trans_units(excl_prefix)
       puts "Filtering plurals" if $VERBOSE
       plurals = doc.filter_plurals(project)
+      puts "Removing excluded translation units" if $VERBOSE
+      doc.xpath("//xmlns:trans-unit").each { |unit| unit.remove if exclude_units.include?(unit['id']) }
       puts "Removing all files having no trans-unit elements after removal" if $VERBOSE
       doc.filter_empty_files
+      puts "Unescaping translation units" if $VERBOSE
+      doc.unescape
+
       if filer_ui_duplicates
         puts "Filtering duplicate xib & storyboard translation files" if $VERBOSE
         doc.filter_duplicate_storyboard_xib_files
@@ -132,11 +137,18 @@ module Xlocalize
       return name
     end
 
-    def import_xliff(locale)
+    def import_xliff(locale, allows_missing_files)
       fname = "#{locale}.xliff"
-      puts "Importing translations from #{fname}"
-      Nokogiri::XML(open(fname)).xpath("//xmlns:file").each do |node|
-        File.open(localized_filename(node["original"], locale), "w") do |file|
+      puts "Importing translations from #{fname}" if $VERBOSE
+      Nokogiri::XML(File.open(fname)).xpath("//xmlns:file").each do |node|
+        tr_fname = localized_filename(node["original"], locale)
+        if !File.exist?(tr_fname)
+          err = "Missing #{tr_fname} file"
+          raise err if !allows_missing_files
+          puts err.yellow if $VERBOSE
+          next
+        end
+        File.open(tr_fname, "w") do |file|
           (node > "body > trans-unit").each do |trans_unit|
             key = trans_unit["id"]
             target = (trans_unit > "target").text
@@ -190,10 +202,10 @@ module Xlocalize
       end
     end
 
-    def import(locales)
+    def import(locales, allows_missing_files=false)
       puts 'Importing translations' if $VERBOSE
       locales.each do |locale|
-        import_xliff(locale)
+        import_xliff(locale, allows_missing_files)
         import_plurals_if_needed(locale)
         puts "Done #{locale}".green if $VERBOSE
       end

data/lib/xlocalize/version.rb

@@ -1,4 +1,4 @@
 module Xlocalize
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
   DESCRIPTION = "Xcode localizations import/export helper tool"
 end

data/lib/xlocalize/xliff.rb

@@ -69,5 +69,11 @@ module Xlocalize
         end
       end
     end
+
+    def unescape
+      self.xpath("//xmlns:source").each do |src|
+        src.content = CGI.unescapeHTML(src.content)
+      end
+    end
   end
 end

data/lib/xlocalize.rb

@@ -16,7 +16,10 @@ module Xlocalize
         c.option '--targets ARRAY', Array, 'Target in the project'
         c.option '--excl_prefix STRING', String, 'Exclude strings having specified prefix'
         c.option '--master_lang STRING', String, 'Master language of the project'
+        c.option '--exclude_units ARRAY', Array, 'Translation unit IDs to exclude'
         c.action do |_, options|
+          options.default :exclude_units => []
+
           if options.project.nil? or
              options.targets.nil? or
              options.excl_prefix.nil? or
@@ -25,7 +28,7 @@ module Xlocalize
           end
 
           wti = WebtranslateIt.new(options.wti_key) if !options.wti_key.nil?
-          Executor.new.export_master(wti, options.project, options.targets, options.excl_prefix, options.master_lang)
+          Executor.new.export_master(wti, options.project, options.targets, options.excl_prefix, options.master_lang, options.exclude_units)
         end
       end
     end
@@ -52,12 +55,13 @@ module Xlocalize
         c.syntax = 'xlocalize import [options]'
         c.description = 'Import localized strings to Xcode project'
         c.option '--locales ARRAY', Array, 'Locales to import'
+        c.option '--allow-missing-files', 'Allow missing files read from xliff'
         c.action do |_, options|
           if options.locales.nil?
             raise 'Missing parameter'
           end
-
-          Executor.new.import(options.locales)
+          allow_missing_files = options.allow_missing_files ||= false
+          Executor.new.import(options.locales, allow_missing_files=allow_missing_files)
         end
       end
     end
@@ -67,6 +71,8 @@ module Xlocalize
       program :version, Xlocalize::VERSION
       program :description, Xlocalize::DESCRIPTION
 
+      global_option('--verbose') { $VERBOSE = true }
+
       define_export_cmd
       define_download_cmd
       define_import_cmd

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlocalize
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Viktoras Laukevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -147,6 +147,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Xcode localizations import/export helper tool