moose-inventory 1.0.8 → 2.0

data/spec/lib/moose_inventory/cli/host_rmvar_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 = []
@@ -38,169 +38,169 @@ RSpec.describe Moose::Inventory::Cli::Host do
       result = @host.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(host rmvar)) # <- no group given
-       end
- 
-       # Check output
-       desired = { aborted: true}
-       desired[:STDERR] = "ERROR: Wrong number of arguments, 0 for 2 or more.\n"
-       expected(actual, desired)
-     end
- 
-     #------------------------
-     it 'HOST key=value ... should abort if the host does not exist' do
-       host_name = "not-a-host"
-       var_name = "foo=bar"
-       actual = runner do
-         @app.start(%W(host rmvar #{host_name} #{var_name}))
-       end
- 
-       # Check output
-       desired = { aborted: true}
-       desired[:STDOUT] =
-         "Remove variable(s) '#{var_name}' from host '#{host_name}':\n"\
-         "  - retrieve host '#{host_name}'...\n"
-       desired[:STDERR] = 
-         "An error occurred during a transaction, any changes have been rolled back.\n"\
-         "ERROR: The host '#{host_name}' does not exist.\n"
-       expected(actual, desired)
-     end
- 
-     #------------------------
-     it 'HOST <malformed> ... should abort with an error' do
-        # 1. Should add the var to the db
-        # 2. Should associate the host with the var
-        
-        host_name = 'test1'
-        @db.models[:host].create(name: host_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(host rmvar #{host_name} #{args} ))
-          end
-          #@console.out(actual,'p')
-    
-          desired = { aborted: true}
-          desired[:STDOUT] = 
-            "Remove variable(s) '#{args}' from host '#{host_name}':\n"\
-            "  - retrieve host '#{host_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(host rmvar)) # <- no group given
+      end
+
+      # Check output
+      desired = { aborted: true }
+      desired[:STDERR] = "ERROR: Wrong number of arguments, 0 for 2 or more.\n"
+      expected(actual, desired)
+    end
+
+    #------------------------
+    it 'HOST key=value ... should abort if the host does not exist' do
+      host_name = 'not-a-host'
+      var_name = 'foo=bar'
+      actual = runner do
+        @app.start(%W(host rmvar #{host_name} #{var_name}))
+      end
+
+      # Check output
+      desired = { aborted: true }
+      desired[:STDOUT] =
+        "Remove variable(s) '#{var_name}' from host '#{host_name}':\n"\
+        "  - retrieve host '#{host_name}'...\n"
+      desired[:STDERR] =
+        "An error occurred during a transaction, any changes have been rolled back.\n"\
+        "ERROR: The host '#{host_name}' does not exist.\n"
+      expected(actual, desired)
+    end
+
+    #------------------------
+    it 'HOST <malformed> ... should abort with an error' do
+      # 1. Should add the var to the db
+      # 2. Should associate the host with the var
+
+      host_name = 'test1'
+      @db.models[:host].create(name: host_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(host rmvar #{host_name} #{args}))
         end
+        # @console.out(actual,'p')
+
+        desired = { aborted: true }
+        desired[:STDOUT] =
+          "Remove variable(s) '#{args}' from host '#{host_name}':\n"\
+          "  - retrieve host '#{host_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 'host rmvar HOST <valid args> ... should remove the host variable' do
-       # 1. Should add the var to the db
-       # 2. Should associate the host with the var
-       
-       host_name = 'test1'
-
-       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 host and hostvar
-         @db.models[:host].create(name: host_name)
-         runner do
-           @app.start(%W(host addvar #{host_name} #{var[:name]}=#{var[:value]} ))
-         end
-         
-         # Try to remove the hostvar using the case example valid args 
-         actual = runner do
-           @app.start(%W(host rmvar #{host_name} #{example}))
-         end
-         #@console.out(actual,'p')
-         
-         # Check the output
-         desired = { aborted: false}
-         desired[:STDOUT] =
-           "Remove variable(s) '#{example}' from host '#{host_name}':\n"\
-           "  - retrieve host '#{host_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
-         host = @db.models[:host].find(name: host_name)
-         hostvars = host.hostvars_dataset
-         expect(hostvars.count).to eq(0)
-         
-         hostvars = @db.models[:hostvar].all
-         expect(hostvars.count).to eq(0)
-       end
+      # 1. Should add the var to the db
+      # 2. Should associate the host with the var
+
+      host_name = 'test1'
+
+      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 host and hostvar
+        @db.models[:host].create(name: host_name)
+        runner do
+          @app.start(%W(host addvar #{host_name} #{var[:name]}=#{var[:value]}))
+        end
+
+        # Try to remove the hostvar using the case example valid args
+        actual = runner do
+          @app.start(%W(host rmvar #{host_name} #{example}))
+        end
+        # @console.out(actual,'p')
+
+        # Check the output
+        desired = { aborted: false }
+        desired[:STDOUT] =
+          "Remove variable(s) '#{example}' from host '#{host_name}':\n"\
+          "  - retrieve host '#{host_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
+        host = @db.models[:host].find(name: host_name)
+        hostvars = host.hostvars_dataset
+        expect(hostvars.count).to eq(0)
+
+        hostvars = @db.models[:hostvar].all
+        expect(hostvars.count).to eq(0)
+      end
     end
-    
+
     #------------------------
     it 'HOST key1=value1 key2=value2 ... should remove multiple key/value pairs' do
       host_name = 'test1'
-      varsarray  = [
-        {name: 'var1', value: "val1"},
-        {name: 'var2', value: "val2"}
+      varsarray = [
+        { name: 'var1', value: 'val1' },
+        { name: 'var2', value: 'val2' },
       ]
-          
+
       vars = []
       varsarray.each do |var|
         vars << "#{var[:name]}=#{var[:value]}"
       end
-        
+
       @db.models[:host].create(name: host_name)
       actual = runner do
-        @app.start(%W(host addvar #{host_name}) + vars )
+        @app.start(%W(host addvar #{host_name}) + vars)
       end
-      
+
       actual = runner do
-        @app.start(%W(host rmvar #{host_name}) + vars )
+        @app.start(%W(host rmvar #{host_name}) + vars)
       end
-      #@console.out(actual,'p')
-      
-      desired = { aborted: false}
-      desired[:STDOUT] = 
+      # @console.out(actual,'p')
+
+      desired = { aborted: false }
+      desired[:STDOUT] =
         "Remove variable(s) '#{vars.join(',')}' from host '#{host_name}':\n"\
         "  - retrieve host '#{host_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
       host = @db.models[:host].find(name: host_name)
       hostvars = host.hostvars_dataset
       expect(hostvars.count).to eq(0)
-    end        
+    end
   end
 end

data/spec/lib/moose_inventory/config/config_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe 'Moose::Inventory::Config' do
     @mockarg_parts = {
       config:  File.join(spec_root, 'config/config.yml'),
       format:  'yaml',
-      env:     'test'
+      env:     'test',
     }
 
     @mockargs = []
@@ -39,7 +39,7 @@ RSpec.describe 'Moose::Inventory::Config' do
     end
 
     it 'should default "--format" to json' do
-      @config.init([])
+      @config.init(['--config', @mockarg_parts[:config]])
       expect(@config._confopts[:format]).to eq('json')
     end
 
@@ -49,7 +49,7 @@ RSpec.describe 'Moose::Inventory::Config' do
     end
 
     it 'should default "--env" to ""' do
-      @config.init([])
+      @config.init(['--config', @mockarg_parts[:config]])
       expect(@config._confopts[:env]).to eq('')
     end
 
@@ -76,5 +76,18 @@ RSpec.describe 'Moose::Inventory::Config' do
       @config.init(@mockargs)
       expect(@config._settings[:config][:db]).not_to be_nil
     end
+
+    it 'uses safe YAML loading for configuration files' do
+      expect(YAML).not_to receive(:load_file)
+      expect(YAML).to receive(:safe_load_file).with(
+        @mockarg_parts[:config],
+        aliases: false,
+        permitted_classes: [],
+        permitted_symbols: []
+      ).and_call_original
+
+      @config.init(@mockargs)
+      expect(@config._settings[:config][:db]).not_to be_nil
+    end
   end
 end