moose-inventory 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b70b5c9f5c9a0b7995c21952592dec88f31f92eb
-  data.tar.gz: 27d851baa44920820ff764da7ceaeb12c09db853
+  metadata.gz: 62c6b9792b94606206b9ef3fd2ec764f84246974
+  data.tar.gz: 4e5ad255cbf9c5107da696c0189b6c84ffdd7e0c
 SHA512:
-  metadata.gz: 3f982bdbafb5859491036dbc16779098183ed003a892909b5faf07a5bc4c45b6644f5dba4428e3ae9e2ba95ca4238723f5db3c92613b1aa791ea996d8b743fd0
-  data.tar.gz: d9890ba9ae9d41e295a534ee93139b79612ebff138f44496f862c40f7dfa6f440f35cd5d2eb40577e8102fba0009d00c599e13f2bc935a545193eb4e62014fe5
+  metadata.gz: b2c10d0f8e93835356f5877225495a9de546ce06dabd878519e59586da837676113c0cf67cebdae530199ac32daa94f438c7078044526b6d0d49a971e1701602
+  data.tar.gz: 55c989d8dd9ee2f63fb4b07fa14a7c62b29ef6249676a97061b5b2a66bb44849f2a037f4c4a405cf41add5ae0a4ed0ed142d03a01b714b1a83f0908652fa2b4f

data/README.md

@@ -6,19 +6,22 @@ Note: This software is intended for use on UNIX, Linux, or similar systems.  It
 
 ## Installation
 
-Add this line to your application's Gemfile:
+The tool is a ruby gem. 
+
+It can be install from the command line as follows.
+
+    $ gem install moose-inventory
+
+Alternatively, it can be installed by adding the following line to a Gemfile:
 
 ```ruby
 gem 'moose-inventory'
 ```
 
-And then execute:
+And then executing:
 
     $ bundle
-Or install it yourself as:
-```ruby
-$ gem install moose-inventory
-```
+    
 
 ## Configuration
 The [moose-inventory](https://github.com/RusDavies/moose-inventory) tool makes use of a simple YAML configuration file.  
@@ -86,7 +89,6 @@ The tool itself provides a convenient help feature.  For example, try each of th
     > moose-inventory group help add
 
 ###Global switches
-Not described in the built-in help system are a handful of top-level switches, as follows. 
 
 #### Option `--config <FILE>`
 The *--config* flag sets the configuration file to be used.  If specified, then the file must exist. This takes precedence over all other config files in other locations.  If not provided, then the default is to search standard locations, see later.
@@ -341,11 +343,6 @@ Alternatively, if you are using an [Ansible configuration file](http://docs.ansi
     inventory = ./shim.sh
     
 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*.    
-    
-##Missing features
-The following desired features are yet to be implemented:
-
-1. Groups of groups
 
 ## Contributing
 1. Fork it (https://github.com/RusDavies/moose-inventory/fork )

data/lib/moose_inventory/db/db.rb

@@ -154,11 +154,18 @@ module Moose
         unless @db.table_exists? :groups
           @db.create_table(:groups) do
             primary_key :id
-            foreign_key :parent_id
             column :name, :text, unique: true
           end
         end
 
+        unless @db.table_exists? :groups_groups
+          @db.create_table(:groups_groups) do
+            primary_key :id
+            foreign_key :parent_id, :groups
+            foreign_key :child_id,  :groups
+          end
+        end
+        
         unless @db.table_exists? :groupvars
           @db.create_table(:groupvars) do
             primary_key :id

data/lib/moose_inventory/db/models.rb

@@ -11,11 +11,20 @@ module Moose
       ##
       # Model for the groups table
       class Group < Sequel::Model
-        many_to_one :parent, :class=>self
-        one_to_many :children, :key=>:parent_id, :class=>self
-        many_to_many :hosts
-        one_to_many :groupvars
-      end
+        
+        many_to_many :parents,  
+                     :left_key=>:parent_id, 
+                     :right_key=>:child_id, 
+                     :class=>self
+        
+        many_to_many :children, 
+                     :left_key=>:child_id, 
+                     :right_key=>:parent_id, 
+                     :class=>self        
+
+        many_to_many :hosts 
+        one_to_many  :groupvars
+      end   
 
       ##
       # Model for the hostvars table

data/lib/moose_inventory/version.rb

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

data/spec/lib/moose_inventory/db/models_spec.rb

@@ -126,25 +126,51 @@ RSpec.describe 'models' do
       expect(hosts.count).to eq(1)
       expect(hosts.first[:name]).to eq('Host-test')
     end
-  end
-
-  it 'should have relationships with Hostvars' do
-    groupname = 'group-test'
-    groupvarname = 'groupvar-test'
-    groupvarval = '1'
-
-    group = @db.models[:group].create(name: groupname)
-    groupvar = @db.models[:groupvar].create(name: groupvarname,
-                                            value: groupvarval)
-
-    group.add_groupvar(groupvar)
 
-    group = @db.models[:group].find(name: groupname)
-    groupvars = group.groupvars_dataset
-
-    expect(groupvars).not_to be_nil
-    expect(groupvars.count).to eq(1)
-    expect(groupvars.first[:name]).to eq(groupvarname)
-    expect(groupvars.first[:value]).to eq(groupvarval)
+    it 'should have a many-to-many self-referential relationship (i.e. GROUPS of GROUPS)' do
+      
+      parent1 = @db.models[:group].create(name: 'parent1')
+      parent2 = @db.models[:group].create(name: 'parent2')
+      child1 = @db.models[:group].create(name: 'child1')
+      child2 = @db.models[:group].create(name: 'child2')
+
+      parent1.add_child(child1)  
+      parent1.add_child(child2)
+
+      parent2.add_child(child1)  
+      parent2.add_child(child2)
+      
+      group = @db.models[:group].find(name: 'parent1')
+      children = group.children_dataset
+
+      expect(children).not_to be_nil
+      expect(children.count).to eq(2)
+      
+      group = @db.models[:group].find(name: 'parent2')
+      children = group.children_dataset
+
+      expect(children).not_to be_nil
+      expect(children.count).to eq(2)
+    end
+     
+    it 'should have relationships with Hostvars' do
+      groupname = 'group-test'
+      groupvarname = 'groupvar-test'
+      groupvarval = '1'
+  
+      group = @db.models[:group].create(name: groupname)
+      groupvar = @db.models[:groupvar].create(name: groupvarname,
+                                              value: groupvarval)
+  
+      group.add_groupvar(groupvar)
+  
+      group = @db.models[:group].find(name: groupname)
+      groupvars = group.groupvars_dataset
+  
+      expect(groupvars).not_to be_nil
+      expect(groupvars.count).to eq(1)
+      expect(groupvars.first[:name]).to eq(groupvarname)
+      expect(groupvars.first[:value]).to eq(groupvarval)
+    end
   end
 end

metadata

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