Finishing touches 2

Author: MotorTruck1221

ruby/yamlValidator.rb

@@ -20,12 +20,24 @@ class YamlValidator < Dry::Validation::Contract
     if (Settings.private == "false")
       key.failure('must have a url') if value !~ /\A#{URI::regexp(['http', 'https'])}\z/
       key.failure('must have a / at the end') if value !~ /\/\z/
-      key.failure('The username MUST be "ruby"') if Settings.username != "ruby"
-      key.failure('The password MUST be "ruby"') if Settings.password != "ruby"
     else
       key.failure('must have no url') if value != "NA"
-      key.failure('The username MUST be "ruby"') if Settings.username != "ruby"
-      key.failure('The password MUST be "ruby"') if Settings.password != "ruby"
+    end
+  end
+  rule(:username) do 
+    if (Settings.private == "false")
+      key.failure('the username MUST be "ruby"') if value != "ruby"
+    end
+    if (Settings.private == "true")
+      key.failure('the username must NOT be "ruby"') if value == "ruby"
+    end
+  end
+  rule(:password) do 
+    if (Settings.private == "false")
+      key.failure('the password MUST be "ruby"') if value != "ruby"
+    end
+    if (Settings.private == "true")
+      key.failure('the password must NOT be "ruby"') if value == "ruby"
     end
   end
 end