From 1d4e0aeb9b2c90b73e8d0280c69a57d2c2d386a9 Mon Sep 17 00:00:00 2001
From: Sebastian Ludwig <sebastian@lurado.de>
Date: Sun, 14 Feb 2016 17:59:43 -0600
Subject: [PATCH] Added pendantic option to validate-strings-file command and
 hid errors for keys without tags behind it.

---
 lib/twine/cli.rb                   |  3 +++
 lib/twine/runner.rb                | 10 ++++++----
 test/test_cli.rb                   |  5 +++++
 test/test_validate_strings_file.rb | 22 ++++++++++++++--------
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/lib/twine/cli.rb b/lib/twine/cli.rb
index d96cc08..34a9ed8 100644
--- a/lib/twine/cli.rb
+++ b/lib/twine/cli.rb
@@ -89,6 +89,9 @@ module Twine
           end
           options[:output_encoding] = e
         end
+        opts.on('-p', '--pedantic', 'When validating a strings file, perform additional checks that go beyond pure validity (like presence of tags)') do
+          options[:pedantic] = true
+        end
         opts.on('-h', '--help', 'Show this message.') do |h|
           puts opts.help
           exit
diff --git a/lib/twine/runner.rb b/lib/twine/runner.rb
index f160226..23aa7aa 100644
--- a/lib/twine/runner.rb
+++ b/lib/twine/runner.rb
@@ -179,10 +179,12 @@ module Twine
         errors << "Found duplicate string key(s):\n#{join_keys.call(duplicate_keys)}"
       end
 
-      if keys_without_tags.length == total_strings
-        errors << "None of your strings have tags."
-      elsif keys_without_tags.length > 0
-        errors << "Found strings without tags:\n#{join_keys.call(keys_without_tags)}"
+      if @options[:pedantic]
+        if keys_without_tags.length == total_strings
+          errors << "None of your strings have tags."
+        elsif keys_without_tags.length > 0
+          errors << "Found strings without tags:\n#{join_keys.call(keys_without_tags)}"
+        end
       end
 
       unless invalid_keys.empty?
diff --git a/test/test_cli.rb b/test/test_cli.rb
index cbce75f..9f463ae 100644
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@@ -21,6 +21,11 @@ class CLITestCase < TwineTestCase
       assert_equal @strings_file_path, @options[:strings_file]
     end
 
+    def test_pedantic
+      parse "validate-strings-file #{@strings_file_path} --pedantic"
+      assert @options[:pedantic]
+    end
+
     def test_missing_parameter
       assert_raises Twine::Error do
         parse 'validate-strings-file'
diff --git a/test/test_validate_strings_file.rb b/test/test_validate_strings_file.rb
index fcb6a27..c414e75 100644
--- a/test/test_validate_strings_file.rb
+++ b/test/test_validate_strings_file.rb
@@ -37,14 +37,6 @@ class TestValidateStringsFile < CommandTestCase
     end
   end
 
-  def test_reports_missing_tags
-    random_row.tags.clear
-
-    assert_raises Twine::Error do
-      Twine::Runner.new(@options, @twine_file).validate_strings_file
-    end
-  end
-
   def test_reports_invalid_characters_in_keys
     random_row.key[0] = "!?;:,^`´'\"\\|/(){}[]~-+*=#$%".chars.to_a.sample
 
@@ -52,4 +44,18 @@ class TestValidateStringsFile < CommandTestCase
       Twine::Runner.new(@options, @twine_file).validate_strings_file
     end
   end
+
+  def test_does_not_reports_missing_tags_by_default
+    random_row.tags.clear
+
+    Twine::Runner.new(@options, @twine_file).validate_strings_file
+  end
+
+  def test_reports_missing_tags
+    random_row.tags.clear
+
+    assert_raises Twine::Error do
+      Twine::Runner.new(@options.merge(pedantic: true), @twine_file).validate_strings_file
+    end
+  end
 end