moose-inventory 1.0.8 → 2.0

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

@@ -6,7 +6,7 @@ RSpec.describe Moose::Inventory::Cli::Group do
     @mockarg_parts = {
       config:  File.join(spec_root, 'config/config.yml'),
       format:  'yaml',
-      env:     'test'
+      env:     'test',
     }
 
     @mockargs = []
@@ -23,7 +23,7 @@ RSpec.describe Moose::Inventory::Cli::Group do
 
     @console = Moose::Inventory::Cli::Formatter
     @group = Moose::Inventory::Cli::Group
-    @cli = Moose::Inventory::Cli 
+    @cli = Moose::Inventory::Cli
     @app = Moose::Inventory::Cli::Application
   end
 
@@ -42,7 +42,7 @@ RSpec.describe Moose::Inventory::Cli::Group do
     #---------------------
     it 'should return an empty set when no results' do
       # no items in the db
-      actual = runner { @app.start(%W(group list)) }
+      actual = runner { @app.start(%w(group list)) }
 
       desired = { aborted: false, STDOUT: '', STDERR: '' }
       desired[:STDOUT] = {}.to_yaml
@@ -59,14 +59,14 @@ RSpec.describe Moose::Inventory::Cli::Group do
       groups = %w(group1 group2 group3)
       groups.each do |name|
         runner { @app.start(%W(group add #{name})) }
-        runner { @app.start(%W(group addvar #{ name } #{var})) }
+        runner { @app.start(%W(group addvar #{name} #{var})) }
         mock[name.to_sym] = {}
-        mock[name.to_sym][:groupvars] = {foo: 'bar'}
+        mock[name.to_sym][:groupvars] = { foo: 'bar' }
       end
 
       # items should now be in the db
-      actual = runner{ @app.start(%w(group list)) }
-        
+      actual = runner { @app.start(%w(group list)) }
+
       desired = { aborted: false, STDOUT: '', STDERR: '' }
       desired[:STDOUT] = mock.to_yaml
 
@@ -75,28 +75,27 @@ RSpec.describe Moose::Inventory::Cli::Group do
 
     #---------------------
     it 'should be an alias of --list (i.e. Ansible parameter)' do
-      
       host_name = 'test_host'
 
       mock = {}
       groups = %w(group1 group2 group3)
       groups.each do |name|
         runner { @app.start(%W(group add #{name})) }
-        mock[name.to_sym] = {}
+        mock[name.to_sym] = { hosts: [] }
       end
-    
+
       args = @mockargs.clone
-      args << "--list"
-    
-      actual = runner{ @cli.start(args) }
-        
-      #@console.out(actual, 'y')
-       
+      args << '--list'
+
+      actual = runner { @cli.start(args) }
+
+      # @console.out(actual, 'y')
+
       desired = { aborted: false, STDOUT: '', STDERR: '' }
       desired[:STDOUT] = mock.to_json + "\n"
-    
+
       expected(actual, desired)
-    end    
-    
+    end
+    end
   end
-end
+

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

@@ -6,7 +6,7 @@ RSpec.describe Moose::Inventory::Cli::Group do
     @mockarg_parts = {
       config:  File.join(spec_root, 'config/config.yml'),
       format:  'yaml',
-      env:     'test'
+      env:     'test',
     }
 
     @mockargs = []
@@ -23,12 +23,12 @@ RSpec.describe Moose::Inventory::Cli::Group do
 
     @console = Moose::Inventory::Cli::Formatter
     @group = Moose::Inventory::Cli::Group
-    @cli = Moose::Inventory::Cli 
+    @cli = Moose::Inventory::Cli
     @app = Moose::Inventory::Cli::Application
   end
 
   before(:each) do
-    # We make some @cli calls, which changes config, 
+    # We make some @cli calls, which changes config,
     # so we must reset config on each pass
     @config.init(@mockargs)
     @db.reset
@@ -41,79 +41,78 @@ RSpec.describe Moose::Inventory::Cli::Group do
       result = @group.instance_methods(false).include?(:listvars)
       expect(result).to eq(true)
     end
-     
+
     #-----------------
     it '<missing args> ... should abort with an error' do
-      actual = runner  {  @app.start(%w(group listvars))  }
+      actual = runner  { @app.start(%w(group listvars)) }
 
       # Check output
-      desired = { aborted: true}
+      desired = { aborted: true }
       desired[:STDERR] = "ERROR: Wrong number of arguments, 0 for 1 or more.\n"
       expected(actual, desired)
     end
-    
+
     #-----------------
     it '--ansible <missing args> ... should abort with an error' do
-      
       args = @mockargs.clone
-      args.concat( %w(--ansible group listvars) ).flatten
-    
-      actual = runner{ @cli.start(args) }
- 
+      args.concat(%w(--ansible group listvars)).flatten
+
+      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
-    
+
     #------------------------
     it 'GROUP ... should return a list of group variables grouped by group' do
-      group_name ='test_group'
+      group_name = 'test_group'
       group_vars = %w(foo=bar cow=chicken)
-      
-      tmp = runner {  @app.start(%W(group add #{group_name} )) }
+
+      tmp = runner {  @app.start(%W(group add #{group_name})) }
       tmp = runner {  @app.start(%W(group addvar #{group_name} #{group_vars[0]} #{group_vars[1]})) }
-      
+
       actual = runner do
         @app.start(%W(group listvars #{group_name}))
       end
 
-      #@console.out(actual, 'y')
-      
+      # @console.out(actual, 'y')
+
       # Check output
       mock = {}
-      mock[group_name.to_sym] = {} 
+      mock[group_name.to_sym] = {}
       group_vars.each do |hv|
-        hv_array = hv.split('=')  
-        mock[group_name.to_sym][hv_array[0].to_sym] = hv_array[1] 
+        hv_array = hv.split('=')
+        mock[group_name.to_sym][hv_array[0].to_sym] = hv_array[1]
       end
-      
+
       desired = {}
       desired[:STDOUT] = mock.to_yaml
       expected(actual, desired)
     end
-    
+
     #------------------------
     it '--ansible GROUP ... should return a list of group variables, in a  style akin to Ansible\'s \'--host HOSTNAME\'' do
-      group_name ='test_group'
+      group_name = 'test_group'
       group_vars = %w(foo=bar cow=chicken)
-      
-      tmp = runner {  @app.start(%W(group add #{group_name} )) }
+
+      tmp = runner {  @app.start(%W(group add #{group_name})) }
       tmp = runner {  @app.start(%W(group addvar #{group_name} #{group_vars[0]} #{group_vars[1]})) }
-      
+
       actual = runner do
-        @cli.start(%W(--ansible group listvars #{group_name}))
+        @cli.start(%W(--config #{@mockarg_parts[:config]} --ansible group listvars #{group_name}))
       end
-    
-      #@console.out(actual, 'y')
-      
+
+      # @console.out(actual, 'y')
+
       # Check output
       mock = {}
       group_vars.each do |hv|
-        hv_array = hv.split('=')  
-        mock[hv_array[0].to_sym] = hv_array[1] 
+        hv_array = hv.split('=')
+        mock[hv_array[0].to_sym] = hv_array[1]
       end
-      
+
       desired = {}
       desired[:STDOUT] = mock.to_json + "\n"
       expected(actual, desired)

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

@@ -9,7 +9,7 @@ RSpec.describe Moose::Inventory::Cli::Group do
     @mockarg_parts = {
       config:  File.join(spec_root, 'config/config.yml'),
       format:  'yaml',
-      env:     'test'
+      env:     'test',
     }
 
     @mockargs = []
@@ -22,7 +22,7 @@ RSpec.describe Moose::Inventory::Cli::Group do
     @config.init(@mockargs)
 
     @console = Moose::Inventory::Cli::Formatter
-    
+
     @db = Moose::Inventory::DB
     @db.init if @db.db.nil?
 
@@ -52,18 +52,17 @@ RSpec.describe Moose::Inventory::Cli::Group do
       desired[:STDERR] = "ERROR: Wrong number of arguments, 0 for 1 or more.\n"
       expected(actual, desired)
     end
-    
+
     # --------------------
     it 'ungrouped ... should abort with an error' do
-      actual = runner { @app.start(%W(group rm ungrouped)) }
+      actual = runner { @app.start(%w(group rm ungrouped)) }
 
       # Check output
-      desired = {aborted: true}
+      desired = { aborted: true }
       desired[:STDERR] =
         "Cannot manually manipulate the automatic group 'ungrouped'\n"
       expected(actual, desired)
-    end    
-    
+    end
 
     #---------------
     it '<non-existent group> ... should warn about non-existent groups' do
@@ -73,10 +72,10 @@ RSpec.describe Moose::Inventory::Cli::Group do
       # already exists.
 
       # no items in the db
-      group_name = "fake"
-      actual = runner {  @app.start(%W(group rm #{group_name})) }
- 
-      #@console.out(actual,'y')
+      group_name = 'fake'
+      actual = runner { @app.start(%W(group rm #{group_name})) }
+
+      # @console.out(actual,'y')
       desired = {}
       desired[:STDOUT] =
         "Remove group '#{group_name}':\n"\
@@ -114,26 +113,26 @@ RSpec.describe Moose::Inventory::Cli::Group do
       group = @db.models[:group].find(name: group_name)
       expect(group).to be_nil
     end
-    
+
     #---------------
     it "GROUP ... should handle the automatic 'ungrouped' group for associated hosts" do
-       host_name  = 'test-host1'
-       group_name  = 'test-group1'
-
-       tmp = runner { @app.start(%W(group add #{group_name} --hosts #{host_name})) }
-       expect(tmp[:unexpected]).to eq(false)
-       expect(tmp[:aborted]).to eq(false)  
-       host = @db.models[:host].find(name: host_name)
-       groups_ds = host.groups_dataset
-       expect(groups_ds).not_to be_nil
-       expect(groups_ds[name: 'ungrouped']).to be_nil # Shouldn't be ungrouped 
-
-       # Now do the rm       
-       actual = runner { @app.start(%W(group rm #{group_name})) }
- 
-       # @console.out(actual)
-
-      # Check output 
+      host_name = 'test-host1'
+      group_name = 'test-group1'
+
+      tmp = runner { @app.start(%W(group add #{group_name} --hosts #{host_name})) }
+      expect(tmp[:unexpected]).to eq(false)
+      expect(tmp[:aborted]).to eq(false)
+      host = @db.models[:host].find(name: host_name)
+      groups_ds = host.groups_dataset
+      expect(groups_ds).not_to be_nil
+      expect(groups_ds[name: 'ungrouped']).to be_nil # Shouldn't be ungrouped
+
+      # Now do the rm
+      actual = runner { @app.start(%W(group rm #{group_name})) }
+
+      # @console.out(actual)
+
+      # Check output
       desired = {}
       desired[:STDOUT] =
         "Remove group '#{group_name}':\n"\
@@ -147,16 +146,16 @@ RSpec.describe Moose::Inventory::Cli::Group do
         "Succeeded.\n"
       expected(actual, desired)
 
-       # Check db
-       group = @db.models[:group].find(name: group_name)
-       expect(group).to be_nil
-       
-       host = @db.models[:host].find(name: host_name)
-       expect(host).not_to be_nil
-       groups_ds = host.groups_dataset
-       expect(groups_ds).not_to be_nil
-       expect(groups_ds[name: 'ungrouped']).not_to be_nil
-     end    
+      # Check db
+      group = @db.models[:group].find(name: group_name)
+      expect(group).to be_nil
+
+      host = @db.models[:host].find(name: host_name)
+      expect(host).not_to be_nil
+      groups_ds = host.groups_dataset
+      expect(groups_ds).not_to be_nil
+      expect(groups_ds[name: 'ungrouped']).not_to be_nil
+    end
 
     #---------------
     it 'GROUP1 GROUP2 ... should remove multiple groups' do
@@ -168,20 +167,19 @@ RSpec.describe Moose::Inventory::Cli::Group do
       actual = runner { @app.start(%w(group rm) + names) }
 
       # Check output
-      desired = {STDOUT: ''}
+      desired = { STDOUT: '' }
       names.each do |name|
         # Check output
         desired[:STDOUT] = desired[:STDOUT] +
-          "Remove group '#{name}':\n"\
-          "  - Retrieve group '#{name}'...\n"\
-          "    - OK\n"\
-          "  - Destroy group '#{name}'...\n"\
-          "    - OK\n"\
-          "  - All OK\n"
+                           "Remove group '#{name}':\n"\
+                           "  - Retrieve group '#{name}'...\n"\
+                           "    - OK\n"\
+                           "  - Destroy group '#{name}'...\n"\
+                           "    - OK\n"\
+                           "  - All OK\n"
       end
       desired[:STDOUT] = desired[:STDOUT] + "Succeeded.\n"
       expected(actual, desired)
-      
 
       # Check db
       groups = @db.models[:group].all
@@ -190,27 +188,27 @@ RSpec.describe Moose::Inventory::Cli::Group do
 
     #---------------
     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) ) }
+      @db.models[:group].create(name: 'parent')
+      runner { @app.start(%w(group addchild parent child)) }
+
+      actual = runner { @app.start(%w(group rm child)) }
 
-      actual = runner { @app.start(%w(group rm child) ) }
-    
       # Check output
-      desired = {STDOUT: ''}
+      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"
+                         "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)
@@ -218,31 +216,70 @@ RSpec.describe Moose::Inventory::Cli::Group do
 
     #---------------
     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) ) }
-    
+      @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: ''}
+      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"
-    
+                         "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
-    
+
+    #---------------
+    it 'GROUP --recursive ... should remove orphaned child groups recursively' do
+      runner { @app.start(%w(group add parent)) }
+      runner { @app.start(%w(group add child --hosts child-host)) }
+      runner { @app.start(%w(group add grandchild)) }
+      runner { @app.start(%w(group addchild parent child)) }
+      runner { @app.start(%w(group addchild child grandchild)) }
+
+      actual = runner { @app.start(%w(group rm --recursive parent)) }
+
+      expect(actual[:unexpected]).to eq(false)
+      expect(actual[:aborted]).to eq(false)
+      expect(actual[:STDOUT]).to include("- Recursively delete orphaned group 'child'...\n")
+      expect(actual[:STDOUT]).to include("- Recursively delete orphaned group 'grandchild'...\n")
+
+      %w(parent child grandchild).each do |name|
+        expect(@db.models[:group].find(name: name)).to be_nil
+      end
+
+      host = @db.models[:host].find(name: 'child-host')
+      expect(host.groups_dataset[name: 'ungrouped']).not_to be_nil
+    end
+
+    #---------------
+    it 'GROUP --recursive ... should not remove child groups with another parent' do
+      runner { @app.start(%w(group add parent other-parent)) }
+      runner { @app.start(%w(group addchild parent child)) }
+      runner { @app.start(%w(group addchild other-parent child)) }
+
+      actual = runner { @app.start(%w(group rm --recursive parent)) }
+
+      expect(actual[:unexpected]).to eq(false)
+      expect(actual[:aborted]).to eq(false)
+      expect(@db.models[:group].find(name: 'parent')).to be_nil
+
+      child = @db.models[:group].find(name: 'child')
+      expect(child).not_to be_nil
+      expect(child.parents_dataset[name: 'other-parent']).not_to be_nil
+    end
   end
 end