Fix cli set validator (#467)

* cli: added tests for cli.Set validator

* cli: bug fix for Set validator

plumbum/cli/switches.py

@@ -468,7 +468,7 @@ def __init__(self, *values, **kwargs):
 
     def __repr__(self):
         return "{{{0}}}".format(", ".join(
-            v if isinstance(v, str) else v.__name__ for v in self.values.values()))
+            v if isinstance(v, str) else v.__name__ for v in self.values))
 
     def __call__(self, value, check_csv=True):
         if self.csv and check_csv:

tests/test_cli.py

@@ -21,6 +21,7 @@ def bacon(self, param):
     benedict = cli.CountOf(["--benedict"], help = """a very long help message with lots of
         useless information that nobody would ever want to read, but heck, we need to test
         text wrapping in help messages as well""")
+    num = cli.SwitchAttr(["--num"], cli.Set("MIN", "MAX", int, csv=True))
 
     def main(self, *args):
         old = self.eggs
@@ -95,6 +96,7 @@ class Sample(cli.Application):
 
     foo = cli.SwitchAttr("--foo")
 
+
 Sample.unbind_switches("--version")
 
 class Mumble(cli.Application):
@@ -151,10 +153,22 @@ def test_okay(self):
         assert rc == 0
         assert inst.eggs == "7"
 
+        _, rc = SimpleApp.run(["foo", "--bacon=81", "--num=100"], exit = False)
+        assert rc == 0
+
+        _, rc = SimpleApp.run(["foo", "--bacon=81", "--num=MAX,MIN,100"], exit = False)
+        assert rc == 0
+
     def test_failures(self):
         _, rc = SimpleApp.run(["foo"], exit = False)
         assert rc == 2
 
+        _, rc = SimpleApp.run(["foo", "--bacon=81", "--num=xx"], exit = False)
+        assert rc == 2
+
+        _, rc = SimpleApp.run(["foo", "--bacon=81", "--num=xx"], exit = False)
+        assert rc == 2
+
         _, rc = SimpleApp.run(["foo", "--bacon=hello"], exit = False)
         assert rc == 2