web_translate_it 2.4.7 → 2.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37656492f7a6e8dc4217d6f84799a141f9bc30c2
-  data.tar.gz: 9590f016fa7a25b0453435b06e379566331ae315
+SHA256:
+  metadata.gz: '088a8a2578209bdefd6abbdc9989c29c27da69df2a4ebf57ff7e89aeddc454fe'
+  data.tar.gz: 45428f99e5b9aef34759d7c3c0089cbb843cb6fe298102855823156d8501b4b1
 SHA512:
-  metadata.gz: e9a52a91a082f0ef0906319993b13926e47df20997cfc1aa9775032c4a3d21a2f95d1f784c660b2b3fcbf97448b4e24b2c32ab9b6af3a1794c1070e2a298b9d7
-  data.tar.gz: adcd82f7ce617746a63b6c3dbf838a890c76cbb300b6a205b6a96188a4fca96671d147f49c92f564680ae0ceb74c3e55099a1724fdcd31b2d12f761305e510ba
+  metadata.gz: 15e13a2794cee9a705ad276b8c4d04452fdff2db386b1ec1766c69e3044df1c5258e7e682b981c6c0ce568d83e91af9125ca35b10eb7aedee191744f60b176e2
+  data.tar.gz: 626bda04b619653a15122cd0d41214f2d4cdf7612680c8f378906447c0ce9c6017ec6472189ac12dbcc314b1a370efb8c7f50081a906131a2ec146211b62a783

data/bin/wti

@@ -2,7 +2,7 @@
 
 $PROGRAM_NAME = 'wti'
 
-require 'trollop'
+require 'optimist'
 require 'web_translate_it'
 
 show_commands = <<-EOS
@@ -14,6 +14,7 @@ The most commonly used wti commands are:
    match       Display matching of local files with File Manager
    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
    addlocale   Add a new locale to the project
    rmlocale    Delete a locale from a project
    status      Fetch and display project statistics
@@ -24,8 +25,8 @@ See `wti <command> --help` for more information on a specific command.
 [options] are:
 EOS
 
-SUB_COMMANDS = %w(pull push match add addlocale status st init)
-global_options = Trollop::options do
+SUB_COMMANDS = %w(pull push match add rm mv addlocale rmlocale status st init)
+global_options = Optimist::options do
   stop_on SUB_COMMANDS
   banner show_commands
   version "wti version #{WebTranslateIt::Util.version}"
@@ -34,76 +35,82 @@ end
 command = ARGV.shift # get the subcommand
 command_options = case command
   when "pull"
-    Trollop::options do
+    Optimist::options do
       banner <<-EOS
 wti pull [filename] - Pull target language file(s)
 [options] are:
 EOS
-      opt :locale, "ISO code of locale(s) to pull", :type => :string
+      opt :locale, "ISO code of locale(s) to pull", type: :string
       opt :all,    "Pull all files"
       opt :force,  "Force pull (bypass conditional requests to WTI)"
-      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :debug,  "Display debug information"
     end
   when "push"
-    Trollop::options do
+    Optimist::options do
       banner <<-EOS
 wti push [filename] - Push master language file(s)
 [options] are:
 EOS
-      opt :locale, "ISO code of locale(s) to push", :type => :string
+      opt :locale, "ISO code of locale(s) to push", type: :string
       opt :target, "Upload all target files"
       opt :force,  "Force push (bypass conditional requests to WTI)"
       opt :low_priority, "WTI will process this file with a low priority"
       opt :merge,  "Force WTI to merge this file"
       opt :ignore_missing, "Force WTI to not obsolete missing strings"
       opt :minor, "Minor Changes. When pushing a master file, prevents target translations to be flagged as `to_verify`."
-      opt :label,  "Apply a label to the changes", :type => :string
-      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
+      opt :label,  "Apply a label to the changes", type: :string
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :all,    "DEPRECATED -- See `wti push --target` instead"
       opt :debug,  "Display debug information"
     end
   when "add"
-    Trollop::options do
+    Optimist::options do
       banner "wti add filename - Create and push a new master language file"
       opt :low_priority, "WTI will process this file with a low priority"
-      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :debug,  "Display debug information"
     end
   when "rm"
-    Trollop::options do
+    Optimist::options do
       banner "wti rm filename - Delete a master language file"
-      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :debug,  "Display debug information"
     end
+  when "mv"
+    Optimist::options do
+      banner "wti mv filename - Moves a master language file and its target files"
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
+      opt :debug, "Display debug information"
+    end
   when "addlocale"
-    Trollop::options do
+    Optimist::options do
       banner "wti addlocale localename - Add a new locale to the project"
-      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :debug,  "Display debug information"
     end
   when "rmlocale"
-    Trollop::options do
+    Optimist::options do
       banner "wti rmlocale localename Delete a locale from the project"
-      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :debug,  "Display debug information"
     end
   when "status"
-    Trollop::options do
+    Optimist::options do
       banner "wti status - Fetch and display project statistics"
-      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :debug,  "Display debug information"
     end
   when "init"
-    Trollop::options do
+    Optimist::options do
       banner "wti init [api_token] - Configure your project to sync"
-      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :debug,  "Display debug information"
     end
   when "match"
-    Trollop::options do
+    Optimist::options do
       banner "wti match - Display matching of local files with File Manager"
-      opt :config, "Path to a configuration file", :short => "-c", :default => ".wti"
+      opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :debug,  "Display debug information"
     end
   else
@@ -111,7 +118,7 @@ EOS
       puts show_commands
       exit
     else
-      Trollop::die "Unknown subcommand #{command.inspect}"
+      Optimist::die "Unknown subcommand #{command.inspect}"
     end
   end
 
@@ -122,4 +129,3 @@ rescue Interrupt => e
   puts StringUtil.failure("\nQuitting...")
   exit 1
 end
- 

data/history.md

@@ -1,3 +1,28 @@
+## Version 2.4.12 / 2021-06-30
+
+* Add ability to pass project API token as an ENV variable. You can run:
+  `export WTI_PROJECT_API_KEY=[my_api_token]`
+  `wti pull`
+
+## Version 2.4.11 / 2019-10-22
+
+* Fix for `wti pull` without parameters.
+
+## Version 2.4.10 / 2019-10-21
+
+* New command: `wti mv path/to/file.po newpath/to/file.po` to move a language file
+  both on your local working directory and on your WebTranslateIt project.
+* Fix: `wti pull something` now doesn’t pull anything if no files match what needs to be pulled. Close #151.
+
+## Version 2.4.9 / 2019-08-07
+
+* Fix issue referencing old `Trollop` library. #149
+* Fix issue with SSL certificates. If you encounter any issues you will need to update your CA certificates: https://github.com/AtelierConvivialite/webtranslateit/wiki/Update-CA-certificates
+
+## Version 2.4.8 / 2018-09-06
+
+* Update deprecated gem `Trollop` to `Optimist`.
+
 ## Version 2.4.7 / 2018-03-28
 
 * Add an option to .wti file to silence SSL errors.

data/lib/web_translate_it/command_line.rb

@@ -18,6 +18,8 @@ module WebTranslateIt
           message = "Creating master files"
         when 'rm'
           message = "Deleting files"
+        when 'mv'
+          message = "Moving files"
         when 'addlocale'
           message = "Adding locale"
         when 'rmlocale'
@@ -44,7 +46,7 @@ module WebTranslateIt
       parameters.each do |parameter|
         found_files += files.find_all{ |file| File.fnmatch(parameter, file.file_path) }
       end
-      files = found_files if found_files.any?
+      files = found_files if parameters.any?
       files = files.uniq.sort{ |a,b| a.file_path <=> b.file_path }
       if files.size == 0
         puts "No files to pull."
@@ -111,7 +113,7 @@ module WebTranslateIt
         to_add = parameters.reject{ |param| added.include?(File.expand_path(param))}
         if to_add.any?
           to_add.each do |param|
-            file = TranslationFile.new(nil, param, nil, configuration.api_key)
+            file = TranslationFile.new(nil, param.gsub(/ /, "\\ "), nil, configuration.api_key)
             success = file.create(http, command_options.low_priority)
             complete_success = false if !success
           end
@@ -127,26 +129,77 @@ module WebTranslateIt
       STDOUT.sync = true
       if parameters == []
         puts StringUtil.failure("Error: You must provide the path to the master file to remove.")
-        puts "Usage: wti path/to/rm master_file_1 path/to/master_file_2 ..."
+        puts "Usage: wti rm path/to/master_file_1 path/to/master_file_2 ..."
         exit
       end
       WebTranslateIt::Connection.new(configuration.api_key) do |http|
         parameters.each do |param|
           if Util.ask_yes_no("Are you sure you want to delete the master file #{param}?\nThis will also delete its target files and translations.", false)
-            configuration.files.find_all{ |file| file.file_path == param }.each do |master_file|
-              master_file.delete(http)
-              # delete files
-              success = File.delete(master_file.file_path) if File.exists?(master_file.file_path)
-              complete_success = false if !success
-              configuration.files.find_all{ |file| file.master_id == master_file.id }.each do |target_file|
-                success = File.delete(target_file.file_path) if File.exists?(target_file.file_path)
+            files = configuration.files.find_all{ |file| file.file_path == param }
+            if files.any?
+              files.each do |master_file|
+                master_file.delete(http)
+                # delete files
+                if File.exists?(master_file.file_path)
+                  success = File.delete(master_file.file_path)
+                  puts StringUtil.success("Deleted master file #{master_file.file_path}.") if success
+                end
                 complete_success = false if !success
+                configuration.files.find_all{ |file| file.master_id == master_file.id }.each do |target_file|
+                  if File.exists?(target_file.file_path)
+                    success = File.delete(target_file.file_path)
+                    puts StringUtil.success("Deleted target file #{target_file.file_path}.") if success
+                  else
+                    puts StringUtil.failure("Target file #{target_file.file_path} doesn’t exist locally")
+                  end
+                  complete_success = false if !success
+                end
               end
+              puts StringUtil.success("All done.") if complete_success
+            else
+              puts StringUtil.failure("#{param}: File doesn’t exist on project.")
+            end
+          end
+        end
+      end
+      complete_success
+    end
+    
+    def mv
+      complete_success = true
+      STDOUT.sync = true
+      if parameters.count != 2
+        puts StringUtil.failure("Error: You must provide the source path and destination path of the master file to move.")
+        puts "Usage: wti mv path/to/master_file_old_path path/to/master_file_new_path ..."
+        exit
+      end
+      source = parameters[0]
+      destination = parameters[1]
+      WebTranslateIt::Connection.new(configuration.api_key) do |http|
+        if Util.ask_yes_no("Are you sure you want to move the master file #{source} and its target files?", true)
+          configuration.files.find_all{ |file| file.file_path == source }.each do |master_file|
+            master_file.upload(http, false, false, nil, false, false, true, true, destination)
+            # move master file
+            if File.exists?(source)
+              success = File.rename(source, destination) if File.exists?(source)
+              puts StringUtil.success("Moved master file #{master_file.file_path}.") if success
+            end
+            complete_success = false if !success
+            configuration.files.find_all{ |file| file.master_id == master_file.id }.each do |target_file|
+              if File.exists?(target_file.file_path)
+                success = File.delete(target_file.file_path)
+                complete_success = false if !success
+              end
+            end
+            configuration.reload
+            configuration.files.find_all{ |file| file.master_id == master_file.id }.each do |target_file|
+              success = target_file.fetch(http)
+              complete_success = false if !success
             end
+            puts StringUtil.success("All done.") if complete_success
           end
         end
       end
-      puts StringUtil.success("Master file deleted.")
       complete_success
     end
     

data/lib/web_translate_it/configuration.rb

@@ -20,7 +20,7 @@ module WebTranslateIt
       self.path           = root_path
       self.logger         = logger
       if File.exists?(File.expand_path(path_to_config_file, self.path))
-        self.api_key        = configuration['api_key']
+        self.api_key        = ENV["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']
@@ -33,11 +33,23 @@ module WebTranslateIt
         WebTranslateIt::Connection.turn_silent_on if configuration['silence_errors']
         self.project_name = project_info['project']['name']
       else
-        puts StringUtil.failure("\nCan't find a configuration file in #{File.expand_path(path_to_config_file, self.path)}")
+        puts StringUtil.failure("\nNo configuration file found in #{File.expand_path(path_to_config_file, self.path)}")
         exit(1)
       end
     end
     
+    # Reload project data
+    #
+    def reload
+      project_info = YAML.load WebTranslateIt::Project.fetch_info(self.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
+    
     # Set the project locales from the Project API.
     # Implementation example:
     #

data/lib/web_translate_it/connection.rb

@@ -36,11 +36,6 @@ module WebTranslateIt
       http.set_debug_output($stderr) if @@debug
       begin
         http.verify_mode  = OpenSSL::SSL::VERIFY_PEER
-        if File.exists?('/etc/ssl/certs') # Ubuntu
-          http.ca_path = '/etc/ssl/certs'
-        else
-          http.ca_file = File.expand_path('../cacert.pem', __FILE__)
-        end
         @@http_connection = http.start
         yield @@http_connection if block_given?
       rescue OpenSSL::SSL::SSLError
@@ -74,4 +69,3 @@ module WebTranslateIt
     end
   end
 end
-

data/lib/web_translate_it/project.rb

@@ -8,8 +8,7 @@ module WebTranslateIt
       begin
         WebTranslateIt::Connection.new(api_key) do |http|
           request = Net::HTTP::Get.new("/api/projects/#{api_key}.yaml")
-          request.add_field("X-Client-Name", "web_translate_it")
-          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+          WebTranslateIt::Util.add_fields(request)
           response = http.request(request)
           if response.is_a?(Net::HTTPSuccess)
             return response.body
@@ -39,8 +38,7 @@ module WebTranslateIt
       begin
         WebTranslateIt::Connection.new(api_key) do |http|
           request = Net::HTTP::Get.new("/api/projects/#{api_key}/stats.yaml")
-          request.add_field("X-Client-Name", "web_translate_it")
-          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+          WebTranslateIt::Util.add_fields(request)
           return Util.handle_response(http.request(request), true)
         end
       rescue Timeout::Error
@@ -60,8 +58,7 @@ module WebTranslateIt
       tries ||= 3
       begin
         request = Net::HTTP::Post.new("/api/projects/#{Connection.api_key}/locales")
-        request.add_field("X-Client-Name", "web_translate_it")
-        request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+        WebTranslateIt::Util.add_fields(request)
         request.set_form_data({ 'id' => locale_code }, ';')
         Util.handle_response(Connection.http_connection.request(request), true)
       rescue Timeout::Error
@@ -81,8 +78,7 @@ module WebTranslateIt
       tries ||= 3
       begin
         request = Net::HTTP::Delete.new("/api/projects/#{Connection.api_key}/locales/#{locale_code}")
-        request.add_field("X-Client-Name", "web_translate_it")
-        request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+        WebTranslateIt::Util.add_fields(request)
         Util.handle_response(Connection.http_connection.request(request), true)
       rescue Timeout::Error
         puts "Request timeout. Will retry in 5 seconds."

data/lib/web_translate_it/string.rb

@@ -58,9 +58,7 @@ module WebTranslateIt
       url += '?' + HashUtil.to_params("filters" => params) unless params.empty?
 
       request = Net::HTTP::Get.new(url)
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-
+      WebTranslateIt::Util.add_fields(request)
       begin
         strings = []
         while(request) do
@@ -73,8 +71,7 @@ module WebTranslateIt
           if response["Link"] && response["Link"].include?("rel=\"next\"")
             url = response["Link"].match(/<(.*)>; rel="next"/)[1]
             request = Net::HTTP::Get.new(url)
-            request.add_field("X-Client-Name", "web_translate_it")
-            request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+            WebTranslateIt::Util.add_fields(request)
           else
             request = nil
           end
@@ -110,9 +107,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{id}.yaml")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-
+      WebTranslateIt::Util.add_fields(request)
       begin
         response = Connection.http_connection.request(request)
         return nil if response.code.to_i == 404
@@ -160,9 +155,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Delete.new("/api/projects/#{Connection.api_key}/strings/#{self.id}")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-
+      WebTranslateIt::Util.add_fields(request)
       begin
         Util.handle_response(Connection.http_connection.request(request), true, true)
       rescue Timeout::Error
@@ -194,9 +187,7 @@ module WebTranslateIt
       return translation if translation
       return nil if self.new_record
       request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/strings/#{self.id}/locales/#{locale}/translations.yaml")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-
+      WebTranslateIt::Util.add_fields(request)
       begin
         response = Util.handle_response(Connection.http_connection.request(request), true, true)
         hash = YAML.load(response)
@@ -225,9 +216,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Put.new("/api/projects/#{Connection.api_key}/strings/#{self.id}.yaml")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-      request.add_field("Content-Type", "application/json")
+      WebTranslateIt::Util.add_fields(request)
       request.body = self.to_json
       
       self.translations.each do |translation|
@@ -256,11 +245,8 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Post.new("/api/projects/#{Connection.api_key}/strings")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-      request.add_field("Content-Type", "application/json")
+      WebTranslateIt::Util.add_fields(request)
       request.body = self.to_json(true)
-
       begin
         response = YAML.load(Util.handle_response(Connection.http_connection.request(request), true, true))
         self.id = response["id"]

data/lib/web_translate_it/term.rb

@@ -49,9 +49,7 @@ module WebTranslateIt
       url += '?' + HashUtil.to_params(params) unless params.empty?
 
       request = Net::HTTP::Get.new(url)
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-
+      WebTranslateIt::Util.add_fields(request)
       begin
         terms = []
         while(request) do
@@ -64,8 +62,7 @@ module WebTranslateIt
           if response["Link"] && response["Link"].include?("rel=\"next\"")
             url = response["Link"].match(/<(.*)>; rel="next"/)[1]
             request = Net::HTTP::Get.new(url)
-            request.add_field("X-Client-Name", "web_translate_it")
-            request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+            WebTranslateIt::Util.add_fields(request)
           else
             request = nil
           end
@@ -101,9 +98,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/terms/#{term_id}.yaml")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-
+      WebTranslateIt::Util.add_fields(request)
       begin
         response = Connection.http_connection.request(request)
         return nil if response.code.to_i == 404
@@ -151,9 +146,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Delete.new("/api/projects/#{Connection.api_key}/terms/#{self.id}")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-
+      WebTranslateIt::Util.add_fields(request)
       begin
         Util.handle_response(Connection.http_connection.request(request), true, true)
       rescue Timeout::Error
@@ -185,9 +178,7 @@ module WebTranslateIt
       return translation if translation
       return nil if self.new_record
       request = Net::HTTP::Get.new("/api/projects/#{Connection.api_key}/terms/#{self.id}/locales/#{locale}/translations.yaml")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-
+      WebTranslateIt::Util.add_fields(request)
       begin
         response = Util.handle_response(Connection.http_connection.request(request), true, true)
         array = YAML.load(response)
@@ -217,10 +208,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Put.new("/api/projects/#{Connection.api_key}/terms/#{self.id}.yaml")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-      request.add_field("Content-Type", "application/json")
-          
+      WebTranslateIt::Util.add_fields(request)
       request.body = self.to_json
 
       self.translations.each do |translation|
@@ -246,10 +234,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Post.new("/api/projects/#{Connection.api_key}/terms")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-      request.add_field("Content-Type", "application/json")
-        
+      WebTranslateIt::Util.add_fields(request)
       request.body = self.to_json(true)
 
       begin

data/lib/web_translate_it/term_translation.rb

@@ -60,10 +60,7 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Post.new("/api/projects/#{Connection.api_key}/terms/#{self.term_id}/locales/#{self.locale}/translations")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-      request.add_field("Content-Type", "application/json")
-        
+      WebTranslateIt::Util.add_fields(request)
       request.body = self.to_json
 
       begin
@@ -88,12 +85,8 @@ module WebTranslateIt
       success = true
       tries ||= 3
       request = Net::HTTP::Put.new("/api/projects/#{Connection.api_key}/terms/#{self.id}/locales/#{self.locale}/translations/#{self.id}")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-      request.add_field("Content-Type", "application/json")
-        
+      WebTranslateIt::Util.add_fields(request)
       request.body = self.to_json
-
       begin
         Util.handle_response(Connection.http_connection.request(request), true, true)        
       rescue Timeout::Error

data/lib/web_translate_it/translation.rb

@@ -44,11 +44,8 @@ module WebTranslateIt
     def save
       tries ||= 3
       request = Net::HTTP::Post.new("/api/projects/#{Connection.api_key}/strings/#{self.string_id}/locales/#{self.locale}/translations")
-      request.add_field("X-Client-Name", "web_translate_it")
-      request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-      request.add_field("Content-Type", "application/json")
+      WebTranslateIt::Util.add_fields(request)
       request.body = self.to_json
-
       begin
         Util.handle_response(Connection.http_connection.request(request), true, true)
       rescue Timeout::Error

data/lib/web_translate_it/translation_file.rb

@@ -45,8 +45,7 @@ module WebTranslateIt
       if !File.exist?(self.file_path) or force or self.remote_checksum != self.local_checksum
         begin
           request = Net::HTTP::Get.new(api_url)
-          request.add_field("X-Client-Name", "web_translate_it")
-          request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+          WebTranslateIt::Util.add_fields(request)
           FileUtils.mkpath(self.file_path.split('/')[0..-2].join('/')) unless File.exist?(self.file_path) or self.file_path.split('/')[0..-2].join('/') == ""
           begin
             response = http_connection.request(request)
@@ -83,7 +82,7 @@ module WebTranslateIt
     #
     # Note that the request might or might not eventually be acted upon, as it might be disallowed when processing
     # actually takes place. This is due to the fact that language file imports are handled by background processing.
-    def upload(http_connection, merge=false, ignore_missing=false, label=nil, low_priority=false, minor_changes=false, force=false)
+    def upload(http_connection, merge=false, ignore_missing=false, label=nil, low_priority=false, minor_changes=false, force=false, rename_others=false, destination_path=nil)
       success = true
       tries ||= 3
       display = []
@@ -93,9 +92,11 @@ module WebTranslateIt
 	      if force or self.remote_checksum != self.local_checksum
           File.open(self.file_path) do |file|
             begin
-              request = Net::HTTP::Put::Multipart.new(api_url, {"file" => UploadIO.new(file, "text/plain", file.path), "merge" => merge, "ignore_missing" => ignore_missing, "label" => label, "low_priority" => low_priority, "minor_changes" => minor_changes })
-              request.add_field("X-Client-Name", "web_translate_it")
-              request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+              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?
+              params["rename_others"] = rename_others
+              request = Net::HTTP::Put::Multipart.new(api_url, params)
+              WebTranslateIt::Util.add_fields(request)
               display.push Util.handle_response(http_connection.request(request))
             rescue Timeout::Error
               puts StringUtil.failure("Request timeout. Will retry in 5 seconds.")
@@ -115,7 +116,7 @@ module WebTranslateIt
         end
         puts ArrayUtil.to_columns(display)
       else
-        puts StringUtil.failure("Can't push #{self.file_path}. File doesn't exist.")
+        puts StringUtil.failure("Can't push #{self.file_path}. File doesn't exist locally.")
       end
       return success
     end
@@ -141,8 +142,7 @@ module WebTranslateIt
         File.open(self.file_path) do |file|
           begin
             request = Net::HTTP::Post::Multipart.new(api_url_for_create, { "name" => self.file_path, "file" => UploadIO.new(file, "text/plain", file.path), "low_priority" => low_priority })
-            request.add_field("X-Client-Name", "web_translate_it")
-            request.add_field("X-Client-Version", WebTranslateIt::Util.version)
+            WebTranslateIt::Util.add_fields(request)
             display.push Util.handle_response(http_connection.request(request))
             puts ArrayUtil.to_columns(display)
           rescue Timeout::Error
@@ -159,7 +159,7 @@ module WebTranslateIt
           end
         end
       else
-        puts StringUtil.failure("\nFile #{self.file_path} doesn't exist!")
+        puts StringUtil.failure("\nFile #{self.file_path} doesn't exist locally!")
       end
       return success
     end
@@ -172,28 +172,25 @@ module WebTranslateIt
       display = []
       display.push file_path
       if File.exists?(self.file_path)
-        File.open(self.file_path) do |file|
-          begin
-            request = Net::HTTP::Delete.new(api_url_for_delete)
-            request.add_field("X-Client-Name", "web_translate_it")
-            request.add_field("X-Client-Version", WebTranslateIt::Util.version)
-            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
-              sleep(5)
-              retry
-            else
-              success = false
-            end
-          rescue
-            display.push StringUtil.failure("An error occured: #{$!}")
+        begin
+          request = Net::HTTP::Delete.new(api_url_for_delete)
+          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
+            sleep(5)
+            retry
+          else
             success = false
           end
+        rescue
+          display.push StringUtil.failure("An error occured: #{$!}")
+          success = false
         end
       else
-        puts StringUtil.failure("\nFile #{self.file_path} doesn't exist!")
+        puts StringUtil.failure("\nMaster file #{self.file_path} doesn't exist locally!")
       end
       return success
     end

data/lib/web_translate_it/util.rb

@@ -40,6 +40,12 @@ module WebTranslateIt
       end
     end
     
+    def self.add_fields(request)
+      request.add_field("X-Client-Name", "web_translate_it")
+      request.add_field("X-Client-Version", version)
+      request.add_field("Content-Type", "application/json")
+    end
+    
     ##
     # Ask a question. Returns a true for yes, false for no, default for nil.
     

data/license

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2014 Atelier Convivialite
+Copyright (c) 2009-2019 WebTranslateIt Software S.L
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/readme.md

@@ -7,7 +7,7 @@
 
 wti lets you easily sync your language files with [WebTranslateIt.com](https://webtranslateit.com), a web-based tool to translation software.
 
-<img src="https://s3.amazonaws.com/f.cl.ly/items/27192V1K263K2O433h2g/webtranslateit_com_%E2%80%94_edouard_Edouards-MacBook-Pro-2____code_webtranslateit_com_%E2%80%94___anslateit_com_%E2%80%94_zsh_%E2%80%94_80%C3%9740.png" alt="WebTranslateIt Synchronization Tool" width="500px">
+<img src="http://edouard.baconfile.com.s3.us-east-1.amazonaws.com/web_translate_it/wti4.png" alt="WebTranslateIt Synchronization Tool" width="500px">
 
 ### wti...
 
@@ -276,4 +276,4 @@ fr: 100% translated, 100% completed.
 
 # License
 
-Copyright (c) 2009-2018 Atelier Convivialité, released under the MIT License.
+Copyright (c) 2009-2021 WebTranslateIt Software S.L, released under the MIT License.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.12
 platform: ruby
 authors:
 - Edouard Briere
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,6 @@ files:
 - history.md
 - lib/web_translate_it.rb
 - lib/web_translate_it/auto_fetch.rb
-- lib/web_translate_it/cacert.pem
 - lib/web_translate_it/command_line.rb
 - lib/web_translate_it/configuration.rb
 - lib/web_translate_it/connection.rb
@@ -125,7 +124,7 @@ homepage: https://webtranslateit.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - readme.md
@@ -142,9 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: A CLI to sync locale files with WebTranslateIt.com.
 test_files:

data/lib/web_translate_it/cacert.pem

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
-CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
-nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
-43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
-T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
-gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
-TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
-DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
-hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
-06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
-PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
-YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----