hieracles 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbed104b2e5efb9ab631dc6c92dbcdc15c12c93b
-  data.tar.gz: 23a3969b635a47856e7e4881b303db9de6080ecd
+  metadata.gz: 580fa2b122f177f4e9a901b9dcc6940c721bf45e
+  data.tar.gz: c606cd77e93fd4c9d38d84a89f27790d050b8f36
 SHA512:
-  metadata.gz: ef265813311aab75f57bc92bbe35cb2526969be6937741f909ea232a2d37bf7b7778e42d72bf255ed6e61afa9f0be6c90a9f02675c43b0578029442c75735273
-  data.tar.gz: 1c5d72ac972d07fd0e7751796b9be488ff39e91bc2789855d01d6caf96b356ddb50a5a4f3d3ddfb8a9b2b50644b33f2351485d54c957153c4eefe47dc2562cba
+  metadata.gz: c1b6c1f4e57844360f5ee2c480d6bcb726f053e30e75fff0f3b18c1e55f6e8e15c4d1bced728554de3fcdf82b1f229d1d6176689b3f5a27897e581bea54926ee
+  data.tar.gz: b48b039da054c365cda35829a54f539de888a9192f9f12d934abfeb99596233e18383e96d7b37ce15bee1143c1eca00d9a555433850e5859784d8c7261b2bd16

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 Hieracles Changelog
 =======================
 
+### 0.3.6 - 2016-04-27
+- avoid abusive caching for all farms information
+
 ### 0.3.5 - 2016-02-18
 - change extraparams separator from ; to , to avoid having to quote argument
 - fix merge order for extraparams to override configuration and puppetdb values

data/bin/hc

@@ -24,7 +24,10 @@ end
 if Hieracles::Format.method_defined? command
   begin
     config = Hieracles::Config.new opt.options
-    node = Hieracles::Node.new fqdn, config
+    if fqdn[/\./]
+      node = Hieracles::Node.new fqdn, config
+    else
+    end
   rescue Exception => e
     puts "*** Error: #{e.message}"
     exit(1)

data/lib/hieracles/actions.rb

@@ -0,0 +1,7 @@
+require 'actions/modules'
+
+module Hieracles
+  module Actions
+
+  end
+end

data/lib/hieracles/actions/modules.rb

@@ -0,0 +1,7 @@
+module Hieracles
+  module Actions
+    class Modules
+
+    end
+  end
+end

data/lib/hieracles/registry.rb

@@ -22,23 +22,48 @@ 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|
+    def reload_nodes()
+      @_nodes_parameters = {}
+      @_nodes_modules = {}
+    end
+
+    def nodes_parameters(config, env = 'production')
+      @_nodes_parameters ||= {}
+      @_nodes_parameters[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
+
+    def nodes_modules(config, env = 'production')
+      @_nodes_modules ||= {}
+      @_nodes_modules[env] ||= Dir.glob(File.join(config.encpath, '*.yaml')).sort.reduce({}) do |a, f|
+        YAML.load_file(f)['classes'].each do |cl|
+
+        end
         fqdn = File.basename(f, '.yaml')
         a[fqdn] = YAML.load_file(f)['parameters']
         a
       end
     end
 
-    def farms_counted(config, env = 'production')
+    def farms_counted(config, env = 'production', reload = false)
+      reload_nodes if reload
       Dir.glob(format(config.classpath, '*')).sort.reduce({}) do |a, f|
         sub = Regexp.new(".*#{config.classpath.sub(/%s/,'([^/]*)')}")
         name = f.sub(sub, "\\1")
-        a[name] = nodes_data(config, env).select { |k, v| v['farm'] == name }.length
+        a[name] = nodes_parameters(config, env).select { |k, v| v['farm'] == name }.length
         a
       end
     end
 
+    def modules_counted(config, env = 'production', reload = false)
+      reload_nodes if reload
+      Dir.glob(File.join(config.modulepath, '*')).sort.reduce({}) do |acc, mod|
+        acc
+      end
+    end
+
 	end
 end

data/spec/lib/options/hc_spec.rb

@@ -79,4 +79,8 @@ describe Hieracles::Options::Hc do
     end
 
   end
+
+  describe '.usage' do
+    it { expect(Hieracles::Options::Hc.usage).to include('Usage')}
+  end
 end

data/spec/lib/registry_spec.rb

@@ -42,7 +42,7 @@ describe Hieracles::Registry do
     it { expect(Hieracles::Registry.modules config).to eq expected }
   end
 
-  describe '.nodes_data' do
+  describe '.nodes_parameters' do
     let(:expected) {
       {
         'server.example.com' => {
@@ -68,7 +68,7 @@ describe Hieracles::Registry do
       }
     }
     let(:config) { Hieracles::Config.new options }
-    it { expect(Hieracles::Registry.nodes_data config).to eq expected }
+    it { expect(Hieracles::Registry.nodes_parameters config).to eq expected }
   end
 
   describe '.farms_counted' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieracles
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -153,6 +153,8 @@ files:
 - bin/ppdb
 - hc.1
 - lib/hieracles.rb
+- lib/hieracles/actions.rb
+- lib/hieracles/actions/modules.rb
 - lib/hieracles/config.rb
 - lib/hieracles/format.rb
 - lib/hieracles/formats/console.rb
@@ -263,61 +265,61 @@ signing_key:
 specification_version: 4
 summary: CLI tool for Hiera parameters visualization.
 test_files:
-- spec/files/hiera_deeper.yaml
-- spec/files/facts.json
-- spec/files/farm_modules/dev4.pp
-- spec/files/farm_modules/dev2.pp
-- spec/files/farm_modules/dev.pp
-- spec/files/enc/server2.example.com.yaml
-- spec/files/enc/server.example.com.yaml
-- spec/files/enc/server3.example.com.yaml
-- spec/files/enc/server4.example.com.yaml
-- spec/files/config.yml
-- spec/files/hiera_deep.yaml
-- 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/spec_helper.rb
 - spec/files/hiera_no_yamlbackend.yaml
-- spec/files/ssl/key.pem
-- spec/files/ssl/bad-cert.crt
+- spec/files/facts.json
+- spec/files/hiera_columns.yaml
+- spec/files/ssl/ca.crt
 - spec/files/ssl/bad-ca.crt
 - spec/files/ssl/key-pass.pem
 - spec/files/ssl/cert.crt
-- spec/files/ssl/ca.crt
+- spec/files/ssl/bad-cert.crt
 - spec/files/ssl/bad-key.pem
+- spec/files/ssl/key.pem
 - spec/files/config_withdb.yml
-- spec/files/hiera.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/params/farm/dev.yaml
+- spec/files/params/nodes/server.example.com.yaml
+- spec/files/enc/server2.example.com.yaml
+- spec/files/enc/server.example.com.yaml
+- spec/files/enc/server4.example.com.yaml
+- spec/files/enc/server3.example.com.yaml
+- spec/files/farm_modules/dev4.pp
+- spec/files/farm_modules/dev.pp
+- spec/files/farm_modules/dev2.pp
 - spec/files/hiera_yamlbackend_notfound.yaml
-- spec/files/modules/faux_module2/manifests/init.pp
-- spec/files/modules/fake_module/manifests/init.pp
+- spec/files/hiera.yaml
 - spec/files/modules/fake_module3/manifests/init.pp
-- spec/files/modules/faux_module1/manifests/init.pp
+- spec/files/modules/fake_module/manifests/init.pp
 - spec/files/modules/fake_module2/manifests/init.pp
-- spec/files/hiera_columns.yaml
+- spec/files/modules/faux_module2/manifests/init.pp
+- spec/files/modules/faux_module1/manifests/init.pp
 - spec/files/facts.yaml
-- spec/spec_helper.rb
-- spec/lib/hieracles_spec.rb
-- spec/lib/utils_spec.rb
-- spec/lib/config_spec.rb
-- spec/lib/registry_spec.rb
-- spec/lib/notification_spec.rb
-- spec/lib/puppetdb/fixsslconnectionadapter_spec.rb
+- spec/files/config.yml
+- spec/files/hiera_deep.yaml
+- spec/files/hiera_deeper.yaml
+- spec/lib/node_spec.rb
 - spec/lib/puppetdb/client_spec.rb
-- spec/lib/puppetdb/apierror_spec.rb
+- spec/lib/puppetdb/fixsslconnectionadapter_spec.rb
 - spec/lib/puppetdb/response_spec.rb
-- spec/lib/puppetdb/query_spec.rb
 - spec/lib/puppetdb/request_spec.rb
-- spec/lib/interpolate_spec.rb
+- spec/lib/puppetdb/apierror_spec.rb
+- spec/lib/puppetdb/query_spec.rb
+- spec/lib/hieracles_spec.rb
+- spec/lib/notification_spec.rb
+- spec/lib/utils_spec.rb
 - spec/lib/format_spec.rb
-- spec/lib/optparse_spec.rb
-- spec/lib/options/hc_spec.rb
-- spec/lib/node_spec.rb
-- spec/lib/hiera_spec.rb
-- spec/lib/formats/csv_spec.rb
+- spec/lib/config_spec.rb
+- spec/lib/interpolate_spec.rb
 - spec/lib/formats/rawyaml_spec.rb
 - spec/lib/formats/plain_spec.rb
-- spec/lib/formats/console_spec.rb
-- spec/lib/formats/yaml_spec.rb
 - spec/lib/formats/json_spec.rb
+- spec/lib/formats/yaml_spec.rb
+- spec/lib/formats/csv_spec.rb
+- spec/lib/formats/console_spec.rb
+- spec/lib/options/hc_spec.rb
+- spec/lib/optparse_spec.rb
+- spec/lib/registry_spec.rb
+- spec/lib/hiera_spec.rb