jerakia 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f2853d09f628caae07235bf40b294e2025dce4
-  data.tar.gz: b349c9f8181a4e47a44b53bf9d74602dfcbc2199
+  metadata.gz: a4dda5d22fe6e0fa29b9ce287a9b44f20c2fe3e9
+  data.tar.gz: 21e5f066edc6cd60249767e8ccd277559d9419d6
 SHA512:
-  metadata.gz: 51b217b1c2a946378a4fd8947de57277bc74d2b1dfe659ca8363314b8ecf28b3905b960c04e5b0cece3063d5402fa9b862238fdde2a43755b8a2b9dd4fe38de3
-  data.tar.gz: 3f35a0de6e1b987c41652e572ad31ecdd4aab804e109caae2729728bdb5a319227e626c7e2e1841ce6888e94b9258a2dc4890d20d71dee6b8d4c996b48f61fdb
+  metadata.gz: ab871bf140fd08288bbf39a7be8101c7151823c8eb3249e47e7ed89468399e500111edfc2dc5e108fdae7a557213811afedc5f3e8fb39c310fd27e68c718d187
+  data.tar.gz: 2d793c5c420b128380d813c92e99bb7c56ff137003a016b2f624eb54e9c2a225172f7a7ae49c40495bbbf98a8342a723347bb3deba7699aaab036268d35b511b

data/lib/jerakia/datasource/file_new.rb

@@ -0,0 +1,82 @@
+require 'jerakia/cache/file'
+
+class Jerakia::Datasource
+  module File
+    attr_reader :file_format
+
+    def load_format_handler
+      format = options[:format] || :yaml
+      class_name = format.to_s.capitalize
+      require "jerakia/datasource/file/#{format}"
+      @file_format = eval "Jerakia::Datasource::File::#{class_name}"
+    end
+
+    def cache
+      Jerakia::Cache::File
+    end
+
+    def get_file_with_cache(diskname)
+      if options[:enable_caching]
+        Jerakia.log.debug("Querying cache for file #{diskname}")
+        cache.retrieve(diskname)
+      else
+        ::File.read(diskname) if ::File.exists?(diskname)
+      end
+    end
+
+    def list_fragments(prefix, extension)
+      Dir["#{prefix}.d/*.#{extension}"] if ::File.directory?("#{prefix}.d")
+    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(/\/$/, '').to_s
+      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}")
+        file_contents = get_file_with_cache(f)
+        raw_data << file_contents if file_contents
+      end
+
+      begin
+        file_format.convert(raw_data)
+      rescue Jerakia::FileParseError => e
+        raise Jerakia::FileParseError, "While parsing #{diskname}: #{e.message}"
+      end
+    end
+
+    def run
+      #
+      # Do the lookup
+
+      Jerakia.log.debug("Searching key #{lookup.request.key} from file format #{options[:format]} (#{whoami})")
+      option :searchpath, :type => Array,  :mandatory => true
+      option :format,     :type => Symbol, :default => :yaml
+      option :docroot,    :type => String, :default => '/etc/jerakia/data'
+      option :extension,  :type => String
+
+      load_format_handler
+
+      options[:searchpath].flatten.each do |path|
+        Jerakia.log.debug("Attempting to load data from #{path}")
+        return unless response.want?
+        data = read_from_file(path)
+        Jerakia.log.debug("Datasource provided #{data} looking for key #{lookup.request.key}")
+        unless data[lookup.request.key].nil?
+          Jerakia.log.debug("Found data #{data[lookup.request.key]}")
+          response.submit data[lookup.request.key]
+        end
+      end
+    end
+  end
+end

data/lib/jerakia/policy/registry.rb

@@ -0,0 +1,23 @@
+class Jerakia
+  class Policy
+    class Registry
+
+      @instances = {}
+
+      class << self
+        attr_reader :instances
+
+        def register(name, instance)
+          @instances[name] = instance unless @instances[name]
+        end
+      end
+
+      attr_reader :instance
+
+      def initialize(name, instance)
+        @instance = instance
+        self.class.register(name, self)
+      end
+    end
+  end
+end

data/lib/jerakia/server/rest.rb

@@ -45,6 +45,7 @@ class Jerakia
       end
 
       before do
+        authenticate!
         content_type 'application/json'
       end
 

data/lib/jerakia/version.rb

@@ -3,5 +3,5 @@ class Jerakia
   #
   # This should be updated when a new gem is released and it is read from the gemspec file
   #
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -132,6 +132,7 @@ files:
 - lib/jerakia/datasource/file.rb
 - lib/jerakia/datasource/file/json.rb
 - lib/jerakia/datasource/file/yaml.rb
+- lib/jerakia/datasource/file_new.rb
 - lib/jerakia/datasource/http.rb
 - lib/jerakia/dsl/lookup.rb
 - lib/jerakia/dsl/policy.rb
@@ -144,6 +145,7 @@ files:
 - lib/jerakia/lookup/plugin_config.rb
 - lib/jerakia/lookup/pluginfactory.rb
 - lib/jerakia/policy.rb
+- lib/jerakia/policy/registry.rb
 - lib/jerakia/request.rb
 - lib/jerakia/response.rb
 - lib/jerakia/response/filter.rb