hieracles 0.2.0 → 0.2.1

data/lib/hieracles/format.rb

@@ -8,6 +8,10 @@ module Hieracles
       "#{__callee__} not implemented, please inherit from the Hieracles::Format class to implement a format.\n"
     end
 
+    def facts(_)
+      "#{__callee__} not implemented, please inherit from the Hieracles::Format class to implement a format.\n"
+    end
+
     def files(_)
       "#{__callee__} not implemented, please inherit from the Hieracles::Format class to implement a format.\n"
     end

data/lib/hieracles/formats/console.rb

@@ -1,3 +1,5 @@
+require 'awesome_print'
+
 module Hieracles
   module Formats
     # format accepting colors
@@ -14,7 +16,8 @@ module Hieracles
         "\e[36m%s\e[0m",
         "\e[37m%s\e[0m",
         "\e[38m%s\e[0m",
-        "\e[97m%s\e[0m"
+        "\e[97m%s\e[0m",
+        "\e[35;1m%s\e[0m"
       ]
 
       def initialize(node)
@@ -22,16 +25,40 @@ module Hieracles
         super(node)
       end
 
-      def info(_)
+      def info(filter)
+        build_list(@node.info, @node.notifications, filter)
+      end
+
+      def facts(filter)
+        build_list(@node.facts, @node.notifications, filter)
+      end
+
+      def build_list(hash, notifications, filter)
         back = ''
-        length = max_key_length(@node.info) + 2
+        back << build_notifications(notifications) if notifications
+        if filter[0]
+          hash.select! { |k, v| Regexp.new(filter[0]).match(k.to_s) }
+        end
+        length = max_key_length(hash) + 2
         title = format(COLORS[8], "%-#{length}s")
-        @node.info.each do |k, v|
+        hash.each do |k, v|
+          if v.class.name == 'Hash' || v.class.name == 'Array'
+            v = v.ai({ indent: 10, raw: true}).strip
+          end
           back << format("#{title} %s\n", k, v)
         end
         back
       end
 
+      def build_notifications(notifications)
+        back = "\n"
+        notifications.each do |v|
+          back << format("#{COLORS[9]}\n", "*** #{v.source}: #{v.message} ***")
+        end
+        back << "\n"
+        back
+      end
+
       def files(_)
         @node.files.join("\n") + "\n"
       end
@@ -52,24 +79,30 @@ module Hieracles
       def build_params_line(key, value, filter)
         output = ''
         if !filter || Regexp.new(filter).match(key)
-          first = value.pop
-          filecolor_index = @colors[first[:file]]
-          filecolor = COLORS[filecolor_index]
-          if is_merged? first
-            output << format("%s #{COLORS[5]} %s\n", "[-]", key, sanitize(first[:merged]) )
-            output << format("    #{COLORS[8]}\n", "[#{filecolor_index}] #{key} #{sanitize(first[:value])}" )
-          else
-            output << format("#{filecolor} #{COLORS[5]} %s\n", "[#{filecolor_index}]", key, sanitize(first[:value]) )
-          end
+          output << build_first(key, value.pop)
           while value.count > 0
-            overriden = value.pop
-            filecolor_index = @colors[overriden[:file]]
-            output << format("    #{COLORS[8]}\n", "[#{filecolor_index}] #{key} #{overriden[:value]}")
+            output << build_next(key, value.pop)
           end
         end
         output
       end
 
+      def build_first(key, first)
+        filecolor_index = @colors[first[:file]]
+        filecolor = COLORS[filecolor_index]
+        if is_merged? first
+          format("%s #{COLORS[5]} %s\n", "[-]", key, sanitize(first[:merged]) ) +
+          format("    #{COLORS[8]}\n", "[#{filecolor_index}] #{key} #{sanitize(first[:value])}" )
+        else
+          format("#{filecolor} #{COLORS[5]} %s\n", "[#{filecolor_index}]", key, sanitize(first[:value]) )
+        end
+      end
+
+      def build_next(key, overriden)
+        filecolor_index = @colors[overriden[:file]]
+        format("    #{COLORS[8]}\n", "[#{filecolor_index}] #{key} #{overriden[:value]}")
+      end
+
       def build_modules_line(key, value)
         length = max_key_length(@node.modules) + 3
         value_color = '%s'

data/lib/hieracles/formats/csv.rb

@@ -8,6 +8,10 @@ module Hieracles
         make_csv @node.info.values
       end
 
+      def facts(_)
+        make_csv(@node.facts.keys) + make_csv(@node.facts.values)
+      end
+
       def files(_)
         make_csv @node.files
       end
@@ -30,18 +34,14 @@ module Hieracles
         if !filter || Regexp.new(filter).match(key)
           first = value.pop
           if is_merged? first
-            output << make_csv(in_what_file('-') +
-                     [key, first[:merged].to_s, '0'])
-            output << make_csv(in_what_file(first[:file]) +
-                     [key, first[:value].to_s, '1'])
+            output << build_line('-', key, first[:merged])
+            output << build_line(first[:file], key, first[:value], '1')
           else
-            output << make_csv(in_what_file(first[:file]) +
-                     [key, first[:value].to_s, '0'])
+            output << build_line(first[:file], key, first[:value])
           end
           while value.count > 0
             overriden = value.pop
-            output << make_csv(in_what_file(overriden[:file]) +
-                     [key, overriden[:value].to_s, '1'])
+            output << build_line(overriden[:file], key, overriden[:value], '1')
           end
         end
         output
@@ -53,6 +53,10 @@ module Hieracles
 
     private
 
+      def build_line(whatfile, key, value, overriden = '0')
+        make_csv(in_what_file(whatfile) + [key, value.to_s, overriden])
+      end
+
       def make_csv(array)
         array.join(CVS_DELIM) + "\n"
       end

data/lib/hieracles/formats/json.rb

@@ -6,29 +6,42 @@ module Hieracles
     class Json < Hieracles::Format
 
       def info(_)
-        @node.info.to_json
+        @node.info.merge(alerts).to_json
+      end
+
+      def facts(_)
+        @node.facts.merge(alerts).to_json
       end
 
       def files(_)
-        @node.files.to_json
+        { 'files' => @node.files }.merge(alerts).to_json
       end
 
       def paths(_)
-        @node.paths.to_json
+        { 'paths' => @node.paths }.merge(alerts).to_json
       end
 
       def modules(_)
-        @node.modules.to_json
+        @node.modules.merge(alerts).to_json
       end
 
       def params(args)
-        @node.params(true).to_json
+        @node.params(true).merge(alerts).to_json
       end
 
       def allparams(args)
-        @node.params(false).to_json
+        @node.params(false).merge(alerts).to_json
       end
 
+    private
+
+      def alerts
+        if @node.notifications.count > 0
+          { 'alerts' => @node.notifications.map(&:to_hash) }
+        else
+          {}
+        end
+      end
     end
   end
 end

data/lib/hieracles/formats/plain.rb

@@ -10,15 +10,36 @@ module Hieracles
         super(node)
       end
 
-      def info(_)
+      def info(filter)
+        build_list(@node.info, @node.notifications, filter)
+      end
+
+      def facts(filter)
+        build_list(@node.facts, @node.notifications, filter)
+      end
+
+      def build_list(hash, notifications, filter)
         back = ''
-        length = max_key_length(@node.info) + 2
-        @node.info.each do |k, v|
+        back << build_notifications(notifications) if notifications
+        if filter[0]
+          hash.select! { |k, v| Regexp.new(filter[0]).match(k) }
+        end
+        length = max_key_length(hash) + 2
+        hash.each do |k, v|
           back << format("%-#{length}s %s\n", k, v)
         end
         back
       end
 
+      def build_notifications(notifications)
+        back = "\n"
+        notifications.each do |v|
+          back << "*** #{v.source}: #{v.message} ***\n"
+        end
+        back << "\n"
+        back
+      end
+
       def files(_)
         @node.files.join("\n") + "\n"
       end

