moose-inventory 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62c6b9792b94606206b9ef3fd2ec764f84246974
-  data.tar.gz: 4e5ad255cbf9c5107da696c0189b6c84ffdd7e0c
+  metadata.gz: 2f7a05c05e173698bcbc3b5bcce29ea2c0c7c3bd
+  data.tar.gz: ea46d916c9a5776ce8e3119821ef009fea2e7d4a
 SHA512:
-  metadata.gz: b2c10d0f8e93835356f5877225495a9de546ce06dabd878519e59586da837676113c0cf67cebdae530199ac32daa94f438c7078044526b6d0d49a971e1701602
-  data.tar.gz: 55c989d8dd9ee2f63fb4b07fa14a7c62b29ef6249676a97061b5b2a66bb44849f2a037f4c4a405cf41add5ae0a4ed0ed142d03a01b714b1a83f0908652fa2b4f
+  metadata.gz: 3437c73ddf392819163040737720441e436a86714d4a682f0d5013e7799668ab19533bd1610d9f25b1d5a8c01dd0b8df77b49d4a9accd13b227e4312602848a3
+  data.tar.gz: f405d9fbc5c6f7415abf9cc0f96762a96c50d0439971be527faee5918d89cce9bc099fc0173c7c7fcae8f83a5e587203353b63e687f3cf1ec35062c83cf3b68b

data/lib/moose_inventory/cli/host_listvars.rb

@@ -32,7 +32,7 @@ module Moose
 
           # Convenience
           db = Moose::Inventory::DB
-          fmt = Moose::Inventory::Cli::Formatter
+          fmt = Moose::Inventory::Cli::Formatter 
 
           # Arguments
           names = argv.uniq.map(&:downcase)
@@ -51,8 +51,20 @@ module Moose
                 results[hv[:name].to_sym] = hv[:value]
               end
             end
+            
+            # Add the Ansible 1.3 '_meta' tag 
+            # see http://docs.ansible.com/ansible/developing_inventory.html#tuning-the-external-inventory-script
+            results['_meta'.to_sym] = {} 
+            results['_meta'.to_sym]['hostvars'.to_sym] = {}
+            db.models[:host].each do |host| 
+              results['_meta'.to_sym]['hostvars'.to_sym][host.name().to_sym] = {}
+              host.hostvars_dataset.each do |hv|
+                results['_meta'.to_sym]['hostvars'.to_sym][host.name().to_sym][hv[:name].to_sym] = hv[:value]
+              end
+            end
+            
           else
-            # This our more flexible implementation, which is not  compatible 
+            # This our more flexible implementation, which is not compatible 
             # with the Ansible specs 
             names.each do |name|
               host = db.models[:host].find(name: name)

data/lib/moose_inventory/version.rb

@@ -2,6 +2,6 @@ module Moose
   ##
   # The Moose-Tools dynamic inventory management library
   module Inventory
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/spec/lib/moose_inventory/cli/host_listvar_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Moose::Inventory::Cli::Host do
       @mockargs << val
     end
 
-    @config = Moose::Inventory::Config
+    @config = Moose::Inventory::Config 
     @config.init(@mockargs)
 
     @db = Moose::Inventory::DB
@@ -64,7 +64,7 @@ RSpec.describe Moose::Inventory::Cli::Host do
       actual = runner{ @cli.start(args) }
  
       # Check output
-      desired = { aborted: true}
+      desired = { aborted: true} 
       desired[:STDERR] = "ERROR: Wrong number of arguments for Ansible mode, 0 for 1.\n"
       expected(actual, desired)
     end
@@ -111,12 +111,18 @@ RSpec.describe Moose::Inventory::Cli::Host do
       #@console.out(actual, 'y')
       
       # Check output
+      meta = {}
+      meta['hostvars'.to_sym] = {}
+      meta['hostvars'.to_sym][host_name.to_sym] = {}
+
       mock = {}
       host_vars.each do |hv|
         hv_array = hv.split('=')  
-        mock[hv_array[0].to_sym] = hv_array[1] 
+        mock[hv_array[0].to_sym] = hv_array[1]
+        meta['hostvars'.to_sym][host_name.to_sym][hv_array[0].to_sym] = hv_array[1]  
       end
-      
+      mock['_meta'.to_sym] = meta
+        
       desired = {}
       desired[:STDOUT] = mock.to_json + "\n"
       expected(actual, desired)
@@ -137,11 +143,17 @@ RSpec.describe Moose::Inventory::Cli::Host do
       #@console.out(actual, 'y')
       
       # Check output
+      meta = {} 
+      meta['hostvars'.to_sym] = {}
+      meta['hostvars'.to_sym][host_name.to_sym] = {}
+
       mock = {}
       host_vars.each do |hv|
         hv_array = hv.split('=')  
         mock[hv_array[0].to_sym] = hv_array[1] 
+        meta['hostvars'.to_sym][host_name.to_sym][hv_array[0].to_sym] = hv_array[1]  
       end
+      mock['_meta'.to_sym] = meta
       
       desired = {}
       desired[:STDOUT] = mock.to_json + "\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moose-inventory
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Russell Davies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: indentation