babelyoda 2.1.1 → 2.1.2

data/lib/babelyoda/genstrings.rb

@@ -19,7 +19,7 @@ module Babelyoda
           end
           Dir.glob(File.join(dir, '*.strings')).each do |strings_file|
             strings = Babelyoda::Strings.new(strings_file, language).read!
-            strings.name = File.join('Resources', File.basename(strings.name))
+            strings.name = File.basename(strings.name)
             keysets[strings.name] ||= Keyset.new(strings.name)
             keysets[strings.name].merge!(strings)
           end

data/lib/babelyoda/tanker.rb

@@ -111,7 +111,7 @@ module Babelyoda
     attr_accessor :token
     attr_accessor :project_id
 
-    def replace(keyset, language = nil)
+    def replace(keyset, language = :en)
       validate_keyset_name!(keyset.name)
       doc = project_xml do |xml|
         keyset.to_xml(xml, language)
@@ -120,11 +120,9 @@ module Babelyoda
         :file => StringIO.new(doc),
         'project-id' => project_id,
         'keyset-id' => keyset.name,
-        # TODO: REMOVE ME when Tanker is fixed.
-        'language' => :en,
+        'language' => language,
         :format => 'xml'
       }
-      payload.merge!({:language => language}) if language
       post('/keysets/replace/', payload)
     end
     
@@ -214,7 +212,7 @@ module Babelyoda
       req['AUTHORIZATION'] = token
       req.content_type = multipart_content_type
       req.body = multipart_data(payload)
-
+      
       debug_log = ''
       conn = Net::HTTP.new(uri.host, uri.port)
       conn.set_debug_output(debug_log)
@@ -223,6 +221,10 @@ module Babelyoda
       end
       $logger.debug "HTTP DEBUG: #{debug_log}"
       
+      $logger.debug "=== POST DATA ==========================================="
+      $logger.debug req.body
+      $logger.debug "=== / POST DATA ========================================="
+      
       case res
       when Net::HTTPSuccess, Net::HTTPRedirection
         Nokogiri::XML.parse(res.body)

data/lib/babelyoda/version.rb

@@ -1,3 +1,3 @@
 module Babelyoda
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/lib/babelyoda.rb

@@ -37,7 +37,8 @@ namespace :babelyoda do
         $logger.info "Extracting strings from sources..."
         dev_lang = spec.development_language
         Babelyoda::Genstrings.run(spec.source_files, dev_lang) do |keyset|
-          old_strings_filename = strings_filename(keyset.name, dev_lang)
+          keyset_name = File.join(spec.resources_folder, keyset.name)
+          old_strings_filename = strings_filename(keyset_name, dev_lang)
           old_strings = Babelyoda::Strings.new(old_strings_filename, dev_lang).read
           old_strings.merge!(keyset)
           old_strings.save!
@@ -151,17 +152,37 @@ namespace :babelyoda do
       end
     end
     
-    desc "Pushes resources to the translators"
+    desc "Pushes resources to the translators. Use LANGS to specify languages to push. Defaults to '#{spec.development_language}'."
     task :push => [:drop_orphan_keysets, :drop_orphan_keys] do
-      $logger.info "Pushing local keys to the remote..."
+      langs = [ spec.development_language ]
+      if ENV['LANGS']
+        if ENV['LANGS'] == '*'
+          langs = spec.all_languages
+        else
+          langs = ENV['LANGS'].split(',').map { |s| s.to_sym }
+        end
+      end
+      $logger.info "Pushing local keys for '#{langs.join(', ')}' to the remote..."
       spec.strings_files.each do |filename|
-        strings = Babelyoda::Strings.new(filename, spec.development_language).read!
-        $logger.debug "Processing keyset: #{strings.name}"
-        remote_keyset = spec.engine.load_keyset(strings.name, nil, :unapproved)
-        result = remote_keyset.merge!(strings, preserve: true)
+        local_keyset = nil
+        
+        langs.each do |lang|
+          unless local_keyset
+            local_keyset = Babelyoda::Strings.new(filename, lang).read!
+            $logger.debug "Processing keyset: #{local_keyset.name}"
+          else
+            strings = Babelyoda::Strings.new(strings_filename(local_keyset.name, lang), lang).read!
+            local_keyset.merge!(strings, preserve: true)
+          end
+        end
+        
+        remote_keyset = spec.engine.load_keyset(local_keyset.name, nil, :unapproved)
+        result = remote_keyset.merge!(local_keyset, preserve: true)
         remote_keyset.ensure_languages!(spec.all_languages)
         if result[:new] > 0 || result[:updated] > 0
-          spec.engine.replace(remote_keyset)
+          langs.each do |lang|
+            spec.engine.replace(remote_keyset, lang)
+          end
           $logger.debug "New keys: #{result[:new]} Updated keys: #{result[:updated]}"
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babelyoda
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2012-02-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70356031935100 !ruby/object:Gem::Requirement
+  requirement: &70329428735300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356031935100
+  version_requirements: *70329428735300
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70356031934680 !ruby/object:Gem::Requirement
+  requirement: &70329428734720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356031934680
+  version_requirements: *70329428734720
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70356031934180 !ruby/object:Gem::Requirement
+  requirement: &70329428734060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356031934180
+  version_requirements: *70329428734060
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70356031933720 !ruby/object:Gem::Requirement
+  requirement: &70329428733340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70356031933720
+  version_requirements: *70329428733340
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70356031933120 !ruby/object:Gem::Requirement
+  requirement: &70329428732520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70356031933120
+  version_requirements: *70329428732520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70356031932240 !ruby/object:Gem::Requirement
+  requirement: &70329428731600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -82,10 +82,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70356031932240
+  version_requirements: *70329428731600
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70356031931420 !ruby/object:Gem::Requirement
+  requirement: &70329428730800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -96,10 +96,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70356031931420
+  version_requirements: *70329428730800
 - !ruby/object:Gem::Dependency
   name: rchardet19
-  requirement: &70356031819460 !ruby/object:Gem::Requirement
+  requirement: &70329428730020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70356031819460
+  version_requirements: *70329428730020
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70356031818600 !ruby/object:Gem::Requirement
+  requirement: &70329428729260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -124,10 +124,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70356031818600
+  version_requirements: *70329428729260
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70356031817800 !ruby/object:Gem::Requirement
+  requirement: &70329428728520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -138,10 +138,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70356031817800
+  version_requirements: *70329428728520
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70356031816880 !ruby/object:Gem::Requirement
+  requirement: &70329428727780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -152,10 +152,10 @@ dependencies:
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70356031816880
+  version_requirements: *70329428727780
 - !ruby/object:Gem::Dependency
   name: log4r-color
-  requirement: &70356031815780 !ruby/object:Gem::Requirement
+  requirement: &70329428727060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -163,7 +163,7 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70356031815780
+  version_requirements: *70329428727060
 description: A simple utility to push/pull l10n resources of an Xcode project to/from
   the translators
 email: