transync 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 826e00df7c16d49a77a3ba40b53df4dae4932b53
-  data.tar.gz: 3e7e2a8e1d46072b263450ececeadcd29ca29f05
+  metadata.gz: f11c17bb6bb01279bc8eadbdddff263cfdd781b7
+  data.tar.gz: ba5f4718b72927ad95d3413a70f11004532ddd1e
 SHA512:
-  metadata.gz: 45d1d05c2d8e1384138a8fb883514dbdcc96bcd9c8fd507e05381b5b15c28f5141ca615fad9f62b49d3dff713dcbd8d3c2e27458f80241678df857dad364b457
-  data.tar.gz: dab75e76add54fb2b670446a6f0a1db2895215eeab08db0e36801d1ff9a2b0fb05b7ca78950d3b46f035e063849246c87bdc5c80b809232dd2b127e389552346
+  metadata.gz: 92218c53c2be5315c7642f009f4b84c753c05340ceb8e5bdf2b4f338bec33d4e844975bc25b93a64c577820cd7f4422d9fab5c74070d39ed0836a35dd227fcdc
+  data.tar.gz: d4a2c10e8576748018de65c6ecf773d426f50bc3ea7080bc281324887e5a98ce285c1ced540405dc1a427907b0d0027ac7cffe67732997634dbc8d7df9ba9cd5

data/.gitignore

@@ -17,7 +17,7 @@ test/version_tmp
 tmp
 
 
-settings.yml
+transync.yml
 log/*.log*
 .idea
 .transync_log

data/README.md

@@ -4,14 +4,14 @@
 gem install transync
 ```
 
-You need settings file to be named `settings.yml` and to be in same directory from which we are running `transync` command.
-For example see `settings.SAMPLE.yml`.
+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`.
 
 ### Process
 
 - Create new Google Doc Spreadsheet
-- Copy it's `key` from URL to `settings.yml`
-- Set all the languages and `xliff` you want to sync in `settings.yml` (look at `settings.SAMPLE.yml`)
+- Copy it's `key` from URL to `transync.yml`
+- Set all the languages and `xliff` you want to sync in `transync.yml` (look at `transync.SAMPLE.yml`)
 - set `XLIFF_FILES_PATH` to set path where are your `xliff` files. In project do it with relative path so others can use it
 - set `MISSING_TRANSLATION_TEXT` to set what text should go to `target` element for translation
 - run these commands respectively
@@ -49,4 +49,4 @@ Gem docs available at http://gimite.net/doc/google-drive-ruby
 
 # Known issues
 
-It won't add keys as it should if not all languages are set in settings.yml
+It won't add keys as it should if not all languages are set in transync.yml

data/lib/transync/gdoc_trans/gdoc_trans.rb

@@ -2,17 +2,21 @@ module GdocTrans
   WORKSHEET_COLUMNS = { key: 1 }
   START_ROW = 2
 
-  CONFIG = YAML.load(File.open('settings.yml'))
+  begin
+    CONFIG = YAML.load(File.open('transync.yml'))
+  rescue
+    p 'File transync.yml does not exist'
+    exit(1)
+  end
 
-  # populate languages dynamically from settings.yml
+  # populate languages dynamically from settings yaml file
   CONFIG['LANGUAGES'].each_with_index do |language, index|
     key = language
-    value = index + 2 #
-
+    value = index + 2
     WORKSHEET_COLUMNS[key.to_sym] = value
   end
 
   # Result of WORKSHEET_COLUMNS should be something like this
-  # depends on LANGUAGES set in settings.yml
+  # depends on LANGUAGES set in settings yaml file
   # WORKSHEET_COLUMNS = { key: 1, en: 2, de: 3 }
 end

data/lib/transync/sync/gdoc_2_xliff_main.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'logger'
 require_relative '../gdoc_trans/gdoc_trans_reader'
 require_relative '../xliff_trans/xliff_trans_writer'
 require_relative 'gdoc_to_xliff'
@@ -11,11 +10,10 @@ class Gdoc2XliffMain
   def initialize(path)
     @path = path
     @config = GdocTrans::CONFIG
+    SyncUtil.create_logger('gdoc2xliff')
   end
 
   def run
-    logger = Logger.new('.transync_log/gdoc2xliff.log', 'monthly')
-
     @config['FILES'].each do |file|
       xliff_translations = SyncUtil::check_and_get_xliff_files(@config['LANGUAGES'], path, file)
       gdoc_trans_reader = GdocTransReader.new(@config['GDOC'], file)
@@ -24,8 +22,7 @@ class Gdoc2XliffMain
         options = {
           xliff_translations: xliff_translations,
           gdoc_trans_reader: gdoc_trans_reader,
-          language: language,
-          logger: logger
+          language: language
         }
 
         gdoc_to_xliff = GdocToXliff.new(options)
@@ -33,7 +30,8 @@ class Gdoc2XliffMain
 
         xliff_trans_writer = XliffTransWriter.new(path, file, new_xliff_hash)
         xliff_trans_writer.save if dirty
-        p "#{file} (#{language}) was clean. Already has same keys and values inside Xliff" unless dirty
+
+        SyncUtil.info_clean(file, language, 'was clean. Already has same keys and values inside Xliff') unless dirty
       end
     end
   end

data/lib/transync/sync/gdoc_to_xliff.rb

@@ -1,14 +1,14 @@
+require_relative 'sync_util'
+
 class GdocToXliff
   attr_accessor :xliff_translations,
                 :gdoc_trans_reader,
-                :language,
-                :logger
+                :language
 
   def initialize(options = {})
     self.xliff_translations = options[:xliff_translations]
     self.gdoc_trans_reader = options[:gdoc_trans_reader]
     self.language = options[:language]
-    self.logger = options[:logger]
   end
 
   def sync
@@ -28,14 +28,12 @@ class GdocToXliff
 
       # whole key is missing
       if x_trans.nil?
-        p "Adding Key: #{gdoc_trans[:key]} to #{file}(#{language}) and value '#{gdoc_trans[:value]}'"
-        logger.info "Adding Key: #{gdoc_trans[:key]} to #{file}(#{language}) and value '#{gdoc_trans[:value]}'"
+        SyncUtil.info_diff(file, language, 'Adding', gdoc_trans)
 
         new_xliff_hash[:translations] << gdoc_trans
         dirty = true
       elsif gdoc_trans[:value] != x_trans[:value]
-        p "Changing #{file}(#{language}) #{gdoc_trans[:key]}: '#{x_trans[:value]}' to '#{gdoc_trans[:value]}'"
-        logger.info "Changing #{file}(#{language}) #{gdoc_trans[:key]}: '#{x_trans[:value]}' to '#{gdoc_trans[:value]}'"
+        SyncUtil.info_diff(file, language, 'Changing', gdoc_trans)
 
         x_trans[:value] = gdoc_trans[:value]
         new_xliff_hash[:translations] << x_trans

data/lib/transync/sync/init.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'logger'
 require_relative '../gdoc_trans/gdoc_trans_writer'
 require_relative 'xliff_to_gdoc'
 
@@ -19,8 +18,11 @@ class Init
     spreadsheet = session.spreadsheet_by_key(@gdoc_access['key'])
 
     @config['FILES'].each do |file|
-      worksheet = spreadsheet.add_worksheet(file)
-      p "Adding #{file} worksheet to spreadsheet with first row (key and languages)"
+      worksheet = spreadsheet.worksheets.select { |s| s.title == file }.first
+      if worksheet.nil?
+        worksheet = spreadsheet.add_worksheet(file)
+        p "Adding #{file} worksheet to spreadsheet with first row (key and languages)"
+      end
 
       worksheet[1, 1] = 'Key'
       @config['LANGUAGES'].each_with_index do |language, index|

data/lib/transync/sync/sync_util.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require_relative '../xliff_trans/xliff_trans_reader'
 
 module SyncUtil
@@ -21,4 +22,24 @@ module SyncUtil
     xliff_translations
   end
 
+  def self.info_clean(file, language, message)
+    msg = "#{file} (#{language}) - #{message}"
+    SyncUtil.log_and_puts(msg)
+  end
+
+  def self.info_diff(file, language, operation, trans)
+    msg = "#{file} (#{language}) - #{operation}: '#{trans[:key]}' => '#{trans[:value]}'"
+    SyncUtil.log_and_puts(msg)
+  end
+
+  def self.log_and_puts(msg)
+    p msg
+    @logger.info msg
+  end
+
+  def self.create_logger(direction)
+    # gdoc2xliff or xliff2gdoc
+    @logger = Logger.new(".transync_log/#{direction}.log", 'monthly')
+  end
+
 end

data/lib/transync/sync/xliff_2_gdoc_main.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'logger'
 require_relative '../gdoc_trans/gdoc_trans_reader'
 require_relative '../gdoc_trans/gdoc_trans_writer'
 require_relative 'xliff_to_gdoc'
@@ -11,11 +10,10 @@ class Xliff2GdocMain
   def initialize(path)
     @path = path
     @config = GdocTrans::CONFIG
+    SyncUtil.create_logger('xliff2gdoc')
   end
 
   def run
-    logger = Logger.new('.transync_log/xliff2gdoc.log', 'monthly')
-
     @config['FILES'].each do |file|
       xliff_translations = SyncUtil::check_and_get_xliff_files(@config['LANGUAGES'], path, file)
 
@@ -28,15 +26,14 @@ class Xliff2GdocMain
           gdoc_trans_reader: gdoc_trans_reader,
           gdoc_trans_writer: gdoc_trans_writer,
           language: language,
-          languages: @config['LANGUAGES'],
-          logger: logger
+          languages: @config['LANGUAGES']
         }
         xliff_to_gdoc = XliffToGdoc.new(options)
         dirty = xliff_to_gdoc.sync
 
         # save it back on google drive
         gdoc_trans_writer.worksheet.save if dirty
-        p "#{file} (#{language}) was clean. Already has same keys and values inside GDoc" unless dirty
+        SyncUtil.info_clean(file, language, 'was clean. Already has same keys and values inside GDoc') unless dirty
       end
     end
   end

data/lib/transync/sync/xliff_to_gdoc.rb

@@ -1,3 +1,5 @@
+require_relative 'sync_util'
+
 class XliffToGdoc
   attr_accessor :xliff_translations,
                 :gdoc_trans_reader,
@@ -12,7 +14,6 @@ class XliffToGdoc
     self.gdoc_trans_writer = options[:gdoc_trans_writer]
     self.language = options[:language]
     self.languages = options[:languages]
-    self.logger = options[:logger]
   end
 
   def sync
@@ -37,8 +38,7 @@ class XliffToGdoc
         gdoc_trans_writer.write(current_row, 'key',    x_trans[:key])
         gdoc_trans_writer.write(current_row, language, x_trans[:value])
 
-        p "#{current_row}) Adding Key: #{x_trans[:key]} to #{file}(#{language}) and value '#{x_trans[:value]}'"
-        logger.info "#{current_row}) Adding Key: #{x_trans[:key]} to #{file}(#{language}) and value '#{x_trans[:value]}'"
+        SyncUtil.info_diff(file, language, 'Adding', x_trans)
 
         # Go for all other languages if key was missing
         languages.each do |key_lang|
@@ -53,9 +53,7 @@ class XliffToGdoc
         dirty = true
       elsif gdoc_trans[:value] != x_trans[:value]
         gdoc_trans_writer.write(current_row, language, x_trans[:value])
-
-        p "#{current_row}) Changing #{file}(#{language}) #{x_trans[:key]}: '#{gdoc_trans[:value]}' to '#{x_trans[:value]}'"
-        logger.info "#{current_row}) Changing #{file}(#{language}) #{x_trans[:key]}: '#{gdoc_trans[:value]}' to '#{x_trans[:value]}'"
+        SyncUtil.info_diff(file, language, 'Changing', x_trans)
         dirty = true
       end
     end
@@ -63,4 +61,4 @@ class XliffToGdoc
     dirty
   end
 
-end
+end

data/lib/transync/version.rb

@@ -1,3 +1,3 @@
 module Transync
-  VERSION = '0.1.1'
+  VERSION = '1.0.0'
 end

data/test/fixtures/test.de.xliff

@@ -12,7 +12,7 @@
             </trans-unit>
             <trans-unit id="end_test">
                 <source>end_test</source>
-                <target>End-Test</target>
+                <target>xxx</target>
             </trans-unit>
         </body>
     </file>

data/test/fixtures/validators.de.xliff

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="de" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="title">
+                <source>title</source>
+                <target>Titel</target>
+            </trans-unit>
+            <trans-unit id="round">
+                <source>round</source>
+                <target>Rund</target>
+            </trans-unit>
+            <trans-unit id="end_test">
+                <source>end_test</source>
+                <target>End-Test</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>

data/test/fixtures/validators.en.xliff

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="de" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="title">
+                <source>title</source>
+                <target>Titel</target>
+            </trans-unit>
+            <trans-unit id="round">
+                <source>round</source>
+                <target>Rund</target>
+            </trans-unit>
+            <trans-unit id="end_test">
+                <source>end_test</source>
+                <target>End-Test</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transync
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - zigomir
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -94,9 +94,11 @@ files:
 - lib/transync/version.rb
 - lib/transync/xliff_trans/xliff_trans_reader.rb
 - lib/transync/xliff_trans/xliff_trans_writer.rb
-- settings.SAMPLE.yml
 - test/fixtures/test.de.xliff
 - test/fixtures/test.en.xliff
+- test/fixtures/validators.de.xliff
+- test/fixtures/validators.en.xliff
+- transync.SAMPLE.yml
 - transync.gemspec
 homepage: ''
 licenses:
@@ -118,11 +120,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Synchronize XLIFF translations with Google Drive document
 test_files:
 - test/fixtures/test.de.xliff
 - test/fixtures/test.en.xliff
-has_rdoc: 
+- test/fixtures/validators.de.xliff
+- test/fixtures/validators.en.xliff