locca 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c4dfcb6f714c36e0e945658fde5705de3bb971
-  data.tar.gz: ac9cdc3cf716780c68acabaa7a22fec331722501
+  metadata.gz: bb1bf664519519f97a3250a89d70ef348a0efa90
+  data.tar.gz: 8b82a46b329742f94474f86ee2d6d1c41b01da38
 SHA512:
-  metadata.gz: 6dab801c6e1d3e582ce3285bbfffa1afcb8f5ca111f48a07dfe0d828115b995589a747ee9b87b5445afdc843bec8c145fea9c1057298deabbddbba8a11f66e58
-  data.tar.gz: aaa95ea21cbf1c66ae5eec112753c27566d04a3bc19f0d69f8b17d93dd7485e468fe0b1249d3c0ba07c48b1b9dd79b71f092859de031d88a1d82eb9efdda4997
+  metadata.gz: d76dabd3da74919b09647e9ab6f0d5ce673d184d870ef656da73413c3f01b3bae7dba35690f4e027baca9d8366003584925c64e6f2255be6d853c4bd2861bb9a
+  data.tar.gz: ec1c116543af7a0ba1f2bddc62922efcc816b357437ac71e1d5d054a2326f1899fba753e3b84368973899252f3cd5af8b81dc90b8aab18b47b2f3befa9c7a037

data/bin/locca

@@ -60,7 +60,7 @@ command :merge do |c|
     end 
 end
 
-desc 'Sync translations with external translation service'
+desc 'Sync (fetch, merge and upload new) translations with external translation service'
 command :sync do |c|
     c.action do |global_options, options, args|
         work_dir = global_options['work-dir'.to_sym]
@@ -72,6 +72,18 @@ command :sync do |c|
     end  
 end
 
+desc 'Fetch and merge translations from external translation service'
+command :fetch do |c|
+    c.action do |global_options, options, args|
+        work_dir = global_options['work-dir'.to_sym]
+        if not work_dir
+            work_dir = Dir.getwd
+        end
+
+        $locca.fetch(project_in_dir(work_dir))
+    end  
+end
+
 desc 'Translate the untranslated'
 command :translate do |c|
     c.action do |global_options, options, args|

data/lib/locca.rb

@@ -33,7 +33,7 @@ require 'locca/config_validator'
 
 require 'locca/actions/build_action'
 require 'locca/actions/merge_action'
-require 'locca/actions/sync_action'
+require 'locca/actions/onesky_sync_action'
 require 'locca/actions/translate_action'
 
 require 'locca/sync/onesky'
@@ -57,12 +57,7 @@ module Locca
                 raise 'Can\'t initialize Locca with nil project'
             end
 
-            genstrings = Genstrings.new()
-            collection_builder = collection_builder()
-            collections_generator = CollectionsGenerator.new(genstrings, collection_builder)
-
-            action = BuildAction.new(project, collection_builder, collection_writer(), collections_generator, collection_merger())
-            action.execute()
+            build_action(project).execute()
         end
 
         def merge(src_file, dst_file)
@@ -75,14 +70,15 @@ module Locca
                 raise 'Can\'t initialize Locca with nil project'
             end
             
-            genstrings = Genstrings.new()
-            collection_builder = collection_builder()
-            collections_generator = CollectionsGenerator.new(genstrings, collection_builder)
-
-            onesky = Onesky.new(project.config_value_for_key('onesky_project_id'), project.config_value_for_key('onesky_public_key'), project.config_value_for_key('onesky_secret_key'))
+            one_sky_action(project).sync()
+        end
 
-            action = SyncAction.new(project, collection_builder, collection_writer(), collections_generator, collection_merger(), onesky)
-            action.execute()
+        def fetch(project)
+            if not project
+                raise 'Can\'t initialize Locca with nil project'
+            end
+            
+            one_sky_action(project).fetch()
         end
 
         def translate(project, lang = nil)
@@ -99,6 +95,24 @@ module Locca
             action.execute()
         end
 
