transync 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e731d0853faec16a75252dfc64f65ae783d6a69
-  data.tar.gz: c26ef0c56ef0652d1a6a7cc93472965053fdbb83
+  metadata.gz: 90302f66b201067dffbb9b3e55eded34a9d2bac1
+  data.tar.gz: 7a921bf6c24b68d4b5f94dbf472b9986d5d01c18
 SHA512:
-  metadata.gz: 92476f9124ea09d46e7b98574a07df504f73d5aa0bca336b39ebb87249253b38aa9d75791c91f9771996424c70319834b7cf04c47c718afb40271acdfad7b1e3
-  data.tar.gz: 6c5a099fca0df65ecbbf957ba6918e1d76b7d3936a1ca33403ea56b05432f973aabdb8bc34d12bbfb2d8d66c2828d40cb39ea489de0a6d0786d27a72658ba38b
+  metadata.gz: 9b3107c28d578555752291db1afe9023052c9e55e01407f51252b1eca986be2605a17d11e527508948dc31f01bb9394b5540687798407f82ca91e2de77697411
+  data.tar.gz: 60f2a4823fc51abd6b8855e16801ecc49ec2ce7529e0795566afa40aec9f2c090124a7b0a125666a9c8f8864ba4424e8bab630bcc0a924c958d51ce2238b57cc

data/README.md

@@ -7,6 +7,16 @@ gem install transync
 You need settings file to be named `transync.yml` and to be in same directory from which we are running `transync` command.
 For example see `transync.SAMPLE.yml`.
 
+## Assumptions
+
+You have xliff files in one directory, named like: common.en.xliff where common is name of the file and also google doc
+spreadsheet tab. en is language and you have google doc with structure where first row is key, language 1, language 2
+
+## How does it work?
+
+Updating GDoc from our xliff files. It won't delete any key, it will only add new or change existing ones. Same 
+for direction from Gdoc to xliff.
+
 ### Process
 
 - Create new Google Doc Spreadsheet
@@ -28,27 +38,16 @@ transync x2g
 transync g2x
 ```
 
-### Development on this gem
+### Gem development
 
 ```
-rake install && transync test
+rake install && transync x2g|g2x test
+ruby g2x_spec.rb
+ruby x2g_spec.rb
 ```
 
-# Assumptions:
-
-You have xliff files in one directory, named like: common.en.xliff where common is name of the file and also google doc
-spreadsheet tab. en is language and you have google doc with structure where first row is key, language 1, language 2
-
-# Features
-
-Updating GDoc from our xliff files. It won't delete any key, it will only add new or change existing ones.
-
-# Source
-
-Gem docs available at http://gimite.net/doc/google-drive-ruby
+When running with test as second argument, changes won't be written to files or spreadsheet.
 
 # TODO
 
-- more tests, edge cases
-- more OOP
 - update for more than 2 languages

data/bin/transync

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'transync'
-Transync.run ARGV[0]
+Transync.run ARGV[0], ARGV[1]

data/lib/hash.rb

@@ -0,0 +1,12 @@
+# Monkey patch for diff method
+
+class Hash
+  def diff(other)
+    self.keys.inject({}) do |memo, key|
+      unless self[key] == other[key]
+        memo[key] = [self[key], other[key]]
+      end
+      memo
+    end
+  end
+end

data/lib/transync.rb

@@ -4,13 +4,13 @@ require_relative 'transync/sync/sync_util'
 
 module Transync
 
-  def self.run(mode)
+  def self.run(mode, test = nil)
     FileUtils.mkdir('.transync_log') unless Dir.exist?('.transync_log')
     path = TransyncConfig::CONFIG['XLIFF_FILES_PATH']
 
     if mode == 'x2g' or mode == 'g2x'
       sync = TranslationSync.new(path, mode)
-      sync.run(mode)
+      sync.run(mode, test)
     end
 
     if mode == 'init'

data/lib/transync/sync/sync_util.rb

@@ -26,14 +26,35 @@ module SyncUtil
     SyncUtil.log_and_puts(msg)
   end
 
-  def self.info_diff(file, language, operation, trans_key, trans_value)
-    msg = "#{file} (#{language}) - #{operation}: '#{trans_key}'"
-    msg += " to '#{trans_value}'" unless trans_value.nil?
+  def self.info_diff(file, language, diff)
+    msg = "#{file} (#{language})"
+    if diff.empty?
+      msg += ' already has same keys and values'
+    else
+      msg = build_diff_print(diff, msg)
+    end
     SyncUtil.log_and_puts(msg)
   end
 
+  def self.build_diff_print(diff, msg)
+    begin
+      # get longest key and value
+      max_key_length = diff.keys.max { |a, b| a.length <=> b.length }.length
+      max_val_length = diff.values.max { |a, b| a[1].to_s.length <=> b[1].to_s.length }[1].length
+    rescue
+      max_key_length = 0
+      max_val_length = 0
+    end
+
+    diff.keys.each do |key|
+      operation = diff[key][1].nil? ? 'Adding' : 'Changing'
+      msg += "\n  #{operation.ljust(8)} - #{key.ljust(max_key_length)}: '#{diff[key][1].to_s.ljust(max_val_length)}' => '#{diff[key][0]}' "
+    end
+    msg
+  end
+
   def self.log_and_puts(msg)
-    p msg
+    puts msg
     @logger.info msg
   end
 

data/lib/transync/sync/translation_sync.rb

@@ -1,6 +1,7 @@
 require_relative '../gdoc_trans/gdoc_trans_reader'
 require_relative '../gdoc_trans/gdoc_trans_writer'
 require_relative '../xliff_trans/xliff_trans_writer'
+require_relative '../../hash'
 
 class TranslationSync
 
@@ -11,7 +12,7 @@ class TranslationSync
     SyncUtil.create_logger(direction)
   end
 
-  def run(direction)
+  def run(direction, test)
     @config['FILES'].each do |file|
       valid, _ = SyncUtil::check_and_get_xliff_files(@config['LANGUAGES'], @path, file)
       abort('Fix your Xliff translations first!') unless valid
@@ -20,6 +21,8 @@ class TranslationSync
         trans_sync = TranslationSync.new(@path, direction, file)
         trans_hash = trans_sync.sync(language, direction)
 
+        next if test == 'test' # if testing don't write to files or google doc
+
         if direction == 'x2g'
           gdoc_trans_reader = GdocTransReader.new(file)
           gdoc_trans_writer = GdocTransWriter.new(gdoc_trans_reader.worksheet)
@@ -40,10 +43,16 @@ class TranslationSync
     x_trans_hash = xliff_trans_reader.translations(language)
 
     # We need to merge on translations hash, not whole hash since it will only merge first level
-    x2g_merged_translations = g_trans_hash[:translations].merge(x_trans_hash[:translations])
-    g2x_merged_translations = x_trans_hash[:translations].merge(g_trans_hash[:translations])
+    if direction == 'x2g'
+      merged_translations = g_trans_hash[:translations].merge(x_trans_hash[:translations])
+      diff = x_trans_hash[:translations].diff(g_trans_hash[:translations])
+      SyncUtil.info_diff(@file, language, diff)
+    else
+      merged_translations = x_trans_hash[:translations].merge(g_trans_hash[:translations])
+      diff = g_trans_hash[:translations].diff(x_trans_hash[:translations])
+      SyncUtil.info_diff(@file, language, diff)
+    end
 
-    merged_translations = direction == 'x2g' ? x2g_merged_translations : g2x_merged_translations
     {file: @file, language: language, translations: merged_translations}
   end
 

data/lib/transync/version.rb

@@ -1,3 +1,3 @@
 module Transync
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transync
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - zigomir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -81,6 +81,7 @@ files:
 - README.md
 - Rakefile
 - bin/transync
+- lib/hash.rb
 - lib/transync.rb
 - lib/transync/gdoc_trans/gdoc_trans_reader.rb
 - lib/transync/gdoc_trans/gdoc_trans_writer.rb