web_translate_it 2.4.11 → 2.5.2

checksums.yaml

@@ -1,7 +1,4 @@
 ---
-SHA256:
-  metadata.gz: 66a5c317674bbe2ed5e34456a69f2a4a927d7574d12e6131709c947acb8fa3bb
-  data.tar.gz: 262ca5d895379b6f43a3541917b81f8844d9d3d5d72db86f63fc0388757d703a
 SHA512:
-  metadata.gz: 54d07038ade4c4fa56dc44bd63acd152c22a97ffacf1769915f5728a39b0b45f2bfa9c3baba78fc0dda24c7a087ae7b7a19fdf4ba85b3b025c4f898e59ce6189
-  data.tar.gz: 5fcc2ea6e361b6c31102205a97fce63026f91d1a48d200eb832d3ef81e4a94581df295a9561ec09ddfdb920c5232ff37371398e19ef8d65ccff6c3695830dd2f
+  metadata.gz: 7ede92a93df822b3dd6044a0cfda87771b5d3079920fd46499ed33f88d547aa86b35ce46fef709b05e2c8561d9b37f17dd1e6f620ab8f52b24cf74482f756215
+  data.tar.gz: 9502c4c524303391e3ebc0633c76a9e1f21f011ae82f442bea078b2af5294aa15b0bd2b16491dae0a47a3bcd10c3111d32ed2d8e1648f0eda4d197202364a1c5

data/bin/wti

@@ -40,7 +40,7 @@ command_options = case command
 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, space-separated", 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"
@@ -52,7 +52,7 @@ 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, space-separated", 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"
@@ -97,7 +97,7 @@ EOS
     end
   when "status"
     Optimist::options do
-      banner "wti status - Fetch and display project statistics"
+      banner "wti status - Fetch and display project statistics.\nReturns 100 if untranslated segments exist in project\nReturns 101 if unproofread segments exist in project."
       opt :config, "Path to a configuration file", short: "-c", default: ".wti"
       opt :debug,  "Display debug information"
     end

data/history.md

@@ -1,3 +1,37 @@
+## Version 2.5.2 / 2022-02-02
+
+* Fix compatibility issues with rubies < 2.6.
+
+## Version 2.5.1 / 2021-11-15
+
+* Ruby 3.1.0 compatible.
+
+## Version 2.5.0 / 2021-11-15
+
+* Display files that are being updated on WebTranslateIt but are not ready to be downloaded by a `*`.
+
+``` bash
+~/Desktop/test% wti pull 
+# Pulling files on test 3
+*cs-CZ.de.yml                                       | 65a7fc8..65a7fc8  Skipped
+ en.yml                                             | ffd8096..ffd8096  Skipped
+ i18nextv4.de.json                                  | 142aca7..142aca7  Skipped
+*cs-CZ.yml                                          | 42c32a3..42c32a3  Skipped
+ de.yml                                             | 9dda491..9dda491  Skipped
+ test.de.json                                       | 48a9c13..48a9c13  Skipped
+ test.de.txt                                        | 8f305f3..8f305f3  Skipped
+ test.json                                          | 7a9478f..7a9478f  Skipped
+ i18nextv4.json                                     | 84d6cdf..8776cb3  OK
+ test.txt                                           | 8f305f3..7a1a5db  OK
+```
+* Improve help on `wti status` documentation.
+
+## 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.

data/lib/web_translate_it/command_line.rb

@@ -113,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

data/lib/web_translate_it/configuration.rb

@@ -20,12 +20,16 @@ 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']
         self.after_push     = configuration['after_push']
-        project_info        = YAML.load WebTranslateIt::Project.fetch_info(api_key)
+        project_info = 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
         set_locales_to_ignore(configuration)
         set_locales_needed(configuration)
         set_files(project_info['project'])
@@ -71,7 +75,7 @@ module WebTranslateIt
         if project_file['name'].nil? or project_file['name'].strip == ''
           puts "File #{project_file['id']} not set up"
         else
-          self.files.push TranslationFile.new(project_file['id'], project_file['name'], project_file['locale_code'], self.api_key, project_file['updated_at'], project_file['hash_file'], project_file['master_project_file_id'])
+          self.files.push TranslationFile.new(project_file['id'], project_file['name'], project_file['locale_code'], self.api_key, project_file['updated_at'], project_file['hash_file'], project_file['master_project_file_id'], project_file['fresh'])
         end
       end
     end

data/lib/web_translate_it/translation_file.rb

@@ -12,9 +12,9 @@ module WebTranslateIt
     require 'time'
     require 'fileutils'
     
-    attr_accessor :id, :file_path, :locale, :api_key, :updated_at, :remote_checksum, :master_id
+    attr_accessor :id, :file_path, :locale, :api_key, :updated_at, :remote_checksum, :master_id, :fresh
     
-    def initialize(id, file_path, locale, api_key, updated_at = nil, remote_checksum = "", master_id = nil)
+    def initialize(id, file_path, locale, api_key, updated_at = nil, remote_checksum = "", master_id = nil, fresh = nil)
       self.id         = id
       self.file_path  = file_path
       self.locale     = locale
@@ -22,6 +22,7 @@ module WebTranslateIt
       self.updated_at = updated_at
       self.remote_checksum = remote_checksum
       self.master_id  = master_id
+      self.fresh      = fresh
     end
     
     # Fetch a language file.
@@ -40,7 +41,11 @@ module WebTranslateIt
       success = true
       tries ||= 3
       display = []
-      display.push(self.file_path)
+      if self.fresh
+        display.push(self.file_path)
+      else
+        display.push("*#{self.file_path}")
+      end
       display.push "#{StringUtil.checksumify(self.local_checksum.to_s)}..#{StringUtil.checksumify(self.remote_checksum.to_s)}"
       if !File.exist?(self.file_path) or force or self.remote_checksum != self.local_checksum
         begin

data/lib/web_translate_it/util/array_util.rb

@@ -1,6 +1,10 @@
 class ArrayUtil
   def self.to_columns(arr)
-    " #{StringUtil.backward_truncate(arr[0])} | #{arr[1]}  #{arr[2]}\n"
+    if arr[0][0] == "*"
+      "*#{StringUtil.backward_truncate(arr[0][1..-1])} | #{arr[1]}  #{arr[2]}\n"
+    else
+      " #{StringUtil.backward_truncate(arr[0])} | #{arr[1]}  #{arr[2]}\n"
+    end
   end
 
   def self.chunk(arr, pieces=2)

data/readme.md

@@ -1,9 +1,9 @@
 # WebTranslateIt Synchronization Tool : wti
 
-[RubyDoc](http://rubydoc.info/github/AtelierConvivialite/webtranslateit/) | 
-[Report a bug](http://github.com/AtelierConvivialite/webtranslateit/issues) | 
-[Support](https://webtranslateit.com/support) |
-[WebTranslateIt.com Homepage](https://webtranslateit.com)
+[RubyDoc](https://rubydoc.info/github/webtranslateit/webtranslateit/master) | 
+[Report a bug](https://github.com/webtranslateit/webtranslateit/issues) | 
+[Support](https://webtranslateit.com/en/support) |
+[WebTranslateIt.com Homepage](https://webtranslateit.com/en)
 
 wti lets you easily sync your language files with [WebTranslateIt.com](https://webtranslateit.com), a web-based tool to translation software.
 
@@ -17,14 +17,14 @@ wti lets you easily sync your language files with [WebTranslateIt.com](https://w
 ### Optionally, wti does...
 
 * include a rack middleware you can use in your Rails app to automatically fetch new translations from WebTranslateIt.com.
-* include libraries you can use to programmatically fetch your segments from WebTranslateIt.com. See [Extras](https://github.com/AtelierConvivialite/webtranslateit/wiki/Extras)
-* include a web interface for your translation team to update your language files. [Learn more on the web_translate_it_server project page](https://github.com/AtelierConvivialite/web_translate_it_server).
+* include libraries you can use to programmatically fetch your segments from WebTranslateIt.com. See [Extras](https://github.com/webtranslateit/webtranslateit/wiki/Extras)
+* include a web interface for your translation team to update your language files. [Learn more on the web_translate_it_server project page](https://github.com/webtranslateit/web_translate_it_server).
 
 ---
 
 ## Installation
 
-You will also need ruby to run `wti`. On Linux or a Mac, it’s already installed. Install [RubyInstaller](http://rubyinstaller.org/) if you’re using Windows. [See detailed installation instructions for Windows users](https://github.com/AtelierConvivialite/webtranslateit/wiki/Install-wti-on-Windows).
+You will also need ruby to run `wti`. On Linux or a Mac, it’s already installed. Install [RubyInstaller](http://rubyinstaller.org/) if you’re using Windows. [See detailed installation instructions for Windows users](https://github.com/webtranslateit/webtranslateit/wiki/Install-wti-on-Windows).
 
 ``` bash
 $ gem install web_translate_it
@@ -213,7 +213,7 @@ There are 4 hooks:
 * `before_push`
 * `after_push`
 
-Check the [sample `.wti`](https://github.com/AtelierConvivialite/webtranslateit/blob/master/examples/.wti#L9..L13) file for implementation.
+Check the [sample `.wti`](https://github.com/webtranslateit/webtranslateit/blob/master/examples/.wti#L9..L13) file for implementation.
 
 ## Exit codes
 
@@ -276,4 +276,4 @@ fr: 100% translated, 100% completed.
 
 # License
 
-Copyright (c) 2009-2019 WebTranslateIt Software S.L, released under the MIT License.
+Copyright (c) 2009-2022 [WebTranslateIt Software S.L](https://webtranslateit.com), released under the MIT License.

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
+
 require File.expand_path('../../lib/web_translate_it', __FILE__)
 require 'rspec'
 

data/spec/web_translate_it/string_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
 describe WebTranslateIt::String do
-  
-  let(:api_key) { "19875cfdd4f169b33e0ffab32cfb0bbb9e33d653" }
-  
+
+  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
@@ -31,7 +31,7 @@ describe WebTranslateIt::String do
         string.delete
       end
     end
-    
+
     it "should update an existing String" do
       WebTranslateIt::Connection.new(api_key) do
         string = WebTranslateIt::String.new({ "key" => "bacony" })
@@ -43,11 +43,11 @@ describe WebTranslateIt::String do
         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
@@ -60,20 +60,20 @@ describe WebTranslateIt::String do
         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"
@@ -83,7 +83,7 @@ describe WebTranslateIt::String do
       end
     end
   end
-  
+
   describe "#delete" do
     it "should delete a String" do
       string = WebTranslateIt::String.new({ "key" => "bacon" })
@@ -91,53 +91,48 @@ describe WebTranslateIt::String 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" => "bacon" })
+        string1 = WebTranslateIt::String.new({ "key" => "one two three" })
         string1.save
-        string2 = WebTranslateIt::String.new({ "key" => "tart" })
+        string2 = WebTranslateIt::String.new({ "key" => "four five six" })
         string2.save
-        string3 = WebTranslateIt::String.new({ "key" => "bacon tart" })
+        string3 = WebTranslateIt::String.new({ "key" => "six seven eight" })
         string3.save
-      
-        strings = WebTranslateIt::String.find_all({ "key" => "bacon" })
-        strings.count.should == 2
-        strings[0].key.should == "bacon"
-        strings[1].key.should == "bacon tart"
-        
-        strings = WebTranslateIt::String.find_all({ :key => "bacon" })
+
+        strings = WebTranslateIt::String.find_all({ "key" => "six" })
         strings.count.should == 2
-        strings[0].key.should == "bacon"
-        strings[1].key.should == "bacon tart"
+        strings[0].key.should == "four five six"
+        strings[1].key.should == "six seven eight"
 
-        strings = WebTranslateIt::String.find_all({ "key" => "tart" })
+        strings = WebTranslateIt::String.find_all({ :key => "six" })
         strings.count.should == 2
-        strings[0].key.should == "tart"
-        strings[1].key.should == "bacon tart"
-        
-        strings = WebTranslateIt::String.find_all({ "key" => "bacon tart" })
+        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 == "bacon tart"
-        
-        string1.delete
-        string2.delete
-        string3.delete
+        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" => "bacon", "translations" => [translation] })
+      string = WebTranslateIt::String.new({ "key" => "greetings", "translations" => [translation] })
       WebTranslateIt::Connection.new(api_key) do
         string.save
         string_fetched = WebTranslateIt::String.find(string.id)
@@ -147,9 +142,9 @@ describe WebTranslateIt::String do
         string.delete
       end
     end
-    
+
     it "should not return a stale object" do
-      string = WebTranslateIt::String.new({ :key => "bacon" })
+      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

data/spec/web_translate_it/term_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe WebTranslateIt::Term do
-  
-  let(:api_key) { "19875cfdd4f169b33e0ffab32cfb0bbb9e33d653" }
-  
+
+  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"})
@@ -17,7 +17,7 @@ describe WebTranslateIt::Term do
       term.text.should == "bacon"
     end
   end
-  
+
   describe "#save" do
     it "should create a new Term" do
       WebTranslateIt::Connection.new(api_key) do
@@ -31,10 +31,10 @@ describe WebTranslateIt::Term do
         term.delete
       end
     end
-    
+
     it "should update an existing Term" do
       WebTranslateIt::Connection.new(api_key) do
-        term = WebTranslateIt::Term.new({ "text" => "Term", "description" => "A description" })
+        term = WebTranslateIt::Term.new({ "text" => "Term 2", "description" => "A description" })
         term.save
         term.text = "A Term"
         term.save
@@ -43,11 +43,11 @@ describe WebTranslateIt::Term do
         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
@@ -59,20 +59,20 @@ describe WebTranslateIt::Term do
         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 == "Bonjour"
@@ -81,7 +81,7 @@ describe WebTranslateIt::Term do
       end
     end
   end
-  
+
   describe "#delete" do
     it "should delete a Term" do
       term = WebTranslateIt::Term.new({ "text" => "bacon" })
@@ -89,27 +89,27 @@ describe WebTranslateIt::Term 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
-        term1 = WebTranslateIt::Term.new({ "text" => "bacon" })
+        term1 = WebTranslateIt::Term.new({ "text" => "greeting 1" })
         term1.save
-        term2 = WebTranslateIt::Term.new({ "text" => "tart" })
+        term2 = WebTranslateIt::Term.new({ "text" => "greeting 2" })
         term2.save
-        term3 = WebTranslateIt::Term.new({ "text" => "bacon tart" })
+        term3 = WebTranslateIt::Term.new({ "text" => "greeting 3" })
         term3.save
-      
+
         terms = WebTranslateIt::Term.find_all
         terms.count.should == 3
-        
+
         term1.delete
         term2.delete
         term3.delete

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.4.11
+  version: 2.5.2
 platform: ruby
 authors:
 - Edouard Briere
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +138,7 @@ homepage: https://webtranslateit.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - readme.md
@@ -141,9 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: A CLI to sync locale files with WebTranslateIt.com.
 test_files: