1 files changed, 50 insertions, 24 deletions

diff --git a/lib/oxidized/node.rb b/lib/oxidized/node.rb
index cc1e406..c93a16a 100644
--- a/lib/oxidized/node.rb
+++ b/lib/oxidized/node.rb
@@ -9,9 +9,7 @@ module Oxidized
     attr_accessor :running, :user, :msg, :from, :stats, :retry
     alias :running? :running
     def initialize opt
-      if Oxidized.config.debug == true or opt[:debug] == true
-        puts 'resolving DNS for %s...' % opt[:name]
-      end
+      Oxidized.logger.debug 'resolving DNS for %s...' % opt[:name]
       @name           = opt[:name]
       @ip             = IPAddr.new(opt[:ip]).to_s rescue nil
       @ip           ||= Resolv.new.getaddress @name
@@ -24,7 +22,7 @@ module Oxidized
       @vars           = opt[:vars]
       @stats          = Stats.new
       @retry          = 0
-      @repo           = resolve_repo
+      @repo           = resolve_repo opt
 
       # model instance needs to access node instance
       @model.node = self
@@ -130,24 +128,15 @@ module Oxidized
     end
 
     def resolve_auth opt
-      # Resolve configured username/password, give priority to group level configuration
-      # TODO: refactor to use revised behaviour of Asetus
-      cfg_username, cfg_password =
-        if Oxidized.config.groups.has_key?(@group) and ['username', 'password'].all? {|e| Oxidized.config.groups[@group].has_key?(e)}
-          [Oxidized.config.groups[@group].username, Oxidized.config.groups[@group].password]
-        elsif ['username', 'password'].all? {|e| Oxidized.config.has_key?(e)}
-          [Oxidized.config.username, Oxidized.config.password]
-        else
-          [nil, nil]
-        end
-      auth = {}
-      auth[:username] = (opt[:username] or cfg_username)
-      auth[:password] = (opt[:password] or cfg_password)
-      auth
+      # Resolve configured username/password
+      {
+        username: resolve_key(:username, opt),
+        password: resolve_key(:password, opt),
+      }
     end
 
     def resolve_input opt
-      inputs = (opt[:input]  or Oxidized.config.input.default)
+      inputs = resolve_key :input, opt, Oxidized.config.input.default
       inputs.split(/\s*,\s*/).map do |input|
         if not Oxidized.mgr.input[input]
           Oxidized.mgr.add_input input or raise MethodNotFound, "#{input} not found for node #{ip}"
@@ -157,7 +146,7 @@ module Oxidized
     end
 
     def resolve_output opt
-      output = (opt[:output] or Oxidized.config.output.default)
+      output = resolve_key :output, opt, Oxidized.config.output.default
       if not Oxidized.mgr.output[output]
         Oxidized.mgr.add_output output or raise MethodNotFound, "#{output} not found for node #{ip}"
       end
@@ -165,7 +154,7 @@ module Oxidized
     end
 
     def resolve_model opt
-      model = (opt[:model] or Oxidized.config.model)
+      model = resolve_key :model, opt
       if not Oxidized.mgr.model[model]
         Oxidized.logger.debug "lib/oxidized/node.rb: Loading model #{model.inspect}"
         Oxidized.mgr.add_model model or raise ModelNotFound, "#{model} not found for node #{ip}"
@@ -173,15 +162,52 @@ module Oxidized
       Oxidized.mgr.model[model].new
     end
 
-    def resolve_repo
+    def resolve_repo opt
+      return unless is_git? opt
+
       remote_repo = Oxidized.config.output.git.repo
 
-      if Oxidized.config.output.git.single_repo? || @group.nil? || remote_repo.is_a?(String)
-        remote_repo
+      if remote_repo.is_a?(::String)
+        if Oxidized.config.output.git.single_repo? || @group.nil?
+          remote_repo
+        else
+          File.join(File.dirname(remote_repo), @group + '.git')
+        end
       else
         remote_repo[@group]
       end
     end
 
+    def resolve_key key, opt, global=nil
+      # resolve key, first get global, then get group then get node config
+      key_sym = key.to_sym
+      key_str = key.to_s
+      value   = global
+      Oxidized.logger.debug "node.rb: resolving node key '#{key}', with passed global value of '#{value}' and node value '#{opt[key_sym]}'"
+
+      #global
+      if not value and Oxidized.config.has_key?(key_str)
+        value = Oxidized.config[key_str]
+        Oxidized.logger.debug "node.rb: setting node key '#{key}' to value '#{value}' from global"
+      end
+
+      #group
+      if Oxidized.config.groups.has_key?(@group)
+        if Oxidized.config.groups[@group].has_key?(key_str)
+          value = Oxidized.config.groups[@group][key_str]
+          Oxidized.logger.debug "node.rb: setting node key '#{key}' to value '#{value}' from group"
+        end
+      end
+
+      #node
+      value = opt[key_sym] || value
+      Oxidized.logger.debug "node.rb: returning node key '#{key}' with value '#{value}'"
+      value
+    end
+
+    def is_git? opt
+      (opt[:output] || Oxidized.config.output.default) == 'git'
+    end
+
   end
 end