web_translate_it 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe142160ce726176d6463e38dff4cbabe3c65a2629e537afd070aa9a273e44c2
-  data.tar.gz: 447cc0c48efca6fbf66588f4426c1583f6945f59118593b5d8be5a7c81db40a4
+  metadata.gz: 48cb64ddfb593274e4eefbca5fde69d8ee35a1fc3c7d1776ef0fc094a64d7db5
+  data.tar.gz: 684e5a256509281d8d2913c4c14aa5d6c9757ef0cce6c9edb00f8d5f84bb90df
 SHA512:
-  metadata.gz: 11cc21a06894851d8ead43d573ef69c197e0132f1b38b0c65b27c29541ce5409e0a076147f323f61d1fc1e8f0d89f91050d4011e421e5907e5d7d493a4939806
-  data.tar.gz: 9b8bad87f54a5ff65265b34e71523fbd3bb6aca4f95293d8c59bb970d8bc6de7fae9ea7d2cf3078a0004ffdd4720c03bc0f9ca59a3198390585698a73b6f08bb
+  metadata.gz: cb75b3f71b20995afb60038a39ce148d92d9b2abd15074a076e9abe14a04d4f0d171e89d75ce864272fa4d6d1ddce62ac5359dcdbf492bc9b10f8931247665ca
+  data.tar.gz: 28cbdd2751c994a285d71d3eee33141b2d0011a79e469375fc28d05da45d775a9e8d31e8b7de3b60b84043e18a0e603b4bfd493cc49e73da54774f1d8cc5a4bd

data/history.md

@@ -1,3 +1,8 @@
+## Version 2.6.1 / 2022-03-09
+
+* Display error message for `before_pull`, `after_pull`, `before_push`, `after_push` hooks.
+* Remove `silence_errors` option in configuration file. If SSL isn’t properly configured, it needs to be fixed by updating your cert chain.
+
 ## Version 2.6.0 / 2022-03-08
 
 * Code cleaning using Rubocop.

data/lib/web_translate_it/command_line.rb

@@ -51,7 +51,7 @@ module WebTranslateIt
       end
       files = found_files if parameters.any?
       files = files.uniq.sort { |a, b| a.file_path <=> b.file_path }
-      if files.size == 0
+      if files.empty?
         puts 'No files to pull.'
       else
         # Now actually pulling files
@@ -82,10 +82,10 @@ module WebTranslateIt
       return unless configuration.before_pull
 
       output = `#{configuration.before_pull}`
-      if $?.success?
+      if $CHILD_STATUS.success?
         puts output
       else
-        abort 'Error: exit code for before_pull command is not zero'
+        abort "Error: before_pull command exited with: #{output}"
       end
     end
 
@@ -93,10 +93,10 @@ module WebTranslateIt
       return unless configuration.after_pull
 
       output = `#{configuration.after_pull}`
-      if $?.success?
+      if $CHILD_STATUS.success?
         puts output
       else
-        abort 'Error: exit code for after_pull command is not zero'
+        abort "Error: after_pull command exited with: #{output}"
       end
     end
 
@@ -111,7 +111,7 @@ module WebTranslateIt
                   else
                     configuration.files.find_all { |file| file.locale == locale }.sort { |a, b| a.file_path <=> b.file_path }
                   end
-          if files.size == 0
+          if files.empty?
             puts "Couldn't find any local files registered on WebTranslateIt to push."
           else
             files.each do |file|
@@ -129,10 +129,10 @@ module WebTranslateIt
       return unless configuration.before_push
 
       output = `#{configuration.before_push}`
-      if $?.success?
+      if $CHILD_STATUS.success?
         puts output
       else
-        abort 'Error: exit code for before_push command is not zero'
+        abort "Error: before_push command exited with: #{output}"
       end
     end
 
@@ -140,10 +140,10 @@ module WebTranslateIt
       return unless configuration.after_push
 
       output = `#{configuration.after_push}`
