i18n-migrations 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb3ceb9342d7783602ef5140a652c478be028f86ef9c00189716e19a0510d906
-  data.tar.gz: 77d1390534f26893cffaccee141d87eda064c3e0893b7388e6afcf282637fe8d
+  metadata.gz: 81cdab3c95ecdf3eadada65b83f94e51733cca841bda8862def4150f3ca182ce
+  data.tar.gz: bcce6ac35266718cc3e49ec7289cba1dedd8f0e012c916a82c1fe323390034a7
 SHA512:
-  metadata.gz: 0b7ea99af87e5e72d377e163ee56de47b71d74c118032fd1528f63ee5b170f046b9562ed6d5767ee64d38f806e69b5496e1763cd2c02ee59a1145e7723e8fb57
-  data.tar.gz: da8afa4e69a472f59cad457800b448b1bd00d63b6b34912045649238dace69ee7088c26eafb22ce05e1d21fb5e5ee3ce907814e389ce91e2bf40be18bb2851fb
+  metadata.gz: 65f1fd2c2b047d76b74f6ca85699d8ee5e618b9d35a8e4d24d19a42c851833cfd4cc4f22668f31aecc9eaa2806fffa4801e262ac6193944497fadc48c3c4dcc3
+  data.tar.gz: e041b073626e8546226677bfb927a85a6c3235a233efe33a992b6e7dcb1da2f67c02469552b328b09e6b06ca642fd8579ec378fa08d605a5086342ec75cce5b6

data/bin/i18n-migrate

@@ -10,59 +10,60 @@ def extract_option(name)
   !!ARGV.delete(name)
 end
 
-case ARGV.shift
-when 'setup'
-  puts 'Where should we create a default config file? [.]'
-  dir = gets.chomp
-  dir = dir == '' ? '.' : dir
-  file = I18n::Migrations::Config.copy_default_config_file(dir)
-
-  puts 'You will need to configure this file before you can get going.'
-  puts File.expand_path(file)
-
-when 'new'
-  name = ARGV.shift
-  if name
-    migrator.new_migration name
-  else
-    STDERR.puts 'Usage: im new [name]'
-    exit 1
-  end
-
-when 'migrate'
-  migrator.migrate(ARGV[0] || 'all')
-
-when 'rollback'
-  migrator.rollback(ARGV[0] || 'all')
-
-when 'redo'
-  migrator.rollback(ARGV[0] || 'all')
-  migrator.migrate(ARGV[0] || 'all')
-
-when 'pull'
-  migrator.pull(ARGV[0] || 'all')
+begin
+  case ARGV.shift
+  when 'setup'
+    puts 'Where should we create a default config file? [.]'
+    dir = gets.chomp
+    dir = dir == '' ? '.' : dir
+    file = I18n::Migrations::Config.copy_default_config_file(dir)
+
+    puts 'You will need to configure this file before you can get going.'
+    puts File.expand_path(file)
+
+  when 'new'
+    name = ARGV.shift
+    if name
+      migrator.new_migration name
+    else
+      STDERR.puts 'Usage: im new [name]'
+      exit 1
+    end
+
+  when 'migrate'
+    migrator.migrate(ARGV[0] || 'all')
+
+  when 'rollback'
+    migrator.rollback(ARGV[0] || 'all')
+
+  when 'redo'
+    migrator.rollback(ARGV[0] || 'all')
+    migrator.migrate(ARGV[0] || 'all')
+
+  when 'pull'
+    migrator.pull(ARGV[0] || 'all')
+
+  when 'push'
+    force = extract_option('-f')
+    migrator.push(ARGV[0] || 'all', force)
+
+  when 'validate'
+    migrator.validate(ARGV[0] || 'all')
+
+  when 'new_locale'
+    locale = ARGV.shift
+    if locale
+      migrator.new_locale(locale)
+    else
+      STDERR.puts 'Usage: im new_locale [name]'
+      exit 1
+    end
+
+  when 'version'
+    migrator.version
 
-when 'push'
-  force = extract_option('-f')
-  migrator.push(ARGV[0] || 'all', force)
-
-when 'validate'
-  migrator.validate(ARGV[0] || 'all')
-
-when 'new_locale'
-  locale = ARGV.shift
-  if locale
-    migrator.new_locale(locale)
   else
-    STDERR.puts 'Usage: im new_locale [name]'
-    exit 1
-  end
-
-when 'version'
-  migrator.version
-
-else
-  puts <<-USAGE
+    puts <<-USAGE
 Usage: i18n-migrate [command]
 
 Commands:
