locca 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80210a9c3fa5a0b6ff72aa7deb9e01189dd1a4c1
-  data.tar.gz: a57ecb711907788e14c9a17e24fbe716ff8dc85b
+  metadata.gz: 59c4dfcb6f714c36e0e945658fde5705de3bb971
+  data.tar.gz: ac9cdc3cf716780c68acabaa7a22fec331722501
 SHA512:
-  metadata.gz: 1ae7c80f63fa7298442856284d45a38dd1b2ccc4afd4720299f03b12f26df974d75f80ed93b01e78f2c2e8785a29eddcc07c3bd45e07ab9f76f0a75608897adc
-  data.tar.gz: 40d0fbc0c067f87fcc89d1703db50a8c0e6bd52a60e9e2dd22f39607bf33ffb46e7b3cbdf3eaa566798c148eb0a6971766e3fb5a5f14d2487fd41e5cfde41383
+  metadata.gz: 6dab801c6e1d3e582ce3285bbfffa1afcb8f5ca111f48a07dfe0d828115b995589a747ee9b87b5445afdc843bec8c145fea9c1057298deabbddbba8a11f66e58
+  data.tar.gz: aaa95ea21cbf1c66ae5eec112753c27566d04a3bc19f0d69f8b17d93dd7485e468fe0b1249d3c0ba07c48b1b9dd79b71f092859de031d88a1d82eb9efdda4997

data/bin/locca

@@ -72,6 +72,18 @@ command :sync do |c|
     end  
 end
 
+desc 'Translate the untranslated'
+command :translate 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.translate(project_in_dir(work_dir), args[0])
+    end  
+end
+
 pre do |global, command, options, args|
     $locca = Locca::Locca.new()
     true

data/lib/locca.rb

@@ -34,6 +34,7 @@ require 'locca/config_validator'
 require 'locca/actions/build_action'
 require 'locca/actions/merge_action'
 require 'locca/actions/sync_action'
+require 'locca/actions/translate_action'
 
 require 'locca/sync/onesky'
 
@@ -84,6 +85,20 @@ module Locca
             action.execute()
         end
 
+        def translate(project, lang = nil)
+            if not project
+                raise 'Can\'t initialize Locca with nil project'
+            end
+
+            if not lang
+                lang = project.base_lang
+            end
+
+            collection_builder = collection_builder()
+            action = TranslateAction.new(project, lang, collection_builder, collection_writer(), collection_merger())
+            action.execute()
+        end
+
         def collection_builder()
             parser = Babelyoda::StringsParser.new(Babelyoda::StringsLexer.new())
             return CollectionBuilder.new(File, parser) 

data/lib/locca/actions/translate_action.rb

@@ -0,0 +1,77 @@
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2014 Evgeny Shurakov
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+require 'tempfile'
+require 'open3'
+
+module Locca
+    class TranslateAction
+        def initialize(project, lang, collection_builder, collection_writer, collection_merger)
+            @project = project
+            @lang = lang
+            @collection_merger = collection_merger
+            @collection_builder = collection_builder
+            @collection_writer = collection_writer
+        end
+
+        def execute()
+        	editor = ENV['EDITOR']
+			if !editor
+				raise ArgumentError, 'EDITOR variable should be defined'
+			end
+
+			@project.collection_names().each do |collection_name|
+				collection_path = @project.path_for_collection(collection_name, @lang)
+                collection = @collection_builder.collection_at_path(collection_path)
+
+				tmpCollection = Collection.new()
+
+				collection.sorted_each do |item|
+                    if item.translated?
+						next
+					end
+
+					tmpCollection.add_item(item)
+                end
+
+                if tmpCollection.count == 0
+                	next
+                end
+
+                tmpFile = Tempfile.new("#{collection_name}.#{@lang}.tmp")
+
+                @collection_writer.write_to_path(tmpCollection, tmpFile.path)
+                command = "#{editor} #{tmpFile.path}"
+				stdout,stderr,status = Open3.capture3(command)
+				if status.success?
+					translated_collection = @collection_builder.collection_at_path(tmpFile.path)
+					@collection_merger.merge(translated_collection, collection, (CollectionMerger::ACTION_UPDATE))
+                    @collection_writer.write_to_path(collection, collection_path)
+				end
+				tmpFile.close
+				tmpFile.unlink
+			end
+        end
+	end
+end

data/lib/locca/project.rb

@@ -48,6 +48,15 @@ module Locca
             return result
         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
+
+            return result 
+        end
+
         def path_for_collection(collection_name, lang)
             return File.join(@lang_dir, "#{lang}.lproj", "#{collection_name}.strings")
         end

data/lib/locca/sync/onesky.rb

@@ -22,7 +22,6 @@
 # SOFTWARE.
 #
 
-require 'json'
 require 'digest/md5'
 require 'rest_client'
 

data/lib/locca/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locca
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Shurakov Evgeny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  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:
@@ -94,6 +108,7 @@ files:
 - lib/locca/actions/build_action.rb
 - lib/locca/actions/merge_action.rb
 - lib/locca/actions/sync_action.rb
+- lib/locca/actions/translate_action.rb
 - lib/locca/collection.rb
 - lib/locca/collection_builder.rb
 - lib/locca/collection_item.rb