hiera-fs 0.0.1 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 6d846eab0030cfdd9864f3b9e7f188389fe6bbe9
-  data.tar.gz: 560777fe3604096865d9933d8d19bb187f3d0227
 SHA512: 
-  metadata.gz: bfbff9c16d2771f614abcae9b1ba8085502fe68124620fb57934a3a785a01befc41b611084bd66c22058526aaa4717028c5e573f05cda519a8597d484d6a5e35
-  data.tar.gz: d235a3108d137f8a22248bf10672bb1d8835600adb832182d0099fb0e9abda4af95a8d0ed9951b962b5739623d638f8cb1b5ab79d1ea683fc923e737bee4ee83
+  metadata.gz: bb1f92c9f8d7660f1d3692ad8d25d9da85d2ddaa08b22ceba25fef8d9eceff9e2d0c5f115f71e3cea7a4afcf88a4a495dbef7ab20756d85b3441b215d152b4cc
+  data.tar.gz: e73faecdd85a9c561a70dfe12c6a2b7fe3e01086fffd2d3449ef5cc3c5cbccbe9a530852b4eecf63df9f166c5d5fb405684dbaf6aa5855ccc49ab1ccbe987bf7
+SHA1: 
+  metadata.gz: 328266ae920023536a9e509d471423f047d7ad00
+  data.tar.gz: 58813d71c058b55eb14d21a1eb8d32a02db6fe0e

data/lib/hiera/backend/fs_backend.rb

@@ -3,21 +3,22 @@ class Hiera
     class Fs_backend
 
       def initialize
-        Hiera.debug("[HieraFs]::Hiera fs backend starting")
+        Hiera.debug("[HieraFs]::Hiera-fs backend starting")
       end
 
       def lookup(key, scope, order_override, resolution_type)
         answer = nil
 
+        Hiera.debug("HieraFs::lookup - Looking up '#{key}' in fs backend")
+
         calling_class = scope.resource.name.to_s.downcase
         calling_module = calling_class.split("::").first
 
-        Hiera.debug("[HieraFs]::calling_class: #{calling_class}")
-        Hiera.debug("[HieraFs]::calling_module: #{calling_module}")
-        Hiera.debug("[HieraFs]::Looking up #{key} in fs backend")
+        Hiera.debug("HieraFs::lookup - Calling class: #{calling_class}")
+        Hiera.debug("HieraFs::lookup - Calling module: #{calling_module}")
 
         Backend.datasources(scope, order_override) do |source|
-          Hiera.debug("[HieraFs]::Looking for data source '#{source}'")
+          Hiera.debug("HieraFs::lookup - Looking for data source '#{source}'")
 
           datadir = Backend.datafile(:fs, scope, source, "d") or next
 

data/lib/hierafs/utils.rb

@@ -24,12 +24,7 @@ module HieraFs
         module_path = arr.slice(0, arr.index('manifests')).join(File::SEPARATOR)
         module_source_path = File.join(module_path, default_dir)
 
-        default_source = File.join(module_source_path, key)
-        if File.exists?(default_source)
-          return default_source
-        else
-          return nil
-        end
+        return File.join(module_source_path, key)
 
       end
 
@@ -45,8 +40,6 @@ module HieraFs
 
           files_in_dir = Dir.entries(dir).select { |f| File.file?(File.join(dir, f)) }
 
-          Puppet.debug("Files in #{dir}: #{files_in_dir}")
-
           files_hash = Hash[ files_in_dir.map{ |f| [f, File.join(dir, f)] } ]
           all_files_in_hierarchy = files_hash.merge(all_files_in_hierarchy)
 

data/lib/hierafs/version.rb

@@ -1,3 +1,3 @@
 module HieraFs
-  VERSION = '0.0.1'
+  VERSION = '1.0'
 end

data/lib/puppet/parser/functions/hiera_template.rb

@@ -6,18 +6,13 @@ module Puppet::Parser::Functions
     require 'hierafs/utils'
     require 'hiera_puppet'
 
-    Puppet.debug "In hiera_template function"
-
     key = args[0]
     override = args[1]
 
-    Puppet.debug "key: #{key} override: #{override}"
-
     default_template_file = HieraFs::Utils::get_default_source(self, key, :template)
-    Puppet.debug("Default template: #{default_template_file}")
+    Puppet.debug("HieraFs::hiera_template - Default template: #{default_template_file}")
 
     answer = HieraPuppet.lookup(key, default_template_file, self, override, :priority)
-    debug "Answer: #{answer}"
     raise(Puppet::ParseError, "Could not find data item #{key} in any Hiera data file and no default supplied") if answer.nil?
     raise(Puppet::ParseError, "Template file: #{answer} does not exists") unless File.exists?(answer)
     raise(Puppet::ParseError, "Template file: #{answer} is not a file") unless File.file?(answer)

metadata

@@ -1,18 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: hiera-fs
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: "1.0"
 platform: ruby
 authors: 
 - Alan Castro
