moose-inventory 1.0.8 → 2.0

data/spec/lib/moose_inventory/cli/group_rmvar_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 = []
@@ -38,165 +38,165 @@ RSpec.describe Moose::Inventory::Cli::Group do
       result = @group.instance_methods(false).include?(:rmvar)
       expect(result).to eq(true)
     end
-    
+
     #-----------------
-     it '<missing args> ... should abort with an error' do
-       actual = runner  do
-         @app.start(%w(group rmvar))
-       end
- 
-       # Check output
-       desired = { aborted: true}
-       desired[:STDERR] = "ERROR: Wrong number of arguments, 0 for 2 or more.\n"
-       expected(actual, desired)
-     end
- 
-     #------------------------
-     it 'GROUP key=value ... should abort if the group does not exist' do
-       group_name = "does-not-exist"
-       var_name = "foo=bar"
-       actual = runner do
-         @app.start(%W(group rmvar #{group_name} #{var_name}))
-       end
- 
-       # Check output
-       desired = { aborted: true}
-       desired[:STDOUT] =
-         "Remove variable(s) '#{var_name}' from group '#{group_name}':\n"\
-         "  - retrieve group '#{group_name}'...\n"
-       desired[:STDERR] = 
-         "An error occurred during a transaction, any changes have been rolled back.\n"\
-         "ERROR: The group '#{group_name}' does not exist.\n"
-       expected(actual, desired)
-     end
- 
-     #------------------------
-     it '<malformed> ... should abort with an error' do
-        # 1. Should add the var to the db
-        # 2. Should associate the host with the var
-        
-        group_name = 'test1'
-        @db.models[:group].create(name: group_name)
-  
-        var  = {name: 'foo', value: "bar"}
-        cases = %W(
-          =bar 
-          foo=bar=
-          =foo=bar
-          foo=bar=extra
-        )      
-
-        cases.each do |args| 
-          actual = runner do
-            @app.start(%W(group rmvar #{group_name} #{args} ))
-          end
-          #@console.out(actual,'p')
-    
-          desired = { aborted: true}
-          desired[:STDOUT] = 
-            "Remove variable(s) '#{args}' from group '#{group_name}':\n"\
-            "  - retrieve group '#{group_name}'...\n"\
-            "    - OK\n"\
-            "  - remove variable '#{args}'...\n"
-          desired[:STDERR] = 
-            "An error occurred during a transaction, any changes have been rolled back.\n"\
-            "ERROR: Incorrect format in {#{args}}. Expected 'key' or 'key=value'.\n"
-            
-          expected(actual, desired)
+    it '<missing args> ... should abort with an error' do
+      actual = runner  do
+        @app.start(%w(group rmvar))
+      end
+
+      # Check output
+      desired = { aborted: true }
+      desired[:STDERR] = "ERROR: Wrong number of arguments, 0 for 2 or more.\n"
+      expected(actual, desired)
+    end
+
+    #------------------------
+    it 'GROUP key=value ... should abort if the group does not exist' do
+      group_name = 'does-not-exist'
+      var_name = 'foo=bar'
+      actual = runner do
+        @app.start(%W(group rmvar #{group_name} #{var_name}))
+      end
+
+      # Check output
+      desired = { aborted: true }
+      desired[:STDOUT] =
+        "Remove variable(s) '#{var_name}' from group '#{group_name}':\n"\
+        "  - retrieve group '#{group_name}'...\n"
+      desired[:STDERR] =
+        "An error occurred during a transaction, any changes have been rolled back.\n"\
+        "ERROR: The group '#{group_name}' does not exist.\n"
+      expected(actual, desired)
+    end
+
+    #------------------------
+    it '<malformed> ... should abort with an error' do
+      # 1. Should add the var to the db
+      # 2. Should associate the host with the var
+
+      group_name = 'test1'
+      @db.models[:group].create(name: group_name)
+
+      var = { name: 'foo', value: 'bar' }
+      cases = %w(
+        =bar
+        foo=bar=
+        =foo=bar
+        foo=bar=extra
+      )
+
+      cases.each do |args|
+        actual = runner do
+          @app.start(%W(group rmvar #{group_name} #{args}))
         end
+        # @console.out(actual,'p')
+
+        desired = { aborted: true }
+        desired[:STDOUT] =
+          "Remove variable(s) '#{args}' from group '#{group_name}':\n"\
+          "  - retrieve group '#{group_name}'...\n"\
+          "    - OK\n"\
+          "  - remove variable '#{args}'...\n"
+        desired[:STDERR] =
+          "An error occurred during a transaction, any changes have been rolled back.\n"\
+          "ERROR: Incorrect format in {#{args}}. Expected 'key' or 'key=value'.\n"
+
+        expected(actual, desired)
       end
-     
+    end
+
     #------------------------
     it 'GROUP <valid args> ... should remove the group variable' do
-       group_name = 'group_test'
-       var  = {name: 'foo', value: "bar"}
-       cases = %W(
-         #{var[:name]}
-         #{var[:name]}=
-         #{var[:name]}=#{var[:value]}
-       )
-       cases.each do |example|
-         # reset the db
-         @db.reset
-         
-         # Add an initial group and groupvar
-         @db.models[:group].create(name: group_name)
-         runner do
-           @app.start(%W(group addvar #{group_name} #{var[:name]}=#{var[:value]} ))
-         end
-         
-         # Try to remove the groupvar using the case example valid args 
-         actual = runner do
-           @app.start(%W(group rmvar #{group_name} #{example}))
-         end
-         #@console.out(actual,'p')
-         
-         # Check the output
-         desired = { aborted: false}
-         desired[:STDOUT] =
-           "Remove variable(s) '#{example}' from group '#{group_name}':\n"\
-           "  - retrieve group '#{group_name}'...\n"\
-           "    - OK\n"\
-           "  - remove variable '#{example}'...\n"\
-           "    - OK\n"\
-           "  - all OK\n"\
-           "Succeeded.\n"
-           
-          #@console.out(desired,'p')  
-         expected(actual, desired)
-   
-         # Check the db
-         group = @db.models[:group].find(name: group_name)
-         groupvars = group.groupvars_dataset
-         expect(groupvars.count).to eq(0)
-         
-         groupvars = @db.models[:groupvar].all
-         expect(groupvars.count).to eq(0)
-       end
+      group_name = 'group_test'
+      var = { name: 'foo', value: 'bar' }
+      cases = %W(
+        #{var[:name]}
+        #{var[:name]}=
+        #{var[:name]}=#{var[:value]}
+      )
+      cases.each do |example|
+        # reset the db
+        @db.reset
+
+        # Add an initial group and groupvar
+        @db.models[:group].create(name: group_name)
+        runner do
+          @app.start(%W(group addvar #{group_name} #{var[:name]}=#{var[:value]}))
+        end
+
+        # Try to remove the groupvar using the case example valid args
+        actual = runner do
+          @app.start(%W(group rmvar #{group_name} #{example}))
+        end
+        # @console.out(actual,'p')
+
+        # Check the output
+        desired = { aborted: false }
+        desired[:STDOUT] =
+          "Remove variable(s) '#{example}' from group '#{group_name}':\n"\
+          "  - retrieve group '#{group_name}'...\n"\
+          "    - OK\n"\
+          "  - remove variable '#{example}'...\n"\
+          "    - OK\n"\
+          "  - all OK\n"\
+          "Succeeded.\n"
+
+        # @console.out(desired,'p')
+        expected(actual, desired)
+
+        # Check the db
+        group = @db.models[:group].find(name: group_name)
+        groupvars = group.groupvars_dataset
+        expect(groupvars.count).to eq(0)
+
+        groupvars = @db.models[:groupvar].all
+        expect(groupvars.count).to eq(0)
+      end
     end
-    
+
     #------------------------
     it 'GROUP key1=value1 key2=value2 ... should remove multiple key/value pairs' do
       group_name = 'test_group'
       varsarray  = [
-        {name: 'var1', value: "val1"},
-        {name: 'var2', value: "val2"}
+        { name: 'var1', value: 'val1' },
+        { name: 'var2', value: 'val2' },
       ]
-          
+
       vars = []
       varsarray.each do |var|
         vars << "#{var[:name]}=#{var[:value]}"
       end
-        
+
       @db.models[:group].create(name: group_name)
       actual = runner do
-        @app.start(%W(group addvar #{group_name}) + vars )
+        @app.start(%W(group addvar #{group_name}) + vars)
       end
-      
+
       actual = runner do
-        @app.start(%W(group rmvar #{group_name}) + vars )
+        @app.start(%W(group rmvar #{group_name}) + vars)
       end
-      #@console.out(actual,'y')
-      
-      desired = { aborted: false}
-      desired[:STDOUT] = 
+      # @console.out(actual,'y')
+
+      desired = { aborted: false }
+      desired[:STDOUT] =
         "Remove variable(s) '#{vars.join(',')}' from group '#{group_name}':\n"\
         "  - retrieve group '#{group_name}'...\n"\
         "    - OK\n"
       vars.each do |var|
-        desired[:STDOUT] =  desired[:STDOUT] + 
-          "  - remove variable '#{var}'...\n"\
-          "    - OK\n"
+        desired[:STDOUT] = desired[:STDOUT] +
+                           "  - remove variable '#{var}'...\n"\
+                           "    - OK\n"
       end
-      desired[:STDOUT] =  desired[:STDOUT] + 
-        "  - all OK\n"\
-        "Succeeded.\n"
+      desired[:STDOUT] = desired[:STDOUT] +
+                         "  - all OK\n"\
+                         "Succeeded.\n"
       expected(actual, desired)
-    
+
       # We should have the correct hostvar associations
       group = @db.models[:group].find(name: group_name)
       groupvars = group.groupvars_dataset
       expect(groupvars.count).to eq(0)
-    end        
+    end
   end
 end

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

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 require_relative 'group_add_spec'
-#require_relative 'group_get_spec'
-#require_relative 'group_list_spec'
-#require_relative 'group_rm_spec'
+# require_relative 'group_get_spec'
+# require_relative 'group_list_spec'
+# require_relative 'group_rm_spec'
 #
-#require_relative 'group_addchild_spec'
-#require_relative 'grpi_rmchild_spec'
+# require_relative 'group_addchild_spec'
+# require_relative 'grpi_rmchild_spec'
 #
-#require_relative 'group_addhost_spec'
-#require_relative 'group_rmhost_spec'
+# require_relative 'group_addhost_spec'
+# require_relative 'group_rmhost_spec'
 #
-#require_relative 'group_addvar_spec'
-#require_relative 'group_rmvar_spec'
+# require_relative 'group_addvar_spec'
+# require_relative 'group_rmvar_spec'

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

@@ -9,7 +9,7 @@ RSpec.describe Moose::Inventory::Cli::Host do
     @mockarg_parts = {
       config:  File.join(spec_root, 'config/config.yml'),
       format:  'yaml',
-      env:     'test'
+      env:     'test',
     }
 
     @mockargs = []
@@ -44,8 +44,8 @@ RSpec.describe Moose::Inventory::Cli::Host do
     # --------------------
     it '<no arguments> ... should bail with an error' do
       actual = runner { @app.start(%w(host add)) }
- 
-      desired = { aborted: true}
+
+      desired = { aborted: true }
       desired[:STDERR] = "ERROR: Wrong number of arguments, 0 for 1 or more.\n"
       expected(actual, desired)
     end
@@ -55,8 +55,8 @@ RSpec.describe Moose::Inventory::Cli::Host do
       name = 'test-host-add'
 
       actual = runner { @app.start(%W(host add #{name})) }
-      #@console.out(actual,'y')
-      
+      # @console.out(actual,'y')
+
       # Check output
       desired = {}
       desired[:STDOUT] =
@@ -88,13 +88,13 @@ RSpec.describe Moose::Inventory::Cli::Host do
 
       # Check output
       desired = {}
-      desired[:STDOUT] = 
+      desired[:STDOUT] =
         "Add host '#{name}':\n"\
         "  - Creating host '#{name}'...\n"\
         "    - OK\n"\
         "  - All OK\n"\
         "Succeeded\n"
-          
+
       desired[:STDERR] =
         "WARNING: The host '#{name}' already exists, skipping creation.\n"
 
@@ -108,15 +108,15 @@ RSpec.describe Moose::Inventory::Cli::Host do
       actual = runner { @app.start(%w(host add) + names) }
 
       # Check output
-      desired = {STDOUT: ''}
+      desired = { STDOUT: '' }
       names.each do |name|
-        desired[:STDOUT] =  desired[:STDOUT] +
-          "Add host '#{name}':\n"\
-          "  - Creating host '#{name}'...\n"\
-          "    - OK\n"\
-          "  - Adding automatic association {host:#{name} <-> group:ungrouped}...\n"\
-          "    - OK\n"\
-          "  - All OK\n"
+        desired[:STDOUT] = desired[:STDOUT] +
+                           "Add host '#{name}':\n"\
+                           "  - Creating host '#{name}'...\n"\
+                           "    - OK\n"\
+                           "  - Adding automatic association {host:#{name} <-> group:ungrouped}...\n"\
+                           "    - OK\n"\
+                           "  - All OK\n"
       end
       desired[:STDOUT] = desired[:STDOUT] + "Succeeded\n"
 
@@ -189,7 +189,7 @@ RSpec.describe Moose::Inventory::Cli::Host do
         "Succeeded\n"
       desired[:STDERR] =
         "WARNING: The group '#{group_name}' doesn't exist, but will be created.\n"
-        
+
       expected(actual, desired)
 
       # Check db
@@ -200,6 +200,66 @@ RSpec.describe Moose::Inventory::Cli::Host do
       expect(groups[name: group_name]).not_to be_nil # i.e. not 'ungrouped'
     end
 
+    # --------------------
+    it 'existing HOST --groups NEWGROUP should associate the host with the new group' do
+      name = 'testhost'
+      initial_group = 'initialgroup'
+      new_group = 'newgroup'
+
+      runner { @app.start(%W(host add #{name} --groups #{initial_group})) }
+      actual = runner { @app.start(%W(host add #{name} --groups #{new_group})) }
+
+      desired = {}
+      desired[:STDOUT] =
+        "Add host '#{name}':\n"\
+        "  - Creating host '#{name}'...\n"\
+        "    - OK\n"\
+        "  - Adding association {host:#{name} <-> group:#{new_group}}...\n"\
+        "    - OK\n"\
+        "  - All OK\n"\
+        "Succeeded\n"
+      desired[:STDERR] =
+        "WARNING: The host '#{name}' already exists, skipping creation.\n"\
+        "WARNING: The group '#{new_group}' doesn't exist, but will be created.\n"
+
+      expected(actual, desired)
+
+      host = @db.models[:host].find(name: name)
+      groups = host.groups_dataset
+      expect(groups.count).to eq(2)
+      expect(groups[name: initial_group]).not_to be_nil
+      expect(groups[name: new_group]).not_to be_nil
+    end
+
+    # --------------------
+    it 'existing HOST --groups EXISTINGGROUP should skip existing associations' do
+      name = 'testhost'
+      group_name = 'testgroup'
+
+      runner { @app.start(%W(host add #{name} --groups #{group_name})) }
+      actual = runner { @app.start(%W(host add #{name} --groups #{group_name})) }
+
+      desired = {}
+      desired[:STDOUT] =
+        "Add host '#{name}':\n"\
+        "  - Creating host '#{name}'...\n"\
+        "    - OK\n"\
+        "  - Adding association {host:#{name} <-> group:#{group_name}}...\n"\
+        "    - OK\n"\
+        "  - All OK\n"\
+        "Succeeded\n"
+      desired[:STDERR] =
+        "WARNING: The host '#{name}' already exists, skipping creation.\n"\
+        "WARNING: Association {host:#{name} <-> group:#{group_name}} already exists, skipping creation.\n"
+
+      expected(actual, desired)
+
+      host = @db.models[:host].find(name: name)
+      groups = host.groups_dataset
+      expect(groups.count).to eq(1)
+      expect(groups[name: group_name]).not_to be_nil
+    end
+
     # --------------------
     it 'HOST1 --groups ungrouped ... should abort with an error' do
       name = 'testhost'
@@ -208,7 +268,7 @@ RSpec.describe Moose::Inventory::Cli::Host do
       end
 
       # Check output
-      desired = { aborted: true}
+      desired = { aborted: true }
       desired[:STDERR] =
         "ERROR: Cannot manually manipulate the automatic group 'ungrouped'.\n"
       expected(actual, desired)
@@ -227,26 +287,26 @@ RSpec.describe Moose::Inventory::Cli::Host do
       actual = runner do
         @app.start(%W(host add #{name} --groups #{group_names.join(',')}))
       end
-        
-      #@console.out(actual,'y')
-        
+
+      # @console.out(actual,'y')
+
       # Check output
-      desired = {STDOUT: '', STDERR: ''}
-      desired[:STDOUT] = 
+      desired = { STDOUT: '', STDERR: '' }
+      desired[:STDOUT] =
         "Add host '#{name}':\n"\
         "  - Creating host '#{name}'...\n"\
         "    - OK\n"\
-        
+
       group_names.each do |group|
         desired[:STDOUT] =  desired[:STDOUT] +
-          "  - Adding association {host:#{name} <-> group:#{group}}...\n"\
-          "    - OK\n"
+                            "  - Adding association {host:#{name} <-> group:#{group}}...\n"\
+                            "    - OK\n"
         desired[:STDERR] =  desired[:STDERR] +
-          "WARNING: The group '#{group}' doesn't exist, but will be created.\n"
+                            "WARNING: The group '#{group}' doesn't exist, but will be created.\n"
       end
-      desired[:STDOUT] = desired[:STDOUT] + 
-        "  - All OK\n"\
-        "Succeeded\n"
+      desired[:STDOUT] = desired[:STDOUT] +
+                         "  - All OK\n"\
+                         "Succeeded\n"
 
       expected(actual, desired)
 
@@ -270,7 +330,7 @@ RSpec.describe Moose::Inventory::Cli::Host do
       end
 
       # Check output
-      desired = { aborted: true}
+      desired = { aborted: true }
       desired[:STDERR] =
         "ERROR: Cannot manually manipulate the automatic group 'ungrouped'.\n"
 
@@ -291,27 +351,27 @@ RSpec.describe Moose::Inventory::Cli::Host do
       # Check output
       desired = { aborted: false, STDERR: '', STDOUT: '' }
       names.each do |name|
-        desired[:STDOUT] = desired[:STDOUT] + 
-          "Add host '#{name}':\n"\
-          "  - Creating host '#{name}'...\n"\
-          "    - OK\n"
+        desired[:STDOUT] = desired[:STDOUT] +
+                           "Add host '#{name}':\n"\
+                           "  - Creating host '#{name}'...\n"\
+                           "    - OK\n"
         group_names.each do |group|
-          desired[:STDOUT] =  desired[:STDOUT] +
-            "  - Adding association {host:#{name} <-> group:#{group}}...\n"\
-            "    - OK\n"
+          desired[:STDOUT] = desired[:STDOUT] +
+                             "  - Adding association {host:#{name} <-> group:#{group}}...\n"\
+                             "    - OK\n"
         end
         desired[:STDOUT] = desired[:STDOUT] +
-          "  - All OK\n" 
+                           "  - All OK\n"
       end
-      
+
       group_names.each do |group|
-        desired[:STDERR] =  desired[:STDERR] +
-          "WARNING: The group '#{group}' doesn't exist, but will be created.\n"
+        desired[:STDERR] = desired[:STDERR] +
+                           "WARNING: The group '#{group}' doesn't exist, but will be created.\n"
       end
       desired[:STDOUT] = desired[:STDOUT] + "Succeeded\n"
 
-      #@console.out(desired,'y')
-      
+      # @console.out(desired,'y')
+
       expected(actual, desired)
 
       # Check db