jerakia 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3e8936250f4d06c2553fe8569715bd13c94b58d
-  data.tar.gz: 807773e2bf5c2792e553ad5db456426938aa2348
+  metadata.gz: 8e3992783b33d510127ef7fd6312002923e0b7d9
+  data.tar.gz: 8a86292db886d5d14f3937e6112da0ea6f3fb688
 SHA512:
-  metadata.gz: a7f5db5f4147dbc412eb503f812b30cc223a9e3f6464c5ce08b5bc9f398bf5dae76dbc42a271b03b067becfa742356093305a607c1f16eafe0105ba87eebff94
-  data.tar.gz: f21fc2d475838dbb4302c8bcb498a6e69eefec2e1aed6f27facbac5ef091ec5d16c74bdb4570f4cd66b1c612a42a79ff4bc21df9892bd3c27935c749b2712de8
+  metadata.gz: b275a1bdbb27e3c51bfbd2e5c3552c8e9a458136f8ed37fd0dd35a3ad597a0ec9111064d16cd96d6f3e5308dcd998a63c766214bb182c85d4b3cb2a6ddee0812
+  data.tar.gz: c44c4c3d9d0ab8dc0bb547d3fbdbd6d8e5801ce28f31fc60027418ba1d108622bbfe8924661326a1db46350aff7f697f6519b2c5b761163d36a54c0add1d386f

data/lib/hiera/backend/jerakia_backend.rb

@@ -43,7 +43,7 @@ class Hiera
         request = Jerakia::Request.new(
           :key         => key,
           :namespace   => namespace,
-          :policy      => metadata[:jerakia_policy] || @policy,
+          :policy      => metadata["jerakia_policy"] || @policy,
           :lookup_type => lookup_type,
           :merge       => merge_type,
           :metadata    => metadata,

data/lib/jerakia/cli.rb

@@ -27,7 +27,11 @@ class Jerakia
     option :scope,
            aliases: :s,
            type: :string,
-           desc: 'Scope handler'
+           desc: 'Scope handler',
+           default: "metadata"
+    option :scope_options,
+           type: :hash,
+           desc: "Key/value pairs to be passed to the scope handler"
     option :merge_type,
            aliases: :m,
            type: :string,
@@ -37,6 +41,10 @@ class Jerakia
            aliases: :l,
            type: :string,
            desc: 'Log level'
+    option :verbose,
+           aliases: :v,
+           type: :boolean,
+           desc: "Print verbose information"
     option :debug,
            aliases: :D,
            type: :boolean,
@@ -45,11 +53,16 @@ class Jerakia
            aliases: :d,
            type: :hash,
            desc: 'Key/value pairs to be used as metadata for the lookup'
+
     def lookup(key)
 
-      if options[:debug]
+      case true
+      when options[:verbose]
+        loglevel = "verbose"
+        logfile  = STDOUT
+      when options[:debug]
         loglevel = "debug"
-        logfile = STDOUT
+        logfile  = STDOUT
       else
         logfile = nil
         loglevel = options[:log_level]
@@ -62,12 +75,14 @@ class Jerakia
         :loglevel => loglevel,
       })
       req = Jerakia::Request.new(
-        :key         => key,
-        :namespace   => options[:namespace].split(/::/),
-        :policy      => options[:policy].to_sym,
-        :lookup_type => options[:type].to_sym,
-        :merge       => options[:merge_type].to_sym,
-        :metadata    => options[:metadata]
+        :key           => key,
+        :namespace     => options[:namespace].split(/::/),
+        :policy        => options[:policy].to_sym,
+        :lookup_type   => options[:type].to_sym,
+        :merge         => options[:merge_type].to_sym,
+        :metadata      => options[:metadata] || {},
+        :scope         => options[:scope].to_sym,
+        :scope_options => options[:scope_options],
       )
 
       answer = jac.lookup(req)

data/lib/jerakia/datasource/dummy.rb

@@ -6,7 +6,7 @@ class Jerakia::Datasource
       # Do the lookup
 
       Jerakia.log.debug("Searching key #{lookup.request.key} in dummy datasource")
-      option :return, { :type => String, :default => "Returned data" }  
+      option :return, { :type => [ String, Hash, Array ], :default => "Returned data" }  
       response.submit options[:return]
       
 

data/lib/jerakia/datasource.rb

@@ -29,7 +29,9 @@ class Jerakia::Datasource
       Jerakia.crit "#{opt} must be configured in #{whoami}" if data[:mandatory]
     else 
       if data[:type]
-        Jerakia.crit "#{opt} must be a #{data[:type].to_s} in #{whoami}" unless @options[opt].is_a?(data[:type])
+        unless Array(data[:type]).include?(@options[opt].class)
+          Jerakia.crit "#{opt} is a #{opt.class} but must be a #{data[:type].to_s} in #{whoami}"
+        end
       end
     end
   end

data/lib/jerakia/launcher.rb

@@ -14,7 +14,11 @@ class Jerakia::Launcher
     policy_name=request.policy.to_s
     Jerakia.log.debug "Invoked lookup for #{@@request.key} using policy #{policy_name}"
     filename=File.join(Jerakia.config.policydir, "#{policy_name}.rb")
