web_translate_it 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4db3eb8623580c53dff0ca3d6e4dea860781436b20c9ff4580bf53e5a7661d0
-  data.tar.gz: f68c3e3ef4b7ed934a6df20da1c4eb13afaa7c115468595f241efc4bc3f5dea5
+  metadata.gz: 62888b8fc7d40d82a556bbe69e049b5f8ca713d79208c1a65540c9fa3893bdad
+  data.tar.gz: e3f9e96f09e669f20d2235314842bfc0b2865cf67816b4bc48d2e369c4b13bdf
 SHA512:
-  metadata.gz: 2faab2844f1ed735004291f6dc7def7cdb630837c18e4e526ca90dc83cb537379090f825403a5cfb2b758fa7213945419fd47eb45e849b154b20af1cbf54d3a5
-  data.tar.gz: b1ae273de1459eabe8ad461d0eee5261e2428aff6ad69230ee7af9a1806302efb09fcea4af7f864c0f6fde697ef7558339777717d583a6cdac95e92a5e9c70ae
+  metadata.gz: '099f8ebe73c79ad7a57a56beab8e8a2f1aa5688b57fa84c6020439d11fa2e836047cc22ebfcd33363db8ff751dbbffd9c27fe952a3930786acfda715d8bebdfd'
+  data.tar.gz: 8f2611c67e384f751d617a863675e66a9c0c4ce0f254516f42a3a7284aa784a9f6938895bb5e3b9d5bb005ccc1831b59b6f8159b5edbd1cb648305f692cae080

data/bin/wti

@@ -13,6 +13,7 @@ show_commands = <<~COMMANDS
      pull        Pull target language file(s)
      push        Push master language file(s)
      match       Display matching of local files with File Manager
+     diff        Display a diff between local and remote files
      add         Create and push a new master language file
      rm          Delete a master language file from a project
      mv          Moves a file both locally and from a project
@@ -26,7 +27,7 @@ show_commands = <<~COMMANDS
   [options] are:
 COMMANDS
 
-SUB_COMMANDS = %w[pull push match add rm mv addlocale rmlocale status st init].freeze
+SUB_COMMANDS = %w[pull push match diff add rm mv addlocale rmlocale status st init].freeze
 global_options = Optimist.options do
   stop_on SUB_COMMANDS
   banner show_commands
@@ -65,6 +66,15 @@ when 'push'
     opt :all,    'DEPRECATED -- See `wti push --target` instead'
     opt :debug,  'Display debug information'
   end
+when 'diff'
+  Optimist.options do
+    banner <<~BANNER
+      wti diff [filename] - Display a diff between local and remote files
+      [options] are:
+    BANNER
+    opt :config, 'Path to a configuration file', short: '-c', default: '.wti'
+    opt :debug,  'Display debug information'
+  end
 when 'add'
   Optimist.options do
     banner 'wti add filename - Create and push a new master language file'

data/history.md

@@ -1,3 +1,7 @@
+## Version 3.2.0 / 2026-01-14
+
+* Add `wti diff` command.
+
 ## Version 3.1.2 / 2025-06-06
 
 * Fix `wti mv` command. #366

data/lib/web_translate_it/command_line.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'tempfile'
+
 module WebTranslateIt
 
   class CommandLine # rubocop:todo Metrics/ClassLength
@@ -15,6 +17,8 @@ module WebTranslateIt
           'Pulling files'
         when 'push'
           'Pushing files'
+        when 'diff'
+          'Diffing files'
         when 'add'
           'Creating master files'
         when 'rm'
@@ -150,6 +154,42 @@ module WebTranslateIt
       end
     end
 
+    def diff # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+      complete_success = true
+      $stdout.sync = true
+      WebTranslateIt::Connection.new(configuration.api_key) do |http|
+        files = if parameters.any?
+                  configuration.files.find_all { |file| parameters.include?(file.file_path) }.sort { |a, b| a.file_path <=> b.file_path }
+                else
+                  configuration.files.find_all { |file| file.locale == configuration.source_locale }.sort { |a, b| a.file_path <=> b.file_path }
+                end
+        if files.empty?
+          puts "Couldn't find any local files registered on WebTranslateIt to diff."
+        else
+          files.each do |file|
+            if File.exist?(file.file_path)
+              remote_content = file.fetch_remote_content(http)
+              if remote_content
+                temp_file = Tempfile.new('wti')
+                temp_file.write(remote_content)
+                temp_file.close
+                puts "Diff for #{file.file_path}:"
+                system "diff #{temp_file.path} #{file.file_path}"
+                temp_file.unlink
+              else
+                puts StringUtil.failure("Couldn't fetch remote file #{file.file_path}")
+                complete_success = false
+              end
+            else
+              puts StringUtil.failure("Can't diff #{file.file_path}. File doesn't exist locally.")
+              complete_success = false
+            end
+          end
+        end
+      end
+      complete_success
+    end
+
     def add # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       complete_success = true
       $stdout.sync = true
@@ -296,7 +336,7 @@ module WebTranslateIt
         api_key = Util.ask(' Project API Key:')
         path = Util.ask(' Path to configuration file:', '.wti')
       end
-      FileUtils.mkpath(path.split('/')[0..path.split('/').size - 2].join('/')) unless path.split('/').size == 1
+      FileUtils.mkpath(path.split('/')[0..(path.split('/').size - 2)].join('/')) unless path.split('/').size == 1
       project = JSON.parse WebTranslateIt::Project.fetch_info(api_key)
       project_info = project['project']
       if File.exist?(path) && !File.writable?(path)

data/lib/web_translate_it/translation_file.rb

@@ -46,27 +46,27 @@ module WebTranslateIt
       end
       display.push "#{StringUtil.checksumify(local_checksum.to_s)}..#{StringUtil.checksumify(remote_checksum.to_s)}"
       if !File.exist?(file_path) || force || (remote_checksum != local_checksum)
+
+        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) || (file_path.split('/')[0..-2].join('/') == '')
         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) || (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).positive?
-              sleep(5)
-              retry
-            else
-              success = false
-            end
-          rescue StandardError
-            display.push StringUtil.failure("An error occured: #{$ERROR_INFO}")
+          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).positive?
+            sleep(5)
+            retry
+          else
             success = false
           end
+        rescue StandardError
+          display.push StringUtil.failure("An error occured: #{$ERROR_INFO}")
+          success = false
         end
+
       else
         display.push StringUtil.success('Skipped')
       end
@@ -74,6 +74,13 @@ module WebTranslateIt
       success
     end
 
+    def fetch_remote_content(http_connection)
+      request = Net::HTTP::Get.new(api_url)
+      WebTranslateIt::Util.add_fields(request)
+      response = http_connection.request(request)
+      response.body if response.code.to_i == 200
+    end
+
     # Update a language file to Web Translate It by performing a PUT Request.
     #
     # Example of implementation:

data/lib/web_translate_it/util/string_util.rb

@@ -3,7 +3,7 @@
 class StringUtil
 
   def self.backward_truncate(str)
-    return "...#{str[str.length - 50 + 3..str.length]}" if str.length > 50
+    return "...#{str[(str.length - 50 + 3)..str.length]}" if str.length > 50
 
     spaces = ''
     (50 - str.length).times { spaces += ' ' }

data/man/wti.1

@@ -15,6 +15,9 @@
 .P
 \fBwti pull\fR [\fB\-l\fR] \fIOPTIONS\fR
 .
+.P
+\fBwti diff\fR \fIOPTIONS\fR
+.
 .SH "DESCRIPTION"
 \fBwti\fR is an utility to help you sync language files between the WebTranslateIt\.com service and your computer/server\.
 .
@@ -25,6 +28,9 @@
 \fBwti pull\fR will pull the target language files from Web Translate It\. It will download and update your file with the latest translations from Web Translate It\.
 .
 .P
+\fBwti diff\fR will show a difference between your local file and the file hosted at Web Translate It\.
+.
+.P
 \fBwti status\fR fetch and display translation statistics from Web Translate It\.
 .
 .SH "OPTIONS"

data/man/wti.1.html

@@ -93,6 +93,8 @@ update the strings hosted at Web Translate It by the strings from the file you p
 <p><code>wti pull</code> will pull the target language files from Web Translate It. It will download
 and update your file with the latest translations from Web Translate It.</p>
 
+<p><code>wti diff</code> will display a diff between local and remote language files.</p>
+
 <p><code>wti status</code> fetch and display translation statistics from Web Translate It.</p>
 
 <h2 id="OPTIONS">OPTIONS</h2>

data/man/wti.1.ron

@@ -9,6 +9,8 @@ wti(1) -- WebTranslateIt.com from the command line
 
 `wti pull` [`-l`] <OPTIONS>
 
+`wti diff` <OPTIONS>
+
 ## DESCRIPTION
  
 `wti` is an utility to help you sync language files between the
@@ -20,6 +22,8 @@ update the strings hosted at Web Translate It by the strings from the file you p
 `wti pull` will pull the target language files from Web Translate It. It will download
 and update your file with the latest translations from Web Translate It.
 
+`wti diff` will show a difference between your local file and the file hosted at Web Translate It.
+
 `wti status` fetch and display translation statistics from Web Translate It.
 
 ## OPTIONS

data/readme.md

@@ -12,7 +12,7 @@ wti lets you easily sync your language files with [WebTranslateIt.com](https://w
 
 ### wti...
 
-* wti is a **command-line tool**. It works on all operating systems: Windows, Linux, MacOS X, ... It is also available as a [Docker package](https://github.com/webtranslateit/wti-docker/pkgs/container/wti-docker).
+* wti is a **command-line tool**. It works on all operating systems: Windows, Linux, macOS, ... It is also available as a [Docker package](https://github.com/webtranslateit/wti-docker/pkgs/container/wti-docker).
 * wti is really easy to use. It was inspired by git. Use `wti push` and `wti pull` to sync your language files with WebTranslateIt.com.
 
 ### Optionally, wti does...
@@ -29,8 +29,8 @@ You will also need ruby to run `wti`. We require ruby version 3.0 or newer. On L
 
 ``` bash
 $ gem install web_translate_it
-Fetching: web_translate_it-3.0.2.gem (100%)
-Successfully installed web_translate_it-3.0.2
+Fetching: web_translate_it-3.2.0.gem (100%)
+Successfully installed web_translate_it-3.2.0
 1 gem installed
 ```
 
@@ -38,7 +38,7 @@ At this point you should have the `wti` executable working:
 
 ``` bash
 $ wti -v
-wti version 3.0.2
+wti version 3.2.0
 ```
 
 We also provide `wti` as a Docker packages. [See our packages and instructions to install](https://github.com/webtranslateit/wti-docker/pkgs/container/wti-docker).
@@ -78,6 +78,7 @@ Execute `wti --help` to see the usage:
       pull        Pull target language file(s)
       push        Push master language file(s)
       match       Display matching of local files with File Manager
+      diff        Display a diff between local and remote files
       add         Create and push a new master language file
       addlocale   Add a new locale to the project
       server      Start a synchronisation server
@@ -196,6 +197,10 @@ Append `--help` for each command for more information. For instance:
     <td>wti match</td>
     <td>Show matching between files on local computer and the ones in WebTranslateIt’s File Manager</td>
   </tr>
+  <tr>
+    <td>wti diff config/locales/app/en.yml</td>
+    <td>View diff between local and remote file config/locales/app/en.yml</td>
+  </tr>
 </table>
 
 ## Hooks
@@ -272,4 +277,4 @@ fr: 100% translated, 100% completed.
 
 # License
 
-Copyright (c) 2009-2024 [WebTranslateIt Software S.L](https://webtranslateit.com), released under the MIT License.
+Copyright (c) 2009-2026 [WebTranslateIt Software S.L](https://webtranslateit.com), released under the MIT License.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Edouard Briere
 bindir: bin
 cert_chain: []
-date: 2025-06-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A CLI tool to sync locale files with WebTranslateIt.com.
 test_files: []