jerakia 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzQ2YTJkNGRkY2ViNGVmMjFlNWFlYjlkYmE4OTY2NzY2YTE1NjQ0YQ==
-  data.tar.gz: !binary |-
-    YWJmMWVmZjUzYzk2OTFjZDZmM2MzYmEzZTY1NGU5NWZmMjU3Yjc2OA==
+SHA1:
+  metadata.gz: c6acac89ddfc15c52ab520f40f8742b41bfff43c
+  data.tar.gz: 3d38c1f23615cf0d768e1ee570c336eafc4dd305
 SHA512:
-  metadata.gz: !binary |-
-    NWQ0ZjNkMmRhNTQ2NGM2MDdiNzE2ZjY2NDA2MTAxNmE2MmI1ZTY0MGFiZjMz
-    M2FjZTg3Mzk2OTcwY2FmMWVhNWJmMDIzYTk3MjgyMzRlMmQ4MGQ4MTU5MmMx
-    MzJhNDMwN2NlZTUxYzMyMmViOTMyMDA0M2UwYWFmYWQzZjdkM2U=
-  data.tar.gz: !binary |-
-    ODVlMWY3NjMyYmUwMDI2NjkwNTRmMzYxYjIyYzRkYzQ4NjE1NDgyNWNhMDBi
-    YTRkMjM3MjkxNmNhOTk0MzE4NTZlNDhhN2QwOGY2YzUwZTY5NmUzMDRhZTQz
-    NDk5MmVmMDQ3ZDM1MDgwMTA2ZGExYjE0NzU1MDRiM2MxNDIzYTc=
+  metadata.gz: 8c7d34fa57d58252f3e8e60be1d4eee70e2bb5e96edb5667273394366eae282a9af473afcb298aee9c67a05789ff477411fe0405d92112d18af71d53c9152372
+  data.tar.gz: d469edcfd9ac14665944b372e29f8533eed8bce3c507f04073056af67363ebf273bb650a211f4bc19a94ee11c70bf1f91502f2afe3fae5f4175e45554f38d94a

data/lib/jerakia/datasource.rb

@@ -26,7 +26,10 @@ class Jerakia::Datasource
   end
 
   def option(opt, data={})
-    @options[opt] ||= data[:default] || nil
+    if @options[opt].nil? and data.key?(:default)
+      @options[opt] = data[:default]
+    end
+    
     Jerakia.log.debug("[#{whoami}]: options[#{opt}] to #{options[opt]} [#{options[opt].class}]")
     if @options[opt].nil?
       raise Jerakia::PolicyError, "#{opt} option must be supplied for datasource #{@name} in lookup #{lookup.name}" if data[:mandatory]

data/lib/jerakia/datasource/http.rb

@@ -54,14 +54,23 @@ class Jerakia::Datasource
       options[:paths].flatten.each do |path|
         Jerakia.log.debug("Attempting to load data from #{path}")
         return unless response.want?
+
         data=http_lookup.get_parsed(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]
+        Jerakia.log.debug("Datasource provided #{data} (#{data.class}) looking for key #{lookup.request.key}")
+
+        if data.is_a?(Hash)
+          unless data[lookup.request.key].nil?
+            Jerakia.log.debug("Found data #{data[lookup.request.key]}")
+            response.submit data[lookup.request.key]
+          end
+        else
+          unless options[:output] == 'plain' or options[:failure] == 'graceful'
+            raise Jerakia::Error, "HTTP request did not return a hash for #{lookup.request.key} #{whoami}"
+          end
+          response.submit data
         end
+
       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 = "1.1.0"
+  VERSION = "1.1.1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -42,14 +42,14 @@ dependencies:
   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
 description: Extendable and flexible data lookup system
@@ -107,17 +107,17 @@ 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.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extendable and flexible ata lookup system