web_translate_it 2.6.0 → 2.6.3.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe142160ce726176d6463e38dff4cbabe3c65a2629e537afd070aa9a273e44c2
-  data.tar.gz: 447cc0c48efca6fbf66588f4426c1583f6945f59118593b5d8be5a7c81db40a4
+  metadata.gz: 173ab262e04fc47e5c64636a93414ca39f69ee400950a57fb6df13f0df2cd9e2
+  data.tar.gz: d0e5e1acc433b7fd4b42c685b55d9df142fe93e1f09e99ca86c3f1f4f722e52e
 SHA512:
-  metadata.gz: 11cc21a06894851d8ead43d573ef69c197e0132f1b38b0c65b27c29541ce5409e0a076147f323f61d1fc1e8f0d89f91050d4011e421e5907e5d7d493a4939806
-  data.tar.gz: 9b8bad87f54a5ff65265b34e71523fbd3bb6aca4f95293d8c59bb970d8bc6de7fae9ea7d2cf3078a0004ffdd4720c03bc0f9ca59a3198390585698a73b6f08bb
+  metadata.gz: 5460467df6c3b1276fe83c9c7d60f80810c4f91211251babd3d1fd7d37e9619b2793d39063cccb9731267074d52197f2c5dc2288c95f9d9ac03d90930a80a5f1
+  data.tar.gz: 390ff085d8d5ede3e6d146c9f5b7620aa62b8d1502a4d97410f42a9b7fe4f0ccaf643b5c633b110546a666716f0fae41d238b65400ee9aae78babbdca73db109

data/history.md

@@ -1,3 +1,17 @@
+## Version 2.6.3.pre1 / 2022-06-14
+
+* Fix deprecation warning. #181
+* Set minimum ruby version to 2.6. It is [EOL since December 2018](https://endoflife.date/ruby), but it’s still the default ruby shipped with Mac OS Monterey.
+
+## Version 2.6.2 / 2022-04-05
+
+* Fix `wti init` command with ruby 3.1. #177
+
+## 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
 
@@ -294,7 +294,11 @@ module WebTranslateIt
         path = Util.ask(' Path to configuration file:', '.wti')
       end
       FileUtils.mkpath(path.split('/')[0..path.split('/').size - 2].join('/')) unless path.split('/').size == 1
-      project = YAML.load WebTranslateIt::Project.fetch_info(api_key)
+      project = if RUBY_VERSION >= '3.1'
+                  YAML.safe_load WebTranslateIt::Project.fetch_info(api_key), permitted_classes: [Time]
+                else
+                  YAML.load WebTranslateIt::Project.fetch_info(api_key)
+                end
       project_info = project['project']
       if File.exist?(path) && !File.writable?(path)
         puts StringUtil.failure("Error: `#{path}` file is not writable.")
@@ -414,30 +418,35 @@ module WebTranslateIt
 
     def generate_configuration(api_key, project_info)
       <<~FILE
+        # Required - The Project API Token from WebTranslateIt.com
+        # More information: https://github.com/webtranslateit/webtranslateit/wiki#configuration-file
+
         api_key: #{api_key}
 
-        # Optional: locales not to sync with WebTranslateIt.
+        # Optional - Locales not to sync with WebTranslateIt.
+        # Takes a string, a symbol, or an array of string or symbol.
+
+        # ignore_locales: [#{project_info['source_locale']['code']}]
+
+        # Optional - Locales to sync with WebTranslateIt.
         # Takes a string, a symbol, or an array of string or symbol.
-        # More information here: https://github.com/AtelierConvivialite/webtranslateit/wiki
-        # ignore_locales: '#{project_info['source_locale']['code']}'
 
-        # Or if you prefer a list of locales to sync with WebTranslateIt:
         # needed_locales: #{project_info['target_locales'].map { |locale| locale['code'] }}
 
         # Optional: files not to sync with WebTranslateIt.
         # Takes an array of globs.
+
         # ignore_files: ['somefile*.csv']
 
-        # Optional
+        # Optional - Hooks
+        # Takes a string containing a command to run.
+
         # before_pull: "echo 'some unix command'"   # Command executed before pulling files
         # after_pull:  "touch tmp/restart.txt"      # Command executed after pulling files
-        #
+
         # 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

@@ -17,7 +17,7 @@ module WebTranslateIt
       self.path           = root_path
       self.logger         = logger
       if File.exist?(File.expand_path(path_to_config_file, path))
-        self.api_key        = ENV['WTI_PROJECT_API_KEY'] || configuration['api_key']
+        self.api_key        = ENV.fetch('WTI_PROJECT_API_KEY') { configuration['api_key'] }
         self.before_pull    = configuration['before_pull']
         self.after_pull     = configuration['after_pull']
         self.before_push    = configuration['before_push']
@@ -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,9 +97,9 @@ 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 = { 'file' => Multipart::Post::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?
             params['rename_others'] = rename_others
             request = Net::HTTP::Put::Multipart.new(api_url, params)
@@ -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
@@ -150,20 +150,20 @@ module WebTranslateIt
       display.push "#{StringUtil.checksumify(local_checksum.to_s)}..[     ]"
       if File.exist?(file_path)
         File.open(file_path) do |file|
-          request = Net::HTTP::Post::Multipart.new(api_url_for_create, { 'name' => file_path, 'file' => UploadIO.new(file, 'text/plain', file.path), 'low_priority' => low_priority })
+          request = Net::HTTP::Post::Multipart.new(api_url_for_create, { 'name' => file_path, 'file' => Multipart::Post::UploadIO.new(file, 'text/plain', file.path), 'low_priority' => low_priority })
           WebTranslateIt::Util.add_fields(request)
           display.push Util.handle_response(http_connection.request(request))
           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

@@ -1,7 +1,7 @@
 class ArrayUtil
   def self.to_columns(arr)
     if arr[0][0] == '*'
-      "*#{StringUtil.backward_truncate(arr[0][1..-1])} | #{arr[1]}  #{arr[2]}\n"
+      "*#{StringUtil.backward_truncate(arr[0][1..])} | #{arr[1]}  #{arr[2]}\n"
     else
       " #{StringUtil.backward_truncate(arr[0])} | #{arr[1]}  #{arr[2]}\n"
     end
@@ -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://www.rubydoc.info/gems/web_translate_it/) |
+[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.3.pre1
 platform: ruby
 authors:
 - Edouard Briere
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -156,12 +156,6 @@ files:
 - man/wti.1.html
 - man/wti.1.ron
 - readme.md
-- spec/examples/config/translation.yml
-- spec/examples/en.yml
-- spec/spec_helper.rb
-- spec/web_translate_it/auto_fetch_spec.rb
-- spec/web_translate_it/string_spec.rb
-- spec/web_translate_it/term_spec.rb
 homepage: https://webtranslateit.com
 licenses:
 - MIT
@@ -183,21 +177,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: A CLI tool to sync locale files with WebTranslateIt.com.
-test_files:
-- spec/web_translate_it/auto_fetch_spec.rb
-- spec/web_translate_it/term_spec.rb
-- spec/web_translate_it/string_spec.rb
-- spec/spec_helper.rb
-- spec/examples/config/translation.yml
-- spec/examples/en.yml
+test_files: []

data/spec/examples/config/translation.yml

@@ -1,9 +0,0 @@
-# The Project API Token from Web Translate It
-api_key: 4af21ce1fb3a4f7127a60b31ebc41c1446b38bb2
-
-# Optional: locales not to sync with Web Translate It.
-# eg. [:en, :fr] or just 'en'
-# ignore_locales: :en
-
-# Silence SSL errors
-# silence_errors: true

data/spec/examples/en.yml

@@ -1,38 +0,0 @@
-en:
-  activerecord:
-    errors:
-      templates:
-        header:
-          one: "1 error prohibited this {{model}} from being saved"
-          other: "{{count}} errors prohibited this {{model}} from being saved"
-          body: "there were problems with the following fields:"
-          messages:
-            accepted: "must be accepted"
-            blank: "can't be blank"
-            confirmation: "doesn't match confirmation"
-            empty: "can't be empty"
-            equal_to: "must be equal to {{count}}"
-            even: "must be even"
-            exclusion: "is reserved"
-            greater_than: "must be greater than {{count}}"
-            greater_than_or_equal_to: "must be greater than or equal to {{count}}"
-            inclusion: "is not included in the list"
-            invalid: "is invalid"
-            less_than: "must be less than {{count}}"
-            less_than_or_equal_to: "must be less than or equal to {{count}}"
-            not_a_number: "is not a number"
-            odd: "must be odd"
-            taken: "is already taken"
-            too_long: "is too long (maximum is {{count}} characters)"
-            too_short: "is too short (minimum is {{count}} characters)"
-            wrong_length: "is the wrong length (should be {{count}} characters)" 
-      models:
-        invitation:
-          attributes:
-            email:
-              user_already_invited: "This user has already been invited"
-              user_already_member: "This user is already a member"
-        project_file:
-          attributes:
-            file:
-              file_format_not_supported: "Sorry, we currenly support only Gettext .pot/.po, .yml/.yaml and .strings"

data/spec/spec_helper.rb

@@ -1,11 +0,0 @@
-if ENV['COVERAGE']
-  require 'simplecov'
-  SimpleCov.start
-end
-
-require File.expand_path('../lib/web_translate_it', __dir__)
-require 'rspec'
-
-class I18n
-  def self.reload!; end
-end

data/spec/web_translate_it/auto_fetch_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-describe WebTranslateIt::AutoFetch do
-  let(:application) { double(:application, call: []) }
-
-  let(:env) do
-    { 'PATH_INFO' => path }
-  end
-
-  subject { described_class.new(application) }
-
-  before { WebTranslateIt.stub(:fetch_translations) }
-
-  after { subject.call(env) }
-
-  context 'path is /' do
-    let(:path) { '/' }
-
-    it 'should call the application' do
-      application.should_receive(:call).with(env)
-    end
-
-    it 'should update the translations' do
-      WebTranslateIt.should_receive(:fetch_translations)
-    end
-
-    it 'should reload the I18n definitions' do
-      I18n.should_receive(:reload!)
-    end
-  end
-
-  context 'path is /assets/application.js' do
-    let(:path) { '/assets/application.js' }
-
-    it 'should call the application' do
-      application.should_receive(:call).with(env)
-    end
-
-    it 'should not update the translations' do
-      WebTranslateIt.should_not_receive(:fetch_translations)
-    end
-
-    it 'should not reload the I18n definitions' do
-      I18n.should_not_receive(:reload!)
-    end
-  end
-end

data/spec/web_translate_it/string_spec.rb

@@ -1,153 +0,0 @@
-require 'spec_helper'
-
-describe WebTranslateIt::String do
-  let(:api_key) { 'proj_pvt_glzDR250FLXlMgJPZfEyHQ' }
-
-  describe '#initialize' do
-    it 'should assign api_key and many parameters' do
-      string = WebTranslateIt::String.new({ 'id' => 1234, 'key' => 'bacon' })
-      string.id.should == 1234
-      string.key.should == 'bacon'
-    end
-
-    it 'should assign parameters using symbols' do
-      string = WebTranslateIt::String.new({ id: 1234, key: 'bacon' })
-      string.id.should == 1234
-      string.key.should == 'bacon'
-    end
-  end
-
-  describe '#save' do
-    it 'should create a new String' do
-      WebTranslateIt::Connection.new(api_key) do
-        string = WebTranslateIt::String.new({ 'key' => 'bacon' })
-        string.save
-        string.id.should_not be_nil
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.should_not be_nil
-        string_fetched.should be_a(WebTranslateIt::String)
-        string_fetched.id.should == string.id
-        string.delete
-      end
-    end
-
-    it 'should update an existing String' do
-      WebTranslateIt::Connection.new(api_key) do
-        string = WebTranslateIt::String.new({ 'key' => 'bacony' })
-        string.save
-        string.key = 'bacon changed'
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.key.should == 'bacon changed'
-        string.delete
-      end
-    end
-
-    it 'should create a new String with Translation' do
-      translation1 = WebTranslateIt::Translation.new({ 'locale' => 'en', 'text' => 'Hello' })
-      translation2 = WebTranslateIt::Translation.new({ 'locale' => 'fr', 'text' => 'Bonjour' })
-
-      string = WebTranslateIt::String.new({ 'key' => 'bacon', 'translations' => [translation1, translation2] })
-      WebTranslateIt::Connection.new(api_key) do
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.translation_for('en').should_not be_nil
-        string_fetched.translation_for('en').text.should == 'Hello'
-        string_fetched.translation_for('fr').should_not be_nil
-        string_fetched.translation_for('fr').text.should == 'Bonjour'
-        string_fetched.translation_for('es').should be_nil
-        string.delete
-      end
-    end
-
-    it 'should update a String and save its Translation' do
-      translation1 = WebTranslateIt::Translation.new({ 'locale' => 'en', 'text' => 'Hello' })
-      translation2 = WebTranslateIt::Translation.new({ 'locale' => 'fr', 'text' => 'Bonjour' })
-
-      string = WebTranslateIt::String.new({ 'key' => 'bacon' })
-      WebTranslateIt::Connection.new(api_key) do
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.translation_for('fr').should be_nil
-
-        string_fetched.translations = [translation1, translation2]
-        string_fetched.save
-
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.translation_for('en').should_not be_nil
-        string_fetched.translation_for('en').text.should == 'Hello'
-        string_fetched.translation_for('fr').should_not be_nil
-        string_fetched.translation_for('fr').text.should == 'Bonjour'
-        string.delete
-      end
-    end
-  end
-
-  describe '#delete' do
-    it 'should delete a String' do
-      string = WebTranslateIt::String.new({ 'key' => 'bacon' })
-      WebTranslateIt::Connection.new(api_key) do
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.should_not be_nil
-
-        string_fetched.delete
-        WebTranslateIt::String.find(string.id).should be_nil
-      end
-    end
-  end
-
-  describe '#find_all' do
-    it 'should find many strings' do
-      WebTranslateIt::Connection.new(api_key) do
-        string1 = WebTranslateIt::String.new({ 'key' => 'one two three' })
-        string1.save
-        string2 = WebTranslateIt::String.new({ 'key' => 'four five six' })
-        string2.save
-        string3 = WebTranslateIt::String.new({ 'key' => 'six seven eight' })
-        string3.save
-
-        strings = WebTranslateIt::String.find_all({ 'key' => 'six' })
-        strings.count.should == 2
-        strings[0].key.should == 'four five six'
-        strings[1].key.should == 'six seven eight'
-
-        strings = WebTranslateIt::String.find_all({ key: 'six' })
-        strings.count.should == 2
-        strings[0].key.should == 'four five six'
-        strings[1].key.should == 'six seven eight'
-
-        strings = WebTranslateIt::String.find_all({ 'key' => 'eight' })
-        strings.count.should == 1
-        strings[0].key.should == 'six seven eight'
-
-        strings = WebTranslateIt::String.find_all({ 'key' => 'three' })
-        strings.count.should == 1
-        strings[0].key.should == 'one two three'
-      end
-    end
-  end
-
-  describe '#translation_for' do
-    it 'should fetch translations' do
-      translation = WebTranslateIt::Translation.new({ 'locale' => 'en', 'text' => 'Hello' })
-      string = WebTranslateIt::String.new({ 'key' => 'greetings', 'translations' => [translation] })
-      WebTranslateIt::Connection.new(api_key) do
-        string.save
-        string_fetched = WebTranslateIt::String.find(string.id)
-        string_fetched.translation_for('en').should_not be_nil
-        string_fetched.translation_for('en').text.should == 'Hello'
-        string_fetched.translation_for('fr').should be_nil
-        string.delete
-      end
-    end
-
-    it 'should not return a stale object' do
-      string = WebTranslateIt::String.new({ key: 'greetings 2' })
-      translation = WebTranslateIt::Translation.new({ locale: 'es', text: 'text', string_id: string.id })
-      string.translations << translation
-      string.translation_for('fr').should be_nil
-      string.translation_for('es').should_not be_nil
-    end
-  end
-end

data/spec/web_translate_it/term_spec.rb

@@ -1,121 +0,0 @@
-require 'spec_helper'
-
-describe WebTranslateIt::Term do
-  let(:api_key) { 'proj_pvt_glzDR250FLXlMgJPZfEyHQ' }
-
-  describe '#initialize' do
-    it 'should assign api_key and many parameters' do
-      term = WebTranslateIt::Term.new({ 'id' => 1234, 'text' => 'bacon' })
-      term.id.should == 1234
-      term.text.should == 'bacon'
-    end
-
-    it 'should assign parameters using symbols' do
-      term = WebTranslateIt::Term.new({ id: 1234, text: 'bacon' })
-      term.id.should == 1234
-      term.text.should == 'bacon'
-    end
-  end
-
-  describe '#save' do
-    it 'should create a new Term' do
-      WebTranslateIt::Connection.new(api_key) do
-        term = WebTranslateIt::Term.new({ 'text' => 'Term', 'description' => 'A description' })
-        term.save
-        term.id.should_not be_nil
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.should_not be_nil
-        term_fetched.should be_a(WebTranslateIt::Term)
-        term_fetched.id.should == term.id
-        term.delete
-      end
-    end
-
-    it 'should update an existing Term' do
-      WebTranslateIt::Connection.new(api_key) do
-        term = WebTranslateIt::Term.new({ 'text' => 'Term 2', 'description' => 'A description' })
-        term.save
-        term.text = 'A Term'
-        term.save
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.text.should == 'A Term'
-        term.delete
-      end
-    end
-
-    it 'should create a new Term with a TermTranslation' do
-      translation1 = WebTranslateIt::TermTranslation.new({ 'locale' => 'fr', 'text' => 'Bonjour' })
-      translation2 = WebTranslateIt::TermTranslation.new({ 'locale' => 'fr', 'text' => 'Salut' })
-
-      term = WebTranslateIt::Term.new({ 'text' => 'Hello', 'translations' => [translation1, translation2] })
-      WebTranslateIt::Connection.new(api_key) do
-        term.save
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.translation_for('fr').should_not be_nil
-        term_fetched.translation_for('fr')[0].text.should == 'Salut'
-        term_fetched.translation_for('fr')[1].text.should == 'Bonjour'
-        term_fetched.translation_for('es').should be_nil
-        term.delete
-      end
-    end
-
-    it 'should update a Term and save its Translation' do
-      translation1 = WebTranslateIt::TermTranslation.new({ 'locale' => 'fr', 'text' => 'Bonjour' })
-      translation2 = WebTranslateIt::TermTranslation.new({ 'locale' => 'fr', 'text' => 'Salut' })
-
-      term = WebTranslateIt::Term.new({ 'text' => 'Hi!' })
-      WebTranslateIt::Connection.new(api_key) do
-        term.save
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.translation_for('fr').should be_nil
-
-        term_fetched.translations = [translation1, translation2]
-        term_fetched.save
-
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.translation_for('fr').should_not be_nil
-        term_fetched.translation_for('fr')[0].text.should == 'Salut'
-        term_fetched.translation_for('fr')[1].text.should == 'Bonjour'
-        term.delete
-      end
-    end
-  end
-
-  describe '#delete' do
-    it 'should delete a Term' do
-      term = WebTranslateIt::Term.new({ 'text' => 'bacon' })
-      WebTranslateIt::Connection.new(api_key) do
-        term.save
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.should_not be_nil
-
-        term_fetched.delete
-        term_fetched = WebTranslateIt::Term.find(term.id)
-        term_fetched.should be_nil
-      end
-    end
-  end
-
-  describe '#find_all' do
-    it 'should fetch many terms' do
-      WebTranslateIt::Connection.new(api_key) do
-        terms = WebTranslateIt::Term.find_all
-        count = terms.count
-
-        term1 = WebTranslateIt::Term.new({ 'text' => 'greeting 1' })
-        term1.save
-        term2 = WebTranslateIt::Term.new({ 'text' => 'greeting 2' })
-        term2.save
-        term3 = WebTranslateIt::Term.new({ 'text' => 'greeting 3' })
-        term3.save
-
-        terms = WebTranslateIt::Term.find_all
-        count - terms.count.should == 3
-
-        term1.delete
-        term2.delete
-        term3.delete
-      end
-    end
-  end
-end