From 30c019447bdf99589383a50b9b68d5ae2dcc76a8 Mon Sep 17 00:00:00 2001
From: Jeroen Hoekx <jeroen.hoekx@hamok.be>
Date: Wed, 10 Oct 2012 18:17:24 +0200
Subject: [PATCH 1/2] Fix typo in inventory API test script.

---
 test/inventory_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/inventory_api.py b/test/inventory_api.py
index bcde15bd3c7..1c64fda7987 100644
--- a/test/inventory_api.py
+++ b/test/inventory_api.py
@@ -13,7 +13,7 @@ parser.add_option('-e', '--extra-vars', default=None, dest="extra")
 options, args = parser.parse_args()
 
 systems = {
-    "ungouped": [ "jupiter", "saturn" ],
+    "ungrouped": [ "jupiter", "saturn" ],
     "greek": [ "zeus", "hera", "poseidon" ],
     "norse": [ "thor", "odin", "loki" ]
 }

From 23a62f5a7891ca0a77933d98db075e01b7ccbe8b Mon Sep 17 00:00:00 2001
From: Jeroen Hoekx <jeroen.hoekx@hamok.be>
Date: Wed, 10 Oct 2012 18:35:45 +0200
Subject: [PATCH 2/2] Return multiple groups from inventory API.

---
 lib/ansible/inventory/script.py |  5 ++++-
 test/TestInventory.py           | 10 ++++++++++
 test/inventory_api.py           |  6 ++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/ansible/inventory/script.py b/lib/ansible/inventory/script.py
index 524ee83319f..a7561d5ed6f 100644
--- a/lib/ansible/inventory/script.py
+++ b/lib/ansible/inventory/script.py
@@ -35,6 +35,7 @@ class InventoryScript(object):
         self.groups = self._parse()
 
     def _parse(self):
+        all_hosts = {}
 
         groups = {}
         self.raw = utils.parse_json(self.data)
@@ -45,7 +46,9 @@ class InventoryScript(object):
             group = groups[group_name] = Group(group_name)
             host = None
             for hostname in hosts:
-                host = Host(hostname)
+                if not hostname in all_hosts:
+                    all_hosts[hostname] = Host(hostname)
+                host = all_hosts[hostname]
                 group.add_host(host)
                 # FIXME: hack shouldn't be needed
                 all.add_host(host)
diff --git a/test/TestInventory.py b/test/TestInventory.py
index 048126cc784..8985b1ec6ba 100644
--- a/test/TestInventory.py
+++ b/test/TestInventory.py
@@ -246,3 +246,13 @@ class TestInventory(unittest.TestCase):
         actual_hosts = inventory.get_hosts(host_names)
         actual_host_names = [host.name for host in actual_hosts]
         assert host_names == actual_host_names
+
+    def test_script_multiple_groups(self):
+        inventory = self.script_inventory()
+        vars = inventory.get_variables('zeus')
+
+        print "VARS=%s" % vars
+        
+        assert vars == {'inventory_hostname': 'zeus',
+                        'inventory_hostname_short': 'zeus',
+                        'group_names': ['greek', 'major-god']}
diff --git a/test/inventory_api.py b/test/inventory_api.py
index 1c64fda7987..0510862a10a 100644
--- a/test/inventory_api.py
+++ b/test/inventory_api.py
@@ -15,13 +15,15 @@ options, args = parser.parse_args()
 systems = {
     "ungrouped": [ "jupiter", "saturn" ],
     "greek": [ "zeus", "hera", "poseidon" ],
-    "norse": [ "thor", "odin", "loki" ]
+    "norse": [ "thor", "odin", "loki" ],
+    "major-god": [ "zeus", "odin" ],
 }
 
 variables = {
     "thor": {
         "hammer": True
-        }
+        },
+    "zeus": {},
 }
 
 if options.list_hosts == True: