hieracles 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8a864c5618b6297ced275fbd2bdc05444ef190e
-  data.tar.gz: 8417df1abc0dd1b2bd516f59c14c9924d5efedb4
+  metadata.gz: 44c29a8927b67e49372692e6b01dbc470d501934
+  data.tar.gz: 0d951af952efeaeae73dbe43dc22a93b6c1efb71
 SHA512:
-  metadata.gz: a5f7e2ac82b91f4308615a7378c726d16487633a47438d47976e3e0e6251bd89ab9fc57b6aca8b87ea367fc38f9b99b7b59940d80e13d5de4f136ef522665e39
-  data.tar.gz: 9c56a3cb36c07afa57c0548020d72641c8fe23e1d39825ac5c49a3f9161dead0f307507906a29d9e362da1b5580db3730f83d033b0cfef4dc5716c6181c9f332
+  metadata.gz: e8cf4e3b7cd75be578b054e4eaeb3f304d5335bf1300a417836574b04fb3437c31eab7c3f0002ed13f446b9bc1ca86d99f831990345f5d9e9f3d970cbd19c4a5
+  data.tar.gz: c79542cdc9cd45d562a32ecc30b40ebcdee791f9c94e469855fa1d47dec5cac8dabc0761aca34924a15b987f36aed62851ce1c72cacc8b7319feb0551560979f

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Hieracles Changelog
 =======================
 
+### 0.3.3 - 2016-02-11
+- add some convenience methods for usage as a lib
+- add a nodes_data in registry module to get all info for all nodes.
+
 ### 0.3.2 - 2015-12-30
 - fix ppdb that suffered a regression
 

data/README.md

