transync 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53afd1b65e808cfce2e81eec433f2503ecc48e50
-  data.tar.gz: f82b54ece69a6a9517e1926cca8b960325e99f31
+  metadata.gz: 49efb85a09f9890df8eba832d04c506230170c66
+  data.tar.gz: 7c49b7c23956526668d1dac41e33bc4fae6f5054
 SHA512:
-  metadata.gz: adde07a797914699e9de74366856e41daff5cd4569c533aa6af8c1ecb95067e62f2e63f5f53b3bb405c85ba3f1117cf5bf30998672ec6014bcfb67781d3e186c
-  data.tar.gz: d124defa8261d27de9f511354fbe9f364233900acd74b5b18022a9eebdfb932deded157856f95bac16a553042c2d76e1d40a7e76e433d82e85109349c6dd7173
+  metadata.gz: 5414c79018b18062005a39dbd9c439189fdc86e5c0870b8d5c2e6023e61379cfea363c50de03e0df1a7520c69c557fdaba91163be43cf8062ec0281768cfdb76
+  data.tar.gz: 6f3aa8575a1905f67f8597169d8d66c160c490c1038da9fbc5cd006e7895a33a419b4e4c35af1c5856ac9f57f8d8f50c90887d94ca7f28f582077d389db12e22

data/lib/transync/gdoc_trans/gdoc_trans_reader.rb

@@ -1,3 +1,4 @@
+require 'colorize'
 require_relative '../transync_config'
 
 class GdocTransReader
@@ -5,8 +6,8 @@ class GdocTransReader
 
   # file represents tab in spreadsheet
   def initialize(file)
-    @worksheet = TransyncConfig::WORKSHEETS.detect{ |w| w.title == file }
-    abort("#{file} tab is not defined in GDoc") if @worksheet.nil?
+    @worksheet = TransyncConfig.worksheets.detect{ |w| w.title == file }
+    abort("\u{2717} '#{file}' tab is not defined in GDoc".colorize(:red)) if @worksheet.nil?
   end
 
   def translations(language)

data/lib/transync/runner.rb

@@ -22,7 +22,9 @@ module Transync
       TransyncConfig::CONFIG['FILES'].each do |file|
         xliff_files = XliffTransReader.new(PATH, file, TransyncConfig::CONFIG['LANGUAGES'])
         puts "\u{2713} '#{file}' have all the keys for all languages in XLIFF files.".colorize(:green) if xliff_files.valid?
+      end
 
+      TransyncConfig::CONFIG['FILES'].each do |file|
         TransyncConfig::CONFIG['LANGUAGES'].each do |language|
           trans_sync = TranslationSync.new(PATH, 'test', file)
 
@@ -32,7 +34,6 @@ module Transync
             puts "\u{2717} '#{file}.#{language}' XLIFF is NOT in sync with GDoc. See diff!".colorize(:red)
           end
         end
-
         puts '----------'
       end
     end

data/lib/transync/sync/init.rb

@@ -1,3 +1,5 @@
+require 'colorize'
+
 class Init
 
   def initialize(path)
@@ -7,10 +9,10 @@ class Init
 
   def run
     @config['FILES'].each do |file|
-      worksheet = TransyncConfig::WORKSHEETS.detect{ |s| s.title == file }
+      worksheet = TransyncConfig.worksheets.detect{ |s| s.title == file }
       if worksheet.nil?
-        worksheet = TransyncConfig::SPREADSHEET.add_worksheet(file)
-        p "Adding #{file} worksheet to spreadsheet with first row (key and languages)"
+        worksheet = TransyncConfig.spreadsheet.add_worksheet(file)
+        puts "\u{2713} adding '#{file}' worksheet to spreadsheet with first row (key and languages)".colorize(:green)
       end
 
       worksheet[1, 1] = 'Key'
@@ -21,9 +23,9 @@ class Init
     end
 
     # re-init spreadsheet after new worksheets were created
-    TransyncConfig.init_spreadsheet
+    TransyncConfig.re_init
     sync = TranslationSync.new(@path, 'x2g')
-    sync.run('x2g', nil)
+    sync.run('x2g')
   end
 
 end

data/lib/transync/sync/translation_sync.rb

@@ -17,16 +17,17 @@ class TranslationSync
       xliff_files = XliffTransReader.new(@path, file, @config['LANGUAGES'])
       abort('Fix your Xliff translations by hand or run transync update!') unless xliff_files.valid?
 
+      gdoc_trans_reader  = GdocTransReader.new(file)
+      gdoc_trans_writer  = GdocTransWriter.new(gdoc_trans_reader.worksheet)
+      xliff_trans_writer = XliffTransWriter.new(@path, file)
+
       @config['LANGUAGES'].each do |language|
         trans_sync = TranslationSync.new(@path, direction, file)
         trans_hash = trans_sync.sync(language, direction)
 
         if direction == 'x2g'
-          gdoc_trans_reader = GdocTransReader.new(file)
-          gdoc_trans_writer = GdocTransWriter.new(gdoc_trans_reader.worksheet)
           gdoc_trans_writer.write(trans_hash)
         else
-          xliff_trans_writer = XliffTransWriter.new(@path, file)
           xliff_trans_writer.write(trans_hash)
         end
       end

data/lib/transync/transync_config.rb

@@ -8,6 +8,9 @@ module TransyncConfig
   WORKSHEET_COLUMNS = { key: 1 }
   START_ROW = 2
 
+  @spreadsheet = nil
+  @worksheets  = nil
+
   def self.init_spreadsheet
     session     = GoogleDrive.login(CONFIG['GDOC']['email'], CONFIG['GDOC']['password'])
     spreadsheet = session.spreadsheet_by_key(CONFIG['GDOC']['key'])
@@ -16,18 +19,33 @@ module TransyncConfig
     return spreadsheet, worksheets
   end
 
+  # This gets executed automatically when module is evaluated (required?)
   begin
     CONFIG = YAML.load(File.open('transync.yml'))
-    SPREADSHEET, WORKSHEETS = TransyncConfig.init_spreadsheet
+    @spreadsheet, @worksheets = TransyncConfig.init_spreadsheet
+
+    # populate languages dynamically from settings yaml file
+    CONFIG['LANGUAGES'].each_with_index do |language, index|
+      key = language
+      value = index + 2
+      WORKSHEET_COLUMNS[key.to_sym] = value
+    end
   rescue => e
     p e.message
     exit(1)
   end
 
-  # populate languages dynamically from settings yaml file
-  CONFIG['LANGUAGES'].each_with_index do |language, index|
-    key = language
-    value = index + 2
-    WORKSHEET_COLUMNS[key.to_sym] = value
+  # used for init command after we create new tabs
+  def self.re_init
+    @spreadsheet, @worksheets = TransyncConfig.init_spreadsheet
+  end
+
+  def self.worksheets
+    @worksheets
   end
+
+  def self.spreadsheet
+    @spreadsheet
+  end
+
 end

data/lib/transync/version.rb

@@ -1,3 +1,3 @@
 module Transync
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transync
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - zigomir