babelyoda 2.0.0 → 2.0.1

data/lib/babelyoda/ibtool.rb

@@ -24,7 +24,7 @@ module Babelyoda
       $logger.error "IBTOOL ERROR: #{ncmd}" unless rc
     end
     
-    def self.localize_incrementally(source_xib_fn, target_xib_fn, strings_fn, old_source_xib_fn, old_target_xib_fn)
+    def self.localize_incrementally(source_xib_fn, target_xib_fn, strings_fn, old_source_xib_fn)
       # ibtool
       #   --previous-file path_to_project/English.lproj/MainWindow.old.xib          # The old English XIB
       #   --incremental-file path_to_project/fr.lproj/MainWindow.old.xib            # The old French XIB
@@ -33,14 +33,14 @@ module Babelyoda
       #   --write path_to_project/fr.lproj/MainWindow.xib                           # The new French XIB that will be created
       #   path_to_project/English.lproj/MainWindow.new.xib                          # The new English XIB
 
-      ncmd = ['ibtool', '--previous-file', old_source_xib_fn, '--incremental-file', old_target_xib_fn, 
+      ncmd = ['ibtool', '--previous-file', old_source_xib_fn, '--incremental-file', target_xib_fn, 
         '--strings-file', strings_fn, '--localize-incremental', '--write', target_xib_fn, source_xib_fn]
       rc = Kernel.system(*ncmd)
       $logger.error "IBTOOL ERROR: #{ncmd}" unless rc
     end
     
     def self.import_strings(filename, strings_filename)
-      ncmd = ['ibtool', '--import-strings-file', strings_filename, filename]
+      ncmd = ['ibtool', '--import-strings-file', strings_filename, '--write', filename, filename]
       rc = Kernel.system(*ncmd)
       $logger.error "IBTOOL ERROR: #{ncmd}" unless rc
     end

data/lib/babelyoda/version.rb

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

data/lib/babelyoda/xib.rb

@@ -58,15 +58,15 @@ module Babelyoda
     
     def localize_incremental(language, scm)
       assert_localization_target(language)
-      unless has_incremental_resources?(language, scm)
+      unless localizable_incrementally?(scm, language)
         localize(language, scm)
       else
         puts "Incrementally localizing #{filename} => #{File.localized(filename, language)}..."
         strings_fn = strings_filename(language)
         $logger.error "No strings file found: #{strings_fn}" unless File.exist?(strings_fn)
         
-        scm.fetch_versions!(filename, File.localized(filename, language)) do |filenames|
-          Babelyoda::Ibtool.localize_incrementally(filename, File.localized(filename, language), strings_fn, filenames[0], filenames[1])
+        scm.fetch_versions!(filename) do |filenames|
+          Babelyoda::Ibtool.localize_incrementally(filename, File.localized(filename, language), strings_fn, filenames[0])
         end
       end
     end
@@ -76,13 +76,14 @@ module Babelyoda
     end
     
     def import_strings(scm)
+      puts "Importing #{strings_filename} => #{filename}"
       Babelyoda::Ibtool.import_strings(filename, strings_filename)
     end
     
   private
-    
-    def has_incremental_resources?(language, scm)
-      scm.version_exist?(filename) && scm.version_exist?(File.localized(filename, language))
+  
+    def localizable_incrementally?(scm, language)
+      scm.version_exist?(filename) && File.exist?(File.localized(filename, language))
     end
     
     def assert_localization_target(language)

data/lib/babelyoda.rb

@@ -34,7 +34,7 @@ namespace :babelyoda do
       puts "Extracting strings from sources..."
       dev_lang = spec.development_language
 
-      spec.scm.transaction("Extract strings from sources") do 
+      spec.scm.transaction("[Babelyoda] Extract strings from sources") do 
         Babelyoda::Genstrings.run(spec.source_files, dev_lang) do |keyset|
           old_strings_filename = strings_filename(keyset.name, dev_lang)
           old_strings = Babelyoda::Strings.new(old_strings_filename, dev_lang).read
@@ -48,7 +48,7 @@ namespace :babelyoda do
     desc "Extract strings from XIBs"
     task :extract_xib_strings do
       puts "Extracting .strings from XIBs..."
-      spec.scm.transaction("Extract strings from XIBs") do 
+      spec.scm.transaction("[Babelyoda] Extract strings from XIBs") do 
         spec.xib_files.each do |xib_filename|
           xib = Babelyoda::Xib.new(xib_filename, spec.development_language)
           next unless xib.extractable?(spec.development_language)
@@ -118,7 +118,7 @@ namespace :babelyoda do
     desc "Fetches remote strings and merges them down into local .string files"
     task :fetch_strings do
       puts "Fetching remote translations..."
-      spec.scm.transaction("Merge in remote translations") 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)
@@ -136,7 +136,7 @@ namespace :babelyoda do
     task :localize_xibs do
       puts "Translating XIB files..."
       
-      spec.scm.transaction("Localize XIB files") do 
+      spec.scm.transaction("[Babelyoda] Localize XIB files") do 
         spec.xib_files.each do |filename|
           xib = Babelyoda::Xib.new(filename, spec.development_language)
 
@@ -147,12 +147,9 @@ namespace :babelyoda do
         end
       end
       
-      spec.scm.transaction("Update XIB SHA1 version refs") do 
+      spec.scm.transaction("[Babelyoda] Update XIB SHA1 version refs") do 
         spec.xib_files.each do |filename|
           spec.scm.store_version!(filename)
-          spec.localization_languages.each do |language|
-            spec.scm.store_version!(File.localized(filename, language))
-          end
         end
       end
     end
@@ -161,6 +158,28 @@ 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
+    
     namespace :remote do
       
       desc "List remote keysets"

metadata

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