babelyoda 2.0.4 → 2.0.5

data/lib/babelyoda/keyset.rb

@@ -1,3 +1,5 @@
+require_relative 'logger'
+
 module Babelyoda
   class Keyset
     attr_accessor :name

data/lib/babelyoda/version.rb

@@ -1,3 +1,3 @@
 module Babelyoda
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/lib/babelyoda.rb

@@ -201,29 +201,34 @@ namespace :babelyoda do
         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
+          lang_strings = Babelyoda::Strings.new(File.localized(filename, language), language).read
           combined_keyset.merge!(lang_strings)
         end
       end
-      $logger.info "#{spec.development_language}: #{combined_keyset.keys.size} keys"
-      total_missing_count = combined_keyset.keys.size
-      
-      present = {}
-      spec.localization_languages.each do |language|
-        present[language] = Babelyoda::Keyset.new("babelyoda.verify.#{language}")
-      end
       combined_keyset.drop_empty!
+      
+      count = {}
+      spec.all_languages.each { |lang| count[lang.to_sym] = 0}
+      
       combined_keyset.keys.each_value do |key|
-        spec.localization_languages.each do |lang|
-          present[lang.to_sym].merge_key!(key) if key.values.has_key?(lang.to_sym)
+        spec.all_languages.each do |lang|
+          count[lang.to_sym] += 1 if key.values.has_key?(lang.to_sym)
         end
       end
+
+      total_count = count[spec.development_language.to_sym]
+      $logger.info "#{spec.development_language}: #{total_count} keys"
+      
+      all_found = true
       spec.localization_languages.each do |language|
-        count = present[language].keys.size
-        total_missing_count -= count
-        $logger.error "#{language}: #{combined_keyset.keys.size - count} keys (#{count} translations missing)" if count > 0
+        lang_count = count[language.to_sym]
+        missing_count = total_count - lang_count
+        if missing_count > 0
+          $logger.error "#{language}: #{lang_count} keys (#{missing_count} translations missing)"
+          all_found = false
+        end
       end
-      exit 1 if total_missing_count > 0
+      exit 1 unless all_found
     end
     
     namespace :remote do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelyoda
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70227304242720 !ruby/object:Gem::Requirement
+  requirement: &70322929940960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70227304242720
+  version_requirements: *70322929940960
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70227304241120 !ruby/object:Gem::Requirement
+  requirement: &70322929938420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -38,10 +38,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70227304241120
+  version_requirements: *70322929938420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70227304239460 !ruby/object:Gem::Requirement
+  requirement: &70322929935740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -52,10 +52,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70227304239460
+  version_requirements: *70322929935740
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70227304238220 !ruby/object:Gem::Requirement
+  requirement: &70322929933140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70227304238220
+  version_requirements: *70322929933140
 - !ruby/object:Gem::Dependency
   name: rchardet19
-  requirement: &70227304237000 !ruby/object:Gem::Requirement
+  requirement: &70322929929440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +80,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70227304237000
+  version_requirements: *70322929929440
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70227304235840 !ruby/object:Gem::Requirement
+  requirement: &70322929920800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -94,10 +94,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70227304235840
+  version_requirements: *70322929920800
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70227304234560 !ruby/object:Gem::Requirement
+  requirement: &70322929916980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -108,10 +108,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70227304234560
+  version_requirements: *70322929916980
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70227304233280 !ruby/object:Gem::Requirement
+  requirement: &70322929915060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70227304233280
+  version_requirements: *70322929915060
 - !ruby/object:Gem::Dependency
   name: log4r-color
-  requirement: &70227304231860 !ruby/object:Gem::Requirement
+  requirement: &70322929896260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,7 +133,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70227304231860
+  version_requirements: *70322929896260
 description: A simple utility to push/pull l10n resources of an Xcode project to/from
   the translators
 email:
@@ -181,12 +181,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3841547272139031711
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3841547272139031711
 requirements: []
 rubyforge_project: babelyoda
 rubygems_version: 1.8.10