locca 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c932554b9be74b84f6218393fa08c900a66d26b2
-  data.tar.gz: c16b9a45ccc2f36c1be19692de62ced14d0ffd0a
+  metadata.gz: 80210a9c3fa5a0b6ff72aa7deb9e01189dd1a4c1
+  data.tar.gz: a57ecb711907788e14c9a17e24fbe716ff8dc85b
 SHA512:
-  metadata.gz: ac6fa5e4c42f18b568827720619d52c53b41500aa404d29f7ba37c3eb7d736095542f69f34cba8ab210946977eb541cb455ac78e412a1b1d357d07ed68d4adcb
-  data.tar.gz: fbb62afd2df2aa68e452ab7a4aefbdc5ad1a39b6686cff31859fcec222b4441213f8a78a1db253398c2409bf7985f0ac631ae1dfe00fb54393337267ce51c969
+  metadata.gz: 1ae7c80f63fa7298442856284d45a38dd1b2ccc4afd4720299f03b12f26df974d75f80ed93b01e78f2c2e8785a29eddcc07c3bd45e07ab9f76f0a75608897adc
+  data.tar.gz: 40d0fbc0c067f87fcc89d1703db50a8c0e6bd52a60e9e2dd22f39607bf33ffb46e7b3cbdf3eaa566798c148eb0a6971766e3fb5a5f14d2487fd41e5cfde41383

data/bin/locca

@@ -45,14 +45,8 @@ command :build do |c|
         if not work_dir
             work_dir = Dir.getwd
         end
-        project_dir_locator = Locca::ProjectDirLocator.new()
-        config_reader = Locca::ConfigReader.new()
-        config_validator = Locca::ConfigValidator.new(['code_dir', 'lang_dir'])
-        project_factory = Locca::ProjectFactory.new(project_dir_locator, config_reader, config_validator)
 
-        project = project_factory.new_project(work_dir)
-
-        $locca.build(project)
+        $locca.build(project_in_dir(work_dir))
     end
 end
 
@@ -66,6 +60,18 @@ command :merge do |c|
     end 
 end
 
+desc 'Sync translations with external translation service'
+command :sync 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.sync(project_in_dir(work_dir))
+    end  
+end
+
 pre do |global, command, options, args|
     $locca = Locca::Locca.new()
     true
@@ -84,4 +90,13 @@ on_error do |exception|
     true
 end
 
+def project_in_dir(dir)
+    project_dir_locator = Locca::ProjectDirLocator.new()
+    config_reader = Locca::ConfigReader.new()
+    config_validator = Locca::ConfigValidator.new(['code_dir', 'lang_dir', 'base_lang'])
+    project_factory = Locca::ProjectFactory.new(project_dir_locator, config_reader, config_validator)
+
+    project = project_factory.new_project(dir)
+end
+
 exit run(ARGV)

data/lib/locca.rb

@@ -33,6 +33,9 @@ require 'locca/config_validator'
 
 require 'locca/actions/build_action'
 require 'locca/actions/merge_action'
+require 'locca/actions/sync_action'
+
+require 'locca/sync/onesky'
 
 require 'locca/collections_generator'
 require 'locca/collection_merger'
@@ -66,6 +69,21 @@ module Locca
             action.execute()
         end
 
+        def sync(project)
+            if not project
+                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'))
+
+            action = SyncAction.new(project, collection_builder, collection_writer(), collections_generator, collection_merger(), onesky)
+            action.execute()
+        end
+
         def collection_builder()
             parser = Babelyoda::StringsParser.new(Babelyoda::StringsLexer.new())
             return CollectionBuilder.new(File, parser) 

data/lib/locca/actions/sync_action.rb

@@ -0,0 +1,84 @@
+#
+# 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.
+#
+
+# 1. Fetch translations from one sky app
+# 2. Merge translated values with local translations
+# 3. Run 'build' action
+# 4. Upload base language translations to one sky app
+
+require 'locca/collection_merger'
+
+module Locca
+    class SyncAction
+        def initialize(project, collection_builder, collection_writer, collections_generator, collection_merger, onesky)
+            @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())
+
+            # 1
+            generated_collections.each do |generated_collection|
+                langs.each do |lang|
+                    print "\t* fetch: #{lang}/#{generated_collection.name}.strings\n"
+                    data = @onesky.fetch_translations(lang, "#{generated_collection.name}.strings")
+                    fetched_collection = @collection_builder.collection_from_datastring(data)
+
+                    local_collection_path = @project.path_for_collection(generated_collection.name, lang)
+                    local_collection = @collection_builder.collection_at_path(local_collection_path)
+
+                    # 2
+                    print "\t* 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
+
+            # 3
+            generated_collections.each do |generated_collection|
+                langs.each do |lang|
+                    print "\t* 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)
+                    @collection_merger.merge(generated_collection, collection, (CollectionMerger::ACTION_ADD | CollectionMerger::ACTION_DELETE))
+                    @collection_writer.write_to_path(collection, collection_path)
+                end
+            end
+
+            # 4
+            generated_collections.each do |generated_collection|
+                print "\t* 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
+        end
+    end
+end

data/lib/locca/collection_builder.rb

@@ -32,16 +32,22 @@ module Locca
         end
 
         def collection_at_path(path)
-            name = File.basename(path, '.strings')
-            collection = Collection.new(name)
+            collection = nil
 
             @file_manager.open(path, 'rb:BOM|UTF-8:UTF-8') do |file|
-                @parser.parse(file.read()) do |key, value, comment|
-                    collection.add_item(CollectionItem.new(key, value, comment))
-                end
+                collection = collection_from_datastring(file.read())
+                collection.name = File.basename(path, '.strings')
             end
 
             return collection
         end
+
+        def collection_from_datastring(datastring)
+            collection = Collection.new()
+            @parser.parse(datastring) do |key, value, comment|
+                collection.add_item(CollectionItem.new(key, value, comment))
+            end
+            return collection
+        end
     end
 end

data/lib/locca/project.rb

@@ -27,11 +27,12 @@ module Locca
         attr_reader :dir
         attr_reader :code_dir
         attr_reader :lang_dir
-
+        
         attr_reader :base_lang
 
         def initialize(dir, config)
             @dir = dir
+            @config = config
             
             @code_dir = File.join(dir, config['code_dir'])
             @lang_dir = File.join(dir, config['lang_dir'])
@@ -50,5 +51,9 @@ module Locca
         def path_for_collection(collection_name, lang)
             return File.join(@lang_dir, "#{lang}.lproj", "#{collection_name}.strings")
         end
+
+        def config_value_for_key(key)
+            return @config[key]
+        end
     end
 end

data/lib/locca/sync/onesky.rb

@@ -0,0 +1,70 @@
+#
+# 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 'json'
+require 'digest/md5'
+require 'rest_client'
+
+module Locca
+    class Onesky
+
+    	def initialize(project_id, public_key, secret_key)
+    		@project_id = project_id
+            @public_key = public_key
+            @secret_key = secret_key
+        end
+
+        def upload_file(file_path)
+            fetch_response(:post, "files", {'file' => File.new(file_path), 'file_format' => 'IOS_STRINGS', 'is_keeping_all_strings' => 'false'})
+        end
+
+        def fetch_translations(lang, file_name)
+            return fetch_response(:get, "translations", {'locale' => lang, 'source_file_name' => file_name})
+        end
+
+        def authorization_params
+            timestamp = Time.now.to_i.to_s
+            {:"api_key" => @public_key, :timestamp => timestamp, :"dev_hash" => Digest::MD5.hexdigest(timestamp + @secret_key)}
+        end
+
+        def fetch_response(http_verb, path, params)
+            options = {:content_type => "application/json; charset=UTF-8", :accept => "application/json"}
+            params = authorization_params.merge(params)
+            
+            path = "https://platform.api.onesky.io/1/projects/#{@project_id}/#{path}"
+
+            response = case http_verb
+            when :get
+                RestClient.get(path, {:params => params}.merge(options))
+            when :post
+                RestClient.post(path, params.merge(options))
+            else
+                raise "bad http verb"
+            end
+
+            return response
+        end
+
+    end
+end

data/lib/locca/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locca
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Shurakov Evgeny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -93,6 +93,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/collection.rb
 - lib/locca/collection_builder.rb
 - lib/locca/collection_item.rb
@@ -107,6 +108,7 @@ files:
 - lib/locca/project.rb
 - lib/locca/project_dir_locator.rb
 - lib/locca/project_factory.rb
+- lib/locca/sync/onesky.rb
 - lib/locca/version.rb
 - lib/locca.rb
 - README.rdoc
@@ -131,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Application localization kit