fastlane-plugin-flutter 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a5c9b9a28e41593a86173cdbaf70d207af1ab6e
-  data.tar.gz: d1856be81db8b2ee23d1256a5f66a192d5ffec48
+  metadata.gz: c316ef1b82023c187f64f845756d3b2587fe820f
+  data.tar.gz: f312e47178083ab7a7170d0fe315450a4e973756
 SHA512:
-  metadata.gz: 1bf04d9031d6be50a97208d83b12fbf6c381a9add3399c470ba0d436070bfea728451b38de8ca7675d707b40e6e5ffdec732e5c3ac325f9848bae06fd3d1dc86
-  data.tar.gz: 31f77407265132eef039c6b91ee104d2e5ef5d6569aef1422834dade4221e7dae202b9c9b1b8250c0c690cb0ed72f6efbcdb6312ba15f2a8800ab1ba1ae4200d
+  metadata.gz: 81d218b9b3b9540cc1813d7e33c5a535967438ac425f0b0000f0d44e85cda337d507a5b11eecf272d5307ccc8be9e4170e3a7bd29e615927487167b8d42e12f7
+  data.tar.gz: 13ed10d618b0f6494d96a5e299ab157bb5c5eb92aba21852209b961a36f5b6fe18c14e0417cdb8d04ee416a61b8008da45dbb597c7cb76524214119c81bc4137

data/lib/fastlane/plugin/flutter/actions/flutter_action.rb

@@ -67,63 +67,81 @@ module Fastlane
         when 'format'
           sh *%w(flutter format .)
         when 'l10n'
-          unless params[:l10n_strings_file]
-            UI.user_error!('l10n_strings_file is a required parameter for ' \
-                           'l10n action')
-          end
+          run_l10n(params)
+        end
+      end
 
-          output_dir = 'lib/l10n'
-          l10n_messages_file = File.join(output_dir, 'intl_messages.arb')
-          # This file will not exist before it's generated for the first time.
-          if File.exist?(l10n_messages_file)
-            l10n_messages_was = File.read(l10n_messages_file)
-          end
+      def self.run_l10n(params)
+        unless params[:l10n_strings_file]
+          UI.user_error!('l10n_strings_file is a required parameter for ' \
+                         'l10n action')
+        end
 
-          extract_to_arb_options = ["--output-dir=#{output_dir}"]
-          if params[:l10n_strings_locale]
-            extract_to_arb_options.push(
-              "--locale=#{params[:l10n_strings_locale]}"
-            )
-          end
+        output_dir = 'lib/l10n'
+        l10n_messages_file = File.join(output_dir, 'intl_messages.arb')
+        # This file will not exist before it's generated for the first time.
+        if File.exist?(l10n_messages_file)
+          l10n_messages_was = File.read(l10n_messages_file)
+        end
 
-          sh *%w(flutter pub pub run intl_translation:extract_to_arb),
-             *extract_to_arb_options, params[:l10n_strings_file]
+        extract_to_arb_options = ["--output-dir=#{output_dir}"]
+        if params[:l10n_strings_locale]
+          extract_to_arb_options.push(
+            "--locale=#{params[:l10n_strings_locale]}"
+          )
+        end
 
-          if l10n_messages_was
-            # intl will update @@last_modified even if there are no updates;
-            # this leaves Git directory unnecessary dirty. If that's the only
-            # change, just restore the previous contents.
-            if Helper::FlutterHelper.restore_l10n_timestamp(
-              l10n_messages_file, l10n_messages_was
+        sh *%w(flutter pub pub run intl_translation:extract_to_arb),
+           *extract_to_arb_options, params[:l10n_strings_file]
+
+        if l10n_messages_was
+          # intl will update @@last_modified even if there are no updates;
+          # this leaves Git directory unnecessary dirty. If that's the only
+          # change, just restore the previous contents.
+          if Helper::FlutterHelper.restore_l10n_timestamp(
+            l10n_messages_file, l10n_messages_was
+          )
+            UI.message(
+              "@@last_modified has been restored in #{l10n_messages_file}"
             )
-              UI.message(
-                "@@last_modified has been restored in #{l10n_messages_file}"
-              )
-            end
-          end
-
-          # Sort files for consistency, because messages_all.dart will have
-          # imports ordered as in the command line below.
-          arb_files = Dir.glob(File.join(output_dir, 'intl_*.arb')).sort
-
-          unless params[:l10n_strings_locale]
-            # Don't generate .dart for the original ARB unless it has its own
-            # locale.
-            arb_files.delete(l10n_messages_file)
           end
+        end
 
-          if params[:l10n_reformat_arb]
-            arb_files.each do |arb_file|
-              UI.message("Reformatting file #{arb_file}...")
-              Helper::FlutterHelper.reformat_arb(arb_file)
+        # Sort files for consistency, because messages_all.dart will have
+        # imports ordered as in the command line below.
+        arb_files = Dir.glob(File.join(output_dir, 'intl_*.arb')).sort
+
+        if params[:l10n_verify_arb]
+          errors_found = arb_files.any? do |arb_file|
+            unless arb_file == l10n_messages_file
+              UI.message("Verifying #{arb_file}...")
+              errors = Helper::FlutterHelper.compare_arb(l10n_messages_file,
+                                                         arb_file)
+              if errors.any?
+                errors.each(&UI.method(:error))
+              end
             end
           end
+          UI.user_error!('Found inconsistencies in ARB files') if errors_found
+        end
+
+        unless params[:l10n_strings_locale]
+          # Don't generate .dart for the original ARB unless it has its own
+          # locale.
+          arb_files.delete(l10n_messages_file)
+        end
 
-          sh *%W(flutter pub pub run intl_translation:generate_from_arb
-                 --output-dir=#{output_dir}
-                 --no-use-deferred-loading
-                 #{params[:l10n_strings_file]}) + arb_files
+        if params[:l10n_reformat_arb]
+          arb_files.each do |arb_file|
+            UI.message("Reformatting file #{arb_file}...")
+            Helper::FlutterHelper.reformat_arb(arb_file)
+          end
         end
+
+        sh *%W(flutter pub pub run intl_translation:generate_from_arb
+               --output-dir=#{output_dir}
+               --no-use-deferred-loading
+               #{params[:l10n_strings_file]}) + arb_files
       end
 
       def self.description
@@ -189,6 +207,14 @@ module Fastlane
             is_string: false,
             default_value: false,
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :l10n_verify_arb,
+            env_name: 'FL_FLUTTER_L10N_VERIFY_ARB',
+            description: 'Verify that each .arb file includes all strings',
+            optional: true,
+            is_string: false,
+            default_value: true,
+          ),
         ]
       end
 

data/lib/fastlane/plugin/flutter/helper/flutter_helper.rb

@@ -1,5 +1,6 @@
 require 'fastlane_core/ui/ui'
 require 'json'
+require 'set'
 
 module Fastlane
   # UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
@@ -29,6 +30,33 @@ module Fastlane
 
         File.write(file_name, pretty_content + "\n")
       end
+
+      def self.compare_arb(origin, sample)
+        is_significant_key = ->(key) { !key.start_with?('@') }
+
+        origin_keys = Set.new(JSON.parse(File.read(origin))
+          .keys
+          .select(&is_significant_key))
+        sample_keys = Set.new(JSON.parse(File.read(sample))
+          .keys
+          .select(&is_significant_key))
+
+        keys_not_in_sample = origin_keys - sample_keys
+        keys_not_in_origin = sample_keys - origin_keys
+
+        differencies = []
+        if keys_not_in_sample.any?
+          differencies.push("Translation string(s): " \
+                            "#{keys_not_in_sample.to_a.join(', ')}; " \
+                            "are missing")
+        end
+        if keys_not_in_origin.any?
+          differencies.push("Translation string(s): " \
+                            "#{keys_not_in_origin.to_a.join(', ')}; " \
+                            "are unused")
+        end
+        differencies
+      end
     end
   end
 end

data/lib/fastlane/plugin/flutter/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Flutter
-    VERSION = "0.1.12"
+    VERSION = "0.1.13"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-flutter
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Artem Sheremet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry