i18n-migrations 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a61642308e6f7429d13a4c6f1b0f6789b75af51091b3966474c72fe1834e79f9
-  data.tar.gz: 046affdbc02080b90a1d18e0b89f668a025e404e25016cab3036fa7151c1680f
+  metadata.gz: f6b1e9a88178e490e8baba639086d36979b29d071c21fa370fb735ba50bb59b5
+  data.tar.gz: 8e7d1a53fa84cb226edec7bd5fdf60149b4935cf3d0030ebef6cc8d75846f815
 SHA512:
-  metadata.gz: b2383e487b6aff057aa3e78d831b692344bab7058ce9b94df3ee95b9e559fd9bbeb8112c5b75315097d5473679380f1f1ee9a0e46beb83b045ad2d1a501da5ed
-  data.tar.gz: ee172e7cda5416a57e31370dc694c5df868217b780a6de51b3eb99e6389d298e6f82d8c9997faaf19e9b9b6c1c821be1066714b82c9461e2d4bb659cda1dec04
+  metadata.gz: 43f7eddfd78658cc5f25ba43d7169928e9f53505ab01df23fb2e83310c05954d9b997827cfad186fc7abf76a7183c5addc8b13d156f80b5efad523743975d14a
+  data.tar.gz: dab17959080db63b69f5a8ed32733b2769bd35592c52334c3e6624db16c96719ce38d82a3a91ff7f915d623652817dffe4447806d2b56c81bc837637453c05cc

data/bin/i18n-migrate

@@ -2,6 +2,7 @@
 
 require_relative '../lib/i18n/migrations/migrator'
 require_relative '../lib/i18n/migrations/config'
+require_relative '../lib/i18n/migrations/version'
 
 migrator = I18n::Migrations::Migrator.new
 
@@ -45,6 +46,13 @@ case ARGV.shift
     force = extract_option('-f')
     migrator.push(ARGV[0] || 'all', force)
 
+  when 'exp-pull'
+    migrator.exp_pull(ARGV[0] || 'all')
+
+  when 'exp-push'
+    force = extract_option('-f')
+    migrator.exp_push(ARGV[0] || 'all', force)
+
   when 'validate'
     migrator.validate(ARGV[0] || 'all')
 
@@ -62,7 +70,7 @@ case ARGV.shift
 
   else
     puts <<-USAGE
-Usage: im [command]
+Usage: i18n-migrate [command]
 
 Commands:
   setup - Setup a new project w/ i18n-migrations.
@@ -76,8 +84,6 @@ Commands:
   new_locale - Copy your current main locale file to a new language, translating all keys.
   version - Print version of locales.
 
+i18n-migrations version #{I18n::Migrations::VERSION}
     USAGE
-    puts
-    puts "Commands:"
-    puts
 end

data/lib/i18n/migrations/crowd_translate_client.rb

@@ -0,0 +1,45 @@
+require 'rest_client'
+
+module I18n
+  module Migrations
+    class CrowdTranslateClient
+      def sync_migrations(migrations)
+        local_versions = migrations.all_versions
+        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(', ')}")
+        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))
+          end
+        end
+      end
+
+      def play_all_migrations
+
+      end
+
+      def get_locale_file(locale_code)
+        get("/locales/#{locale_code}.yml")
+      end
+
+      private
+
+      def get(url)
+        response = RestClient.get "https://crowd-translate.herokuapp.com#{url}"
+        response.body
+      end
+
+      def put(url, params = {})
+        response = RestClient.put "https://crowd-translate.herokuapp.com#{url}",
+                                  params: params
+        response.body
+      end
+    end
+  end
+end

data/lib/i18n/migrations/google_translate_dictionary.rb

@@ -12,14 +12,11 @@ module I18n
       def lookup(term, key: nil)
         return [term, ''] if @from_locale == @to_locale
 
-        response = RestClient.get 'https://www.googleapis.com/language/translate/v2', {
-            accept: :json,
-            params: { key: @key,
-                      source: @from_locale,
-                      target: @to_locale,
-                      format: format(key),
-                      q: term }
-        }
+        response = google_translate(key: @key,
+                                    source: @from_locale,
+                                    target: @to_locale,
+                                    format: format(key),
+                                    q: term)
         translated_term = JSON.parse(response.body)['data']['translations'].first['translatedText']
         translated_term, errors = fix(term, translated_term, key: key)
         unless errors.empty?
@@ -135,6 +132,22 @@ module I18n
         end
         nil
       end
+
+      def google_translate(key:, source:, target:, format:, q:)
+        params = { key: key,
+                   source: source,
+                   target: target,
+                   format: format,
+                   q: q }
+        url = 'https://www.googleapis.com/language/translate/v2'
+        begin
+          RestClient.get url, { accept: :json, params: params }
+        rescue Exception
+          puts "Google Translate Error: #{$!.message}"
+          puts "  #{url}?#{params.map { |k, v| [k, URI.escape(v.to_s)].join('=') }.join('&')}"
+          raise
+        end
+      end
     end
   end
 end

data/lib/i18n/migrations/locale.rb

@@ -2,6 +2,7 @@ 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
@@ -16,6 +17,7 @@ module I18n
       end
 
       def validate(data, notes)
+        fix_count, error_count = 0, 0
         main_data = main_locale.read_data
         main_data.each do |key, main_term|
           old_term = data[key]
@@ -27,6 +29,7 @@ module I18n
             puts "#{@name} (old): #{old_term}"
             puts "#{@name} (new): #{new_term}"
             puts
+            fix_count += 1
           end
           replace_errors_in_notes(notes, key, errors)
           if errors.length > 0
@@ -34,8 +37,12 @@ module I18n
             puts "#{@main_locale_name.bold}: #{main_term}"
             puts "#{@name.bold}: #{old_term}"
             puts
+            error_count += 1
           end
         end
+
+        puts "#{name}: #{fix_count} Fixes" if fix_count > 0
+        puts "#{name}: #{error_count} Errors" if error_count > 0
       end
 
       def update_info
@@ -92,6 +99,14 @@ module I18n
         puts "\n#{count} keys"
       end
 
+      def pull_from_crowd_translate(client)
+        data = client.get_locale_file(name)
+        File.open(File.join(@locales_dir, "#{name}.yml"), 'w') do |file|
+          file << data
+        end
+        write_remote_version(YAML::load(data)[name])
+      end
+
       def push(sheet)
         main_data = main_locale.read_data
         data, notes = read_data_and_notes
@@ -119,11 +134,14 @@ module I18n
         count = 0
         main_data = main_locale.read_data
         main_data.each do |key, term|
-          new_data[key], new_notes[key] = @dictionary.lookup(term, key: key)
+          if key == 'VERSION'
+            new_data['VERSION'] = main_data['VERSION']
+          else
+            new_data[key], new_notes[key] = @dictionary.lookup(term, key: key)
+          end
           print '.'.green
           break if limit && limit < (count += 1)
         end
-        new_data['VERSION'] = main_data['VERSION']
         puts
         write_data_and_notes(new_data, new_notes)
       end
@@ -166,17 +184,19 @@ module I18n
       end
 
       def write_data_and_notes(data, notes)
-        write_to_file("#{@name}.yml", data)
+        write_data(data)
         write_to_file("../#{@name}_notes.yml", notes) unless main_locale?
       end
 
+      def write_data(data)
+        write_to_file("#{@name}.yml", data)
+      end
 
       def write_remote_version(data)
         write_to_file("../#{@name}_remote_version.yml",
                       { 'VERSION' => read_versions(data) })
       end
 
-
       def migrate_to_version(data, notes, version, direction)
         migrations.play_migration(version: version,
                                   locale: @name,

data/lib/i18n/migrations/migration_factory.rb

@@ -11,6 +11,10 @@ module I18n
         Dir[@migration_dir + '/*.rb'].map { |name| File.basename(name).gsub('.rb', '') }
       end
 
+      def get_migration(version:)
+        File.read(File.join(@migration_dir, "#{version}.rb"))
+      end
+
       def play_migration(version:, locale:, data:, notes:, dictionary:, direction:)
         filename = File.join(@migration_dir, "#{version}.rb")
         require filename

data/lib/i18n/migrations/migrator.rb

@@ -4,12 +4,12 @@ require 'active_support/inflector'
 require 'active_support/core_ext/object'
 require 'colorize'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'google_translate_dictionary'
-require 'google_spreadsheet'
-require 'config'
-require 'locale'
-require 'migration_factory'
+require 'i18n/migrations/google_translate_dictionary'
+require 'i18n/migrations/google_spreadsheet'
+require 'i18n/migrations/config'
+require 'i18n/migrations/locale'
+require 'i18n/migrations/migration_factory'
+require 'i18n/migrations/crowd_translate_client'
 
 CONCURRENT_THREADS = 4
 
@@ -22,7 +22,7 @@ module I18n
         Locale.new(name,
                    locales_dir: config.locales_dir,
                    main_locale_name: config.main_locale,
-                   migrations: MigrationFactory.new(config.migration_dir),
+                   migrations: new_migrations,
                    dictionary: new_dictionary(name))
       end
 
@@ -96,6 +96,21 @@ end
         end
       end
 
+      def exp_pull(locale_or_all)
+        client = new_crowd_translate_client
+        each_locale(locale_or_all) do |locale|
+          locale.pull_from_crowd_translate(client)
+          migrate(locale.name)
+        end
+      end
+
+      def exp_push(locale_or_all, force = false)
+        client = new_crowd_translate_client
+        client.sync_migrations(new_migrations)
+        client.play_all_migrations
+        exp_pull(locale_or_all)
+      end
+
       def new_locale(new_locale, limit = nil)
         locale_for(new_locale).create
       end
@@ -124,7 +139,7 @@ end
           locale_names.each_slice(CONCURRENT_THREADS) do |some_locale_names|
             threads = some_locale_names.map do |l|
               locale = locale_for(l)
-              Thread.new {yield locale}
+              Thread.new { yield locale }
             end
             threads.each(&:join)
           end
@@ -151,6 +166,15 @@ end
                                       key: config.google_translate_api_key,
                                       do_not_translate: config.main_locale == locale ? {} : config.do_not_translate(locale))
       end
+
+      def new_migrations
+        MigrationFactory.new(config.migration_dir)
+      end
+
+      def new_crowd_translate_client
+        CrowdTranslateClient.new
+      end
+
     end
   end
 end

data/lib/i18n/migrations/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-migrations
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Jeremy Lightsmith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - i18n-migrations.gemspec
 - lib/i18n-migrations.rb
 - lib/i18n/migrations/config.rb
+- lib/i18n/migrations/crowd_translate_client.rb
 - lib/i18n/migrations/google_spreadsheet.rb
 - lib/i18n/migrations/google_translate_dictionary.rb
 - lib/i18n/migrations/locale.rb
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Migrations for doing i18n.