moose-inventory 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b88c60df4ba175770a974076cf92e3c1c130d1e
-  data.tar.gz: d7c7481e41f66ff8ea49ed8e64593d3221eb3fcf
+  metadata.gz: 570b23a90a452e12fb6aa8f03e5b9613a3c365ff
+  data.tar.gz: 152441118aedc1f0935510e6f9c7357d514553b7
 SHA512:
-  metadata.gz: f3447e95438f00cfbcfb9c14553c5fd68cad6c9d263f4eb00d2f9e61498fd8139d6dff4a6401480d384e5e91e4fc655f9f674582080eff77fd671da6245e16b0
-  data.tar.gz: 5bf036761787ba2ea318dd65f0462d5dffaa7e36bbf63cb0e451c39b7b7e77fc2567adbcb0a4937569469bef5600123b6d2f52c7879909a45abfc5570dc06128
+  metadata.gz: 15a262e2ac4d8bab1fc356b7f60aceb612544d09a1df770952199eabe4668923dae44d40cf2d76460939f197374208bef687c8e33a70f575979a9635bbceaa38
+  data.tar.gz: 44eb25e1744164bc618c5d54ae52bc926f30f8e5c265939fb7ae53dd857ec8c676831089713b1d674f7c17079d723bbf310189d890a88bf76e163ca4649ff094

data/README.md

@@ -308,7 +308,7 @@ Removing variables, groups, and hosts is just as easy.  In the following example
 
 The *moose-inventory* tool is compliant with the Ansible specifications for [dynamic inventory sources](http://docs.ansible.com/developing_inventory.html).
 
-However, to make use of *moose-inventory's* multiple environment and configuration file options, a shim script should be used as the target for the [external inventory script](http://docs.ansible.com/intro_dynamic_inventory.html). A trivial example may look something like this,  
+However, to make use of *moose-inventory's* multiple environment and configuration file options, a shim script should be used as the target for the [external inventory script](http://docs.ansible.com/intro_dynamic_inventory.html). A trivial example may look something like the following.  
 
 ```shell
 #!/bin/bash
@@ -316,10 +316,17 @@ However, to make use of *moose-inventory's* multiple environment and configurati
 CONF='./example.conf'
 ENV='dev'
 
-moose-inventory --config $CONF --env $ENV $@
+moose-inventory --config $CONF --env $ENV "$@"
 
 exit $?
 ```
+
+**IMPORTANT**: Take care to notice that "$@" is the quoted form.  In fact, $@ and "$@" behave differently in how they handle white space.  If you expect spaces in your variable names or values, such as in the following example, then you must use the quoted form "$@".
+
+    $ ./shim.sh host add example
+    $ ./shim.sh host addvar example "my var"="hello world"
+     
+
 When Ansible calls the external inventory script, it passes certain parameters, which *moose-inventory* automatically recognises and responds to.  The Ansible parameters, and their equivalent *moose-inventory* parameters are shown below. 
 
 Ansible          | moose-inventory
@@ -342,8 +349,8 @@ Yet another option is to copy the shim script to */etc/ansible/hosts* and `chmod
 To persist data from Ansible to the inventory, simply call the shim script via a local_action command, for example:
 
 ```shell
-- set_fact: mydata="Hello World"
-- local_action: command shim.sh host addvar {{ ansible_host }} mydata={{ mydata }} 
+- set_fact: mydata="Hello world"
+- local_action: command shim.sh host addvar {{ inventory_hostname }} mydata="{{ mydata }}" 
 ```
 
 

data/lib/moose_inventory/cli/group_list.rb

@@ -33,7 +33,7 @@ module Moose
 
               
             results[group[:name].to_sym] = {}
-            unless hosts.length == 0
+            unless hosts.length == 0  and confopts[:ansible] != true 
               results[group[:name].to_sym][:hosts] = hosts
             end
 

data/lib/moose_inventory/cli/host_addvar.rb

@@ -31,6 +31,7 @@ module Moose
           # Transaction
           db.transaction do # Transaction start
             puts "Add variables '#{vars.join(",")}' to host '#{name}':"
+            
             fmt.puts 2,"- retrieve host '#{name}'..."
             host = db.models[:host].find(name: name)
             if host.nil?

data/lib/moose_inventory/version.rb

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

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

@@ -113,7 +113,7 @@ RSpec.describe Moose::Inventory::Cli::Host do
      end
     
     #------------------------
-    it 'host addvar HOST key=value ... should associate the host with the key/value pair' do
+    fit 'host addvar HOST key=value ... should associate the host with the key/value pair' do
       # 1. Should add the var to the db
       # 2. Should associate the host with the var
       
@@ -145,7 +145,41 @@ RSpec.describe Moose::Inventory::Cli::Host do
       expect(hostvars[name: var[:name]]).not_to be_nil
       expect(hostvars[name: var[:name]][:value]).to eq(var[:value])
     end
-   
+
+    #------------------------
+    fit 'host addvar HOST "my val"="hello world" ... should associate the host with the key/value pair' do
+      # 1. Should add the var to the db
+      # 2. Should associate the host with the var
+      
+      host_name = 'test1'
+      var  = {name: 'my val', value: "hello world"}
+    
+      @db.models[:host].create(name: host_name)
+      
+      actual = runner do
+        @app.start(%W(host addvar #{host_name} #{var[:name]}=#{var[:value]} ))
+      end
+      #@console.out(actual,'p')
+      
+      desired = { aborted: false}
+      desired[:STDOUT] = 
+        "Add variables '#{var[:name]}=#{var[:value]}' to host '#{host_name}':\n"\
+        "  - retrieve host '#{host_name}'...\n"\
+        "    - OK\n"\
+        "  - add variable '#{var[:name]}=#{var[:value]}'...\n"\
+        "    - OK\n"\
+        "  - all OK\n"\
+        "Succeeded.\n"
+      expected(actual, desired)
+    
+      # We should have the correct hostvar associations
+      host = @db.models[:host].find(name: host_name)
+      hostvars = host.hostvars_dataset
+      expect(hostvars.count).to eq(1)
+      expect(hostvars[name: var[:name]]).not_to be_nil
+      expect(hostvars[name: var[:name]][:value]).to eq(var[:value])
+    end
+    
   #------------------------
   it 'host addvar HOST key1=value1 key2=value2 ... should associate the host with multiple key/value pairs' do
     # 1. Should add the var to the db

metadata

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