moose-inventory 1.0.7 → 1.0.9

data/lib/moose_inventory/cli/group_rm.rb

@@ -7,20 +7,19 @@ module Moose
       ##
       # Implementation of "group rm" methods of the CLI
       class Group
-
         #==========================
         desc 'rm NAME',
              'Remove a group NAME from the inventory'
         def rm(*argv) # rubocop:disable Metrics/AbcSize
           #
           # Sanity
-          if argv.length < 1
-               abort('ERROR: Wrong number of arguments, '\
-                 "#{argv.length} for 1 or more.")
-           end          
-          
+          if argv.empty?
+            abort('ERROR: Wrong number of arguments, '\
+              "#{argv.length} for 1 or more.")
+           end
+
           # Convenience
-          db    = Moose::Inventory::DB
+          db = Moose::Inventory::DB
           fmt = Moose::Inventory::Cli::Formatter
 
           # Arguments
@@ -30,7 +29,7 @@ module Moose
           if names.include?('ungrouped')
             abort("Cannot manually manipulate the automatic group 'ungrouped'\n")
           end
-            
+
           # Transaction
           warn_count = 0
           db.transaction do # Transaction start
@@ -40,35 +39,51 @@ module Moose
               group = db.models[:group].find(name: name)
               if group.nil?
                 warn_count += 1
-                fmt.warn "Group '#{ name }' does not exist, skipping.\n"
-                fmt.puts 4, "- No such group, skipping."
+                fmt.warn "Group '#{name}' does not exist, skipping.\n"
+                fmt.puts 4, '- No such group, skipping.'
               end
-              fmt.puts 4, "- OK" 
+              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|
                   host_groups_ds = host.groups_dataset
-                  if host_groups_ds.count == 1 # We're the only group
-                    fmt.puts 2, "- Adding automatic association {group:ungrouped <-> host:#{host[:name]}}..."
-                    ungrouped = db.models[:group].find_or_create(name: 'ungrouped')
-                    host.add_group(ungrouped)
-                    fmt.puts 4, "- OK"
-                  end
+                  next unless host_groups_ds.count == 1 # We're the only group
+                  fmt.puts 2, "- Adding automatic association {group:ungrouped <-> host:#{host[:name]}}..."
+                  ungrouped = db.models[:group].find_or_create(name: 'ungrouped')
+                  host.add_group(ungrouped)
+                  fmt.puts 4, '- OK'
                 end
                 # Remove the group
                 fmt.puts 2, "- Destroy group '#{name}'..."
                 group.remove_all_hosts
                 group.destroy
-                fmt.puts 4, "- OK"
+                fmt.puts 4, '- OK'
               end
-              fmt.puts 2, "- All OK"
+              fmt.puts 2, '- All OK'
             end
           end # Transaction end
           if warn_count == 0
-            puts "Succeeded."
+            puts 'Succeeded.'
           else
-            puts "Succeeded, with warnings."
+            puts 'Succeeded, with warnings.'
           end
         end
       end

data/lib/moose_inventory/cli/group_rmchild.rb

@@ -7,16 +7,15 @@ module Moose
     module Cli
       ##
       # Implemention of the "group rmchild" methods of the CLI
-      class Group < Thor # rubocop:disable ClassLength
+      class Group
         #==========================
         desc 'rmchild PARENTGROUP CHILDGROUP_1 [CHILDGROUP_2 ... ]',
-        'Dissociate one or more child-groups CHILDGROUP_n from PARENTGROUP'
-        def rmchild(*argv)
-
+             'Dissociate one or more child-groups CHILDGROUP_n from PARENTGROUP'
+        def rmchild(*_argv)
           # Sanity check
           if args.length < 2
             abort("ERROR: Wrong number of arguments, #{args.length} "\
-              "for 2 or more.")
+              'for 2 or more.')
           end
 
           # Arguments
@@ -43,7 +42,7 @@ module Moose
               if pgroup.nil?
                 abort("ERROR: The group '#{pname}' does not exist.")
               end
-              fmt.puts 4, "- OK"
+              fmt.puts 4, '- OK'
 
               # Dissociate parent group from the child groups
               groups_ds = pgroup.children_dataset

data/lib/moose_inventory/cli/group_rmhost.rb

@@ -7,7 +7,6 @@ module Moose
       ##
       # Implementation of the "group rmhost" method of the CLI
       class Group
-
         #==========================
         desc 'rmhost GROUPNAME HOSTNAME_1 [HOSTNAME_2 ...]',
              'Dissociate the hosts HOSTNAME_n from the group NAME'
@@ -19,7 +18,7 @@ module Moose
             abort("ERROR: Wrong number of arguments, #{args.length} for 2 or more.")
           end
 
-          # Arguments 
+          # Arguments
           name = args[0].downcase
           hosts = args.slice(1, args.length - 1).uniq.map(&:downcase)
 
@@ -29,7 +28,7 @@ module Moose
           end
 
           # Convenience
-          db    = Moose::Inventory::DB
+          db = Moose::Inventory::DB
           fmt = Moose::Inventory::Cli::Formatter
 
           # Transaction
@@ -40,21 +39,19 @@ module Moose
               puts "Dissociate group '#{name}' from host(s) '#{hosts.join(',')}':"
               fmt.puts 2, "- retrieve group '#{name}'..."
               group = db.models[:group].find(name: name)
-              if group.nil?
-                abort("ERROR: The group '#{name}' does not exist.")
-              end
+              abort("ERROR: The group '#{name}' does not exist.") if group.nil?
               fmt.puts 4, '- OK'
 
               # dissociate group from the hosts
-              ungrouped  = db.models[:group].find_or_create(name: 'ungrouped')
+              ungrouped = db.models[:group].find_or_create(name: 'ungrouped')
               hosts_ds = group.hosts_dataset
-              hosts.each do |h| # rubocop:disable Style/Next
-                fmt.puts 2, "- remove association {group:#{name} <-> host:#{ h }}..."
+              hosts.each do |h|
+                fmt.puts 2, "- remove association {group:#{name} <-> host:#{h}}..."
 
                 # Check against existing associations
                 if hosts_ds[name: h].nil?
                   warn_count += 1
-                  fmt.warn "Association {group:#{name} <-> host:#{ h }} doesn't"\
+                  fmt.warn "Association {group:#{name} <-> host:#{h}} doesn't"\
                     " exist, skipping.\n"
                   fmt.puts 4, '- doesn\'t exist, skipping.'
                   fmt.puts 4, '- OK'
@@ -63,14 +60,13 @@ module Moose
 
                 host = db.models[:host].find(name: h)
                 group.remove_host(host) unless host.nil?
-                fmt.puts 4,'- OK'
+                fmt.puts 4, '- OK'
 
                 # Add the host to the ungrouped group if not in any other group
-                if host.groups_dataset.count == 0
-                  fmt.puts 2, "- add automatic association {group:ungrouped <-> host:#{h}}..."
-                  host.add_group(ungrouped)
-                  fmt.puts 4, '- OK'
-                end
+                next unless host.groups_dataset.count == 0
+                fmt.puts 2, "- add automatic association {group:ungrouped <-> host:#{h}}..."
+                host.add_group(ungrouped)
+                fmt.puts 4, '- OK'
               end
               fmt.puts 2, '- all OK'
             end # Transaction end

data/lib/moose_inventory/cli/group_rmvar.rb

@@ -15,7 +15,7 @@ module Moose
             abort('ERROR: Wrong number of arguments, ' \
                   "#{args.length} for 2 or more.")
           end
-          
+
           # Convenience
           db  = Moose::Inventory::DB
           fmt = Moose::Inventory::Cli::Formatter
@@ -26,8 +26,8 @@ module Moose
 
           # Transaction
           db.transaction do # Transaction start
