hieracles 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979857ccc68e688d421a488ae1d7a46e43363208
-  data.tar.gz: 6ddb11e2037df811f6c209d8def3f0fc25805427
+  metadata.gz: 4db8ec53dcd991137c7b1f4348de57cb175c7ced
+  data.tar.gz: 4a127e0e7c5b4f5e10aea37991cf82b9a48b888f
 SHA512:
-  metadata.gz: d30867447a99006f2a4a3d70b027e54c25630b04aabf65ec41a53801846b2f2e347a3fcc9ddf73859e05b25475da7e18b1428049b1e9abaedab6da9fdf6b4d54
-  data.tar.gz: d3556118c9d8230a9b472668a475c23c3a2ccd365365ed818cc86b94fca94b881091a1d52614c4e3466b1953739617d6a6d967667b2b859636e046b573b68a39
+  metadata.gz: cf8bfbe6606861d66931e0d3e065b1f3aff29eb25d7ec5dce8cbb6d5072e00de0c19bfac6f2f23b24dbd504f711461938ad2e3a375087af10fef54e0a58fba34
+  data.tar.gz: edd1d70376daac1a0a458da5348e271ea89257c4140db2b6fe83607e2f6199b23683590290cfd76246ad8aff34bfbcbea2146f0719ec1607139a8222e8d01223

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Hieracles Changelog
 =======================
 
+### 0.1.3 - 2015-11-12
+- added scope (facts) interpretation for the hiera file
+  (very basic interpolation, not yet hiera-lib level)
+
 ### 0.1.2 - 2015-11-12
 - fix yaml more for case of nilclass in params
 - fix the case when a params file is empty

data/README.md

@@ -48,6 +48,7 @@ Configuration variables are:
 - encpath
 - hierafile
 - format
+- defaultscope
 
 For an  example setup you can check in `spec/files`.
 
@@ -84,8 +85,8 @@ Usage
       -j <fact_file> - facts in json format
 
 
-About facts
-------------------
+About facts aka. scope
+------------------------
 
 _(work in progress)_
 
@@ -95,6 +96,24 @@ Like with Hiera CLI you can use hieracles with defined top-scope variables. Thos
 - `-y <fact_file>` which takes the fact file from a yaml source created by `facter -y` on your node for example, but it can be written manually for experimentation purposes.
 - `-j <fact_file>` same as above, but with output of `facter -j`
 
+You can define a default scope in your configuration file `defaultscope` in `~/.confg/hieracles/config.yml`. For example:
+
+    ---
+    colors: true
+    classpath: farm_modules/%s/manifests/init.pp
+    hierafile: dev/hiera-local.yaml
+    encpath: enc 
+    defaultscope:
+        operatingsystem: Debian
+        lsbdistcodename: Jessie
+
+In order the scope with be built from:
+
+- the config file
+- if `-y <file>` option (or `-j`) is present the `defaultscope` in the config file will be totally ignored
+- the `-p key=value` option with overide variable per variable
+
+
 Completion
 -------------
 There is a simple zsh completion file in `tools/completion`. 
@@ -128,9 +147,9 @@ and install
 
 Todo
 --------------
-- add json format
-- add override information in yaml format
-- add a command to search for node according to a filter
+- add json format (done)
+- add override information in yaml format (done)
+- add a command to search for node according to a filter (done)
 - add a command to find all nodes that use a given module
 - add a command that finds all nodes for which a params is defined
 - detect unused params

data/lib/hieracles/config.rb

@@ -1,13 +1,15 @@
 require 'fileutils'
 require 'json'
 require 'yaml'
+require 'hieracles/utils'
 
 module Hieracles
   # configuration singleton
   module Config
+    include Hieracles::Utils
     extend self
 
-    attr_reader :extraparams, :server, :classpath, :facts,
+    attr_reader :extraparams, :server, :classpath, :scope,
       :modulepath, :hierafile, :basepath, :encpath, :format
 
     def load(options)
@@ -24,7 +26,7 @@ module Hieracles
       @format = (options[:format] || values['format'] || 'console').capitalize
       facts_file = options[:yaml_facts] || options[:json_facts]
       facts_format = options[:json_facts] ? :json : :yaml
-      @facts = (facts_file && load_facts(facts_file, facts_format)) || {}
+      @scope = sym_keys((facts_file && load_facts(facts_file, facts_format)) || values['defaultscope'] || {})
     end
 
     def initconfig(file)

data/lib/hieracles/help.rb

@@ -29,6 +29,8 @@ module Hieracles
         -h <hierafile>
         -b <basepath> default ./
         -e <encdir>
+        -y <fact_file> - facts in yaml format
+        -j <fact_file> - facts in json format
         -v just displays the version of Hieracles
       END
     end

data/lib/hieracles/hiera.rb

@@ -1,5 +1,4 @@
 module Hieracles
-
   class Hiera
 
     def initialize

data/lib/hieracles/node.rb

@@ -13,6 +13,7 @@ module Hieracles
       @hiera = Hieracles::Hiera.new
       @hiera_params = { fqdn: fqdn }.
         merge(get_hiera_params(fqdn)).
+        merge(Config.scope).
         merge(Config.extraparams)
       @fqdn = fqdn
     end
@@ -51,6 +52,7 @@ module Hieracles
           s = to_shallow_hash(data)
           s.each do |k,v|
             params[k] ||= []
+            # f needs interpolation
             params[k] << { value: v, file: f}
           end
         end
@@ -62,7 +64,10 @@ module Hieracles
       params = {}
       paths(without_common).each do |f|
         data = YAML.load_file(f)
-        deep_merge!(params, data) if data
+        if data
+          # data needs interpolation
+          deep_merge!(params, data)
+        end
       end
       deep_sort(params)
     end

data/spec/lib/config_spec.rb

@@ -61,7 +61,7 @@ describe Hieracles::Config do
     it { expect(Hieracles::Config.extract_params(str)).to eq expected }
   end
 
-  describe '.facts' do
+  describe '.scope' do
     context 'with a yaml file' do
       let(:options) do
         { 
@@ -73,7 +73,7 @@ describe Hieracles::Config do
       let(:expected) { 'Debian' }
       before { Hieracles::Config.load options }
 
-      it { expect(Hieracles::Config.facts['osfamily']).to eq expected }
+      it { expect(Hieracles::Config.scope[:osfamily]).to eq expected }
     end
     context 'with a json file' do
       let(:options) do
@@ -86,7 +86,7 @@ describe Hieracles::Config do
       let(:expected) { 'Debian' }
       before { Hieracles::Config.load options }
 
-      it { expect(Hieracles::Config.facts['osfamily']).to eq expected }
+      it { expect(Hieracles::Config.scope[:osfamily]).to eq expected }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieracles
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler