Merge lp:~mew/charm-helpers/relationset-withdict into lp:charm-helpers

[Matthew Wedgwood]

Accommodate relation setting keys that are not valid python identifiers

**kwargs only accepts keys that are valid python identifiers. This change allows relation-set to take settings that, for example, contain dashes. It maintains backward compatibility with **kwargs settings.

[Haw Loeung (hloeung)]

Looks good to me, +1

review: Approve

=== modified file 'charmhelpers/core/hookenv.py'
--- charmhelpers/core/hookenv.py	2013-05-21 21:01:31 +0000
+++ charmhelpers/core/hookenv.py	2013-05-31 08:38:25 +0000
@@ -124,10 +124,12 @@
         return None
 
 
-def relation_set(relation_id=None, **kwargs):
+def relation_set(relation_id=None, relation_settings={}, **kwargs):
     relation_cmd_line = ['relation-set']
     if relation_id is not None:
         relation_cmd_line.extend(('-r', relation_id))
+    for k, v in relation_settings.items():
+        relation_cmd_line.append('{}={}'.format(k, v))
     for k, v in kwargs.items():
         relation_cmd_line.append('{}={}'.format(k, v))
     subprocess.check_call(relation_cmd_line)
 
=== modified file 'tests/core/test_hookenv.py'
--- tests/core/test_hookenv.py	2013-05-21 21:01:31 +0000
+++ tests/core/test_hookenv.py	2013-05-31 08:38:25 +0000
@@ -497,12 +497,18 @@
                                          123, 'baz-scope', 'baz-unit'])
 
     @patch('subprocess.check_call')
-    def test_sets_relation(self, check_call_):
+    def test_sets_relation_with_kwargs(self, check_call_):
         hookenv.relation_set(foo="bar")
         check_call_.assert_called_with(['relation-set','foo=bar'])
 
 
     @patch('subprocess.check_call')
+    def test_sets_relation_with_dict(self, check_call_):
+        hookenv.relation_set(relation_settings={"foo":"bar"})
+        check_call_.assert_called_with(['relation-set','foo=bar'])
+
+
+    @patch('subprocess.check_call')
     def test_sets_relation_with_relation_id(self, check_call_):
         hookenv.relation_set(relation_id="foo", bar="baz")
         check_call_.assert_called_with(['relation-set', '-r', 'foo',