moose-inventory 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa64e991a9487d623df71257a5c1aaf59edda5b1
-  data.tar.gz: 94b5ae699178d9fdba732e31878899bb988fa15b
+  metadata.gz: d4c867504f182214f4cb07980133ad5de8a68832
+  data.tar.gz: 99a656d44136b36bb7bd2c7187ec9ff66af51bb5
 SHA512:
-  metadata.gz: 7d59d86537df3366dba60baff13c0656915bd42d6d17fd2bfe42080363c8aeef6dfba1e36deca4cdbf92fc59160b9f5d4a8afbb9d63f4ac17cd9ada2b2dc6bc3
-  data.tar.gz: 22d2c8eb12465e4c51f7aad80669b2173f6e86501739be2310339b4c0633e9d3b4ad90145faa37525b96c02303ecfe3f011af54afc135562b63208818b9ba85d
+  metadata.gz: 3d1fe423b62518e54affd30939593ce8c8d6b0145424651a35aa30186bedd9ba195025abd7ef04385f082a7fedfb496a0aa75b994f1f52b724438e5b998745b7
+  data.tar.gz: d257057b70e3c25f043d0ae43faac496fe2e5461cf0bcad821196da30c5d86883d1620468bbdef1e6b91ecbb8476459af0eab62c0f0d8cc0d8552dab664aa29b

data/README.md

@@ -2,14 +2,22 @@
 
 The [moose-inventory](https://github.com/RusDavies/moose-inventory) software is a tool for managing dynamic inventories, intended for use with [Ansible](http://www.ansible.com/home). 
 
-Note: This software is intended for use on UNIX, Linux, or similar systems.  It will likely not work on Windows, due to some hard-wired search paths - I may fix that in the future but, for now, sorry. 
+Note 1: For many, the really interesting part of this tool will be it's ability to write to the inventory database from within Ansible, as described at the end of this document.  If that's what tickles your fancy, then I encourage you to get a sense of the capability by [jumping to that section first](https://github.com/RusDavies/moose-inventory#writing-to-the-dynamic-inventory-from-ansible). ;o)
+
+
+Note 2: This software is intended for use on UNIX/Linux systems.  It will likely not work on Windows, due to some hard-wired search paths - I may fix that in the future but, for now, sorry. 
 
 ## Installation
 
+Note: You may need to install certain development tools (e.g. gcc, postresql-devel, mysql-devel, sqlite-devel) on your system, in order for the gem installation to perform native builds. 
+
 The tool is a ruby gem. Assuming that you have ruby on your system, then it can be installed from the command line as follows.
 
     $ gem install moose-inventory
 
+Note: It may be necassary to first install certain development tools (e.g. gcc, postresql-devel, mysql-devel, sqlite-devel), in order for the gem installation to perform nati
+ve builds.
+
 It can also be installed by adding the following line to a Gemfile and then executing `bundle`:
 
 ```ruby
@@ -306,6 +314,7 @@ Removing variables, groups, and hosts is just as easy.  In the following example
 
 ### Using moose-inventory with Ansible
 
+
 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 the following.  
@@ -346,14 +355,14 @@ Alternatively, if using an [Ansible configuration file](http://docs.ansible.com/
     
 Yet another option is to copy the shim script to */etc/ansible/hosts* and `chmod +x` it.  However, since this would essentially fix the config file and environment used, doing so would defeat the flexibility intended for *moose-inventory*.    
 
-To persist data from Ansible to the inventory, simply call the shim script via a local_action command, for example:
+#### Writing to the dynamic inventory from Ansible
+A useful aspect of dynamic inventories is the possibility of writing data to the inventory. 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 {{ inventory_hostname }} mydata="{{ mydata }}" 
 ```
 
-
  
 ## Contributing
 1. Fork it (https://github.com/RusDavies/moose-inventory/fork )

data/lib/moose_inventory/cli/group_rm.rb

@@ -45,6 +45,23 @@ module Moose
               end
               fmt.puts 4, "- OK" 
               unless group.nil?
+                # Dissociate from any parent groups
+                pgroups_ds = group.parents_dataset
+                pgroups_ds.each do |parent|
+                  fmt.puts 2, "- Remove association {group:#{name} <-> group:#{parent.name}}..."
+                  parent.remove_child(group)
+                  fmt.puts 4, '- OK'
+                end
+
+                # Dissociate from any child groups
+                groups_ds = group.children_dataset
+                groups_ds.each do |child|
+                  fmt.puts 2, "- Remove association {group:#{name} <-> group:#{child.name}}..."
+                  group.remove_child(child)
+                  # TODO: Should we propagate the delete to orphaned children? 
+                  fmt.puts 4, '- OK'
+                end
+                                
                 # Handle automatic group for any associated hosts
                 hosts_ds = group.hosts_dataset
                 hosts_ds.each do |host|

data/lib/moose_inventory/version.rb

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

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

@@ -184,8 +184,65 @@ RSpec.describe Moose::Inventory::Cli::Group do
       
 
       # Check db
-      hosts = @db.models[:host].all
-      expect(hosts.count).to eq(0)
+      groups = @db.models[:group].all
+      expect(groups.count).to eq(0)
     end
+
+    #---------------
+    it 'GROUP ... should remove GROUP, where GROUP has an associated parent.' do
+      @db.models[:group].create(name: "parent")
+      runner { @app.start(%w(group addchild parent child) ) }
+
+      actual = runner { @app.start(%w(group rm child) ) }
+    
+      # Check output
+      desired = {STDOUT: ''}
+      # Check output
+      desired[:STDOUT] = desired[:STDOUT] +
+        "Remove group 'child':\n"\
+        "  - Retrieve group 'child'...\n"\
+        "    - OK\n"\
+        "  - Remove association {group:child <-> group:parent}...\n"\
+        "    - OK\n"\
+        "  - Destroy group 'child'...\n"\
+        "    - OK\n"\
+        "  - All OK\n"
+
+      desired[:STDOUT] = desired[:STDOUT] + "Succeeded.\n"
+      expected(actual, desired)
+    
+      # Check db
+      groups = @db.models[:group].all
+      expect(groups.count).to eq(1)
+    end
+
+    #---------------
+    it 'GROUP ... should remove GROUP, where GROUP has an associated child.' do
+      @db.models[:group].create(name: "parent")
+      runner { @app.start(%w(group addchild parent child) ) }
+    
+      actual = runner { @app.start(%w(group rm parent) ) }
+    
+      # Check output
+      desired = {STDOUT: ''}
+      # Check output
+      desired[:STDOUT] = desired[:STDOUT] +
+        "Remove group 'parent':\n"\
+        "  - Retrieve group 'parent'...\n"\
+        "    - OK\n"\
+        "  - Remove association {group:parent <-> group:child}...\n"\
+        "    - OK\n"\
+        "  - Destroy group 'parent'...\n"\
+        "    - OK\n"\
+        "  - All OK\n"
+    
+      desired[:STDOUT] = desired[:STDOUT] + "Succeeded.\n"
+      expected(actual, desired)
+    
+      # Check db
+      groups = @db.models[:group].all
+      expect(groups.count).to eq(1)
+    end
+    
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moose-inventory
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Russell Davies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: indentation
@@ -355,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Moose-tools inventory manager