-            puts "Remove variable(s) '#{vars.join(",")}' from group '#{name}':"
-            
+            puts "Remove variable(s) '#{vars.join(',')}' from group '#{name}':"
+
             fmt.puts 2, "- retrieve group '#{name}'..."
             group = db.models[:group].find(name: name)
             if group.nil?
@@ -35,7 +35,7 @@ module Moose
                    "The group '#{name}' does not exist."
             end
             fmt.puts 4, '- OK'
-            
+
             groupvars_ds = group.groupvars_dataset
             vars.each do |v|
               fmt.puts 2, "- remove variable '#{v}'..."
@@ -45,7 +45,7 @@ module Moose
                      "Incorrect format in {#{v}}. " \
                      'Expected \'key\' or \'key=value\'.'
               end
-            
+
               # Check against existing associations
               groupvar = groupvars_ds[name: vararray[0]]
               unless groupvar.nil?

data/lib/moose_inventory/cli/host.rb

@@ -9,7 +9,7 @@ module Moose
     module Cli
       ##
       # Class implementing the "host" methods of the CLI
-      class Host < Thor # rubocop:disable Metrics/ClassLength
+      class Host < Thor
         require_relative 'host_add'
         require_relative 'host_get'
         require_relative 'host_list'

data/lib/moose_inventory/cli/host_add.rb

@@ -4,7 +4,7 @@ require 'indentation'
 
 require_relative './formatter.rb'
 require_relative '../db/exceptions.rb'
- 
+
 module Moose
   module Inventory
     module Cli
@@ -18,7 +18,7 @@ module Moose
         # rubocop:disable Metrics/LineLength
         def add(*argv) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           # rubocop:enable Metrics/LineLength
-          if argv.length < 1
+          if argv.empty?
             abort('ERROR: Wrong number of arguments, '\
               "#{argv.length} for 1 or more.")
           end
@@ -26,25 +26,25 @@ module Moose
           # Convenience
           db = Moose::Inventory::DB
           fmt = Moose::Inventory::Cli::Formatter
-          
+
           # Arguments
           names = argv.uniq.map(&:downcase)
 
           # split(/\W+/) splits on hyphens too, which is not what we want
-          #groups = options[:groups].downcase.split(/\W+/).uniq
-          options[:groups].nil? && options[:groups] = ''  
+          # groups = options[:groups].downcase.split(/\W+/).uniq
+          options[:groups].nil? && options[:groups] = ''
           groups = options[:groups].downcase.split(',').uniq
 
           # Sanity
           if groups.include?('ungrouped')
-            abort("ERROR: Cannot manually manipulate "\
+            abort('ERROR: Cannot manually manipulate '\
               "the automatic group 'ungrouped'.")
           end
 
           # Process
           db.transaction do # Transaction start
             fmt.reset_indent
-              
+
             names.each do |name|
               puts "Add host '#{name}':"
               fmt.puts 2, "- Creating host '#{name}'..."
@@ -56,8 +56,8 @@ module Moose
                 fmt.warn "The host '#{name}' already exists, skipping creation.\n"
                 groups_ds = host.groups_dataset
               end
-              fmt.puts 4, "- OK"
-              
+              fmt.puts 4, '- OK'
+
               groups.each do |g|
                 next if g.nil? || g.empty?
                 fmt.puts 2, "- Adding association {host:#{name} <-> group:#{g}}..."
@@ -66,23 +66,23 @@ module Moose
                   fmt.warn "The group '#{g}' doesn't exist, but will be created.\n"
                   group = db.models[:group].create(name: g)
                 end
-                if !groups_ds.nil? && groups_ds[name: g].nil?
-                  fmt.warn "Association {host:#{name} <-> group:#{ g }} already exists, skipping creation.\n"
+                if !groups_ds.nil? && !groups_ds[name: g].nil?
+                  fmt.warn "Association {host:#{name} <-> group:#{g}} already exists, skipping creation.\n"
                 else
                   host.add_group(group)
                 end
                 fmt.puts 4, '- OK'
               end
-              
+
               # Handle the automatic 'ungrouped' group
               groups_ds = host.groups_dataset
-              if !groups_ds.nil?  && groups_ds.count == 0
-                  fmt.puts 2, "- Adding automatic association {host:#{name} <-> group:ungrouped}..."
-                  ungrouped = db.models[:group].find_or_create(name: 'ungrouped')
-                  host.add_group(ungrouped)
-                  fmt.puts 4, "- OK"
+              if !groups_ds.nil? && groups_ds.count == 0
+                fmt.puts 2, "- Adding automatic association {host:#{name} <-> group:ungrouped}..."
+                ungrouped = db.models[:group].find_or_create(name: 'ungrouped')
+                host.add_group(ungrouped)
+                fmt.puts 4, '- OK'
               end
-              fmt.puts 2, "- All OK"
+              fmt.puts 2, '- All OK'
             end
           end # Transaction end
           puts 'Succeeded'

data/lib/moose_inventory/cli/host_addgroup.rb

@@ -33,11 +33,11 @@ module Moose
           if groups.include?('ungrouped')
             abort 'ERROR: Cannot manually manipulate the automatic '\
               'group \'ungrouped\'.'
-          end 
-          
+          end
+
           # Transaction
           db.transaction do # Transaction start
-            puts "Associate host '#{name}' with groups '#{groups.join(',')}':" 
+            puts "Associate host '#{name}' with groups '#{groups.join(',')}':"
             # Get the target host
             fmt.puts 2, "- Retrieve host '#{name}'..."
             host = db.models[:host].find(name: name)
@@ -50,20 +50,20 @@ module Moose
             # Associate host with the groups
             groups_ds = host.groups_dataset
             groups.each do |g|
-              fmt.puts 2,  "- Add association {host:#{name} <-> group:#{ g }}..."
+              fmt.puts 2,  "- Add association {host:#{name} <-> group:#{g}}..."
 
               # Check against existing associations
               if !groups_ds[name: g].nil?
                 fmt.warn "Association {host:#{name} <-> group:#{g}} already exists, skipping."
-                fmt.puts 4,  "- Already exists, skipping."
+                fmt.puts 4, '- Already exists, skipping.'
               else
                 # Add new association
                 group = db.models[:group].find(name: g)
                 if group.nil?
                   fmt.warn "Group '#{g}' does not exist and will be created."
-                  fmt.puts 4,  "- Group does not exist, creating now..."
+                  fmt.puts 4, '- Group does not exist, creating now...'
                   group = db.models[:group].create(name: g)
-                  fmt.puts 6,  "- OK"
+                  fmt.puts 6, '- OK'
                 end
                 host.add_group(group)
               end
@@ -72,9 +72,9 @@ module Moose
 
             # Handle 'ungrouped' group automation
             unless groups_ds[name: 'ungrouped'].nil?
-              fmt.puts 2,  '- Remove automatic association '\
+              fmt.puts 2, '- Remove automatic association '\
                 "{host:#{name} <-> group:ungrouped}..."
-              ungrouped  = db.models[:group].find(name: 'ungrouped')
+              ungrouped = db.models[:group].find(name: 'ungrouped')
               host.remove_group(ungrouped) unless ungrouped.nil?
               fmt.puts 4, '- OK'
             end

data/lib/moose_inventory/cli/host_addvar.rb

@@ -30,9 +30,9 @@ module Moose
 
           # Transaction
           db.transaction do # Transaction start
-            puts "Add variables '#{vars.join(",")}' to host '#{name}':"
-            
-            fmt.puts 2,"- retrieve host '#{name}'..."
+            puts "Add variables '#{vars.join(',')}' to host '#{name}':"
+
+            fmt.puts 2, "- retrieve host '#{name}'..."
             host = db.models[:host].find(name: name)
             if host.nil?
               fail db.exceptions[:moose],
@@ -44,11 +44,11 @@ module Moose
             vars.each do |v|
               fmt.puts 2, "- add variable '#{v}'..."
               vararray = v.split('=')
-              if v.start_with?('=') ||  v.end_with?('=') || vararray.length != 2
+              if v.start_with?('=') || v.end_with?('=') || vararray.length != 2
                 fail db.exceptions[:moose],
                      "Incorrect format in '{#{v}}'. Expected 'key=value'."
               end
-                
+
               # Check against existing associations
               hostvar = hostvars_ds[name: vararray[0]]
               if !hostvar.nil?
@@ -61,7 +61,7 @@ module Moose
               else
                 # hostvar doesn't exist, so create and associate
                 hostvar = db.models[:hostvar].create(name: vararray[0],
-                                                      value: vararray[1])
+                                                     value: vararray[1])
                 host.add_hostvar(hostvar)
               end
               fmt.puts 4, '- OK'

data/lib/moose_inventory/cli/host_get.rb

@@ -16,7 +16,7 @@ module Moose
         desc 'get HOST_1 [HOST_2 ...]',
              'Get hosts HOST_n from the inventory'
         def get(*argv) # rubocop:disable Metrics/AbcSize
-          if argv.length < 1
+          if argv.empty?
             abort('ERROR: Wrong number of arguments, '\
               "#{argv.length} for 1 or more")
           end
@@ -24,30 +24,27 @@ module Moose
           # Convenience
           db = Moose::Inventory::DB
           fmt = Moose::Inventory::Cli::Formatter
-          
+
           # Arguments
           names = argv.uniq.map(&:downcase)
 
           # Process
           results = {}
-          names.each do |name| # rubocop:disable Style/Next
+          names.each do |name|
             host = db.models[:host].find(name: name)
 
-            unless host.nil?
-              groups = host.groups_dataset.map(:name)
-
-              hostvars = {}
-              host.hostvars_dataset.each do |hv|
-                hostvars[hv[:name].to_sym] = hv[:value]
-              end
-
-              results[host[:name].to_sym] = {}
-              unless groups.length == 0
-                results[host[:name].to_sym][:groups] = groups
-              end
-              unless hostvars.length == 0
-                results[host[:name].to_sym][:hostvars] = hostvars
-              end
+            next if host.nil?
+            groups = host.groups_dataset.map(:name)
+
+            hostvars = {}
+            host.hostvars_dataset.each do |hv|
+              hostvars[hv[:name].to_sym] = hv[:value]
+            end
+
+            results[host[:name].to_sym] = {}
+            results[host[:name].to_sym][:groups] = groups unless groups.empty?
+            unless hostvars.empty?
+              results[host[:name].to_sym][:hostvars] = hostvars
             end
           end
 

data/lib/moose_inventory/cli/host_list.rb

@@ -24,11 +24,11 @@ module Moose
             results[host[:name].to_sym][:groups] = groups
 
             hostvars = {}
-            host.hostvars_dataset.each do |hv| 
-              hostvars[hv[:name].to_sym] = hv[:value] 
+            host.hostvars_dataset.each do |hv|
+              hostvars[hv[:name].to_sym] = hv[:value]
             end
 
-            unless hostvars.length == 0
+            unless hostvars.empty?
               results[host[:name].to_sym][:hostvars] = hostvars
             end
           end

data/lib/moose_inventory/cli/host_listvars.rb

@@ -15,32 +15,31 @@ module Moose
         def listvars(*argv)
           # Convenience
           confopts = Moose::Inventory::Config._confopts
-          
+
           # sanity
           if confopts[:ansible] == true
             if argv.length != 1
-            abort('ERROR: Wrong number of arguments for Ansible mode, '\
-                  "#{args.length} for 1.")
+              abort('ERROR: Wrong number of arguments for Ansible mode, '\
+                    "#{args.length} for 1.")
             end
           else
-            if argv.length < 1
+            if argv.empty?
               abort('ERROR: Wrong number of arguments, '\
                     "#{args.length} for 1 or more.")
             end
           end
 