+- Paulo Henrique
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2014-04-11 00:00:00 Z
+date: 2014-04-12 00:00:00 Z
 dependencies: []
 
-description: "    File system hiera backend.\n"
+description: |
+  A data backend for Hiera that can return content of files, parsed templates and directorie's files.
+
 email: alanclic@gmail.com
 executables: []
 
@@ -21,12 +24,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- hiera-fs.gemspec
 - lib/hiera/backend/fs_backend.rb
 - lib/hierafs/utils.rb
 - lib/hierafs/version.rb

data/.gitignore

@@ -1,2 +0,0 @@
-pkg/
-*.gem$

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in teste.gemspec
-gemspec

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Alan Castro
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,114 +0,0 @@
-## hiera-fs: a file-system hiera backend
-
-### Instalation
-
-sudo gem install hiera-fs
-
-### Description
-
-Hiera-fs allows you create a more extensible module, by letting the user create
-specific files/templates somewhere in his hiera hierarchy.
-
-### Functions
-
-- `hiera_file(<key>, [<override>])`
-
-Returns a file's content from hiera hierarchy.
-The default files is `{modulename}/files/key`.
-
-- `hiera_template(<key>, [<override>])`
-
-Returns a templates's content from hiera hierarchy.
-The default template is `{modulename}/templates/key`.
-
-- `hiera_dir(<key>, [<override>])`
-
-Returns a hash of all files names and paths that exists in `key` directory in our hiera hierarchy.
-If directory does not exists, the function returns an empty hash `{}`.
-
-### How does it work?
-
-#### hiera\_template and hiera\_file
-
-For better understading, let's look at an example.
-
-Imagine we have the following dns module:
-
-    ├── dns
-    │   ├── files
-    │   │   └── resolv.conf
-    │   ├── manifests
-    │   │   └── init.pp
-    │   └── templates
-    │       └── resolv.conf.erb
-
-In our `manifests/init.pp` we have the following code:
-
-    class dns {
-      file { '/etc/resolv.conf.template':
-        ensure  => file,
-        content => hiera_template('resolv.conf.erb'),
-      }
-      file { '/etc/resolv.conf.file':
-        ensure  => file,
-        content => hiera_file('resolv.conf'),
-      }
-    }
-
-Our `templates/resolv.conf.erb` has the following code:
-
-    resolv.conf template
-    My operatingsystem <%= @operatingsystem %>
-
-Our `files/resolv.conf.erb` has the following code:
-
-    my resolv.conf file
-    <%= @operatingsystem %> will not work :/
-
-If you don't create any hiera configuration, your dns module will use the files
-defined in templates (for hiera\_template) and in files (for hiera\_file).
-
-Let's say that you have the following `hiera.yaml`
-
-    ---
-    :backends:
-      - fs
-    :fs:
-      :datadir: /etc/puppet/hiera
-    :hierarchy:
-      - common/%{calling_module}
-      - common
-
-The `hiera_template` call will look for your template in the following directories and order:
-
-    - /etc/puppet/hiera/common.d/resolv.conf.erb
-    - /etc/puppet/hiera/common/dns.d/resolv.conf.erb
-
-The default template used is `dns/templates/resolv.conf.erb`.
-
-The `hiera_file` call will look for your file in the following directories and order:
-    
-    - /etc/puppet/hiera/common.d/resolv.conf
-    - /etc/puppet/hiera/common/dns.d/resolv.conf
-
-The default file used is `dns/files/resolv.conf`.
-
-#### hiera\_dir
-
-The function `hiera_dir(key)` is quite simple, it looks somewhere in your hiera hierarchy for
-a directory named `key` and returns a hash containing with all filenames and filepaths.
-
-    { 
-      'filename1' => 'filepath1',
-      'filename2' => 'filepath2',
-      'filename3' => 'filepath3',
-      'filename4' => 'filepath4'
-    }
-
-If the directory does not exists, the function simple returns `{}`.
-
-If we use the hiera.yaml defined before and called `hiera_dir('repos')` in our 
-dns module init.pp manifest, hiera would look `repos` directory in the following paths:
-
-    - /etc/puppet/hiera/common.d/repos
-    - /etc/puppet/hiera/common/dns.d/repos

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/hiera-fs.gemspec

@@ -1,24 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'hierafs/version'
-
-Gem::Specification.new do |s|
-  s.name        = "hiera-fs"
-  s.version     = HieraFs::VERSION
-  s.platform    = Gem::Platform::RUBY
-
-  s.authors     = "Alan Castro"
-  s.email       = "alanclic@gmail.com"
-  s.homepage    = "http://github.com/alancastro/hiera-fs"
-  s.summary     = "File system hiera backend"
-  s.description = <<-DESCRIPTION
-    File system hiera backend.
-  DESCRIPTION
-
-  s.license  = 'MIT'
-
-  s.files        = %x[git ls-files].split($/)
-  s.require_paths = ['lib']
-
-end