jerakia 1.1.2 → 1.2.0

data/lib/jerakia.rb

@@ -1,4 +1,7 @@
-
+# Class Jerakia
+#
+# Main Jerakia class
+#
 class Jerakia
   require 'jerakia/policy'
   require 'jerakia/lookup'
@@ -11,72 +14,87 @@ class Jerakia
   require 'jerakia/version'
   require 'jerakia/error'
 
+  attr_reader :options
 
-  def initialize(options={})
-
-    configfile = options[:config] || ENV['JERAKIA_CONFIG'] || '/etc/jerakia/jerakia.yaml'
-    @@config = File.exist?(configfile) ? Jerakia::Config.load_from_file(configfile) : Jerakia::Config.new
+  class << self
+    attr_reader :config
+    attr_reader :log
+  end
 
+  @config = nil
+  @log = nil
 
-    if @@config[:plugindir]
-      $LOAD_PATH << @@config[:plugindir] unless $LOAD_PATH.include?(@@config[:plugindir])
-    end
+  def initialize(options = {})
+    @options = options
 
-    @@filecache = {}
-    loglevel = options[:loglevel] || @@config["loglevel"] || "info"
-    logfile = options[:logfile] || @@config["logfile"] || "/var/log/jerakia.log"
+    load_config
+    load_log_handler
 
-    @@log = Jerakia::Log.new(loglevel.to_sym, logfile)
-    @@log.debug("Jerakia initialized")
+    if config[:plugindir]
+      $LOAD_PATH << config[:plugindir] unless $LOAD_PATH.include?(config[:plugindir])
+    end
 
+    log.debug('Jerakia initialized')
     Jerakia.log.verbose("Jerakia started. Version #{Jerakia::VERSION}")
   end
 
   def lookup(request)
-    begin
-      lookup_instance = Jerakia::Launcher.new(request)
-      lookup_instance.invoke_from_file
-      lookup_instance.answer
-    rescue Jerakia::Error => e
-      Jerakia.fatal(e.message, e)
-    end
+    lookup_instance = Jerakia::Launcher.new(request)
+    lookup_instance.invoke_from_file
+    lookup_instance.answer
+  rescue Jerakia::Error => e
+    Jerakia.fatal(e.message, e)
+  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}"
+    raise e
   end
 
+
   def config
-    @@config
+    self.class.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}"
-    raise e
+  def log
+    self.class.log
   end
 
-  def self.filecache(name)
-    begin
-      @@filecache[name] ||= File.read(name)
-    rescue Errno::ENOENT => e
-      raise Jerakia::Error, "Could not read file #{name}, #{e.message}"
+  class << self
+    def config=(data)
+      @config ||= data
+    end
+
+    def log=(logger)
+      @log ||= logger
     end
-    return @@filecache[name]
   end
 
-  def add_to_filecache(name,data)
-    @@filecache[name] = data
+  private
+
+  def configfile
+    options[:config] || ENV['JERAKIA_CONFIG'] || '/etc/jerakia/jerakia.yaml'
   end
 
-  def self.config
-    @@config
+  def config_instance
+    File.exist?(configfile) ? Jerakia::Config.load_from_file(configfile) : Jerakia::Config.new
   end
 
-  def log
-    @@log
+  def load_config
+    self.class.config = config_instance
   end
 
-  def self.log
-    @@log
+  def loglevel
+    options[:loglevel] || config['loglevel'] || 'info'
   end
 
+  def logfile
+    options[:logfile] || config['logfile'] || '/var/log/jerakia.log'
+  end
+
+  def load_log_handler
+    self.class.log = Jerakia::Log.new(loglevel.to_sym, logfile)
+  end
 end

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

@@ -3,33 +3,31 @@ require 'jerakia'
 require 'json'
 
 class Puppet::DataBinding::Jerakia < Puppet::Indirector::Code
-  desc "Data binding for Jerakia"
+  desc 'Data binding for Jerakia'
 
   attr_reader :jerakia
   attr_reader :policy
 
   def initialize(*args)
-    @jerakia=::Jerakia.new
-    @default_policy = "default"
+    @jerakia = ::Jerakia.new
+    @default_policy = 'default'
     super
   end
 
   def find(request)
-
-    lookupdata=request.key.split(/::/)
-    key=lookupdata.pop
-    namespace=lookupdata
-    metadata =  request.options[:variables].to_hash.reject { |k, v| v.is_a?(Puppet::Resource) }
-    policy=metadata["jerakia_policy"] || @default_policy
+    lookupdata = request.key.split(/::/)
+    key = lookupdata.pop
+    namespace = lookupdata
+    metadata = request.options[:variables].to_hash.reject { |_k, v| v.is_a?(Puppet::Resource) }
+    policy = metadata['jerakia_policy'] || @default_policy
     jacreq = Jerakia::Request.new(
       :key => key,
       :namespace => namespace,
       :policy => policy,
       :lookup_type => :first,
-      :metadata => metadata,
+      :metadata => metadata
     )
     answer = jerakia.lookup(jacreq)
     answer.payload
   end
 end
-

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

@@ -10,37 +10,35 @@ require 'jerakia'
 require 'json'
 
 class Puppet::DataBinding::Jerakia_rest < Puppet::Indirector::Code
-  desc "Data binding for Jerakia"
+  desc 'Data binding for Jerakia'
 
   attr_reader :jerakia
   attr_reader :jerakia_url
   attr_reader :policy
 
   def initialize(*args)
-    @jerakia=::Jerakia.new
-    @jerakia_url=@jerakia.config.server_url
-    @policy = "puppet"
+    @jerakia = ::Jerakia.new
+    @jerakia_url = @jerakia.config.server_url
+    @policy = 'puppet'
     super
   end
 
   def find(request)
+    lookupdata = request.key.split(/::/)
+    key = lookupdata.pop
+    namespace = lookupdata
 
-    lookupdata=request.key.split(/::/)
-    key=lookupdata.pop
-    namespace=lookupdata
+    # metadata =  request.options[:variables].to_hash
 
-    #metadata =  request.options[:variables].to_hash
- 
     metadata = {
-      :environment => request.options[:variables].environment,
+      :environment => request.options[:variables].environment
     }
-    payload={
+    payload = {
       :namespace => namespace,
       :lookup_type => :first,
-      :metadata => metadata,
+      :metadata => metadata
     }.to_json
     response = RestClient.get "#{jerakia_url}/#{policy}/#{key}", :params => { :payload => payload }
     response
   end
 end
-

metadata

@@ -1,57 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2017-01-17 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: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: lookup_http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: data_mapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: Extendable and flexible data lookup system
 email: 
 executables:
@@ -67,6 +123,9 @@ files:
 - lib/jerakia/cache/entry.rb
 - lib/jerakia/cache/file.rb
 - lib/jerakia/cli.rb
+- lib/jerakia/cli/lookup.rb
+- lib/jerakia/cli/server.rb
+- lib/jerakia/cli/token.rb
 - lib/jerakia/config.rb
 - lib/jerakia/datasource.rb
 - lib/jerakia/datasource/dummy.rb
@@ -82,6 +141,7 @@ files:
 - lib/jerakia/lookup.rb
 - lib/jerakia/lookup/plugin.rb
 - lib/jerakia/lookup/plugin/hiera.rb
+- lib/jerakia/lookup/plugin_config.rb
 - lib/jerakia/lookup/pluginfactory.rb
 - lib/jerakia/policy.rb
 - lib/jerakia/request.rb
@@ -92,7 +152,13 @@ files:
 - lib/jerakia/schema.rb
 - lib/jerakia/scope.rb
 - lib/jerakia/scope/metadata.rb
+- lib/jerakia/scope/puppetdb.rb
+- lib/jerakia/scope/server.rb
 - lib/jerakia/scope/yaml.rb
+- lib/jerakia/server.rb
+- lib/jerakia/server/auth.rb
+- lib/jerakia/server/auth/token.rb
+- lib/jerakia/server/rest.rb
 - lib/jerakia/util.rb
 - lib/jerakia/version.rb
 - lib/puppet/indirector/data_binding/jerakia.rb
@@ -107,18 +173,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Extendable and flexible ata lookup system
 test_files: []
+has_rdoc: