rouster 0.53 → 0.57

data/lib/rouster/deltas.rb

@@ -12,13 +12,12 @@ class Rouster
   # runs `crontab -l <user>` and parses output, returns hash:
   # {
   #   user => {
-  #     logicalOrderInt => {
+  #     command => {
   #       :minute => minute,
   #       :hour   => hour,
   #       :dom    => dom, # day of month
   #       :mon    => mon, # month
   #       :dow    => dow, # day of week
-  #       :command => command,
   #     }
   #   }
   # }
@@ -33,15 +32,15 @@ class Rouster
     if cache and self.deltas[:crontab].class.eql?(Hash)
 
       if self.cache_timeout and self.cache_timeout.is_a?(Integer) and (Time.now.to_i - self.cache[:crontab]) > self.cache_timeout
-        @log.debug(sprintf('invalidating [crontab] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:crontab]), self.cache_timeout))
+        @logger.debug(sprintf('invalidating [crontab] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:crontab]), self.cache_timeout))
         self.deltas.delete(:crontab)
       end
 
       if self.deltas.has_key?(:crontab) and self.deltas[:crontab].has_key?(user)
-        @log.debug(sprintf('using cached [crontab] from [%s]', self.cache[:crontab]))
+        @logger.debug(sprintf('using cached [crontab] from [%s]', self.cache[:crontab]))
         return self.deltas[:crontab][user]
       elsif self.deltas.has_key?(:crontab) and user.eql?('*')
-        @log.debug(sprintf('using cached [crontab] from [%s]', self.cache[:crontab]))
+        @logger.debug(sprintf('using cached [crontab] from [%s]', self.cache[:crontab]))
         return self.deltas[:crontab]
       else
         # noop fallthrough to gather data to cache
@@ -49,7 +48,6 @@ class Rouster
 
     end
 
-    i = 0
     res = Hash.new
     users = nil
 
@@ -69,25 +67,30 @@ class Rouster
       end
 
       raw.split("\n").each do |line|
-        next if line.match(/^#/)
+        next if line.match(/^#|^\s+$/)
         elements = line.split("\s")
 
+        command = elements[5..elements.size].join(' ')
+
         res[u] ||= Hash.new
-        res[u][i] ||= Hash.new
-
-        res[u][i][:minute]  = elements[0]
-        res[u][i][:hour]    = elements[1]
-        res[u][i][:dom]     = elements[2]
-        res[u][i][:mon]     = elements[3]
-        res[u][i][:dow]     = elements[4]
-        res[u][i][:command] = elements[5..elements.size].join(' ')
-      end
 
-      i += 1
+        if res[u][command].class.eql?(Hash)
+          unique = elements.join('')
+          command = sprintf('%s-duplicate.%s', command, unique)
+          @logger.info(sprintf('duplicate crontab command found, adding hash key[%s]', command))
+        end
+
+        res[u][command]           = Hash.new
+        res[u][command][:minute]  = elements[0]
+        res[u][command][:hour]    = elements[1]
+        res[u][command][:dom]     = elements[2]
+        res[u][command][:mon]     = elements[3]
+        res[u][command][:dow]     = elements[4]
+      end
     end
 
     if cache
-      @log.debug(sprintf('caching [crontab] at [%s]', Time.now.asctime))
+      @logger.debug(sprintf('caching [crontab] at [%s]', Time.now.asctime))
 
       if ! user.eql?('*')
         self.deltas[:crontab] ||= Hash.new
@@ -124,10 +127,10 @@ class Rouster
     if cache and ! self.deltas[:groups].nil?
 
       if self.cache_timeout and self.cache_timeout.is_a?(Integer) and (Time.now.to_i - self.cache[:groups]) > self.cache_timeout
-        @log.debug(sprintf('invalidating [groups] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:groups]), self.cache_timeout))
+        @logger.debug(sprintf('invalidating [groups] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:groups]), self.cache_timeout))
         self.deltas.delete(:groups)
       else
-        @log.debug(sprintf('using cached [groups] from [%s]', self.cache[:groups]))
+        @logger.debug(sprintf('using cached [groups] from [%s]', self.cache[:groups]))
         return self.deltas[:groups]
       end
 
@@ -166,7 +169,7 @@ class Rouster
         gid = users[user][:gid]
 
         unless known_valid_gids.member?(gid)
-          @log.warn(sprintf('found user[%s] with unknown GID[%s], known GIDs[%s]', user, gid, known_valid_gids))
+          @logger.warn(sprintf('found user[%s] with unknown GID[%s], known GIDs[%s]', user, gid, known_valid_gids))
           next
         end
 
@@ -186,7 +189,7 @@ class Rouster
     end
 
     if cache
-      @log.debug(sprintf('caching [groups] at [%s]', Time.now.asctime))
+      @logger.debug(sprintf('caching [groups] at [%s]', Time.now.asctime))
       self.deltas[:groups] = groups
       self.cache[:groups]  = Time.now.to_i
     end
@@ -219,10 +222,10 @@ class Rouster
     if cache and ! self.deltas[:packages].nil?
 
       if self.cache_timeout and self.cache_timeout.is_a?(Integer) and (Time.now.to_i - self.cache[:packages]) > self.cache_timeout
-        @log.debug(sprintf('invalidating [packages] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:packages]), self.cache_timeout))
+        @logger.debug(sprintf('invalidating [packages] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:packages]), self.cache_timeout))
         self.deltas.delete(:packages)
       else
-        @log.debug(sprintf('using cached [packages] from [%s]', self.cache[:packages]))
+        @logger.debug(sprintf('using cached [packages] from [%s]', self.cache[:packages]))
         return self.deltas[:packages]
       end
 
@@ -299,7 +302,7 @@ class Rouster
     end
 
     if cache
-      @log.debug(sprintf('caching [packages] at [%s]', Time.now.asctime))
+      @logger.debug(sprintf('caching [packages] at [%s]', Time.now.asctime))
       self.deltas[:packages] = res
       self.cache[:packages]  = Time.now.to_i
     end
@@ -332,10 +335,10 @@ class Rouster
 
     if cache and ! self.deltas[:ports].nil?
       if self.cache_timeout and self.cache_timeout.is_a?(Integer) and (Time.now.to_i - self.cache[:ports]) > self.cache_timeout
-        @log.debug(sprintf('invalidating [ports] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:ports]), self.cache_timeout))
+        @logger.debug(sprintf('invalidating [ports] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:ports]), self.cache_timeout))
         self.deltas.delete(:ports)
       else
-        @log.debug(sprintf('using cached [ports] from [%s]', self.cache[:ports]))
+        @logger.debug(sprintf('using cached [ports] from [%s]', self.cache[:ports]))
         return self.deltas[:ports]
       end
     end
@@ -367,7 +370,7 @@ class Rouster
     end
 
     if cache
-      @log.debug(sprintf('caching [ports] at [%s]', Time.now.asctime))
+      @logger.debug(sprintf('caching [ports] at [%s]', Time.now.asctime))
       self.deltas[:ports] = res
       self.cache[:ports]  = Time.now.to_i
     end
@@ -400,10 +403,10 @@ class Rouster
     if cache and ! self.deltas[:services].nil?
 
       if self.cache_timeout and self.cache_timeout.is_a?(Integer) and (Time.now.to_i - self.cache[:services]) > self.cache_timeout
-        @log.debug(sprintf('invalidating [services] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:services]), self.cache_timeout))
+        @logger.debug(sprintf('invalidating [services] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:services]), self.cache_timeout))
         self.deltas.delete(:services)
       else
-        @log.debug(sprintf('using cached [services] from [%s]', self.cache[:services]))
+        @logger.debug(sprintf('using cached [services] from [%s]', self.cache[:services]))
         return self.deltas[:services]
       end
 
@@ -492,18 +495,20 @@ class Rouster
 
           if line.match(/^(\w+?)\sis\s(.*)$/)
             # <service> is <state>
-            res[$1] = $2
+            name = $1
+            state = $2
+            res[name] = state
 
-            if $2.match(/^not/)
+            if state.match(/^not/)
               # this catches 'Kdump is not operational'
-              res[$1] = 'stopped'
+              res[name] = 'stopped'
             end
 
           elsif line.match(/^(\w+?)\s\(pid.*?\)\sis\s(\w+)$/)
             # <service> (pid <pid> [pid]) is <state>...
             res[$1] = $2
           elsif line.match(/^(\w+?)\sis\s(\w+)\.*$/) # not sure this is actually needed
-            @log.debug('triggered supposedly unnecessary regex')
+            @logger.debug('triggered supposedly unnecessary regex')
             # <service> is <state>. whatever
             res[$1] = $2
           elsif line.match(/^(\w+?)\:.*?(\w+)$/)
@@ -529,7 +534,7 @@ class Rouster
       if humanize
         res.each_pair do |k,v|
           next if allowed_modes.member?(v)
-          @log.debug(sprintf('replacing service[%s] status of [%s] with [%s] for uniformity', k, v, failover_mode))
+          @logger.debug(sprintf('replacing service[%s] status of [%s] with [%s] for uniformity', k, v, failover_mode))
           res[k] = failover_mode
         end
       end
@@ -539,7 +544,7 @@ class Rouster
     end
 
     if cache
-      @log.debug(sprintf('caching [services] at [%s]', Time.now.asctime))
+      @logger.debug(sprintf('caching [services] at [%s]', Time.now.asctime))
       self.deltas[:services] = res
       self.cache[:services]  = Time.now.to_i
     end
@@ -566,10 +571,10 @@ class Rouster
     if cache and ! self.deltas[:users].nil?
 
       if self.cache_timeout and self.cache_timeout.is_a?(Integer) and (Time.now.to_i - self.cache[:users]) > self.cache_timeout
-        @log.debug(sprintf('invalidating [users] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:users]), self.cache_timeout))
+        @logger.debug(sprintf('invalidating [users] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:users]), self.cache_timeout))
         self.deltas.delete(:users)
       else
-        @log.debug(sprintf('using cached [users] from [%s]', self.cache[:users]))
+        @logger.debug(sprintf('using cached [users] from [%s]', self.cache[:users]))
         return self.deltas[:users]
       end
 
@@ -594,7 +599,7 @@ class Rouster
     end
 
     if cache
-      @log.debug(sprintf('caching [users] at [%s]', Time.now.asctime))
+      @logger.debug(sprintf('caching [users] at [%s]', Time.now.asctime))
       self.deltas[:users] = res
       self.cache[:users]  = Time.now.to_i
     end

data/lib/rouster/puppet.rb

@@ -20,10 +20,10 @@ class Rouster
     if cache.true? and ! self.facts.nil?
 
       if self.cache_timeout and self.cache_timeout.is_a?(Integer) and (Time.now.to_i - self.cache[:facter]) > self.cache_timeout
-        @log.debug(sprintf('invalidating [facter] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:facter]), self.cache_timeout))
+        @logger.debug(sprintf('invalidating [facter] cache, was [%s] old, allowed [%s]', (Time.now.to_i - self.cache[:facter]), self.cache_timeout))
         self.facts = nil
       else
-        @log.debug(sprintf('using cached [facter] from [%s]', self.cache[:facter]))
+        @logger.debug(sprintf('using cached [facter] from [%s]', self.cache[:facter]))
         return self.facts
       end
 
@@ -38,7 +38,7 @@ class Rouster
     end
 
     if cache.true?
-      @log.debug(sprintf('caching [facter] at [%s]', Time.now.asctime))
+      @logger.debug(sprintf('caching [facter] at [%s]', Time.now.asctime))
       self.facts = res
       self.cache[:facter] = Time.now.to_i
     end
@@ -93,8 +93,17 @@ class Rouster
   # parameters
   # * [input] - string to look at, defaults to self.get_output()
   def get_puppet_errors(input=nil)
-    str    = input.nil? ? self.get_output() : input
-    errors = str.scan(/35merr:.*/)
+    str       = input.nil? ? self.get_output() : input
+    errors    = nil
+    errors_27 = str.scan(/35merr:.*/)
+    errors_30 = str.scan(/Error:.*/)
+
+    # TODO this is a little less than efficient, don't scan for 3.0 if you found 2.7
+    if errors_27.size > 0
+      errors = errors_27
+    else
+      errors = errors_30
+    end
 
     errors.empty? ? nil : errors
   end
@@ -107,8 +116,17 @@ class Rouster
   # parameters
   # * [input] - string to look at, defaults to self.get_output()
   def get_puppet_notices(input=nil)
-    str     = input.nil? ? self.get_output() : input
-    notices = str.scan(/36mnotice:.*/)
+    str        = input.nil? ? self.get_output() : input
+    notices    = nil
+    notices_27 = str.scan(/36mnotice:.*/) # not sure when this stopped working
+    notices_30 = str.scan(/Notice:.*/)
+
+    # TODO this is a little less than efficient, don't scan for 3.0 if you found 2.7
+    if notices_27.size > 0
+      notices = notices_27
+    else
+      notices = notices_30
+    end
 
     notices.empty? ? nil : notices
   end
@@ -151,7 +169,7 @@ class Rouster
     cmd = 'hiera'
 
     if facts.nil?
-      @log.info('no facts provided, calling facter() automatically')
+      @logger.info('no facts provided, calling facter() automatically')
       facts = self.facter()
     end
 
@@ -279,14 +297,13 @@ class Rouster
       end
     end
 
-
     results[:classes]   = classes
     results[:resources] = resources
 
     results
   end
 
-  # TODO: come up with better method names here.. remove_existing_certs() and remove_my_cert() are not very descriptive
+  # TODO: come up with better method names here.. remove_existing_certs() and remove_specific_cert() are not very descriptive
 
   ##
   # remove_existing_certs
@@ -307,16 +324,46 @@ class Rouster
       hacky_break = false
 
       except.each do |exception|
+        next if hacky_break
         hacky_break = line.match(/#{exception}/)
+      end
 
-        next if hacky_break
+      next if hacky_break
+
+      host = $1 if line.match(/^\+\s"(.*?)"/)
+
+      hosts.push(host) unless host.nil? # only want to clear signed certs
+    end
+
+    hosts.each do |host|
+      self.run(sprintf('puppet cert --clean %s', host))
+    end
+
+  end
+
+  ##
+  # remove_specific_cert
+  #
+  # ... removes a specific (or several specific) certificates, effectively the reverse of remove_existing_certs() - and again, really only useful when called on a puppet master
+  def remove_specific_cert (targets)
+    targets = targets.kind_of?(Array) ? targets : [targets]
+    hosts = Array.new()
+
+    res = self.run('puppet cert list --all')
+
+    res.each_line do |line|
+      hacky_break = true
+
+      targets.each do |target|
+        next unless hacky_break
+        hacky_break = line.match(/#{target}/)
       end
 
       next unless hacky_break
 
       host = $1 if line.match(/^\+\s"(.*?)"/)
+      hosts.push(host) unless host.nil?
 
-      hosts.push(host) unless host.nil? # only want to clear signed certs
     end
 
     hosts.each do |host|
@@ -325,6 +372,7 @@ class Rouster
 
   end
 
+
   ##
   # run_puppet
   #
@@ -355,7 +403,7 @@ class Rouster
   # parameters
   # * [mode] - method to run puppet, defaults to 'master'
   # * [opts] - hash of additional options
-  def run_puppet(mode='master', passed_opts=nil)
+  def run_puppet(mode='master', passed_opts={})
 
     if mode.eql?('master')
       opts = {
@@ -391,22 +439,33 @@ class Rouster
         :additional_options => nil
       }.merge!(passed_opts)
 
-      ## validate required arguments
-      raise InternalError.new(sprintf('invalid hiera config specified[%s]', opts[:hiera_config])) unless self.is_file?(opts[:hiera_config])
-      raise InternalError.new(sprintf('invalid module dir specified[%s]', opts[:module_dir])) unless self.is_dir?(opts[:module_dir])
+      ## validate arguments -- can do better here (:manifest_dir, :manifest_file)
+      puppet_version = self.get_puppet_version() # hiera_config specification is only supported in >3.0, but NOT required anywhere
+
+      if opts[:hiera_config]
+        if puppet_version > '3.0'
+          raise InternalError.new(sprintf('invalid hiera config specified[%s]', opts[:hiera_config])) unless self.is_file?(opts[:hiera_config])
+        else
+          @logger.error(sprintf('puppet version[%s] does not support --hiera_config, ignoring', puppet_version))
+        end
+      end
 
-      puppet_version = self.get_puppet_version() # hiera_config specification is only supported in >3.0
+      if opts[:module_dir]
+        raise InternalError.new(sprintf('invalid module dir specified[%s]', opts[:module_dir])) unless self.is_dir?(opts[:module_dir])
+      end
 
       if opts[:manifest_file]
         opts[:manifest_file] = opts[:manifest_file].class.eql?(Array) ? opts[:manifest_file] : [opts[:manifest_file]]
         opts[:manifest_file].each do |file|
           raise InternalError.new(sprintf('invalid manifest file specified[%s]', file)) unless self.is_file?(file)
 
-          cmd = sprintf('puppet apply %s --modulepath=%s', (puppet_version > '3.0') ? "--hiera_config=#{opts[:hiera_config]}" : '', opts[:module_dir])
+          cmd = 'puppet apply'
+          cmd << sprintf(' --modulepath=%s', opts[:module_dir]) unless opts[:module_dir].nil?
+          cmd << sprintf(' --hiera_config=%s', opts[:hiera_config]) unless opts[:hiera_config].nil? or puppet_version < '3.0'
           cmd << sprintf(' --environment %s', opts[:environment]) unless opts[:environment].nil?
           cmd << sprintf(' --certname %s', opts[:certname]) unless opts[:certname].nil?
           cmd << ' --pluginsync' if opts[:pluginsync]
-          cmd << opts[:additional_options] unless opts[:additional_options].nil?
+          cmd << sprintf(' %s', opts[:additional_options]) unless opts[:additional_options].nil?
           cmd << sprintf(' %s', file)
 
           self.run(cmd, opts[:expected_exitcode])
@@ -422,11 +481,13 @@ class Rouster
 
           manifests.each do |m|
 
-            cmd = sprintf('puppet apply %s --modulepath=%s', (puppet_version > '3.0') ? "--hiera_config=#{opts[:hiera_config]}" : '', opts[:module_dir])
+            cmd = 'puppet apply'
+            cmd << sprintf(' --modulepath=%s', opts[:module_dir]) unless opts[:module_dir].nil?
+            cmd << sprintf(' --hiera_config=%s', opts[:hiera_config]) unless opts[:hiera_config].nil? or puppet_version < '3.0'
             cmd << sprintf(' --environment %s', opts[:environment]) unless opts[:environment].nil?
             cmd << sprintf(' --certname %s', opts[:certname]) unless opts[:certname].nil?
             cmd << ' --pluginsync' if opts[:pluginsync]
-            cmd << opts[:additional_options] unless opts[:additional_options].nil?
+            cmd << sprintf(' %s', opts[:additional_options]) unless opts[:additional_options].nil?
             cmd << sprintf(' %s', m)
 
             self.run(cmd, opts[:expected_exitcode])

data/lib/rouster/testing.rb

@@ -8,7 +8,99 @@ class Rouster
   ##
   # validate_cron
   #
-  # TODO how do we actually want to implement this? since cron jobs don't have names, what does the user specify instead?
+  # given the name of the user who owns crontab, the cron's command to execute and a hash of expectations, returns true|false whether cron matches expectations
+  #
+  # parameters
+  # * <user> - name of user who owns crontab
+  # * <name> - the cron's command to execute
+  # * <expectations> - hash of expectations, see examples
+  # * <fail_fast> - return false immediately on any failure (default is false)
+  #
+  # example expectations:
+  # 'username',
+  # '/home/username/test.pl', {
+  #    :ensure => 'present',
+  #    :minute => 1,
+  #    :hour   => 0,
+  #    :dom    => '*',
+  #    :mon    => '*',
+  #    :dow    => '*',
+  # }
+  #
+  # 'root',
+  # 'printf > /var/log/apache/error_log', {
+  #    :minute => 59,
+  #    :hour   => [8, 12],
+  #    :dom    => '*',
+  #    :mon    => '*',
+  #    :dow    => '*',
+  # }
+  #
+  # supported keys:
+  #   * :exists|:ensure -- defaults to present if not specified
+  #   * :minute
+  #   * :hour
+  #   * :dom -- day of month
+  #   * :mon -- month
+  #   * :dow  -- day of week
+  #   * :constrain
+  def validate_cron(user, name, expectations, fail_fast=false)
+    if user.nil?
+      raise InternalError.new('no user specified constraint')
+    end
+
+    crontabs = self.get_crontab(user)
+
+    if expectations[:ensure].nil? and expectations[:exists].nil?
+      expectations[:ensure] = 'present'
+    end
+
+    if expectations.has_key?(:constrain)
+      expectations[:constrain] = expectations[:constrain].class.eql?(Array) ? expectations[:constrain] : [expectations[:constrain]]
+
+      expectations[:constrain].each do |constraint|
+        fact, expectation = constraint.split("\s")
+        unless meets_constraint?(fact, expectation)
+          @logger.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
+          return true
+        end
+      end
+
+      expectations.delete(:constrain)
+    end
+
+    results = Hash.new()
+    local = nil
+
+    expectations.each do |k,v|
+      case k
+        when :ensure, :exists
+          if crontabs.has_key?(name)
+            if v.to_s.match(/absent|false/).nil?
+              local = true
+            else
+              local = false
+            end
+          else
+            local = v.to_s.match(/absent|false/).nil? ? false : true
+          end
+        when :minute, :hour, :dom, :mon, :dow
+          if crontabs.has_key?(name) and crontabs[name].has_key?(k) and crontabs[name][k].to_s.eql?(v.to_s)
+            local = true
+          else
+            local = false
+          end
+        else
+          raise InternalError.new(sprintf('unknown expectation[%s / %s]', k, v))
+      end
+
+      return false if local.eql?(false) and fail_fast.eql?(true)
+      results[k] = local
+    end
+
+    @logger.info("#{name} [#{expectations}] => #{results}")
+    results.find{|k,v| v.false? }.nil?
+  end
 
   ##
   # validate_file
@@ -72,7 +164,7 @@ class Rouster
         expectation = $2
 
         unless meets_constraint?(fact, expectation)
-          @log.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
+          @logger.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
           return true
         end
       end
@@ -92,6 +184,14 @@ class Rouster
             local = true
           elsif properties.nil?
             local = false
+          elsif v.to_s.match(/symlink|link/)
+            if expectations[:target].nil?
+              # don't validate the link path, just check whether we're a link
+              local = properties[:symlink?]
+            else
+              # validate the link path
+              local = properties[:target].eql?(expectations[:target])
+            end
           else
             case v
               when 'dir', 'directory'
@@ -139,6 +239,18 @@ class Rouster
             end
             next if local.false?
           end
+        when :notcontains, :doesntcontain # TODO determine the appropriate attribute title here
+          v = v.class.eql?(Array) ? v : [v]
+          v.each do |regex|
+            local = true
+            begin
+              self.run(sprintf("grep -c '%s' %s", regex, name))
+              local = false
+            rescue
+              local = true
+            end
+            next if local.false?
+          end
         when :mode, :permissions
           if properties.nil?
             local = false
@@ -171,6 +283,8 @@ class Rouster
           end
         when :type
           # noop allowing parse_catalog() output to be passed directly
+        when :target
+          # noop allowing ensure => 'link' / 'symlink' to specify their .. target
         else
           raise InternalError.new(sprintf('unknown expectation[%s / %s]', k, v))
       end
@@ -179,9 +293,8 @@ class Rouster
       results[k] = local
     end
 
-    @log.info(results)
+    @logger.info("#{name} [#{expectations}] => #{results}")
     results.find{|k,v| v.false? }.nil?
-
   end
 
   ##
@@ -227,7 +340,7 @@ class Rouster
       expectations[:constrain].each do |constraint|
         fact, expectation = constraint.split("\s")
         unless meets_constraint?(fact, expectation)
-          @log.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
+          @logger.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
           return true
         end
       end
@@ -276,7 +389,7 @@ class Rouster
       results[k] = local
     end
 
-    @log.info(results)
+    @logger.info("#{name} [#{expectations}] => #{results}")
     results.find{|k,v| v.false? }.nil?
   end
 
@@ -322,7 +435,7 @@ class Rouster
       expectations[:constrain].each do |constraint|
         fact, expectation = constraint.split("\s")
         unless meets_constraint?(fact, expectation)
-          @log.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
+          @logger.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
           return true
         end
       end
@@ -368,8 +481,8 @@ class Rouster
     end
 
     # TODO figure out a good way to allow access to the entire hash, not just boolean -- for now just print at an info level
-    @log.info(results)
 
+    @logger.info("#{name} [#{expectations}] => #{results}")
     results.find{|k,v| v.false? }.nil?
   end
 
@@ -417,7 +530,7 @@ class Rouster
       expectations[:constrain].each do |constraint|
         fact, expectation = constraint.split("\s")
         unless meets_constraint?(fact, expectation)
-          @log.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
+          @logger.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
           return true
         end
       end
@@ -461,8 +574,7 @@ class Rouster
       results[k] = local
     end
 
-    @log.info(results)
-
+    @logger.info("#{name} [#{expectations}] => #{results}")
     results.find{|k,v| v.false? }.nil?
   end
 
@@ -503,7 +615,7 @@ class Rouster
       expectations[:constrain].each do |constraint|
         fact, expectation = constraint.split("\s")
         unless meets_constraint?(fact, expectation)
-          @log.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
+          @logger.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
           return true
         end
       end
@@ -542,9 +654,8 @@ class Rouster
       results[k] = local
     end
 
-    @log.info(results)
+    @logger.info("#{name} [#{expectations}] => #{results}")
     results.find{|k,v| v.false? }.nil?
-
   end
 
   ##
@@ -594,7 +705,7 @@ class Rouster
       expectations[:constrain].each do |constraint|
         fact, expectation = constraint.split("\s")
         unless meets_constraint?(fact, expectation)
-          @log.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
+          @logger.info(sprintf('returning true for expectation [%s], did not meet constraint[%s/%s]', name, fact, expectation))
           return true
         end
       end
@@ -663,9 +774,8 @@ class Rouster
       results[k] = local
     end
 
-    @log.info(results)
+    @logger.info("#{name} [#{expectations}] => #{results}")
     results.find{|k,v| v.false? }.nil?
-
   end
 
   ## internal methods
@@ -687,7 +797,7 @@ class Rouster
 
     unless self.respond_to?('facter') or self.respond_to?('hiera')
       # if we haven't loaded puppet.rb, we won't have access to facts/hiera lookups
-      @log.warn('using constraints without loading [rouster/puppet] will not work, forcing no-op')
+      @logger.warn('using constraints without loading [rouster/puppet] will not work, forcing no-op')
       return false
     end
 
@@ -712,7 +822,7 @@ class Rouster
       res = ! actual.to_s.match(/#{expectation}/).nil?
     end
 
-    @log.debug(sprintf('meets_constraint?(%s, %s): %s', key, expectation, res.nil?))
+    @logger.debug(sprintf('meets_constraint?(%s, %s): %s', key, expectation, res.nil?))
     res
   end