xlocalize 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e9711c270d3b8f1436b0b740d56adc3cf167316
-  data.tar.gz: fc2ef80a45346002dc7fe9d188f038df232b33d7
+  metadata.gz: f18a1267e6b51f35e4ed9744bb3d0fb93aa19350
+  data.tar.gz: d5761da399cbc9057322506902fb6aabe797de8b
 SHA512:
-  metadata.gz: 136703bed8b27bced211d7e073990a3e2f38f8f593e50cdfd15c754b87abcae20ed41293142f05c4d4363f12f416c77682ac213ad8c355fb00a57565d2031ada
-  data.tar.gz: e9a79bec1f3466ff2e5b98fdcdf41123724d640bfe6ef102d3db20752957f1f1614a88fe8aaf9963aaba16722b2b8a2a0700758329f319b0315bb4d86cb45d3a
+  metadata.gz: e7239c52d390a97c8dd1b0e9ff0e9943e05a059e7186919b399a6a50aadcb15d3b4272470ad8114d006ce76869ab0e0d85a9bebacaf294771e6b526305188114
+  data.tar.gz: ce3ca40f1c3285255afb7c397994fe47fa69eab9dab68752f3e2cb0509d48fe26a81e15a39916ad8e3550eaf1e398ed4d239f8c659d8e9b9d399913f44b1b4c5

data/.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
 cache: bundler
-rvm: 2.0.0
-osx_image: xcode8
+rvm: 2.2
+matrix:
+  include:
+    - {os: osx, osx_image: xcode8.3}
+    - {os: osx, osx_image: xcode9.2}
 git:
   depth: 1
-before_install: gem install bundler
-install: bundle install
 script: bundle exec rspec -f d -c
-os: osx
 addons:
   code_climate:
     repo_token: b4206ed2b9443314c998e8909dfa31f0ed476ea5ab460b98e102cd20508ff564

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## [v0.3.1](https://github.com/viktorasl/xlocalize/releases/tag/0.3.1)
+
+* [7eb4563](https://github.com/viktorasl/xlocalize/commit/7eb4563456932b72fab0b3579a9d9ed1d5b97f0c) Fixes plurals export on Xcode9 and later
+* [758ef1e](https://github.com/viktorasl/xlocalize/commit/758ef1eae39ec5cc15d58b39eda93cc423f1dfa8) Tests on multiple Xcode versions

data/lib/xlocalize/executor.rb

@@ -1,5 +1,6 @@
 require 'xlocalize/webtranslateit'
 require 'xlocalize/xliff'
+require 'xlocalize/helper'
 require 'colorize'
 require 'nokogiri'
 require 'yaml'
@@ -17,15 +18,20 @@ module Xlocalize
 
     def export_master(wti, project, targets, excl_prefix, master_lang)
       master_file_name = locale_file_name(master_lang)
-      
-      # 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
+
       File.delete(master_file_name) if File.exist?(master_file_name)
-      system "xcodebuild -exportLocalizations -localizationPath ./ -project #{project} & sleep 0"
-      while !File.exist?(master_file_name) do
-        sleep(1)
+
+      if Helper.xcode_at_least?(9)
+        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"
+        while !File.exist?(master_file_name) do
+          sleep(1)
+        end        
       end
 
       purelyze(master_lang, targets, excl_prefix, project)

data/lib/xlocalize/helper.rb

@@ -0,0 +1,16 @@
+
+module Xlocalize
+  
+  class Helper
+
+    def self.xcode_version
+      output = `xcodebuild -version`
+      output.split("\n").first.split(' ')[1]
+    end
+
+    def self.xcode_at_least?(version)
+      v = xcode_version
+      Gem::Version.new(v) >= Gem::Version.new(version)
+    end
+  end
+end

data/lib/xlocalize/version.rb

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

data/lib/xlocalize/xliff.rb

@@ -46,6 +46,7 @@ module Xlocalize
         end
         plurals[fname_stringsdict] = translations
       }
+      plurals.each { |k, _| self.css('file[original="' << k << '"]').remove }
       return plurals
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlocalize
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Viktoras Laukevičius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -148,6 +148,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -158,6 +159,7 @@ files:
 - bin/xlocalize
 - lib/xlocalize.rb
 - lib/xlocalize/executor.rb
+- lib/xlocalize/helper.rb
 - lib/xlocalize/version.rb
 - lib/xlocalize/webtranslateit.rb
 - lib/xlocalize/xliff.rb
@@ -187,3 +189,4 @@ signing_key:
 specification_version: 4
 summary: Xcode localizations import/export helper tool
 test_files: []
+has_rdoc: