hiera-redis 1.0.3 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cac011c3dd470b0d5ac2ab886736201363571b91
+  data.tar.gz: 44a7d272df8504896fb604245ebdc0fa24221d7f
+SHA512:
+  metadata.gz: 22521481aef98392ba0b1e44c9a195229b7a45f83465c07a54368d37b9f57f3874b03e857dfaa1987af16db44795b41b412fadfa30d576d07088917232f1fb3d
+  data.tar.gz: 29f64f78d0df2f6ed4bd2434ec27c7e0f618b815fde841a84b29388ea674bc7a06ec548cf3841b61cbb0931448019cae910a0e74878d8bea443338a62f772923

data/lib/hiera/backend/redis_backend.rb

@@ -1,126 +1,99 @@
 class Hiera
   module Backend
     class Redis_backend
+      VERSION = '2.0.0'
 
-      VERSION="1.0.3"
-
-      attr_reader :redis, :options
+      attr_reader :options
 
       def initialize
-        Hiera.debug("Hiera Redis backend %s starting" % VERSION)
-        @redis = connect
+        require 'redis'
+        Hiera.debug("Hiera Redis backend #{VERSION} starting")
+        @options = { separator: ':', soft_connection_failure: false }.merge(Config[:redis] || {})
+        case options[:deserialize]
+        when :json then require 'json'
+        when :yaml then require 'yaml'
+        end
       end
 
-      def deserialize(args = {})
-        return nil if args[:data].nil?
-        return args[:data] unless args[:data].is_a? String
+      def deserialize(value)
+        return value unless value.is_a?(String)
 
-        result = case options[:deserialize]
-        when :json
-          require 'json'
-          JSON.parse args[:data]
-        when :yaml
-          require 'yaml'
-          YAML::load args[:data]
+        case options[:deserialize]
+        when :json then JSON.parse(value)
+        when :yaml then YAML.load(value)
         else
-          Hiera.warn "Invalid configuration for :deserialize; found %s" % options[:deserialize]
-          args[:data]
+          Hiera.warn("Invalid configuration for :deserialize; found #{options[:deserialize]}")
+          value
         end
-
-        Hiera.debug "Deserialized %s" % options[:deserialize].to_s.upcase
-        result
-
-      # when we try to deserialize a string
-      rescue JSON::ParserError
-        args[:data]
       rescue => e
-        Hiera.warn "Exception raised: %s: %s" % [e.class, e.message]
+        Hiera.warn("Error de-serializing data: #{e.class}: #{e.message}")
+        value
       end
 
-      def lookup(key, scope, order_override, resolution_type)
+      def lookup(key, scope, order_override, resolution_type, context)
         answer = nil
+        found = false
 
         Backend.datasources(scope, order_override) do |source|
-          redis_key = "%s" % [source.split('/'), key].join(options[:separator])
-          Hiera.debug "Looking for %s%s%s" % [source, options[:separator], key]
-
-          data = redis_query redis_key
-
-          data = deserialize(:data => data,
-                  :redis_key => redis_key,
-                  :key => key) if options.include? :deserialize
+          redis_key = (source.split('/') << key).join(options[:separator])
+          data = read_value(redis_key)
+          next if data.nil?
 
-          next unless data
+          found = true
+          new_answer = Backend.parse_answer(data, scope, {}, context)
 
-          new_answer = Backend.parse_answer(data, scope)
-
-          case resolution_type
+          case resolution_type.is_a?(Hash) ? :hash : resolution_type
           when :array
-            raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.is_a? Array or new_answer.is_a? String
+            check_type(key, new_answer, Array, String)
             answer ||= []
             answer << new_answer
           when :hash
-            raise Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}" unless new_answer.is_a? Hash
+            check_type(key, new_answer, Hash)
             answer ||= {}
-            answer = new_answer.merge answer
+            answer = Backend.merge_answer(new_answer, answer, resolution_type)
           else
             answer = new_answer
             break
           end
         end
 
-        Hiera.debug "answer is %s" % answer.inspect
+        throw :no_such_key unless found
         answer
+      rescue Redis::CannotConnectError, Errno::ENOENT => e
+        Hiera.warn("Cannot connect to redis server at #{redis.id}")
+        raise e unless options[:soft_connection_failure]
       end
 
       private
 
-      def connect
-
-        # override default options
-        @options = {
-          :host => 'localhost',
-          :port => 6379,
-          :db => 0,
-          :password => nil,
-          :timeout => 3,
-          :path => nil,
-          :soft_connection_failure => false,
-          :separator => ':'
-        }.merge Config[:redis] || {}
+      def check_type(key, value, *types)
+        return if types.any? { |type| value.is_a?(type) }
+        expected = types.map(&:name).join(' or ')
+        raise "Hiera type mismatch for key '#{key}': expected #{expected} and got #{value.class}"
+      end
 
-        require 'redis'
+      def redis
+        @redis ||= Redis.new(@options)
+      end
 
-        Redis.new(options)
-      rescue LoadError
-        retry if require 'rubygems'
+      def read_value(key)
+        data = redis_query(key)
+        options[:deserialize] ? deserialize(data) : data
       end
 
       def redis_query(redis_key)
-
-        case redis.type redis_key
+        case redis.type(redis_key)
         when 'set'
-          redis.smembers redis_key
+          redis.smembers(redis_key)
         when 'hash'
-          redis.hgetall redis_key
+          redis.hgetall(redis_key)
         when 'list'
           redis.lrange(redis_key, 0, -1)
         when 'string'
-          redis.get redis_key
+          redis.get(redis_key)
         when 'zset'
           redis.zrange(redis_key, 0, -1)
-        else
-          Hiera.debug("No such key: %s" % redis_key)
-          nil
         end
-      rescue Redis::CannotConnectError => e
-        Hiera.warn('Cannot connect to Redis server')
-        raise e unless options.has_key?(:soft_connection_failure)
-        nil
-      rescue Errno::ENOENT => e
-        Hiera.warn('Cannot connect to Redis server')
-        raise e unless options.has_key?(:soft_connection_failure)
-        nil
       end
     end
   end

metadata

@@ -1,63 +1,87 @@
 --- !ruby/object:Gem::Specification
 name: hiera-redis
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
-- Adam Kosmin c/o Reliant Security, Inc.
+- Reliant Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hiera
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 description: Allows hiera functions to pull data from a Redis database.
-email: heira-redis@reliantsecurity.com
+email: dev@reliantsecurity.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hiera/backend/redis_backend.rb
 - COPYING
+- lib/hiera/backend/redis_backend.rb
 homepage: http://github.com/reliantsecurity/hiera-redis
 licenses:
 - GPL-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Redis backend for Hiera.
 test_files: []