Merge pull request #223 from DannyBen/update/unique-validation

Improve non-unique command validation by testing name and aliases together

Author: DannyBen

lib/bashly/concerns/validation_helpers.rb

@@ -52,10 +52,16 @@ def assert_hash(key, value, whitelist = nil)
       end
     end
 
-    def assert_uniq(key, value, array_key)
+    def assert_uniq(key, value, array_keys)
       return unless value
-      list = value.map { |c| c[array_key] }.compact.flatten
-      assert list.uniq?, "#{key} cannot have elements with similar #{array_key} values"
+      array_keys = [array_keys] unless array_keys.is_a? Array
+      list = []
+      array_keys.each do |array_key|
+        list += value.map { |c| c[array_key] }.compact.flatten
+      end
+
+      nonuniqs = list.nonuniq
+      assert nonuniqs.empty?, "#{key} contains non-unique elements (#{nonuniqs.join ', '}) in #{array_keys.join ' or '}"
     end
 
     def assert_string_or_array(key, value)

lib/bashly/config_validator.rb

@@ -124,8 +124,7 @@ def assert_command(key, value)
       assert_array "#{key}.environment_variables", value['environment_variables'], of: :env_var
       assert_array "#{key}.examples", value['examples'], of: :string
 
-      assert_uniq "#{key}.commands", value['commands'], 'name'
-      assert_uniq "#{key}.commands", value['commands'], 'alias'
+      assert_uniq "#{key}.commands", value['commands'], ['name', 'alias']
       assert_uniq "#{key}.flags", value['flags'], 'long'
       assert_uniq "#{key}.flags", value['flags'], 'short'
       assert_uniq "#{key}.args", value['args'], 'name'

lib/bashly/extensions/array.rb

@@ -5,8 +5,8 @@ def indent(offset)
     map { |line| "#{indentation}#{line}" }
   end
 
-  def uniq?
-    self == uniq
+  def nonuniq
+    tally.select { |key, count| count > 1 }.keys
   end
 
 end

spec/approvals/validations/non_uniq_arg_names

@@ -1 +1 @@
-#<Bashly::ConfigurationError: root.args cannot have elements with similar name values>
+#<Bashly::ConfigurationError: root.args contains non-unique elements (file) in name>

spec/approvals/validations/non_uniq_command_aliases

@@ -1 +1 @@
-#<Bashly::ConfigurationError: root.commands cannot have elements with similar alias values>
+#<Bashly::ConfigurationError: root.commands contains non-unique elements (c) in name or alias>

spec/approvals/validations/non_uniq_command_mix

@@ -0,0 +1 @@
+#<Bashly::ConfigurationError: root.commands contains non-unique elements (pull) in name or alias>

spec/approvals/validations/non_uniq_command_names

@@ -1 +1 @@
-#<Bashly::ConfigurationError: root.commands cannot have elements with similar name values>
+#<Bashly::ConfigurationError: root.commands contains non-unique elements (download) in name or alias>

spec/approvals/validations/non_uniq_flags_longs

@@ -1 +1 @@
-#<Bashly::ConfigurationError: root.flags cannot have elements with similar long values>
+#<Bashly::ConfigurationError: root.flags contains non-unique elements (--force) in long>

spec/approvals/validations/non_uniq_flags_shorts

@@ -1 +1 @@
-#<Bashly::ConfigurationError: root.flags cannot have elements with similar short values>
+#<Bashly::ConfigurationError: root.flags contains non-unique elements (-f) in short>

spec/bashly/extensions/array_spec.rb

@@ -13,4 +13,11 @@
       end
     end
   end
+
+  describe '#nonuniq' do
+    subject { %w[one it it two works three works] }
+    it "returns an array of non unique elements" do
+      expect(subject.nonuniq).to eq %w[it works]
+    end
+  end
 end