web_translate_it 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37656492f7a6e8dc4217d6f84799a141f9bc30c2
-  data.tar.gz: 9590f016fa7a25b0453435b06e379566331ae315
+  metadata.gz: 9deef6447dcb281c15e92dedce6223314e18b8c1
+  data.tar.gz: 60e47ba7afe0ad87462c9ac28f8b2b83ae5caa38
 SHA512:
-  metadata.gz: e9a52a91a082f0ef0906319993b13926e47df20997cfc1aa9775032c4a3d21a2f95d1f784c660b2b3fcbf97448b4e24b2c32ab9b6af3a1794c1070e2a298b9d7
-  data.tar.gz: adcd82f7ce617746a63b6c3dbf838a890c76cbb300b6a205b6a96188a4fca96671d147f49c92f564680ae0ceb74c3e55099a1724fdcd31b2d12f761305e510ba
+  metadata.gz: 1094a19a6d0f19cdf4a19335e2f4034724d81338bae26f837acf2780dc9be539f446d40e3e0f8c72c7faef75d83530d9256963f5de841f8077ed67bd8606b43d
+  data.tar.gz: 709988816f70f68dcc94aa3c9e2075aecd8e2a43577da4e9ce16be3911c9ea35ef2743c3b6f9af4b344d0ac080b4c972d6036ee8b2f1e14ccaa86d745fdc7784

data/bin/wti

@@ -2,7 +2,7 @@
 
 $PROGRAM_NAME = 'wti'
 
-require 'trollop'
+require 'optimist'
 require 'web_translate_it'
 
 show_commands = <<-EOS
@@ -18,14 +18,15 @@ The most commonly used wti commands are:
    rmlocale    Delete a locale from a project
    status      Fetch and display project statistics
    init        Configure your project to sync
+   configuser  Configure your user email
 
 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 addlocale status st init configuser)
+global_options = Optimist::options do
   stop_on SUB_COMMANDS
   banner show_commands
   version "wti version #{WebTranslateIt::Util.version}"
@@ -34,7 +35,7 @@ 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:
@@ -46,7 +47,7 @@ EOS
       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:
@@ -64,44 +65,49 @@ EOS
       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 :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 :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 :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 :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 :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 :debug,  "Display debug information"
     end
+  when "configuser"
+    Optimist::options do
+      banner "wti configuser - Configure your user email"
+      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 :debug,  "Display debug information"

data/history.md

@@ -1,3 +1,7 @@
+## 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/connection.rb

@@ -74,4 +74,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)
@@ -94,8 +93,7 @@ module WebTranslateIt
           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)
+              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.")
@@ -141,8 +139,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
@@ -175,8 +172,7 @@ module WebTranslateIt
         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)
+            WebTranslateIt::Util.add_fields(request)
             display.push Util.handle_response(http_connection.request(request))
             puts ArrayUtil.to_columns(display)
           rescue Timeout::Error

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.
     

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.8
 platform: ruby
 authors:
 - Edouard Briere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-09-06 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