-      if $?.success?
+      if $CHILD_STATUS.success?
         puts output
       else
-        abort 'Error: exit code for after_push command is not zero'
+        abort "Error: after_push command exited with: #{output}"
       end
     end
 
@@ -435,9 +435,6 @@ module WebTranslateIt
         # before_push: "echo 'some unix command'"   # Command executed before pushing files
         # after_push:  "touch tmp/restart.txt"      # Command executed after pushing files
 
-        # Silence SSL errors
-        # silence_errors: true
-
       FILE
     end
 

data/lib/web_translate_it/configuration.rb

@@ -32,7 +32,6 @@ module WebTranslateIt
         set_locales_needed(configuration)
         set_files(project_info['project'])
         set_locales(project_info['project'])
-        WebTranslateIt::Connection.turn_silent_on if configuration['silence_errors']
         self.project_name = project_info['project']['name']
       else
         puts StringUtil.failure("\nNo configuration file found in #{File.expand_path(path_to_config_file, path)}")
@@ -42,13 +41,12 @@ module WebTranslateIt
 
     # Reload project data
     #
-    def reload # rubocop:todo Metrics/AbcSize
+    def reload
       project_info = YAML.load WebTranslateIt::Project.fetch_info(api_key)
       set_locales_to_ignore(configuration)
       set_locales_needed(configuration)
       set_files(project_info['project'])
       set_locales(project_info['project'])
-      WebTranslateIt::Connection.turn_silent_on if configuration['silence_errors']
       self.project_name = project_info['project']['name']
     end
 
@@ -70,7 +68,7 @@ module WebTranslateIt
     def set_files(project) # rubocop:todo Metrics/AbcSize
       self.files = []
       project['project_files'].each do |project_file|
-        if project_file['name'].nil? or project_file['name'].strip == ''
+        if project_file['name'].nil? || (project_file['name'].strip == '')
           puts "File #{project_file['id']} not set up"
         elsif ignore_files&.any? { |glob| File.fnmatch(glob, project_file['name']) }
           puts "Ignoring #{project_file['name']}"

data/lib/web_translate_it/connection.rb

@@ -1,15 +1,16 @@
+require 'English'
 module WebTranslateIt
   class Connection
+    attr_reader :api_key, :http_connection
+
     require 'net/http'
     require 'net/https'
     require 'openssl'
     require 'uri'
-    require 'ostruct'
 
-    @@api_key = nil
-    @@http_connection = nil
-    @@debug = false
-    @@silent = false
+    @api_key = nil
+    @http_connection = nil
+    @debug = false
 
     #
     # Initialize and yield a HTTPS Keep-Alive connection to WebTranslateIt.com
@@ -27,44 +28,32 @@ module WebTranslateIt
     # end
     #
     def initialize(api_key) # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
-      @@api_key = api_key
-      proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : OpenStruct.new
+      @api_key = api_key
+      proxy = ENV['http_proxy'] ? URI.parse(ENV['http_proxy']) : Struct.new(:host, :port, :user, :password).new
       http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new('webtranslateit.com', 443)
       http.use_ssl      = true
       http.open_timeout = http.read_timeout = 60
-      http.set_debug_output($stderr) if @@debug
+      http.set_debug_output($stderr) if @debug
       begin
-        http.verify_mode  = OpenSSL::SSL::VERIFY_PEER
-        @@http_connection = http.start
-        yield @@http_connection if block_given?
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        @http_connection = http.start
+        yield @http_connection if block_given?
       rescue OpenSSL::SSL::SSLError
-        puts 'Unable to verify SSL certificate.' unless @@silent
+        puts 'Unable to verify SSL certificate.' unless @silent
         http = Net::HTTP::Proxy(proxy.host, proxy.port, proxy.user, proxy.password).new('webtranslateit.com', 443)
-        http.set_debug_output($stderr) if @@debug
+        http.set_debug_output($stderr) if @debug
         http.use_ssl      = true
         http.open_timeout = http.read_timeout = 60
-        http.verify_mode  = OpenSSL::SSL::VERIFY_NONE
-        @@http_connection = http.start
-        yield @@http_connection if block_given?
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        @http_connection = http.start
+        yield @http_connection if block_given?
       rescue
-        puts $!
+        puts $ERROR_INFO
       end
     end
 
-    def self.http_connection
-      @@http_connection
-    end
-
     def self.turn_debug_on
-      @@debug = true
-    end
-
-    def self.turn_silent_on
-      @@silent = true
-    end
-
-    def self.api_key
-      @@api_key
+      @debug = true
     end
   end
 end

data/lib/web_translate_it/project.rb

@@ -1,3 +1,4 @@
+require 'English'
 module WebTranslateIt
   class Project
     def self.fetch_info(api_key) # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
@@ -16,14 +17,14 @@ module WebTranslateIt
         end
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
           success = false
         end
       rescue
-        puts $!.inspect
+        puts $ERROR_INFO.inspect
       end
       success
     end
@@ -39,7 +40,7 @@ module WebTranslateIt
         end
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -59,7 +60,7 @@ module WebTranslateIt
         Util.handle_response(Connection.http_connection.request(request), true)
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -78,7 +79,7 @@ module WebTranslateIt
         Util.handle_response(Connection.http_connection.request(request), true)
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else

data/lib/web_translate_it/string.rb

@@ -78,7 +78,7 @@ module WebTranslateIt
         return strings
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -102,7 +102,7 @@ module WebTranslateIt
     # to find and instantiate the String which ID is `1234`.
     #
 
-    def self.find(id) # rubocop:todo Metrics/MethodLength
+    def self.find(id) # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
       success = true
       tries ||= 3
       request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{id}.yaml")
@@ -116,7 +116,7 @@ module WebTranslateIt
         return string
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -160,7 +160,7 @@ module WebTranslateIt
         Util.handle_response(Connection.http_connection.request(request), true, true)
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -198,7 +198,7 @@ module WebTranslateIt
         return translation
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -229,7 +229,7 @@ module WebTranslateIt
         Util.handle_response(Connection.http_connection.request(request), true, true)
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -255,7 +255,7 @@ module WebTranslateIt
         return true
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else

data/lib/web_translate_it/term.rb

@@ -69,7 +69,7 @@ module WebTranslateIt
         return terms
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -93,7 +93,7 @@ module WebTranslateIt
     # to find and instantiate the Term which ID is `1234`.
     #
 
-    def self.find(term_id) # rubocop:todo Metrics/MethodLength
+    def self.find(term_id) # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
       success = true
       tries ||= 3
       request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/terms/#{term_id}.yaml")
@@ -107,7 +107,7 @@ module WebTranslateIt
         return term
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -151,7 +151,7 @@ module WebTranslateIt
         Util.handle_response(Connection.http_connection.request(request), true, true)
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -193,7 +193,7 @@ module WebTranslateIt
         return translations
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -221,7 +221,7 @@ module WebTranslateIt
         Util.handle_response(Connection.http_connection.request(request), true, true)
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -245,7 +245,7 @@ module WebTranslateIt
         return true
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else

data/lib/web_translate_it/term_translation.rb

@@ -69,7 +69,7 @@ module WebTranslateIt
         return true
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else
@@ -89,7 +89,7 @@ module WebTranslateIt
         Util.handle_response(Connection.http_connection.request(request), true, true)
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         else

data/lib/web_translate_it/translation.rb

@@ -45,7 +45,7 @@ module WebTranslateIt
         Util.handle_response(Connection.http_connection.request(request), true, true)
       rescue Timeout::Error
         puts 'Request timeout. Will retry in 5 seconds.'
-        if (tries -= 1) > 0
+        if (tries -= 1).positive?
           sleep(5)
           retry
         end

data/lib/web_translate_it/translation_file.rb

@@ -46,25 +46,25 @@ module WebTranslateIt
         display.push("*#{file_path}")
       end
       display.push "#{StringUtil.checksumify(local_checksum.to_s)}..#{StringUtil.checksumify(remote_checksum.to_s)}"
-      if !File.exist?(file_path) or force or remote_checksum != local_checksum
+      if !File.exist?(file_path) || force || (remote_checksum != local_checksum)
         begin
           request = Net::HTTP::Get.new(api_url)
           WebTranslateIt::Util.add_fields(request)
-          FileUtils.mkpath(file_path.split('/')[0..-2].join('/')) unless File.exist?(file_path) or file_path.split('/')[0..-2].join('/') == ''
+          FileUtils.mkpath(file_path.split('/')[0..-2].join('/')) unless File.exist?(file_path) || (file_path.split('/')[0..-2].join('/') == '')
           begin
             response = http_connection.request(request)
             File.open(file_path, 'wb') { |file| file << response.body } if response.code.to_i == 200
             display.push Util.handle_response(response)
           rescue Timeout::Error
             puts StringUtil.failure('Request timeout. Will retry in 5 seconds.')
-            if (tries -= 1) > 0
+            if (tries -= 1).positive?
               sleep(5)
               retry
             else
               success = false
             end
           rescue
-            display.push StringUtil.failure("An error occured: #{$!}")
+            display.push StringUtil.failure("An error occured: #{$ERROR_INFO}")
             success = false
           end
         end
@@ -97,7 +97,7 @@ module WebTranslateIt
       display.push(file_path)
       display.push "#{StringUtil.checksumify(local_checksum.to_s)}..#{StringUtil.checksumify(remote_checksum.to_s)}"
       if File.exist?(file_path)
-        if force or remote_checksum != local_checksum
+        if force || (remote_checksum != local_checksum)
           File.open(file_path) do |file|
             params = { 'file' => UploadIO.new(file, 'text/plain', file.path), 'merge' => merge, 'ignore_missing' => ignore_missing, 'label' => label, 'low_priority' => low_priority, 'minor_changes' => minor_changes }
             params['name'] = destination_path unless destination_path.nil?
@@ -107,14 +107,14 @@ module WebTranslateIt
             display.push Util.handle_response(http_connection.request(request))
           rescue Timeout::Error
             puts StringUtil.failure('Request timeout. Will retry in 5 seconds.')
-            if (tries -= 1) > 0 # rubocop:todo Metrics/BlockNesting
+            if (tries -= 1).positive? # rubocop:todo Metrics/BlockNesting
               sleep(5)
               retry
             else
               success = false
             end
           rescue
-            display.push StringUtil.failure("An error occured: #{$!}")
+            display.push StringUtil.failure("An error occured: #{$ERROR_INFO}")
             success = false
           end
         else
@@ -156,14 +156,14 @@ module WebTranslateIt
           puts ArrayUtil.to_columns(display)
         rescue Timeout::Error
           puts StringUtil.failure('Request timeout. Will retry in 5 seconds.')
-          if (tries -= 1) > 0
+          if (tries -= 1).positive?
             sleep(5)
             retry
           else
             success = false
           end
         rescue
-          display.push StringUtil.failure("An error occured: #{$!}")
+          display.push StringUtil.failure("An error occured: #{$ERROR_INFO}")
           success = false
         end
       else
@@ -187,14 +187,14 @@ module WebTranslateIt
           puts ArrayUtil.to_columns(display)
         rescue Timeout::Error
           puts StringUtil.failure('Request timeout. Will retry in 5 seconds.')
-          if (tries -= 1) > 0
+          if (tries -= 1).positive?
             sleep(5)
             retry
           else
             success = false
           end
         rescue
-          display.push StringUtil.failure("An error occured: #{$!}")
+          display.push StringUtil.failure("An error occured: #{$ERROR_INFO}")
           success = false
         end
       else

data/lib/web_translate_it/util/array_util.rb

@@ -14,7 +14,7 @@ class ArrayUtil
     start = 0
     1.upto(pieces) do |i|
       last = start + mid
-      last = last - 1 unless len % pieces >= i
+      last -= 1 unless len % pieces >= i
       chunks << (arr[start..last] || [])
       start = last + 1
     end

data/lib/web_translate_it/util.rb

@@ -10,7 +10,7 @@ module WebTranslateIt
     end
 
     def self.calculate_percentage(processed, total)
-      return 0 if total == 0
+      return 0 if total.zero?
 
       ((processed * 10) / total).to_f.ceil * 10
     end
@@ -19,7 +19,7 @@ module WebTranslateIt
     # rubocop:todo Metrics/MethodLength
     # rubocop:todo Metrics/AbcSize
     def self.handle_response(response, return_response = false, raise_exception = false) # rubocop:todo Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity
-      if response.code.to_i >= 400 and response.code.to_i < 500
+      if (response.code.to_i >= 400) && (response.code.to_i < 500)
         raise "Error: #{MultiJson.load(response.body)['error']}" if raise_exception
 
         puts StringUtil.failure(MultiJson.load(response.body)['error'])
@@ -80,13 +80,13 @@ module WebTranslateIt
     # Ask a question. Returns an answer.
 
     def self.ask(question, default = nil)
-      question = question + " (Default: #{default})" unless default.nil?
+      question += " (Default: #{default})" unless default.nil?
       print("#{question}  ")
       $stdout.flush
 
       result = $stdin.gets
       result&.chomp!
-      result = default if result.nil? or result == ''
+      result = default if result.nil? || (result == '')
       result
     end
 

data/lib/web_translate_it.rb

@@ -13,6 +13,8 @@ require 'web_translate_it/auto_fetch'
 require 'web_translate_it/command_line'
 require 'web_translate_it/project'
 
+require 'English'
+
 module WebTranslateIt
   def self.fetch_translations # rubocop:todo Metrics/AbcSize
     config = Configuration.new

data/readme.md

@@ -1,7 +1,7 @@
 # WebTranslateIt Synchronization Tool : wti
 
-[RubyDoc](https://rubydoc.info/github/webtranslateit/webtranslateit/master) | 
-[Report a bug](https://github.com/webtranslateit/webtranslateit/issues) | 
+[RubyDoc](https://rubydoc.info/github/webtranslateit/webtranslateit/master) |
+[Report a bug](https://github.com/webtranslateit/webtranslateit/issues) |
 [Support](https://webtranslateit.com/support) |
 [WebTranslateIt.com Homepage](https://webtranslateit.com)
 
@@ -32,7 +32,7 @@ Fetching: web_translate_it-2.1.3.gem (100%)
 Successfully installed web_translate_it-2.1.3
 1 gem installed
 ```
-    
+
 At this point you should have the `wti` executable working:
 
 ``` bash
@@ -83,9 +83,9 @@ Please refer to [our documentation about syncing multiple projects](https://gith
 Execute `wti --help` to see the usage:
 
     Usage: wti <command> [options]+
-  
+
     The most commonly used wti commands are:
-  
+
       pull        Pull target language file(s)
       push        Push master language file(s)
       match       Display matching of local files with File Manager
@@ -96,7 +96,7 @@ Execute `wti --help` to see the usage:
       init        Configure your project to sync      
 
     See `wti <command> --help` for more information on a specific command.
-  
+
     [options] are:
       --config, -c <s>:   Path to a translation.yml file (default: .wti)
          --version, -v:   Print version and exit
@@ -217,7 +217,7 @@ There are 4 hooks:
 * `before_push`
 * `after_push`
 
-Check the [sample `.wti`](https://github.com/webtranslateit/webtranslateit/blob/master/examples/.wti#L9..L13) file for implementation.
+Check the [sample `.wti`](https://github.com/webtranslateit/webtranslateit/blob/master/examples/.wti#L16-L21) file for implementation.
 
 ## Exit codes
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Edouard Briere
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json