jerakia 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 343d8ffe41f66435cee08e8db34bb2ff5ae8b005
-  data.tar.gz: 127a03abde135fd9b33368b68d04cd81d8d78864
+  metadata.gz: 7db60ab44da9734856532ab3507e65bdc2ce81ee
+  data.tar.gz: 063e0a3386fe6fb6a68095a85d64129e0c8ebc2e
 SHA512:
-  metadata.gz: 174b063357edeec29a0cd6ca6549c9f6ccd07d73aa5989f2ed6650f0605ddf5c856e0a8728f9fe4eb4c43374684a3e97d27cd50a64e5e7be3e0748797e72d24e
-  data.tar.gz: b2f5c63df21955ce11550cc7176eb439ae9ad73e26677dc852837bf10a3eda625ac9422f563adc728fc2b94a522f2e49ed4e6a51501018a296c364db75909630
+  metadata.gz: 0d4bbcb6fc23eee976c17404da5dd626fcbc8421785488cbca29b779c5c0f8b515e0af5d2d0cb1c3eb1f9a624b5fd913824d56e9852344177ac90b613dc820b9
+  data.tar.gz: 66aac7b0a5b6652ccdb2ceabca8511ae88ce7ce2917748a66cc7abe58707239c40e20b52b21842d7d9b698073606acbcbccab7f54f0c7f472ea893d70f8f9c54

data/lib/jerakia/datasource/file.rb

@@ -57,7 +57,7 @@ class Jerakia::Datasource
 
       load_format_handler
 
-      options[:searchpath].each do |path|
+      options[:searchpath].flatten.each do |path|
         Jerakia.log.debug("Attempting to load data from #{path}")
         return unless response.want?
         data=read_from_file(path)

data/lib/jerakia/launcher.rb

@@ -12,7 +12,7 @@ class Jerakia::Launcher
 
   def invoke
     policy_name=request.policy.to_s
-    Jerakia.log.info "Invoked lookup for #{@@request.key} using policy #{policy_name}"
+    Jerakia.log.debug "Invoked lookup for #{@@request.key} using policy #{policy_name}"
     filename=File.join(Jerakia.config.policydir, "#{policy_name}.rb")
     policydata=Jerakia.filecache(filename)
     instance_eval policydata

data/lib/jerakia/lookup.rb

@@ -96,9 +96,13 @@ class Jerakia::Lookup
   end
 
 
+  def get_matches(key,match)
+    matches = Array(match).select { |m| key[Regexp.new(m)] == key}
+  end
+  
   def confine(key=nil,match)
     if key
-      invalidate unless key[Regexp.new(match)] == key
+      invalidate unless get_matches(key,match).size > 0
     else
       invalidate
     end
@@ -106,7 +110,7 @@ class Jerakia::Lookup
 
   def exclude(key=nil,match)
     if key
-      invalidate if key[Regexp.new(match)] == key
+      invalidate if get_matches(key,match).size > 0
     end
   end
       

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

@@ -10,9 +10,7 @@ class Puppet::DataBinding::Jerakia < Puppet::Indirector::Code
 
   def initialize(*args)
     @jerakia=::Jerakia.new
-
-    # Currently defaulting the policy to "puppet" - we should change this.
-    @default_policy = @jerakia::config["puppet"]["default_policy"] || "puppet"
+    @default_policy = "default"
     super
   end
 
@@ -28,7 +26,7 @@ class Puppet::DataBinding::Jerakia < Puppet::Indirector::Code
       :namespace => namespace,
       :policy => policy,
       :lookup_type => :first,
-      :metadata => {}
+      :metadata => metadata,
     )
     answer = jerakia.lookup(jacreq)
     answer.payload

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jerakia
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Craig Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies: []
 description: Extendable and flexible data lookup system
 email: 
@@ -50,7 +50,6 @@ files:
 - lib/jerakia/util.rb
 - lib/puppet/indirector/data_binding/jerakia.rb
 - lib/puppet/indirector/data_binding/jerakia_rest.rb
-- lib/test.pp
 homepage: http://github.com/crayfishx/jerakia
 licenses:
 - Apache 2.0

data/lib/test.pp