-
           # Convenience
           db = Moose::Inventory::DB
-          fmt = Moose::Inventory::Cli::Formatter 
+          fmt = Moose::Inventory::Cli::Formatter
 
           # Arguments
           names = argv.uniq.map(&:downcase)
 
-          #process
+          # process
           results = {}
-            
-          if confopts[:ansible] == true 
+
+          if confopts[:ansible] == true
             # This is the implementation per Ansible specs
             name = names.first
             host = db.models[:host].find(name: name)
@@ -51,28 +50,27 @@ module Moose
                 results[hv[:name].to_sym] = hv[:value]
               end
             end
-            
-            # Add the Ansible 1.3 '_meta' tag 
+
+            # Add the Ansible 1.3 '_meta' tag
             # see http://docs.ansible.com/ansible/developing_inventory.html#tuning-the-external-inventory-script
-            results['_meta'.to_sym] = {} 
+            results['_meta'.to_sym] = {}
             results['_meta'.to_sym]['hostvars'.to_sym] = {}
-            db.models[:host].each do |host| 
-              results['_meta'.to_sym]['hostvars'.to_sym][host.name().to_sym] = {}
+            db.models[:host].each do |host|
+              results['_meta'.to_sym]['hostvars'.to_sym][host.name.to_sym] = {}
               host.hostvars_dataset.each do |hv|
-                results['_meta'.to_sym]['hostvars'.to_sym][host.name().to_sym][hv[:name].to_sym] = hv[:value]
+                results['_meta'.to_sym]['hostvars'.to_sym][host.name.to_sym][hv[:name].to_sym] = hv[:value]
               end
             end
-            
+
           else
-            # This our more flexible implementation, which is not compatible 
-            # with the Ansible specs 
+            # This our more flexible implementation, which is not compatible
+            # with the Ansible specs
             names.each do |name|
               host = db.models[:host].find(name: name)
-              unless host.nil?
-                results[name.to_sym] = {}
-                host.hostvars_dataset.each do |hv|
-                  results[name.to_sym][hv[:name].to_sym] = hv[:value]
-                end
+              next if host.nil?
+              results[name.to_sym] = {}
+              host.hostvars_dataset.each do |hv|
+                results[name.to_sym][hv[:name].to_sym] = hv[:value]
               end
             end
           end

data/lib/moose_inventory/cli/host_rm.rb

@@ -16,7 +16,7 @@ module Moose
         def rm(*argv) # rubocop:disable Metrics/AbcSize
           #
           # Sanity
-          if argv.length < 1
+          if argv.empty?
             abort('ERROR: Wrong number of arguments, '\
               "#{argv.length} for 1 or more.")
           end
@@ -24,7 +24,7 @@ module Moose
           # Convenience
           db = Moose::Inventory::DB
           fmt = Moose::Inventory::Cli::Formatter
-          
+
           # Arguments
           names = argv.uniq.map(&:downcase)
 
@@ -38,22 +38,22 @@ module Moose
               if host.nil?
                 warn_count += 1
                 fmt.warn "Host '#{name}' does not exist, skipping.\n"
-                fmt.puts 4, "- No such host, skipping."
+                fmt.puts 4, '- No such host, skipping.'
               end
-              fmt.puts 4, "- OK" 
+              fmt.puts 4, '- OK'
               unless host.nil?
                 fmt.puts 2, "- Destroy host '#{name}'..."
                 host.remove_all_groups
                 host.destroy
-                fmt.puts 4, "- OK"
+                fmt.puts 4, '- OK'
               end
-              fmt.puts 2, "- All OK"
+              fmt.puts 2, '- All OK'
             end
           end # Transaction end
-          if warn_count == 0 
-            puts "Succeeded."
+          if warn_count == 0
+            puts 'Succeeded.'
           else
-            puts "Succeeded, with warnings."
+            puts 'Succeeded, with warnings.'
           end
         end
       end