locca 0.9.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de31b1cfbf5dc6be572c084cef8289b33c3749f
-  data.tar.gz: a6bfe34dc35e921aa820b89307ef65b9aba2d4a1
+  metadata.gz: 602f845e29ca86257e780db088e19b58bb9915f3
+  data.tar.gz: 2f883c90409ea10ddc4223d8aae2aad0c7ea9a57
 SHA512:
-  metadata.gz: 72ac44b04a266a3be55956243e18f8657761cda099415ca84da8057bdd3eab185920aa0bb72481e4ee4664f32262a6a37cb62f996d9648d3f05a6f5583ab3136
-  data.tar.gz: bda3270eb43c1848535d70c575f61dd175f784e24f1186d7bc9f3b439634c9893b7787233a5df989e6febee989b09a2d9a6ef642d3a2df62ffe2f0efcd9f9a4c
+  metadata.gz: c2080c2b434355c8f9a6e06bb4b04affa80c32f46e6c72a862e9aca1153803fda5b4e2ea5b5a9c2e1bbe6441e949bc531eae6c1cd37752e45986579012ffbdcc
+  data.tar.gz: d8c18e5980afb6e573bbb9c366e1879628c6185b015076f1eba4523c9813060ab94eb3c2c926be9a34f5ae468eadcc4f4b37251e87587927932065321d10f756

data/bin/locca

@@ -46,7 +46,10 @@ command :build do |c|
             work_dir = Dir.getwd
         end
 
-        $locca.build(project_in_dir(work_dir))
+        projects_in_dir(work_dir).each { |project|  
+            $locca.build(project)
+        }
+        
     end
 end
 
@@ -71,7 +74,10 @@ command :sync do |c|
             work_dir = Dir.getwd
         end
 
-        $locca.sync(project_in_dir(work_dir), options[:prune])
+        projects_in_dir(work_dir).each { |project|  
+            $locca.sync(project, options[:prune])
+        }
+        
     end  
 end
 
@@ -83,7 +89,9 @@ command :fetch do |c|
             work_dir = Dir.getwd
         end
 
-        $locca.fetch(project_in_dir(work_dir))
+        projects_in_dir(work_dir).each { |project|  
+            $locca.fetch(project)
+        }
     end  
 end
 
@@ -95,7 +103,9 @@ command :translate do |c|
             work_dir = Dir.getwd
         end
 
-        $locca.translate(project_in_dir(work_dir), args[0])
+        projects_in_dir(work_dir).each { |project|  
+            $locca.translate(project, args[0])
+        }
     end  
 end
 
@@ -119,12 +129,12 @@ on_error do |exception|
     true
 end
 
-def project_in_dir(dir)
+def projects_in_dir(dir)
     project_dir_locator = Locca::ProjectDirLocator.new()
     config_reader = Locca::ConfigReader.new()
     project_factory = Locca::ProjectFactory.new(project_dir_locator, config_reader)
 
-    project = project_factory.new_project(dir)
+    return project_factory.all_projects(dir)
 end
 
 exit run(ARGV)

data/lib/locca/actions/build_action.rb

@@ -37,7 +37,6 @@ module Locca
         def execute()
             generated_collections = @collections_generator.generate()
             langs = @project.langs()
-
             generated_collections.each do |generated_collection|
                 langs.each do |lang|
                     collection_path = @project.path_for_collection(generated_collection.name, lang)

data/lib/locca/actions/onesky_sync_action.rb

@@ -47,7 +47,7 @@ module Locca
             # 1
             @generated_collections.each do |generated_collection|
                 @langs.each do |lang|
-                    print "[*] fetch: #{lang}/#{generated_collection.name}\n"
+                    print "[*] #{@project.name}: fetch: #{lang}/#{generated_collection.name}\n"
                     data = @onesky.fetch_translations(lang, @project.full_collection_name(generated_collection.name))
                     fetched_collection = @collection_builder.collection_from_datastring(data)
 
@@ -55,7 +55,7 @@ module Locca
                     local_collection = @collection_builder.collection_at_path(local_collection_path)
 
                     # 2
-                    print "[*] merge: onesky -> #{lang}/#{generated_collection.name}\n"
+                    print "[*] #{@project.name}: merge: onesky -> #{lang}/#{generated_collection.name}\n"
                     @collection_merger.merge(fetched_collection, local_collection, CollectionMerger::ACTION_ADD | CollectionMerger::ACTION_UPDATE)
                     @collection_writer.write_to_path(local_collection, local_collection_path)
                 end
@@ -68,7 +68,7 @@ module Locca
             # 3
             @generated_collections.each do |generated_collection|
                 @langs.each do |lang|
-                    print "[*] merge: code -> #{lang}/#{generated_collection.name}\n"
+                    print "[*] #{@project.name}: merge: code -> #{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)
@@ -81,7 +81,7 @@ module Locca
             if @project.prevent_sync_without_comments?                    
                 lang = @project.base_lang
                 @generated_collections.each do |generated_collection|
-                    print "[*] check: #{lang}/#{generated_collection.name}\n"
+                    print "[*] #{@project.name}: 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)                
@@ -95,7 +95,7 @@ module Locca
 
             # 4
             @generated_collections.each do |generated_collection|
-                print "[*] upload: #{@project.base_lang}/#{generated_collection.name}\n"
+                print "[*] #{@project.name}: upload: #{@project.base_lang}/#{generated_collection.name}\n"
                 collection_path = @project.path_for_collection(generated_collection.name, @project.base_lang())
                 @onesky.upload_file(collection_path, @project.one_sky_file_format, prune_missing_strings)
             end

data/lib/locca/collections_generator.rb

@@ -24,15 +24,15 @@
 
 module Locca
     class CollectionsGenerator
-        def initialize(project, genstrings, collection_builder)
-            @project = project
+        def initialize(source_files, genstrings, collection_builder)
+            @source_files = source_files
             @genstrings = genstrings
             @collection_builder = collection_builder
         end
 
         def generate()
             result = Array.new()
-            @genstrings.generate(@project.code_dir) do |filepath|
+            @genstrings.generate(@source_files) do |filepath|
                 collection = @collection_builder.collection_at_path(filepath)
                 result.push(collection)
             end

data/lib/locca/config_reader.rb

@@ -21,12 +21,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-require 'yaml'
+require 'json'
 
 module Locca
     class ConfigReader
         def read(path)
-            return YAML.load_file(path)
+            return JSON.parse(IO.read(path))
         end
     end
 end

data/lib/locca/genstrings.rb

@@ -27,9 +27,10 @@ require 'tmpdir'
 
 module Locca
     class Genstrings
-        def generate(code_dir)
+        def generate(source_files)
             Dir.mktmpdir do |tmp_dir|
-                command = "find #{code_dir} -iname \"*.m\" -or -iname \"*.mm\" -or -iname \"*.c\" -or -iname \"*.swift\" | xargs genstrings -o '#{tmp_dir}'"
+                file_list = "'" + source_files.join("' '") + "'"
+                command = "genstrings -o '#{tmp_dir}' #{file_list}"
                 stdout, stderr, status = Open3.capture3(command)
 
                 stderr = stderr.strip

data/lib/locca/projects/android_project.rb

@@ -28,8 +28,15 @@ module Locca
     class AndroidProject < Project
         MAIN_COLLECTION_NAME = 'strings'
 
+        attr_reader :lang_dir
+
         def initialize(dir, config)
         	super(dir, config)
+            @lang_dir = File.join(dir, config['lang_dir'])
+        end
+
+        def name
+            return "Android"
         end
 
         def langs

data/lib/locca/projects/project.rb

@@ -25,16 +25,12 @@
 module Locca
     class Project
         attr_reader :dir
-        attr_reader :lang_dir
-        
         attr_reader :base_lang
 
         def initialize(dir, config)
             @dir = dir
             @config = config
-            
-            @lang_dir = File.join(dir, config['lang_dir'])
-            
+                        
             @base_lang = config['base_lang']
         end
 
@@ -84,5 +80,9 @@ module Locca
             # implement in subclass
         end
 
+        def name
+            return ""
+        end
+
     end
 end

data/lib/locca/projects/project_factory.rb

@@ -21,6 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
+require 'xcodeproj'
 require_relative 'xcode_project'
 
 module Locca
@@ -40,7 +41,7 @@ module Locca
             @config_reader = config_reader
         end
 
-        def new_project(project_dir)
+        def all_projects(project_dir)
             project_dir = @project_dir_locator.locate(project_dir)
             if not project_dir
                 raise ProjectNotFoundError, 'Can\'t find .locca dir (also checked parent dirs)'
@@ -51,12 +52,23 @@ module Locca
                 raise ConfigNotFoundError, 'Can\'t find .locca/config'
             end
 
-            if Dir.glob("#{project_dir}/**/AndroidManifest.xml").length > 0
-                return AndroidProject.new(project_dir, config)
+            results = Array.new()
+
+            if config["project_file"]
+                project = Xcodeproj::Project.open(File.join(project_dir, config["project_file"]))
+                config["targets"].each { |target_name, target_config|  
+                    project.native_targets().each { |target|  
+                        if target.name == target_name
+                            merged_config = config.merge(target_config)
+                            results.push(XcodeProject.new(project_dir, target, merged_config))
+                        end
+                    }
+                }
             else
-                return XcodeProject.new(project_dir, config)
+                results.push(AndroidProject.new(project_dir, config))
             end
-                        
+
+            return results         
         end
 
     end

data/lib/locca/projects/xcode_project.rb

@@ -22,31 +22,41 @@
 # SOFTWARE.
 #
 
+require 'xcodeproj'
 require_relative 'project'
 
 module Locca
     class XcodeProject < Project
-        attr_reader :code_dir
+        attr_reader :langs
 
-        def initialize(dir, config)
+        def initialize(dir, xcode_target, config)
         	super(dir, config)
-            @code_dir = File.join(dir, config['code_dir'])
-        end
+            @xcode_target = xcode_target
 
-        def langs
-            result = Set.new()
-            Dir.glob(File.join(@lang_dir, '*.lproj')) do |filepath|
-                result.add(File.basename(filepath, '.lproj'))
-            end
+            @files = Array.new()
+            @langs = Set.new()
 
-            return result
+            @xcode_target.resources_build_phase.files_references.each { |file|  
+                if file.display_name.end_with?(".strings") && file.is_a?(Xcodeproj::Project::Object::PBXVariantGroup)
+                    @files.push(file)
+                    if file.display_name == "Localizable.strings"
+                        file.files.each { |variant_file|  
+                            @langs.add(variant_file.name)
+                        }
+                    end
+                end
+            }
+        end
+
+        def name
+            return @xcode_target.name
         end
 
         def collection_names
             result = Set.new()
-            Dir.glob(File.join(@lang_dir, "#{@base_lang}.lproj", '*.strings')) do |filepath|
-                result.add(File.basename(filepath, '.strings'))
-            end
+            @files.each { |file|  
+                result.add(File.basename(file.display_name, '.strings'))
+            }
 
             return result 
         end
@@ -56,7 +66,18 @@ module Locca
         end
 
         def path_for_collection(collection_name, lang)
-            return File.join(@lang_dir, "#{lang}.lproj", "#{collection_name}.strings")
+            collection_name = "#{collection_name}.strings"
+            @files.each { |file|  
+                if file.display_name == collection_name
+                    file.files.each { |variant_file|  
+                        if variant_file.name == lang
+                            return variant_file.real_path
+                        end
+                    }
+                end
+            }
+
+            return nil
         end
 
 		def collection_builder()
@@ -69,7 +90,11 @@ module Locca
         end
 
         def collections_generator()
-            return CollectionsGenerator.new(self, Genstrings.new(), collection_builder())
+            source_files = Array.new()
+            @xcode_target.source_build_phase.files_references.each { |file|  
+                source_files.push(file.real_path.to_s)
+            }
+            return CollectionsGenerator.new(source_files, Genstrings.new(), collection_builder())
         end
 
         def one_sky_file_format

data/lib/locca/version.rb

@@ -22,5 +22,5 @@
 # SOFTWARE.
 #
 module Locca
-  VERSION = '0.9.7'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locca
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 2.0.0
 platform: ruby
 authors:
 - Shurakov Evgeny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -108,6 +108,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: inbox@shurakov.name
 executables: