hieraviz 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 696d61009ddd71002471a1ea73f2ae29cc852c83
-  data.tar.gz: 5a47b70c375793428efd086105b6a23cafff17bb
+SHA256:
+  metadata.gz: 9bac3af0637b03cc817afa615fc23438e7a69d80d5b878206874b947e7679148
+  data.tar.gz: 2a2936df0f3b6446b57c9d62b8420c2b678ab8352ba9f8c06fc2e66a5437b5c2
 SHA512:
-  metadata.gz: 3db49fea1e8d1bc172d2ef989624c299f06550a78689f5e074f5544c9e96677781f9299310040a87bf4835d94495916f7bb352ddd3a599a2d55fc1752c0862a2
-  data.tar.gz: d4c90394a44814599169f3d7e14f6734e7949b494ca14106320b56700475249f8fba17f35a0cfa18d18d9c287bed19f117e20d43273925d424224b2c7d9e15c4
+  metadata.gz: 955b562b5915e2b7817522794a308a786c995afded7b3735aaea2a48c006d411704032798ec90738072d37f1e89a47d632998409c3c9a8f52ae880d8dd55c1c6
+  data.tar.gz: 3781dbfab5fb417ebeb313a8ed3654d6c199c72ffe0bbf8d8ca4a725024cca1b7c9ac3d5a2a00f9af7990b9778ca0a9fead026a35821fcc3f45651dee809203e

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Hieraviz Changelog
 ========================
 
+### v0.2.6 - 2018-01-27
+- security update on yajl-ruby
+- update new regexps due to mustermann upgarde
+
+### v0.2.5 - 2016-12-30
+- update hieracles lib
+
 ### v0.2.4 - 2016-04-29
 - fix the dynamic changes of puppet directories
 

data/app/apiv1.rb

@@ -74,74 +74,81 @@ module HieravizApp
       200
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
       check_authorization
       hieracles_config = prepare_config(base)
       json Hieracles::Registry.nodes(hieracles_config)
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/info} do |base, node|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/info} do |base, node|
       check_authorization
       hieracles_config = prepare_config(base)
       node = Hieracles::Node.new(node, hieracles_config)
       json node.info
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/params} do |base, node|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/params} do |base, node|
       check_authorization
       hieracles_config = prepare_config(base, node)
       node = Hieracles::Node.new(node, hieracles_config)
       json node.params
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/allparams} do |base, node|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/allparams} do |base, node|
       check_authorization
       hieracles_config = prepare_config(base, node)
       node = Hieracles::Node.new(node, hieracles_config)
       json node.params(false)
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
       check_authorization
       facts = get_facts(base, node)
       json facts.read
     end
 
-    post %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
+    post %r{/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
       check_authorization
       facts = get_facts(base, node)
       data = JSON.parse(request.body.read.to_s)
       json facts.write(data)
     end
 
-    delete %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
+    delete %r{/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/facts} do |base, node|
       check_authorization
       facts = get_facts(base, node)
       json facts.remove
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)$} do |base, node|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)} do |base, node|
       check_authorization
       hieracles_config = prepare_config(base, node)
       node = Hieracles::Node.new(node, hieracles_config)
       json node.params
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
       check_authorization
       cross_origin
       hieracles_config = prepare_config(base)
       json Hieracles::Registry.farms_counted(hieracles_config, base, true)
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/vars} do |base|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/modules} do |base|
+      check_authorization
+      cross_origin
+      hieracles_config = prepare_config(base)
+      json Hieracles::Registry.modules(hieracles_config, base, true)
+    end
+
+    get %r{/?([-_\.a-zA-Z0-9]+)?/vars} do |base|
       check_authorization
       hieracles_config = prepare_config(base)
       hiera = Hieracles::Hiera.new(hieracles_config)
       json hiera.params
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/hierarchy} do |base, node|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/hierarchy} do |base, node|
       check_authorization
       hieracles_config = prepare_config(base, node)
       hiera = Hieracles::Hiera.new(hieracles_config)
@@ -158,10 +165,11 @@ module HieravizApp
       json res
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/farm/([-_\.a-zA-Z0-9]+)$} do |base, farm|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/farm/([-_\.a-zA-Z0-9]+)} do |base, farm|
       # check_authorization
       cross_origin
       hieracles_config = prepare_config(base)
+      Hieracles::Registry.reload_nodes
       nodes =  Hieracles::Registry.nodes_parameters(hieracles_config, base).each_with_object({}) do |(key, val), acc|
         acc[key] = val if val['farm'] == farm
       end

data/app/public/js/main.js

@@ -89,7 +89,8 @@ function end_wait(meat) {
 
 function update_footer(path) {
   var debug = document.querySelector('.foot .debug');
-  debug.innerHTML = "curl -s http://" + window.location.host + path + " | jq '.'";
+  console.log(window.location);
+  debug.innerHTML = "curl -ks " + window.location.origin + path + " | jq '.'";
 }
 
 

data/app/web.rb

@@ -127,40 +127,40 @@ module HieravizApp
       end
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
       @username = check_authorization
       hieracles_config = prepare_config(base)
       @nodes = Hieracles::Registry.nodes(hieracles_config)
       erb :nodes
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
       @username = check_authorization
       hieracles_config = prepare_config(base)
       @farms = Hieracles::Registry.farms_counted(hieracles_config, base)
       erb :farms
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/modules} do |base|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/modules} do |base|
       prepare_config(base)
       @username = check_authorization
       erb :modules
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/resources} do |base|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/resources} do |base|
       prepare_config(base)
       @username = check_authorization
       erb :resources
     end
 
-    get %r{^/?([-_\.a-zA-Z0-9]+)?/user} do |base|
+    get %r{/?([-_\.a-zA-Z0-9]+)?/user} do |base|
       prepare_config(base)
       @username = check_authorization
       @userinfo = session[:access_token] ? userinfo : {}
       erb :user
     end
 
-    get %r{^/([-_\.a-zA-Z0-9]+)$} do |base|
+    get %r{/([-_\.a-zA-Z0-9]+)} do |base|
       prepare_config(base)
       @username = username
       erb :home

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieraviz
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Simple web application for accessing Puppet development code
                             and production data in a unified interface. Its main goal is
@@ -351,36 +365,36 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Web and API server for accessing Puppet dev and prod data.
 test_files:
 - spec/oauth2_helper.rb
-- spec/spec_helper.rb
-- spec/app/web_dummy_auth_spec.rb
-- spec/app/apiv1_spec.rb
-- spec/app/web_spec.rb
-- spec/files/config_gitlab.yml
-- spec/files/config_multi.yml
-- spec/files/hiera.yml
 - spec/files/config_dummy.yml
+- spec/files/hiera.yml
 - spec/files/config.yml
-- spec/files/puppet/params/common/common.yaml
-- spec/files/puppet/params/nodes/node1.example.com.yaml
-- spec/files/puppet/enc/node1.example.com.yaml
-- spec/files/puppet/farm_modules/farm1/manifests/init.pp
-- spec/files/puppet/modules/module1/init.pp
-- spec/files/puppet/hiera.yml
-- spec/files/puppet2/params/common/common.yaml
-- spec/files/puppet2/params/nodes/node1.example.com.yaml
-- spec/files/puppet2/enc/node1.example.com.yaml
 - spec/files/puppet2/farm_modules/farm1/manifests/init.pp
-- spec/files/puppet2/modules/module1/init.pp
 - spec/files/puppet2/hiera.yml
-- spec/sinatra_helper.rb
+- spec/files/puppet2/enc/node1.example.com.yaml
+- spec/files/puppet2/params/nodes/node1.example.com.yaml
+- spec/files/puppet2/params/common/common.yaml
+- spec/files/puppet2/modules/module1/init.pp
+- spec/files/config_gitlab.yml
+- spec/files/config_multi.yml
+- spec/files/puppet/farm_modules/farm1/manifests/init.pp
+- spec/files/puppet/hiera.yml
+- spec/files/puppet/enc/node1.example.com.yaml
+- spec/files/puppet/params/nodes/node1.example.com.yaml
+- spec/files/puppet/params/common/common.yaml
+- spec/files/puppet/modules/module1/init.pp
+- spec/spec_helper.rb
 - spec/lib/auth_gitlab_spec.rb
-- spec/lib/puppetdb_spec.rb
 - spec/lib/config_spec.rb
-- spec/lib/facts_spec.rb
 - spec/lib/store_spec.rb
+- spec/lib/facts_spec.rb
+- spec/lib/puppetdb_spec.rb
+- spec/sinatra_helper.rb
+- spec/app/web_spec.rb
+- spec/app/web_dummy_auth_spec.rb
+- spec/app/apiv1_spec.rb