+        def build_action(project)
+            genstrings = Genstrings.new()
+            collection_builder = collection_builder()
+            collections_generator = CollectionsGenerator.new(genstrings, collection_builder)
+
+            return BuildAction.new(project, collection_builder, collection_writer(), collections_generator, collection_merger())
+        end
+
+        def one_sky_action(project)
+            genstrings = Genstrings.new()
+            collection_builder = collection_builder()
+            collections_generator = CollectionsGenerator.new(genstrings, collection_builder)
+
+            onesky = Onesky.new(project.config_value_for_key('onesky_project_id'), project.config_value_for_key('onesky_public_key'), project.config_value_for_key('onesky_secret_key'))
+
+            return OneskySyncAction.new(project, onesky, collection_builder(), collection_writer(), collections_generator, collection_merger())
+        end
+
         def collection_builder()
             parser = Babelyoda::StringsParser.new(Babelyoda::StringsLexer.new())
             return CollectionBuilder.new(File, parser) 

data/lib/locca/actions/{sync_action.rb → onesky_sync_action.rb}

@@ -30,24 +30,24 @@
 require 'locca/collection_merger'
 
 module Locca
-    class SyncAction
-        def initialize(project, collection_builder, collection_writer, collections_generator, collection_merger, onesky)
+    class OneskySyncAction
+        def initialize(project, onesky, collection_builder, collection_writer, collections_generator, collection_merger)
             @project = project
             @collections_generator = collections_generator
             @collection_merger = collection_merger
             @collection_builder = collection_builder
             @collection_writer = collection_writer
             @onesky = onesky
-        end 
 
-        def execute()
-            langs = @project.langs()
-            generated_collections = @collections_generator.generate(@project.code_dir())
+            @langs = @project.langs()
+            @generated_collections = @collections_generator.generate(@project.code_dir())
+        end 
 
+        def fetch()
             # 1
-            generated_collections.each do |generated_collection|
-                langs.each do |lang|
-                    print "\t* fetch: #{lang}/#{generated_collection.name}.strings\n"
+            @generated_collections.each do |generated_collection|
+                @langs.each do |lang|
+                    print "[*] fetch: #{lang}/#{generated_collection.name}.strings\n"
                     data = @onesky.fetch_translations(lang, "#{generated_collection.name}.strings")
                     fetched_collection = @collection_builder.collection_from_datastring(data)
 
@@ -55,16 +55,20 @@ module Locca
                     local_collection = @collection_builder.collection_at_path(local_collection_path)
 
                     # 2
-                    print "\t* merge: onesky -> #{lang}/#{generated_collection.name}.strings\n"
+                    print "[*] merge: onesky -> #{lang}/#{generated_collection.name}.strings\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
             end
+        end
+
+        def sync()
+            fetch()
 
             # 3
-            generated_collections.each do |generated_collection|
-                langs.each do |lang|
-                    print "\t* merge: code -> #{lang}/#{generated_collection.name}.strings\n"
+            @generated_collections.each do |generated_collection|
+                @langs.each do |lang|
+                    print "[*] merge: code -> #{lang}/#{generated_collection.name}.strings\n"
 
                     collection_path = @project.path_for_collection(generated_collection.name, lang)
                     collection = @collection_builder.collection_at_path(collection_path)
@@ -74,8 +78,8 @@ module Locca
             end
 
             # 4
-            generated_collections.each do |generated_collection|
-                print "\t* upload: #{@project.base_lang}/#{generated_collection.name}.strings\n"
+            @generated_collections.each do |generated_collection|
+                print "[*] upload: #{@project.base_lang}/#{generated_collection.name}.strings\n"
                 collection_path = @project.path_for_collection(generated_collection.name, @project.base_lang())
                 @onesky.upload_file(collection_path)
             end

data/lib/locca/genstrings.rb

@@ -32,7 +32,10 @@ module Locca
                 command = "find #{code_dir} -iname \"*.m\" -or -iname \"*.mm\" -or -iname \"*.c\" | xargs genstrings -o '#{tmp_dir}'"
                 stdout, stderr, status = Open3.capture3(command)
 
-                STDERR.puts(stderr)
+                stderr = stderr.strip
+                if stderr.length > 0
+                    STDERR.puts()
+                end
 
                 if status.success?
                     Dir.glob(File.join(tmp_dir, '*.strings')) do |filename|

data/lib/locca/version.rb

@@ -22,5 +22,5 @@
 # SOFTWARE.
 #
 module Locca
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locca
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Shurakov Evgeny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -107,7 +107,7 @@ files:
 - lib/babelyoda/strings_parser.rb
 - lib/locca/actions/build_action.rb
 - lib/locca/actions/merge_action.rb
-- lib/locca/actions/sync_action.rb
+- lib/locca/actions/onesky_sync_action.rb
 - lib/locca/actions/translate_action.rb
 - lib/locca/collection.rb
 - lib/locca/collection_builder.rb