web_translate_it 2.5.1 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb952e216ebe7b504b0c40dfcc1659795e527b0822c4d952cdba9d251b0f32b5
-  data.tar.gz: 685717f0eb53fe6e5f42c35896cedcfeeb39555e8e7eaf0a4fad7caa3edf237a
+  metadata.gz: bc4a1374f3018354d15fea035305984fa839a6786526cc88e8d3151f176d8f79
+  data.tar.gz: fbc8868713a8d691169eea12318bb0c288853c25cedf24ddaaac10b44b461d09
 SHA512:
-  metadata.gz: 49894fbc42db771158b68e233bbfc1e197d4eb1299f47a25270d4fdd3dbccd846e2018e86b291109bd4195bcdab31188fc518d8bbbf3f65cbd33deb2d0bd6a18
-  data.tar.gz: 1f78011a382d2d4e8ffc9e21135c6e2899420d04403fa3481ce1ced2a9194610285abcec8b78ae8214519cde9106048f2fe1c4ea1e6b1a257e7f4739fe3e1886
+  metadata.gz: c8ec5eae4ac2941ca048cc798fb4ae5cb5c539345d11286d9aa35a68dca5e35cc3e138cbcb95c0ebf5d8adaffda69938cf41613762612a9ba33836e6f95f2871
+  data.tar.gz: 20af38470f30300f01d260e17d15d16ef90597b72d5e1e5f5d9869cf70a192c65d84f3dc9771ada30264f65c75ebfb0855da9b9f0e94e966cfc908cc872b3eda

data/history.md

@@ -1,3 +1,15 @@
+## Version 2.5.4 / 2022-03-08
+
+* Better support for `before_pull`, `after_pull`, `before_push`, `after_push` hooks. They now display the command output, and write an error message if the exit status of the command was not successful.
+
+## Version 2.5.3 / 2022-02-04
+
+* Properly fix ruby compatibility issues.
+
+## 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.

data/lib/web_translate_it/command_line.rb

@@ -36,7 +36,7 @@ module WebTranslateIt
     def pull
       complete_success = true
       STDOUT.sync = true
-      `#{configuration.before_pull}` if configuration.before_pull
+      before_pull_hook
       # Selecting files to pull
       files = []
       fetch_locales_to_pull.each do |locale|
@@ -70,15 +70,37 @@ module WebTranslateIt
         threads.each { |thread| thread.join }
         time = Time.now - time
         puts "Pulled #{files.size} files at #{(files.size/time).round} files/sec, using #{n_threads} threads."
-        `#{configuration.after_pull}` if configuration.after_pull
+        after_pull_hook
         complete_success
       end
     end
-    
+
+    def before_pull_hook
+      if configuration.before_pull
+        output = `#{configuration.before_pull}`
+        if $?.success?
+          puts output
+        else
+          abort 'Error: exit code for before_pull command is not zero'
+        end
+      end
+    end
+
+    def after_pull_hook
+      if configuration.after_pull
+        output = `#{configuration.after_pull}`
+        if $?.success?
+          puts output
+        else
+          abort 'Error: exit code for after_pull command is not zero'
+        end
+      end
+    end
+
     def push
       complete_success = true
       STDOUT.sync = true
-      `#{configuration.before_push}` if configuration.before_push
+      before_push_hook
       WebTranslateIt::Connection.new(configuration.api_key) do |http|
         fetch_locales_to_push(configuration).each do |locale|
           if parameters.any?
@@ -96,9 +118,31 @@ module WebTranslateIt
           end
         end
       end
-      `#{configuration.after_push}` if configuration.after_push
+      after_push_hook
       complete_success
     end
+
+    def before_push_hook
+      if configuration.before_push
+        output = `#{configuration.before_push}`
+        if $?.success?
+          puts output
+        else
+          abort 'Error: exit code for before_push command is not zero'
+        end
+      end
+    end
+
+    def after_push_hook
+      if configuration.after_push
+        output = `#{configuration.after_push}`
+        if $?.success?
+          puts output
+        else
+          abort 'Error: exit code for after_push command is not zero'
+        end
+      end
+    end
     
     def add
       complete_success = true

data/lib/web_translate_it/configuration.rb

@@ -25,7 +25,11 @@ module WebTranslateIt
         self.after_pull     = configuration['after_pull']
         self.before_push    = configuration['before_push']
         self.after_push     = configuration['after_push']
-        project_info        = YAML.safe_load WebTranslateIt::Project.fetch_info(api_key), permitted_classes: [Time]
+        project_info = if RUBY_VERSION >= '3.1.0'
+          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'])

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-2021 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/term_spec.rb

@@ -53,8 +53,8 @@ describe WebTranslateIt::Term do
         term.save
         term_fetched = WebTranslateIt::Term.find(term.id)
         term_fetched.translation_for("fr").should_not be_nil
-        term_fetched.translation_for("fr")[0].text.should == "Bonjour"
-        term_fetched.translation_for("fr")[1].text.should == "Salut"
+        term_fetched.translation_for("fr")[0].text.should == "Salut"
+        term_fetched.translation_for("fr")[1].text.should == "Bonjour"
         term_fetched.translation_for("es").should be_nil
         term.delete
       end
@@ -75,8 +75,8 @@ describe WebTranslateIt::Term do
 
         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"
-        term_fetched.translation_for("fr")[1].text.should == "Salut"
+        term_fetched.translation_for("fr")[0].text.should == "Salut"
+        term_fetched.translation_for("fr")[1].text.should == "Bonjour"
         term.delete
       end
     end
@@ -100,6 +100,9 @@ describe WebTranslateIt::Term do
   describe "#find_all" do
     it "should fetch many terms" do
       WebTranslateIt::Connection.new(api_key) do
+        terms = WebTranslateIt::Term.find_all
+        count = terms.count
+        
         term1 = WebTranslateIt::Term.new({ "text" => "greeting 1" })
         term1.save
         term2 = WebTranslateIt::Term.new({ "text" => "greeting 2" })
@@ -108,7 +111,7 @@ describe WebTranslateIt::Term do
         term3.save
 
         terms = WebTranslateIt::Term.find_all
-        terms.count.should == 3
+        count - terms.count.should == 3
 
         term1.delete
         term2.delete

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_translate_it
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.4
 platform: ruby
 authors:
 - Edouard Briere
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-03-08 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
@@ -141,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A CLI to sync locale files with WebTranslateIt.com.