-    policydata=Jerakia.filecache(filename)
+    begin
+      policydata=Jerakia.filecache(filename)
+    rescue Exception => e
+      Jerakia.crit("Problem loading policy from #{filename}")
+    end
     instance_eval policydata
   end
 

data/lib/jerakia/log.rb

@@ -5,6 +5,8 @@ class Jerakia::Log < Jerakia
     @@logger ||= Logger.new(file)
     @@level ||= level
     case @@level
+    when :verbose
+      @@logger.level = Logger::INFO
     when :info
       @@logger.level = Logger::INFO
     when :debug
@@ -12,6 +14,10 @@ class Jerakia::Log < Jerakia
     end
   end
 
+  def verbose(msg)
+    @@logger.info msg if @@level == :verbose
+  end
+
   def info(msg)
     @@logger.info msg
   end

data/lib/jerakia/lookup.rb

@@ -116,6 +116,7 @@ class Jerakia::Lookup
       
 
   def run
+    Jerakia.log.verbose("lookup: #{@name} key: #{@request.key} namespace: #{@request.namespace.join('/')}")
     @datasource.run
     response=@datasource.response
     @output_filters.each do |filter|

data/lib/jerakia/request.rb

@@ -1,21 +1,41 @@
-class Jerakia::Request
+class Jerakia
+  class Request
 
-  attr_accessor :key
-  attr_accessor :namespace
-  attr_accessor :merge
-  attr_accessor :policy
-  attr_accessor :metadata
-  attr_accessor :lookup_type
-  attr_accessor :scope
+    attr_accessor :key
+    attr_accessor :namespace
+    attr_accessor :merge
+    attr_accessor :policy
+    attr_accessor :metadata
+    attr_accessor :lookup_type
+    attr_accessor :scope
+    attr_accessor :scope_options
 
-  def initialize(opts={})
-    @key = opts[:key] || ''
-    @namespace =  opts[:namespace] || []
-    @merge = opts[:merge] || false
-    @policy = opts[:policy] || 'default'
-    @metadata = opts[:metadata] || {}
-    @lookup_type = opts[:lookup_type] || :first
-    @scope = opts[:scope] || nil
-  end
+    def initialize(opts={})
+      options        = defaults.merge(opts)
+      @key           = options[:key]
+      @namespace     = options[:namespace]
+      @merge         = options[:merge]
+      @policy        = options[:policy]
+      @metadata      = options[:metadata]
+      @lookup_type   = options[:lookup_type]
+      @scope         = options[:scope]
+      @scope_options = options[:scope_options] || {}
+
+      Jerakia.log.debug("Request initialized with #{options}")
+    end
 
+    private
+
+    def defaults
+      {
+        key: '',
+        namespace: [],
+        merge: false,
+        policy: 'default',
+        metadata: {},
+        lookup_type: :first,
+        scope: nil,
+      }
+    end
+  end
 end

data/lib/jerakia/scope/yaml.rb

@@ -0,0 +1,14 @@
+#
+class Jerakia::Scope
+  module Yaml
+    def create
+      yaml_file = request.scope_options["file"] || "./jerakia_scope.yaml"
+      Jerakia.crit("No such file for scope, #{yaml_file}") unless File.exists?(yaml_file)
+      data = YAML.load(File.read(yaml_file))
+      data.each do |key,val|
+        value[key.to_sym] = val
+      end
+    end
+  end
+end
+

data/lib/jerakia/version.rb

@@ -4,6 +4,6 @@ class Jerakia
   #
   # This should be updated when a new gem is released and it is read from the gemspec file
   #
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 
 end

data/lib/jerakia.rb

@@ -11,7 +11,7 @@ class Jerakia
   require 'jerakia/version'
 
   def initialize(options={})
-    configfile = options[:config] || '/etc/jerakia/jerakia.yaml'
+    configfile = options[:config] || ENV['JERAKIA_CONFIG'] ||  '/etc/jerakia/jerakia.yaml'
     @@config = Jerakia::Config.load_from_file(configfile)
 
     if @@config[:plugindir]
@@ -63,6 +63,7 @@ class Jerakia
   end
 
   def self.crit(msg)
+    Jerakia.log.error msg
     fail msg
   end
 end

data/lib/puppet/indirector/data_binding/jerakia.rb

@@ -20,7 +20,7 @@ class Puppet::DataBinding::Jerakia < Puppet::Indirector::Code
     key=lookupdata.pop
     namespace=lookupdata
     metadata =  request.options[:variables].to_hash
-    policy=metadata[:jerakia_policy] || @default_policy
+    policy=metadata["jerakia_policy"] || @default_policy
     jacreq = Jerakia::Request.new(
       :key => key,
       :namespace => namespace,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,6 +75,7 @@ files:
 - lib/jerakia/response/filter/strsub.rb
 - lib/jerakia/scope.rb
 - lib/jerakia/scope/metadata.rb
+- lib/jerakia/scope/yaml.rb
 - lib/jerakia/test.pp
 - lib/jerakia/util.rb
 - lib/jerakia/version.rb
@@ -105,3 +106,4 @@ signing_key:
 specification_version: 4
 summary: Extendable and flexible ata lookup system
 test_files: []
+has_rdoc: