moose-inventory 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a63b0a4a7ad6bd07ebcd5a046dcd9030968ee1ae
-  data.tar.gz: fa90582f07b70b10ac2e712e0535fd3c092074b7
+  metadata.gz: 7694cb8a3c33618943fcc8bd0542b466c1fc2661
+  data.tar.gz: 057335d70625fca40ffc58f0e509b80466e5868c
 SHA512:
-  metadata.gz: 8103f643b5d66b9f46b1ef076468afc8c7a9307f72e3a2bc211909862d796d9c08a4735c3c07382140e219313b9d038a7428d8d48a827034e6c6c011c1f9e4e3
-  data.tar.gz: 3a26d900604cb5dbcccd3c5da3f6182f1fde5db0210c7ecb662dacaf8c47b0ad3eb3e1c64ae377d3c7dbbc0dd2521a902802990402e6f125eed18f672ac7e4c6
+  metadata.gz: 394c749d2d70e32e19514de5b00b60ccb45bc1829f8071804ec4f05b542e2fcbff0a1f27e28ba299d162a6c86ab4dc99bab9c180b31c4d38db18b102ec225a71
+  data.tar.gz: 5598e22deade66147638d2f94d4453f75dfcb01797c70fb37047b5b5c3a5099f078388cc57f9967fab333e53e1b5c1191f1359d2542bc9c759427d760b2c6394

data/lib/moose_inventory/cli/host_listvars.rb

@@ -45,7 +45,7 @@ module Moose
             name = names.first
             host = db.models[:host].find(name: name)
             if host.nil?
-              fmt.warn "The host #{name} does not exist."
+              fmt.warn "The host #{name} does not exist.\n"
             else
               host.hostvars_dataset.each do |hv|
                 results[hv[:name].to_sym] = hv[:value]

data/lib/moose_inventory/config/config.rb

@@ -74,8 +74,12 @@ module Moose
         end
         
         # Sanity
-        # - Ansible output format must be json
-        # @_confopts[:format] = 'json' if @_confopts[:ansible] == true
+        # - Ansible output format must be json - pjson is permitted, but yaml is not. 
+        if @_confopts[:ansible] == true
+          unless @_confopts[:format] =~ /p|pjson|j|json/ 
+            @_confopts[:format] = 'json'
+          end 
+        end
         
       end
 
@@ -106,12 +110,12 @@ module Moose
         case @_argv[0]
           when '--list' 
             @_confopts[:ansible] = true
-            @_confopts[:format] = 'json'
+            @_confopts[:format] = 'json' unless @_confopts[:format] =~ /p|pjson|j|json/ 
             @_argv.clear
             @_argv.concat(['group', 'list']).flatten
           when '--host'
             @_confopts[:ansible] = true
-            @_confopts[:format] = 'json'
+            @_confopts[:format] = 'json' unless @_confopts[:format] =~ /p|pjson|j|json/ 
             host = @_argv[1]
             @_argv.clear
             @_argv.concat(['host', 'listvars', "#{host}"]).flatten

data/lib/moose_inventory/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moose-inventory
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Russell Davies