locca 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184b6cefe3ca2452b2c4bdc102fcbd09ea2cad2a
-  data.tar.gz: e925c505ba4e6fc1ab27606bd611f41eb2fb2386
+  metadata.gz: 694c840f5f64001d74c08f0adf3aab810642aa10
+  data.tar.gz: 8f8e83e8f901f0e193c1ca60841d6e4847b981c7
 SHA512:
-  metadata.gz: b41bbd7d5d909882cd0550d78b336dba9cecd400b0999d32a1718aa5ba34ccafe01ce063cbf4e5b398eed02aac5cf434bbe8ea1d903d8525f5e53fd9bdba4833
-  data.tar.gz: 08cdcfbac26a8874f2d0a0638eb8ae1e957bcb0f3b318b61ecaff96ea2a2516a5e54e6eb550067acc309cc4bda732f3113a3536290f99a2c9c0b2590592824d8
+  metadata.gz: f27ef9dd3d9906a779ab3660181560eb1bee24f70ca859699f84b4514e2cf64ea64ef3614c6e3c7fd6c6301ac88fc6b71e111ff9230ecbcd167b60fb3a810ec5
+  data.tar.gz: 666f1f04e6291be5fcc6e130fb8bb1e87c15089664d059ad7a727441fe6dc221f3c2bc511242fb6db96f72fd3ca2ca9136ad96644beca9cf314492cb1a059d13

data/bin/locca

@@ -110,7 +110,9 @@ end
 on_error do |exception|
     # Error logic here
     # return false to skip default error handling
-    puts exception.backtrace
+    if ENV["LOCCA_DEBUG"]
+        puts exception.backtrace
+    end
     true
 end
 

data/lib/locca/actions/build_action.rb

@@ -42,7 +42,7 @@ module Locca
                 langs.each do |lang|
                     collection_path = @project.path_for_collection(generated_collection.name, lang)
                     collection = @collection_builder.collection_at_path(collection_path)
-                    @collection_merger.merge(generated_collection, collection, (CollectionMerger::ACTION_ADD | CollectionMerger::ACTION_DELETE))
+                    @collection_merger.merge(generated_collection, collection, (CollectionMerger::ACTION_ADD | CollectionMerger::ACTION_DELETE | CollectionMerger::ACTION_UPDATE_COMMENTS))
                     @collection_writer.write_to_path(collection, collection_path)
                 end
             end

data/lib/locca/actions/onesky_sync_action.rb

@@ -70,10 +70,26 @@ module Locca
                 @langs.each do |lang|
                     print "[*] merge: code -> #{lang}/#{generated_collection.name}\n"
 
-                    collection_path = @project.path_for_collection(generated_collection.name, lang)
-                    collection = @collection_builder.collection_at_path(collection_path)
-                    @collection_merger.merge(generated_collection, collection, (CollectionMerger::ACTION_ADD | CollectionMerger::ACTION_DELETE))
-                    @collection_writer.write_to_path(collection, collection_path)
+                    local_collection_path = @project.path_for_collection(generated_collection.name, lang)
+                    local_collection = @collection_builder.collection_at_path(local_collection_path)
+                    @collection_merger.merge(generated_collection, local_collection, (CollectionMerger::ACTION_ADD | CollectionMerger::ACTION_DELETE | CollectionMerger::ACTION_UPDATE_COMMENTS))
+
+                    @collection_writer.write_to_path(local_collection, local_collection_path)
+                end
+            end
+
+            if @project.prevent_sync_without_comments?                    
+                lang = @project.base_lang
+                @generated_collections.each do |generated_collection|
+                    print "[*] check: #{lang}/#{generated_collection.name}\n"
+
+                    local_collection_path = @project.path_for_collection(generated_collection.name, lang)
+                    local_collection = @collection_builder.collection_at_path(local_collection_path)                
+
+                    keys = local_collection.keys_without_comments
+                    if keys.length > 0
+                        raise "Keys without comments:\n" + keys.join("\n")
+                    end
                 end
             end
 

data/lib/locca/collection.rb

@@ -56,6 +56,16 @@ module Locca
             return @items.keys
         end
 
+        def keys_without_comments
+            result = []
+            @items.each do |key, item|
+                if item.comment == nil || item.comment.strip.length == 0
+                    result.push(key)
+                end
+            end
+            return result
+        end
+
         def translated?
             @items.each do |key, item|
                 if !item.translated?

data/lib/locca/collection_merger.rb

@@ -24,9 +24,10 @@
 
 module Locca
     class CollectionMerger
-        ACTION_ADD          = (1 << 0)
-        ACTION_DELETE       = (1 << 1)
-        ACTION_UPDATE       = (1 << 2)
+        ACTION_ADD              = (1 << 0)
+        ACTION_DELETE           = (1 << 1)
+        ACTION_UPDATE           = (1 << 2)
+        ACTION_UPDATE_COMMENTS  = (1 << 3)
         
         def merge(src_collection, dst_collection, actions = (ACTION_ADD | ACTION_DELETE))
             if not src_collection or not dst_collection
@@ -45,6 +46,9 @@ module Locca
                     dst_collection.add_item(src_item.dup)
                 elsif (actions & ACTION_UPDATE) != 0 && dst_item
                     dst_collection.add_item(src_item.dup)
+                elsif (actions & ACTION_UPDATE_COMMENTS) != 0 && dst_item
+                    item = CollectionItem.new(dst_item.key, dst_item.value, src_item.comment)
+                    dst_collection.add_item(item)
                 end
 
                 if dst_keys

data/lib/locca/projects/android_project.rb

@@ -26,6 +26,7 @@ require_relative 'project'
 
 module Locca
     class AndroidProject < Project
+        MAIN_COLLECTION_NAME = 'strings'
 
         def initialize(dir, config)
         	super(dir, config)
@@ -36,7 +37,9 @@ module Locca
             result.add(self.base_lang)
 
             Dir.glob(File.join(@lang_dir, 'values-*')) do |filepath|
-            	result.add(File.basename(filepath).split('-', 2).last) 
+                if (File.exist?(File.join(filepath, "#{MAIN_COLLECTION_NAME}.xml")))
+                    result.add(File.basename(filepath).split('-', 2).last) 
+                end
             end
 
             return result
@@ -44,7 +47,7 @@ module Locca
 
         def collection_names
             result = Set.new()
-            result.add('strings');
+            result.add(MAIN_COLLECTION_NAME);
             return result 
         end
 

data/lib/locca/projects/project.rb

@@ -42,6 +42,16 @@ module Locca
             return @config[key]
         end
 
+        def prevent_sync_without_comments?
+            value = @config['prevent_sync_without_comments']
+            if value == true ||
+                value == 1
+                return true
+            else
+                return false
+            end
+        end
+
         def langs
             # implement in subclass
         end

data/lib/locca/version.rb

@@ -22,5 +22,5 @@
 # SOFTWARE.
 #
 module Locca
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locca
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Shurakov Evgeny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest