babelyoda 2.0.1 → 2.0.2

data/lib/babelyoda/localization_key.rb

@@ -10,6 +10,10 @@ module Babelyoda
       @values = {}
     end
     
+    def to_s
+      "\"#{@id}\" [#{@values.keys.map{|k| ":#{k.to_s}"}.join(', ')}] // #{@context}"
+    end
+    
     def <<(localization_value)
       @values[localization_value.language.to_sym] = localization_value.dup
       self

data/lib/babelyoda/logger.rb

@@ -7,8 +7,8 @@ module Babelyoda
     def exe(cmd) ; putcmd cmd ; system cmd ; end
     def putcmd(cmd) ; print magenta, "CMD: #{cmd}", reset, "\n" ; end
     def status(msg) ; print blue, "--- #{msg} ---", reset, "\n" ; end
-    def success(msg) ; print green, bold, 'SUCCESS: ', msg, reset, "\n" ; end
-    def error(msg) ; print red, bold, 'ERROR: ', msg, reset, "\n" ; exit 1 ; end
+    def success(msg, heading = true) ; print green, bold, (heading ? 'SUCCESS: ' : ''), msg, reset, "\n" ; end
+    def error(msg, heading = true, do_exit = true) ; print red, bold, (heading ? 'ERROR: ' : ''), msg, reset, "\n" ; exit 1 if do_exit; end
     def escape_cmd_args(args) ; args.collect{ |arg| "'#{arg}'"}.join(' ') ; end
   end
 end

data/lib/babelyoda/strings.rb

@@ -1,5 +1,6 @@
 require 'rchardet19'
 
+require_relative 'file'
 require_relative 'keyset'
 require_relative 'strings_lexer'
 require_relative 'strings_parser'
@@ -20,8 +21,9 @@ module Babelyoda
     end
     
     def read
-      if File.exist?(@filename)
-        File.open(@filename, read_mode) do |f|
+      localized_filename = File.localized(@filename, @language)
+      if File.exist?(localized_filename)
+        File.open(localized_filename, read_mode) do |f|
           lexer = StringsLexer.new
           parser = StringsParser.new(lexer, @language)
           parser.parse(f.read) do |localization_key|
@@ -56,6 +58,7 @@ module Babelyoda
       cd = CharDet.detect(File.read(@filename))
       encoding_str = Encoding.aliases[cd.encoding] || cd.encoding
       encoding_str = 'UTF-8' if encoding_str == 'utf-8'
+      encoding_str = 'UTF-8' if encoding_str == 'ascii'
       if (encoding_str != "UTF-8")
         "rb:#{encoding_str}:UTF-8"
       else

data/lib/babelyoda/tanker.rb

@@ -36,7 +36,8 @@ module Babelyoda
       context &&= context.text
       result = self.new(node[:id], context)
       node.css('value').each do |value_node|
-        result << Babelyoda::LocalizationValue.parse_xml(value_node)
+        value = Babelyoda::LocalizationValue.parse_xml(value_node)
+        result << value if value
       end
       result
     end
@@ -44,7 +45,9 @@ module Babelyoda
   
   class LocalizationValue
     def self.parse_xml(node)
-      self.new(node[:language], node.text, node[:status])
+      if node.text.length > 0
+        self.new(node[:language], node.text, node[:status])
+      end
     end
   end
   

data/lib/babelyoda/version.rb

@@ -1,3 +1,3 @@
 module Babelyoda
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/lib/babelyoda.rb

@@ -121,7 +121,7 @@ namespace :babelyoda do
       spec.scm.transaction("[Babelyoda] Merge in remote translations") do 
         spec.strings_files.each do |filename|
           keyset_name = Babelyoda::Keyset.keyset_name(filename)
-          remote_keyset = spec.engine.load_keyset(keyset_name, nil, :unapproved, true)
+          remote_keyset = spec.engine.load_keyset(keyset_name, nil, :unapproved)
           remote_keyset.drop_empty!
           spec.all_languages.each do |language|
             keyset_filename = strings_filename(keyset_name, language)
@@ -158,27 +158,36 @@ namespace :babelyoda do
     task :pull => [:fetch_strings, :localize_xibs] do
     end
     
-    # desc "Verifies all local translations are present"
-    # task :verify do
-    #   combined_keyset = Babelyoda::Keyset.new('babelyoda.verify')
-    #   spec.strings_files.each do |filename|
-    #     dev_lang_strings = Babelyoda::Strings.new(filename, spec.development_language).read
-    #     combined_keyset.merge!(dev_lang_strings)
-    #     spec.localization_languages.each do |language|
-    #       lang_strings = Babelyoda::Strings.new(filename, language).read
-    #       combined_keyset.merge!(lang_strings)
-    #     end
-    #   end
-    #   puts "TOTAL KEYS: #{combined_keyset}"
-    #   missing = {}
-    #   spec.localization_languages.each do |language|
-    #     missing[language] = Babelyoda::Keyset.new('babelyoda.verify.' + language)
-    #   end
-    #   puts "MISSING KEYS:"
-    #   spec.localization_languages.each do |language|
-    #     puts "  #{language}: #{missing}"
-    #   end
-    # end
+    desc "Verifies all local translations are present"
+    task :verify do
+      combined_keyset = Babelyoda::Keyset.new('babelyoda.verify')
+      spec.strings_files.each do |filename|
+        dev_lang_strings = Babelyoda::Strings.new(filename, spec.development_language).read
+        combined_keyset.merge!(dev_lang_strings)
+        spec.localization_languages.each do |language|
+          lang_strings = Babelyoda::Strings.new(filename, language).read
+          combined_keyset.merge!(lang_strings)
+        end
+      end
+      $logger.success("#{spec.development_language}: #{combined_keyset.keys.size} keys", false)
+      missing = {}
+      spec.localization_languages.each do |language|
+        missing[language] = Babelyoda::Keyset.new("babelyoda.verify.#{language}")
+      end
+      combined_keyset.drop_empty!
+      combined_keyset.keys.each_value do |key|
+        spec.localization_languages.each do |lang|
+          missing[lang.to_sym].merge_key!(key) unless key.values.has_key?(lang.to_sym)
+        end
+      end
+      total_missing_count = 0
+      spec.localization_languages.each do |language|
+        count = missing[language].keys.size
+        total_missing_count += count
+        $logger.error("#{language}: #{combined_keyset.keys.size - count} keys (#{count} translations missing)", false, false) if count > 0
+      end
+      exit 1 if total_missing_count > 0
+    end
     
     namespace :remote do
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelyoda
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70248372389060 !ruby/object:Gem::Requirement
+  requirement: &70131405357940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70248372389060
+  version_requirements: *70131405357940
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70248372387200 !ruby/object:Gem::Requirement
+  requirement: &70131405354760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -38,10 +38,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70248372387200
+  version_requirements: *70131405354760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70248372385200 !ruby/object:Gem::Requirement
+  requirement: &70131405344240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -52,10 +52,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70248372385200
+  version_requirements: *70131405344240
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70248372381080 !ruby/object:Gem::Requirement
+  requirement: &70131405341480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70248372381080
+  version_requirements: *70131405341480
 - !ruby/object:Gem::Dependency
   name: rchardet19
-  requirement: &70248372378460 !ruby/object:Gem::Requirement
+  requirement: &70131405339840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +80,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70248372378460
+  version_requirements: *70131405339840
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70248372376260 !ruby/object:Gem::Requirement
+  requirement: &70131405328400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +94,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70248372376260
+  version_requirements: *70131405328400
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70248372375060 !ruby/object:Gem::Requirement
+  requirement: &70131405327320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -108,10 +108,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70248372375060
+  version_requirements: *70131405327320
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70248372373400 !ruby/object:Gem::Requirement
+  requirement: &70131405326220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70248372373400
+  version_requirements: *70131405326220
 description: A simple utility to push/pull l10n resources of an Xcode project to/from
   the translators
 email:
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4332337468175115437
+      hash: -1710872162034708641
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4332337468175115437
+      hash: -1710872162034708641
 requirements: []
 rubyforge_project: babelyoda
 rubygems_version: 1.8.10