data/lib/hieracles/formats/rawyaml.rb

@@ -7,6 +7,10 @@ module Hieracles
         @node.info.to_yaml
       end
 
+      def facts(_)
+        @node.facts.to_yaml
+      end
+
       def files(_)
         @node.files.to_yaml
       end

data/lib/hieracles/formats/yaml.rb

@@ -7,6 +7,10 @@ module Hieracles
         @node.info.to_yaml
       end
 
+      def facts(_)
+        @node.facts.to_yaml
+      end
+
       def files(_)
         @node.files.to_yaml
       end

data/lib/hieracles/node.rb

@@ -8,21 +8,23 @@ module Hieracles
     include Hieracles::Utils
     include Hieracles::Interpolate
 
-    attr_reader :hiera_params, :hiera
+    attr_reader :hiera_params, :hiera, :facts, :notifications
 
     def initialize(fqdn, options)
+      @fqdn = fqdn
       Config.load(options)
       @hiera = Hieracles::Hiera.new
-      @hiera_params = { fqdn: fqdn }.
-        merge(get_hiera_params(fqdn)).
-        merge(Config.scope).
+      @hiera_params = { fqdn: @fqdn }.
+        merge(get_hiera_params(@fqdn)).
         merge(Config.extraparams)
-      @fqdn = fqdn
+      @facts = deep_sort(@hiera_params.
+        merge(Config.scope).
+        merge(puppet_facts))
     end
 
     def get_hiera_params(fqdn)
-      if File.exist?(File.join(Config.path('encpath'), "#{fqdn}.yaml"))
-        load = YAML.load_file(File.join(Config.path('encpath'), "#{fqdn}.yaml"))
+      @__hiera_params ||= if File.exist?(File.join(Config.encpath, "#{fqdn}.yaml"))
+        load = YAML.load_file(File.join(Config.encpath, "#{fqdn}.yaml"))
         sym_keys(load['parameters']).merge({ classes: load['classes']})
       else
         raise "Node not found"
@@ -31,7 +33,7 @@ module Hieracles
 
     def files(without_common = true)
       @__files ||= @hiera.hierarchy.reduce([]) do |a, f|
-        file = parse("#{f}.yaml", @hiera_params, Config.interactive)
+        file = parse("#{f}.yaml", @facts, Config.interactive)
         if file && 
            File.exist?(File.join(@hiera.datapath, file)) &&
            (!without_common ||
@@ -72,6 +74,10 @@ module Hieracles
     end
 
     def modules
+      @_modules ||= _get_modules
+    end
+
+    def _get_modules
       modules = {}
       classfiles.each do |c|
         if File.exist?(c)
@@ -88,12 +94,20 @@ module Hieracles
     end
 
     def info
-      @hiera_params
+      @_info ||= _get_info
+    end
+
+    def _get_info
+      extra = {}
+      if Config.usedb
+        extra = puppetdb_info
+      end
+      @hiera_params.merge extra
     end
 
     def classfiles
       @hiera_params[:classes].map do |cl|
-        format(Config.path('classpath'), cl)
+        format(Config.classpath, cl)
       end
     end
 
@@ -114,6 +128,29 @@ module Hieracles
       modules
     end
 
+    def puppetdb_info
+      request_db.node_info(@fqdn).data
+    end
+
+    def puppet_facts
+      if Config.usedb
+        resp = request_db.node_facts(@fqdn)
+        @notifications = resp.notifications
+        if resp.total_records > 0
+          resp.data
+        else
+          error "not found in puppetdb."
+          {}
+        end
+      else
+        {}
+      end
+    end
+
+    def request_db
+      @_request ||= Hieracles::Puppetdb::Request.new Config.puppetdb
+    end
+
     def merge_trees(left, right)
       case @hiera.merge_behavior
       when :deeper
@@ -146,5 +183,13 @@ module Hieracles
       end
     end
 
+    def error(message)
+      if @notifications
+        @notifications << Notification.new('node', message, 'error')
+      else
+        @notifications = [ Notification.new('node', message, 'error') ]
+      end
+    end
+
   end
 end

data/lib/hieracles/notification.rb

@@ -0,0 +1,31 @@
+module Hieracles
+  class Notification
+    attr_reader :level, :message, :timestamp, :source
+
+    LEVEL = {
+      'fatal' => 0,
+      'error' => 1,
+      'warning' => 2,
+      'info' => 3,
+      'debug' => 4
+    }
+
+    def initialize(source, message, level = 'info')
+      @source = source
+      @level = level
+      @message = message
+      @timestamp = Time.new
+    end
+
+    def to_hash
+      {
+        'source' => @source,
+        'level' => @level,
+        'message' => @message,
+        'timestamp' => @timestamp
+      }
+    end
+
+  end
+end
+    

data/lib/hieracles/options/hc.rb

@@ -0,0 +1,109 @@
+require 'hieracles/optparse'
+
+module Hieracles
+  module Options
+    class Hc < Hieracles::Optparse
+
+      def available_options
+        {
+          config: {
+            has_arg: true,
+            aliases: ['c', 'conf', 'config']
+          },
+          format: {
+            has_arg: true,
+            aliases: ['f', 'format']
+          },
+          params: {
+            has_arg: true,
+            aliases: ['p', 'params']
+          },
+          hierafile: {
+            has_arg: true,
+            aliases: ['h', 'hierafile']
+          },
+          basepath: {
+            has_arg: true,
+            aliases: ['b', 'basepath']
+          },
+          encpath: {
+            has_arg: true,
+            aliases: ['e', 'encpath']
+          },
+          version: {
+            has_arg: false,
+            aliases: ['v', 'version']
+          },
+          yaml_facts: {
+            has_arg: true,
+            aliases: ['y', 'yaml']
+          },
+          json_facts: {
+            has_arg: true,
+            aliases: ['j', 'json']
+          },
+          interactive: {
+            has_arg: false,
+            aliases: ['i', 'interactive']
+          },
+          db: {
+            has_arg: false,
+            aliases: ['db']
+          },
+          nodb: {
+            has_arg: false,
+            aliases: ['nodb', 'no-db', 'no']
+          }
+        }
+      end
+
+      def self.usage
+        return <<-END
+
+Usage: hc <fqdn> <command> [extra_args]
+
+Available commands:
+  info        provides the farm, datacenter, country
+              associated to the given fqdn
+              An extra param can be added for filtering
+              eg. hc <fqdn> info timestamp
+              eg. hc <fqdn> info farm
+  facts       lists facts, either provided as a fact file
+              or grabbed from puppetdb.
+              An extra param can be added for filtering
+              eg. hc <fqdn> facts architecture
+              eg. hc <fqdn> facts 'memory.*mb'
+  files       list all files containing params affecting this fqdn
+              (in more than commons)
+  paths       list all file paths for files with params
+  modules     list modules included in the farm where the node is
+  params      list params for the node matching the fqdn
+              An extra filter string can be added to limit the list
+              use ruby regexp without the enclosing slashes
+              eg. hc <fqdn> params postfix.*version
+              eg. hc <fqdn> params '^postfix'
+              eg. hc <fqdn> params 'version$'
+  allparams   same as params but including the common.yaml params (huge)
+              Also accepts a search string
+
+Extra args:
+  -f <plain|console|csv|yaml|rawyaml|json> default console
+  -p extraparam=what;anotherparam=this 
+  -c <configfile>
+  -h <hierafile>
+  -b <basepath> default ./
+  -e <encdir>
+  -y <fact_file> - facts in yaml format
+  -j <fact_file> - facts in json format
+  -v just displays the version of Hieracles
+  -i - interactive mode
+  -db - query puppetdb
+  -nodb - do not query puppetdb
+        END
+      end
+
+
+    end
+  end
+end
+