@@ -4,7 +4,7 @@ Hieracles
 [![Gem Version](https://img.shields.io/gem/v/hieracles.svg)](http://rubygems.org/gems/hieracles)
 [![Downloads](http://img.shields.io/gem/dt/hieracles.svg)](https://rubygems.org/gems/hieracles)
 [![Build Status](https://img.shields.io/travis/Gandi/hieracles.svg)](https://travis-ci.org/Gandi/hieracles)
-[![Coverage Status](https://img.shields.io/coveralls/Gandi/hieracles.svg)](https://coveralls.io/github/Gandi/hieracles?branch=master)
+[![Coverage Status](https://img.shields.io/coveralls/Gandi/hieracles.svg)](https://coveralls.io/github/Gandi/hieracles)
 [![Dependency Status](https://gemnasium.com/Gandi/hieracles.svg)](https://gemnasium.com/Gandi/hieracles)
 [![Code Climate](https://img.shields.io/codeclimate/github/Gandi/hieracles.svg)](https://codeclimate.com/github/Gandi/hieracles)
 
@@ -165,6 +165,8 @@ or for a ssl setup:
       ca_file: path/to/ca_file
       verify_peer: false
 
+Note: the SSL config was not tested yet.
+
 #### Usage
 
 If you set `usedb: false` the `hc` commands will not query the puppetdb unless you pass the `-db` options.

data/lib/hieracles/interpolate.rb

@@ -2,7 +2,7 @@ module Hieracles
   module Interpolate
 
     def parse(data, values, interactive = false)
-      data.gsub(/%\{(?:(scope|hiera|literal|alias)\(['"])?(?:::)?([^\}"']*)(?:["']\))?\}/) do |match|
+      data.gsub(regex) do |match|
         if interactive && !values[$2.to_sym]
           values[$2.to_sym] = ask_about($2)
           values[$2.to_sym]
@@ -12,6 +12,13 @@ module Hieracles
       end
     end
 
+    def extract(data)
+      data.scan(regex).reduce([]) do |a, m|
+        a << m[1] unless a.include?(m[1])
+        a
+      end
+    end
+
     def ask_about(var)
       @@output.puts
       @@output.puts "'#{var}' is not defined."
@@ -28,5 +35,9 @@ module Hieracles
       @@output = output
     end
 
+    def regex
+      /%\{(?:(scope|hiera|literal|alias)\(['"])?(?:::)?([^\}"']*)(?:["']\))?\}/
+    end
+
   end
 end

data/lib/hieracles/node.rb

@@ -48,21 +48,6 @@ module Hieracles
       files(without_common).map { |p| File.join(@config.basepath, p) }
     end
 
-    def params_old(without_common = true)
-      params = {}
-      files(without_common).reverse.each do |f|
-        data = YAML.load_file(File.join(@config.basepath, f))
-        if data
-          s = to_shallow_hash(data)
-          s.each do |k,v|
-            params[k] ||= []
-            params[k] << { value: v, file: f }.merge(merge_value(params[k], v))
-          end
-        end
-      end
-      params.sort
-    end
-
     def params(without_common = true)
       params = {}
       files(without_common).each do |f|
@@ -87,7 +72,6 @@ module Hieracles
                 overriden: false,
                 found_in: [{ value: v, file: f }]
               }
-
             end
           end
         end

data/lib/hieracles/registry.rb

@@ -22,5 +22,16 @@ module Hieracles
   		end
   	end
 
+    def nodes_data(config, env = 'production', reload = false)
+      @_nodes_data = {} if reload || !@_nodes_data
+      @_nodes_data[env] ||= Dir.glob(File.join(config.encpath, '*.yaml')).sort.reduce({}) do |a, f|
+        fqdn = File.basename(f, '.yaml')
+        a[fqdn] = YAML.load_file(f)['parameters']
+        a
+      end
+    end
+
+
+
 	end
 end

data/spec/files/params/farm_datacenter/dev_dc1.yaml

@@ -0,0 +1 @@
+dc_param: value for dc1

data/spec/files/params/farm_datacenter/dev_dc2.yaml

@@ -0,0 +1 @@
+dc_param: value for dc2

data/spec/lib/interpolate_spec.rb

@@ -43,6 +43,24 @@ describe Hieracles::Interpolate do
     end
   end
 
+  describe '.extract' do
+    context 'with a single var' do
+      let(:data) { 'something_%{a_var}' }
+      let(:expected) { [ 'a_var' ] }
+      it { expect(extract data).to eq expected }
+    end
+    context 'with a 2 vars' do
+      let(:data) { "something_%{a_var}\nanother %{one}" }
+      let(:expected) { [ 'a_var', 'one' ] }
+      it { expect(extract data).to eq expected }
+    end
+    context 'with a 2 identical vars' do
+      let(:data) { "something_%{a_var}\nanother %{a_var}" }
+      let(:expected) { [ 'a_var' ] }
+      it { expect(extract data).to eq expected }
+    end
+  end
+
   describe ".ask_about" do
   end
 

data/spec/lib/registry_spec.rb

@@ -54,4 +54,39 @@ describe Hieracles::Registry do
     it { expect(Hieracles::Registry.modules config).to eq expected }
   end
 
+  describe '.nodes_data' do
+    let(:options) do
+      {
+        config: 'spec/files/config.yml',
+        basepath: 'spec/files'
+      }
+    end
+    let(:expected) {
+      {
+        'server.example.com' => {
+          'country' => 'fr',
+          'datacenter' => 'equinix',
+          'farm' => 'dev'
+        },
+        'server2.example.com' => {
+          'country' => 'fr',
+          'datacenter' => 'equinix',
+          'farm' => 'dev2'
+        },
+        'server3.example.com' => {
+          'country' => 'fr',
+          'datacenter' => 'equinix',
+          'farm' => 'dev3'
+        },
+        'server4.example.com' => {
+          'country' => 'fr',
+          'datacenter' => 'equinix',
+          'farm' => 'dev2'
+        }
+      }
+    }
+    let(:config) { Hieracles::Config.new options }
+    it { expect(Hieracles::Registry.nodes_data config).to eq expected }
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieracles
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -203,6 +203,8 @@ files:
 - spec/files/modules/faux_module2/manifests/init.pp
 - spec/files/params/common/common.yml
 - spec/files/params/farm/dev.yaml
+- spec/files/params/farm_datacenter/dev_dc1.yaml
+- spec/files/params/farm_datacenter/dev_dc2.yaml
 - spec/files/params/nodes/server.example.com.yaml
 - spec/files/ssl/bad-ca.crt
 - spec/files/ssl/bad-cert.crt
@@ -256,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CLI tool for Hiera parameters visualization.
@@ -275,6 +277,8 @@ test_files:
 - spec/files/params/nodes/server.example.com.yaml
 - spec/files/params/farm/dev.yaml
 - spec/files/params/common/common.yml
+- spec/files/params/farm_datacenter/dev_dc1.yaml
+- spec/files/params/farm_datacenter/dev_dc2.yaml
 - spec/files/hiera_no_yamlbackend.yaml
 - spec/files/ssl/key.pem
 - spec/files/ssl/bad-cert.crt