@@ -1,302 +0,0 @@
-class apache ( $port='foo' ,
-$foo1='',
-$foo2='',
-$foo3='',
-$foo4='',
-$foo5='',
-$foo6='',
-$foo7='',
-$foo8='',
-$foo9='',
-$foo10='',
-$foo11='',
-$foo12='',
-$foo13='',
-$foo14='',
-$foo15='',
-$foo16='',
-$foo17='',
-$foo18='',
-$foo19='',
-$foo20='',
-$foo21='',
-$foo22='',
-$foo23='',
-$foo24='',
-$foo26='',
-$bar1='',
-$bar2='',
-$bar3='',
-$bar4='',
-$bar5='',
-$bar6='',
-$bar7='',
-$bar8='',
-$bar9='',
-$bar10='',
-$bar11='',
-$bar12='',
-$bar13='',
-$bar14='',
-$bar15='',
-$bar16='',
-$bar17='',
-$bar18='',
-$bar19='',
-$bar20='',
-$bar21='',
-$bar22='',
-$bar23='',
-$bar24='',
-$foooo1='',
-$foooo2='',
-$foooo3='',
-$foooo4='',
-$foooo5='',
-$foooo6='',
-$foooo7='',
-$foooo8='',
-$foooo9='',
-$foooo10='',
-$foooo11='',
-$foooo12='',
-$foooo13='',
-$foooo14='',
-$foooo15='',
-$foooo16='',
-$foooo17='',
-$foooo18='',
-$foooo19='',
-$foooo20='',
-$foooo21='',
-$foooo22='',
-$foooo23='',
-$foooo24='',
-$foooo26='',
-$baaar1='',
-$baaar2='',
-$baaar3='',
-$baaar4='',
-$baaar5='',
-$baaar6='',
-$baaar7='',
-$baaar8='',
-$baaar9='',
-$baaar10='',
-$baaar11='',
-$baaar12='',
-$baaar13='',
-$baaar14='',
-$baaar15='',
-$baaar16='',
-$baaar17='',
-$baaar18='',
-$baaar19='',
-$baaar20='',
-$baaar21='',
-$baaar22='',
-$baaar23='',
-$baaar24='',
-$fooz1='',
-$fooz2='',
-$fooz3='',
-$fooz4='',
-$fooz5='',
-$fooz6='',
-$fooz7='',
-$fooz8='',
-$fooz9='',
-$fooz10='',
-$fooz11='',
-$fooz12='',
-$fooz13='',
-$fooz14='',
-$fooz15='',
-$fooz16='',
-$fooz17='',
-$fooz18='',
-$fooz19='',
-$fooz20='',
-$fooz21='',
-$fooz22='',
-$fooz23='',
-$fooz24='',
-$fooz26='',
-$barz1='',
-$barz2='',
-$barz3='',
-$barz4='',
-$barz5='',
-$barz6='',
-$barz7='',
-$barz8='',
-$barz9='',
-$barz10='',
-$barz11='',
-$barz12='',
-$barz13='',
-$barz14='',
-$barz15='',
-$barz16='',
-$barz17='',
-$barz18='',
-$barz19='',
-$barz20='',
-$barz21='',
-$barz22='',
-$barz23='',
-$barz24='',
-$foo10='',
-$foo20='',
-$foo30='',
-$foo40='',
-$foo50='',
-$foo60='',
-$foo70='',
-$foo80='',
-$foo90='',
-$foo100='',
-$foo110='',
-$foo120='',
-$foo130='',
-$foo140='',
-$foo150='',
-$foo160='',
-$foo170='',
-$foo180='',
-$foo190='',
-$foo200='',
-$foo210='',
-$foo220='',
-$foo230='',
-$foo240='',
-$foo260='',
-$bar10='',
-$bar20='',
-$bar30='',
-$bar40='',
-$bar50='',
-$bar60='',
-$bar70='',
-$bar80='',
-$bar90='',
-$bar100='',
-$bar110='',
-$bar120='',
-$bar130='',
-$bar140='',
-$bar150='',
-$bar160='',
-$bar170='',
-$bar180='',
-$bar190='',
-$bar200='',
-$bar210='',
-$bar220='',
-$bar230='',
-$bar240='',
-$foooo10='',
-$foooo20='',
-$foooo30='',
-$foooo40='',
-$foooo50='',
-$foooo60='',
-$foooo70='',
-$foooo80='',
-$foooo90='',
-$foooo100='',
-$foooo110='',
-$foooo120='',
-$foooo130='',
-$foooo140='',
-$foooo150='',
-$foooo160='',
-$foooo170='',
-$foooo180='',
-$foooo190='',
-$foooo200='',
-$foooo210='',
-$foooo220='',
-$foooo230='',
-$foooo240='',
-$foooo260='',
-$baaar10='',
-$baaar20='',
-$baaar30='',
-$baaar40='',
-$baaar50='',
-$baaar60='',
-$baaar70='',
-$baaar80='',
-$baaar90='',
-$baaar100='',
-$baaar110='',
-$baaar120='',
-$baaar130='',
-$baaar140='',
-$baaar150='',
-$baaar160='',
-$baaar170='',
-$baaar180='',
-$baaar190='',
-$baaar200='',
-$baaar210='',
-$baaar220='',
-$baaar230='',
-$baaar240='',
-$fooz10='',
-$fooz20='',
-$fooz30='',
-$fooz40='',
-$fooz50='',
-$fooz60='',
-$fooz70='',
-$fooz80='',
-$fooz90='',
-$fooz100='',
-$fooz110='',
-$fooz120='',
-$fooz130='',
-$fooz140='',
-$fooz150='',
-$fooz160='',
-$fooz170='',
-$fooz180='',
-$fooz190='',
-$fooz200='',
-$fooz210='',
-$fooz220='',
-$fooz230='',
-$fooz240='',
-$fooz260='',
-$barz10='',
-$barz20='',
-$barz30='',
-$barz40='',
-$barz50='',
-$barz60='',
-$barz70='',
-$barz80='',
-$barz90='',
-$barz100='',
-$barz110='',
-$barz120='',
-$barz130='',
-$barz140='',
-$barz150='',
-$barz160='',
-$barz170='',
-$barz180='',
-$barz190='',
-$barz200='',
-$barz210='',
-$barz220='',
-$barz230='',
-$barz240='',
-) {
-
-
-  notify { $port: }
-}
-
-include apache