@@ -78,5 +79,9 @@ Commands:
   version - Print version of locales.
 
 i18n-migrations version #{I18n::Migrations::VERSION}
-  USAGE
+    USAGE
+  end
+rescue Exception
+  puts "Error\n#{$!.message}".red
+  exit 1
 end

data/lib/i18n/migrations/backends/crowd_translate_backend.rb

@@ -53,9 +53,7 @@ module I18n
               begin
                 client.put_migration(version: version, ruby_file: migrations.get_migration(version: version))
               rescue
-                puts "There was an error updating migration:".red
-                puts "  #{migrations.migration_file(version: version)}".bold
-                raise
+                raise CrowdTranslateError, "... while updating migration: #{migrations.migration_file(version: version)}\n#{$!.message}"
               end
             end
           end

data/lib/i18n/migrations/backends/crowd_translate_client.rb

@@ -4,16 +4,16 @@ require 'active_support/core_ext/object'
 module I18n
   module Migrations
     module Backends
+      class CrowdTranslateError < StandardError
+      end
+
       class CrowdTranslateClient
         def initialize
           token = ENV['CROWD_TRANSLATE_API_TOKEN']
           raise("You must define CROWD_TRANSLATE_API_TOKEN in order to talk to Crowd Translate") unless token.present?
 
-          server = ENV['CROWD_TRANSLATE_SERVER'] || 'https://crowd-translate.herokuapp.com'
-          @faraday = Faraday.new(
-            url: "#{server}/api/v1",
-            headers: { 'X-CrowdTranslateApiToken' => token },
-          )
+          @server = ENV['CROWD_TRANSLATE_SERVER'] || 'https://crowd-translate.herokuapp.com'
+          @faraday = Faraday.new(url: base_url, headers: { 'X-CrowdTranslateApiToken' => token })
         end
 
         def get_locale_file(locale_code)
@@ -37,15 +37,15 @@ module I18n
 
         def get(path)
           puts "GET #{path}".bold
-          parse_response @faraday.get path
+          parse_response 'GET', path, @faraday.get(path)
         end
 
         def put(path, params = {})
           puts "PUT #{path} #{params.to_s[0..50]}#{'...' if params.to_s.length > 50}".bold
-          parse_response @faraday.put path, params
+          parse_response 'PUT', path, @faraday.put(path, params)
         end
 
-        def parse_response(response)
+        def parse_response(method, path, response)
           if response.success?
             response.body
           else
@@ -54,9 +54,13 @@ module I18n
                     rescue
                       response.body
                     end
-            raise error
+            raise CrowdTranslateError, "... while calling #{method} #{File.join(base_url, path)}\n#{error}"
           end
         end
+
+        def base_url
+          "#{@server}/api/v1"
+        end
       end
     end
   end

data/lib/i18n/migrations/migrator.rb

@@ -72,7 +72,7 @@ end
 
       def pull(locale_or_all)
         each_locale(locale_or_all) do |locale|
-          next if locale.main_locale?
+          # next if locale.main_locale?
           backend.pull(locale)
         end
       end
@@ -104,9 +104,23 @@ end
         end
       end
 
+      private def report_locale_on_error(locale, &block)
+        begin
+          block.call locale
+        rescue Backends::CrowdTranslateError
+          puts "Error\n... while working with #{locale.name}\n#{$!.message}".red
+          # we want a readable error for our users, and the error happened in an external system,
+          # so don't give them a stack trace
+        rescue
+          puts "Error\n... while working with #{locale.name}\n#{$!.message}".red
+          raise
+        end
+      end
+
       private def each_locale(name = 'all',
                               async: true,
-                              concurrency: config.concurrency)
+                              concurrency: config.concurrency,
+                              &block)
         locale_names = name == 'all' ? all_locale_names : [name]
 
         if async
@@ -114,13 +128,13 @@ end
           locale_names.each_slice(concurrency) do |some_locale_names|
             threads = some_locale_names.map do |l|
               locale = locale_for(l)
-              Thread.new { yield locale }
+              Thread.new { report_locale_on_error(locale, &block) }
             end
             threads.each(&:join)
           end
         else
           locale_names.each do |l|
-            yield locale_for(l)
+            report_locale_on_error(locale_for(l), &block)
           end
         end
       end

data/lib/i18n/migrations/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Migrations
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-migrations
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Jeremy Lightsmith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler