i18n-migrations 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6b1e9a88178e490e8baba639086d36979b29d071c21fa370fb735ba50bb59b5
-  data.tar.gz: 8e7d1a53fa84cb226edec7bd5fdf60149b4935cf3d0030ebef6cc8d75846f815
+  metadata.gz: e0f8d5372c9541fdf212f771cbf6fa9f8159fb4f6fb5dab37beca63862cf2deb
+  data.tar.gz: 6f6d8dc7c053da0500415dbe8999bd015eec3023d92898c177b54af5962b4fc6
 SHA512:
-  metadata.gz: 43f7eddfd78658cc5f25ba43d7169928e9f53505ab01df23fb2e83310c05954d9b997827cfad186fc7abf76a7183c5addc8b13d156f80b5efad523743975d14a
-  data.tar.gz: dab17959080db63b69f5a8ed32733b2769bd35592c52334c3e6624db16c96719ce38d82a3a91ff7f915d623652817dffe4447806d2b56c81bc837637453c05cc
+  metadata.gz: 905e9f53dda1e46c7a169ffe869260854964fa323baf030d71f8c9d76d16ba40db658b0235da346256123c8a3e21d0805beef3c055c6efc733e8070a02f0403f
+  data.tar.gz: f3f1cec60dfb164bc0d61e9a81004eb9ebd527568613af170f9d3429e15bf9ddc1803f8258476c5c621e299e3ee87354067e361e34ee29b37937dc8ee74827f3

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.4
+ruby-2.6.5

data/Gemfile

@@ -9,4 +9,4 @@ gem 'ruby-gmail'
 gem 'activesupport'
 gem 'rspec'
 gem 'colorize'
-gem 'rest-client'
+gem 'faraday'

data/bin/i18n-migrate

@@ -46,10 +46,10 @@ case ARGV.shift
     force = extract_option('-f')
     migrator.push(ARGV[0] || 'all', force)
 
-  when 'exp-pull'
+  when 'ct-pull'
     migrator.exp_pull(ARGV[0] || 'all')
 
-  when 'exp-push'
+  when 'ct-push'
     force = extract_option('-f')
     migrator.exp_push(ARGV[0] || 'all', force)
 
@@ -84,6 +84,9 @@ Commands:
   new_locale - Copy your current main locale file to a new language, translating all keys.
   version - Print version of locales.
 
+  ct-pull - Pull from CrowdTranslate
+  ct-push - Push to CrowdTranslate
+
 i18n-migrations version #{I18n::Migrations::VERSION}
     USAGE
 end

data/i18n-migrations.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'google_drive'
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'rest-client'
+  spec.add_dependency 'faraday'
   spec.add_dependency 'colorize'
 end

data/lib/i18n/migrations/crowd_translate_client.rb

@@ -1,21 +1,38 @@
-require 'rest_client'
+require 'faraday'
 
 module I18n
   module Migrations
     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 },
+        )
+      end
+
       def sync_migrations(migrations)
         local_versions = migrations.all_versions
-        remote_versions = JSON.parse(get('/migrations.json'))
+        remote_versions = JSON.parse(get('migrations.json'))
 
         if (extra_versions = remote_versions - local_versions).present?
           raise("You may not upload migrations to the server because it has migrations not found locally: " +
-                    "#{extra_versions.join(', ')}")
+                  "#{extra_versions.join(', ')}")
         end
 
         if (versions_to_add = local_versions - remote_versions).present?
           versions_to_add.each do |version|
-            put("/migrations/#{version}.json",
-                ruby: migrations.get_migration(version: version))
+            begin
+              put("migrations/#{version}.json",
+                  migration: { ruby_file: migrations.get_migration(version: version) })
+            rescue
+              puts "There was an error updating migration:".red
+              puts "  #{migrations.migration_file(version: version)}".bold
+              raise
+            end
           end
         end
       end
@@ -25,20 +42,32 @@ module I18n
       end
 
       def get_locale_file(locale_code)
-        get("/locales/#{locale_code}.yml")
+        get("locales/#{locale_code}.yml")
       end
 
       private
 
-      def get(url)
-        response = RestClient.get "https://crowd-translate.herokuapp.com#{url}"
-        response.body
+      def get(path)
+        puts "GET #{path}".bold
+        parse_response @faraday.get path
       end
 
-      def put(url, params = {})
-        response = RestClient.put "https://crowd-translate.herokuapp.com#{url}",
-                                  params: params
-        response.body
+      def put(path, params = {})
+        puts "PUT #{path} #{params}".bold
+        parse_response @faraday.put path, params
+      end
+
+      def parse_response(response)
+        if response.success?
+          response.body
+        else
+          error = begin
+                    JSON.parse(response.body)['error']
+                  rescue
+                    response.body
+                  end
+          raise error
+        end
       end
     end
   end

data/lib/i18n/migrations/locale.rb

@@ -2,7 +2,6 @@ require 'fileutils'
 require 'yaml'
 require 'active_support'
 require 'colorize'
-require 'rest_client'
 
 # this class does all the work, but doesn't hold config or do more than one locale
 module I18n

data/lib/i18n/migrations/migration_factory.rb

@@ -12,7 +12,11 @@ module I18n
       end
 
       def get_migration(version:)
-        File.read(File.join(@migration_dir, "#{version}.rb"))
+        File.read(migration_file(version: version))
+      end
+
+      def migration_file(version:)
+        File.join(@migration_dir, "#{version}.rb")
       end
 
       def play_migration(version:, locale:, data:, notes:, dictionary:, direction:)

data/lib/i18n/migrations/migrator.rb

@@ -11,7 +11,7 @@ require 'i18n/migrations/locale'
 require 'i18n/migrations/migration_factory'
 require 'i18n/migrations/crowd_translate_client'
 
-CONCURRENT_THREADS = 4
+CONCURRENT_THREADS = 3
 
 # this class knows how to do all the things the cli needs done.
 # it mostly delegates to locale to do it, often asking multiple locales to do the same thing

data/lib/i18n/migrations/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Migrations
-    VERSION = "1.1.2"
+    VERSION = "1.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-migrations
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Jeremy Lightsmith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -106,7 +106,6 @@ files:
 - ".gitignore"
 - ".i18n-migrations.default.yml"
 - ".rspec"
-- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -152,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Migrations for doing i18n.