jerakia 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfa6b5b4e283d6a8eac75289da4e456cdf7b4365
-  data.tar.gz: fd106c3ac2c92d1e18ff1a598b12ccde5a67bc40
+  metadata.gz: 817afa48119cb3dbc3e6dff1aff91c3f02a8963f
+  data.tar.gz: 9888a26fd1dacecfa9b89fb81455076a8133063d
 SHA512:
-  metadata.gz: 7083168d80c4d3d9927eaee085b43199847321911dd63fb1866c5e18ba88aaacce65eb947fe9264c29feb35769152afd3bc8a68bbf60a9450e277c0e5b214610
-  data.tar.gz: 51a5f837b4b4b948e5f70f43116be92dfca2fd016104275d2c7901cb1d71f78e3a6f49d19a94adb29ef315e022f6f707c7192894b9ddecd05bbf141505d8868f
+  metadata.gz: 09b429d1e89534f1485e206fe15b1b4854b123eaeea6f7659700045359631cc767661caad3d574269634a73fc24115b3cba98a9c1bb3ac25709c066f904ae260
+  data.tar.gz: 7644791657536cc40ef083786a1dda5a8c8455f4e2d920d0ff1d47541c6a1c0cb7509cf2b981b4cdd5c3e0c61c35b3f18acb672edff0bbeda1b26358d439bf88

data/bin/jerakia

@@ -1,71 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'jerakia'
-require 'json'
-require 'optparse'
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-options = {
-  :policy       => "default",
-  :config       => "/etc/jerakia/jerakia.yaml",
-  :scope        => nil,
-  :key          => nil,
-  :merge        => "array",
-  :lookup_type  => "first",
-  :namespace    => nil,
-  :metadata     => {},
-}
+require 'jerakia/cli'
 
-OptionParser.new do |opts|
-
-  opts.on("--config CONFIG","-c","Config file") do |c|
-    options[:config] = c
-  end
-
-  opts.on("--key KEY", "-k", "Lookup key") do |k|
-    options[:key] = k
-  end
-
-  opts.on("--policy POLICY", "-p", "Policy") do |p|
-    options[:policy] = p.to_sym
-  end
-
-  opts.on("--namespace NAMESPACE", "-n", "Namespace") do |n|
-    options[:namespace] = n.split(/::/)
-  end
-
-  opts.on("--type TYPE", "-t", "Lookup type") do |t|
-    options[:lookup_type] = t.to_sym
-  end
-
-  opts.on("--scope SCOPE", "-s", "Scope handler") do |s|
-    options[:scope] = s.to_sym
-  end
-
-  opts.on("--merge MERGE", "-m", "Merge type") do |m|
-    options[:merge] = m.to_sym
-  end
-end.parse!
-
-unless ARGV.empty?
-  ARGV.each do |arg|
-    meta=arg.split(':')
-    options[:metadata][meta[0]] = meta[1]
-  end
-end
-
-
-
-jac = Jerakia.new({:config => options[:config]})
-req = Jerakia::Request.new(
-  :key => options[:key],
-  :namespace => options[:namespace],
-  :policy => options[:policy].to_sym,
-  :lookup_type => options[:lookup_type].to_sym,
-  :merge       => options[:merge].to_sym,
-  :loglevel    => 'debug',
-  :metadata => options[:metadata]
-) 
-
-
-answer = jac.lookup(req)
-puts answer.payload.to_json
+Jerakia::CLI.start(ARGV)

data/lib/hiera/backend/jerakia_backend.rb

@@ -2,22 +2,18 @@ class Hiera
   module Backend
     class Jerakia_backend
 
-      def initialize
+      def initialize(config = nil)
         require 'jerakia'
-        @config = Config[:jerakia] || {}
+        @config = config || Hiera.config[:jerakia] || {}
         @policy = @config[:policy] || 'default'
-        @jerakia = ::Jerakia.new(Config[:jerakia] || {}) 
+        @jerakia = ::Jerakia.new(@config)
         Jerakia.log.debug("[hiera] hiera backend loaded with policy #{@policy}")
-
       end
 
-        
       def lookup(key, scope, order_override, resolution_type)
-
-
         lookup_type = :first
         merge_type = :none
-        
+
         case resolution_type
         when :array
           lookup_type = :cascade
@@ -36,7 +32,7 @@ class Hiera
         end
 
         Jerakia.log.debug("[hiera] backend invoked for key #{key} using namespace #{namespace}")
-          
+
         metadata={}
         if scope.is_a?(Hash)
           metadata=scope
@@ -44,24 +40,18 @@ class Hiera
           metadata = scope.real.to_hash
         end
 
-
         request = Jerakia::Request.new(
-          :key =>      key,
+          :key         => key,
           :namespace   => namespace,
           :policy      => metadata[:jerakia_policy] || @policy,
           :lookup_type => lookup_type,
           :merge       => merge_type,
           :metadata    => metadata,
         )
- 
+
         answer = @jerakia.lookup(request)
         answer.payload
-     
-
       end
     end
   end
 end
-
-
-

data/lib/jerakia/cli.rb

@@ -0,0 +1,60 @@
+require 'thor'
+require 'jerakia'
+require 'json'
+
+class Jerakia
+  class CLI < Thor
+    desc 'lookup [KEY]', 'Lookup [KEY] with Jerakia'
+    option :config,
+           aliases: :c,
+           type: :string,
+           default: '/etc/jerakia/jerakia.yaml',
+           desc: 'Configuration file'
+    option :policy,
+           aliases: :p,
+           type: :string,
+           default: 'default',
+           desc: 'Lookup policy'
+    option :namespace,
+           aliases: :n,
+           type: :string,
+           desc: 'Lookup namespace'
+    option :type,
+           aliases: :t,
+           type: :string,
+           default: 'first',
+           desc: 'Lookup type'
+    option :scope,
+           aliases: :s,
+           type: :string,
+           desc: 'Scope handler'
+    option :merge_type,
+           aliases: :m,
+           type: :string,
+           default: 'array',
+           desc: 'Merge type'
+    option :log_level,
+           aliases: :l,
+           type: :string,
+           desc: 'Log level'
+    option :metadata,
+           aliases: :d,
+           type: :hash,
+           desc: 'Key/value pairs to be used as metadata for the lookup'
+    def lookup(key)
+      jac = Jerakia.new({:config => options[:config]})
+      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,
+        :loglevel    => options[:log_level],
+        :metadata    => options[:metadata]
+      )
+
+      answer = jac.lookup(req)
+      puts answer.payload.to_json
+    end
+  end
+end

data/lib/jerakia/config.rb

@@ -1,25 +1,21 @@
-class Jerakia::Config
+require 'yaml'
 
-  require 'yaml'
+class Jerakia::Config
   attr_reader :policydir
   attr_reader :server_url
 
-  def initialize(config='/etc/jerakia/jerakia.yaml')
-    unless File.exists?(config)
-      Jerakia.crit("Config file #{config} not found")
-    end
-    rawdata=File.read(config)
-    ymldata=YAML.load(rawdata)
-    @policydir=ymldata['policydir']
-    @server_url=ymldata['server_url']
-    @configdata=ymldata
+  def self.load_from_file(file = '/etc/jerakia/jerakia.yaml')
+    Jerakia.crit("Config file #{file} not found") unless File.exists?(file)
+    new YAML.load_file(file)
+  end
+
+  def initialize(config)
+    @policydir = config['policydir']
+    @server_url = config['server_url']
+    @configdata = config
   end
 
   def [](key)
     @configdata[key.to_s]
   end
-
-
 end
-
-

data/lib/jerakia/datasource/file/yaml.rb

@@ -5,13 +5,11 @@ class Jerakia::Datasource
       EXTENSION='yaml'
 
       class << self
-      require 'yaml'
-      def import_file(fname)
-        Jerakia.log.debug("scanning file #{fname}")
-        return {} unless ::File.exists?(fname)
-        data=::File.read(fname)
-        YAML.load(data)
-      end
+        require 'yaml'
+        def convert(data)
+          return {} if data.empty?
+          YAML.load(data)
+        end
       end
     end
   end

data/lib/jerakia/datasource/file.rb

@@ -19,31 +19,57 @@ class Jerakia::Datasource
       @@cache
     end
 
-    def read_from_file(fname)
-      fpath = []
-      fpath << options[:docroot] unless fname[0] == '/'
-      fpath << [ fname, lookup.request.namespace ]
-
-      extension = options[:extension] || @file_format::EXTENSION
-      diskname = "#{::File.join(fpath.flatten).gsub(/\/$/, '')}.#{extension}"
-      
-
-      Jerakia.log.debug("read_from_file()  #{diskname}")
+    def import_file(filename)
+      Jerakia.log.debug("import_file() Importing #{filename}")
+      if ::File.exists?(filename)
+        ::File.read(filename)
+      else
+        ""
+      end
+    end
 
-     
+    def get_file_with_cache(diskname)
       if options[:enable_caching]
-        if cache.valid?(diskname) 
+        if cache.valid?(diskname)
           Jerakia.log.debug("Returning cached data")
           cache.get(diskname)
         else
           Jerakia.log.debug("Adding contents of #{diskname} to cache")
-          cache.add(diskname,@file_format.import_file(diskname))
+          cache.add(diskname,import_file(diskname))
         end
       else
-        @file_format.import_file(diskname)
+        import_file(diskname)
+      end
+    end
+
+    def list_fragments(prefix,extension)
+      if ::File.directory?("#{prefix}.d")
+        Dir["#{prefix}.d/*.#{extension}"]
       end
     end
 
+    def read_from_file(fname)
+      fpath = []
+      fpath << options[:docroot] unless fname[0] == '/'
+      fpath << [ fname, lookup.request.namespace ]
+
+      extension = options[:extension] || @file_format::EXTENSION
+      diskname_prefix = "#{::File.join(fpath.flatten).gsub(/\/$/, '')}"
+      diskname = "#{diskname_prefix}.#{extension}"
+      
+      files = [ diskname ]
+      files << list_fragments(diskname_prefix, extension)
+      
+      raw_data=""
+
+      files.flatten.compact.each do |f|
+        Jerakia.log.debug("read_from_file()  #{f}")
+        raw_data << get_file_with_cache(f)
+      end
+
+      file_format.convert(raw_data)
+    end
+
 
     def run
       #

data/lib/jerakia.rb

@@ -1,4 +1,3 @@
-#require 'faster_require'
 
 class Jerakia
   require 'jerakia/policy'
@@ -10,12 +9,9 @@ class Jerakia
   require 'jerakia/launcher'
   require 'jerakia/cache'
 
-
-
-
   def initialize(options={})
     configfile = options[:config] || '/etc/jerakia/jerakia.yaml'
-    @@config = Jerakia::Config.new(configfile)
+    @@config = Jerakia::Config.load_from_file(configfile)
 
     if @@config[:plugindir]
       $LOAD_PATH << @@config[:plugindir] unless $LOAD_PATH.include?(@@config[:plugindir])
@@ -25,26 +21,23 @@ class Jerakia
     loglevel = options[:loglevel] || @@config["loglevel"] || "info"
     @@log = Jerakia::Log.new(loglevel.to_sym)
     @@log.debug("Jerakia initialized")
-
   end
 
   def lookup(request)
-    res=Jerakia::Launcher.new(request)
-    return res.answer
+    Jerakia::Launcher.new(request).answer
   end
 
   def config
     @@config
   end
 
-
   def self.fatal(msg,e)
     stacktrace=e.backtrace.join("\n")
     Jerakia.log.fatal msg
     Jerakia.log.fatal "Full stacktrace output:\n#{$!}\n\n#{stacktrace}"
     puts "Fatal error, check log output for details"
-    exit 1
-  end 
+    throw Exception
+  end
 
   def self.filecache(name)
     @@filecache[name] ||= File.read(name)
@@ -59,20 +52,15 @@ class Jerakia
     @@config
   end
 
-
   def log
     @@log
   end
-  
 
   def self.log
     @@log
   end
 
   def self.crit(msg)
-    
-    puts msg
-    exit 1 
+    fail msg
   end
 end
-

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: lookup_http
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,7 @@ files:
 - lib/jerakia/cache.rb
 - lib/jerakia/cache/entry.rb
 - lib/jerakia/cache/file.rb
+- lib/jerakia/cli.rb
 - lib/jerakia/config.rb
 - lib/jerakia/datamodel.rb
 - lib/jerakia/datasource.rb
@@ -84,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extendable and flexible ata lookup system