hieraviz 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3980ae6dc358ca8afeed70b805ad50870f4d0249
-  data.tar.gz: fdc6112e6912571fda379b8c5bc8a4a36c27eadb
+  metadata.gz: 696d61009ddd71002471a1ea73f2ae29cc852c83
+  data.tar.gz: 5a47b70c375793428efd086105b6a23cafff17bb
 SHA512:
-  metadata.gz: a82521eaa89bc5d5d06bbd085b4f0fefde3a6fe9e05c3df41681368597ed738f4dcb5aed8d8b084bee66f382cb6278def6fe3371fea632abbc42282094b2d1b8
-  data.tar.gz: 2d6ab2c653fbcdc65b0dd241390e5b631f376563ddae72926f3ad701e0b528dd94c0bb9b0e529e6e53c37e51ed530c5362b829870de57c322ab5319c963e0dea
+  metadata.gz: 3db49fea1e8d1bc172d2ef989624c299f06550a78689f5e074f5544c9e96677781f9299310040a87bf4835d94495916f7bb352ddd3a599a2d55fc1752c0862a2
+  data.tar.gz: d4c90394a44814599169f3d7e14f6734e7949b494ca14106320b56700475249f8fba17f35a0cfa18d18d9c287bed19f117e20d43273925d424224b2c7d9e15c4

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 Hieraviz Changelog
 ========================
 
+### v0.2.4 - 2016-04-29
+- fix the dynamic changes of puppet directories
+
 ### v0.2.3 - 2016-04-06
 - fix the handling of ssl in the return link for gitlab auth
 

data/app/apiv1.rb

@@ -31,7 +31,7 @@ module HieravizApp
 
       helpers do
         def check_authorization
-          logger.info session['access_token']
+          # logger.info session['access_token']
           if !session['access_token'] && !request.env['HTTP_X_AUTH']
             redirect '/v1/not_logged'
           end
@@ -131,7 +131,7 @@ module HieravizApp
       check_authorization
       cross_origin
       hieracles_config = prepare_config(base)
-      json Hieracles::Registry.farms_counted(hieracles_config, base)
+      json Hieracles::Registry.farms_counted(hieracles_config, base, true)
     end
 
     get %r{^/?([-_\.a-zA-Z0-9]+)?/vars} do |base|
@@ -162,7 +162,7 @@ module HieravizApp
       # check_authorization
       cross_origin
       hieracles_config = prepare_config(base)
-      nodes =  Hieracles::Registry.nodes_data(hieracles_config, base).each_with_object({}) do |(key, val), acc|
+      nodes =  Hieracles::Registry.nodes_parameters(hieracles_config, base).each_with_object({}) do |(key, val), acc|
         acc[key] = val if val['farm'] == farm
       end
       params = request.env['rack.request.query_hash']

data/app/common.rb

@@ -7,7 +7,6 @@ module HieravizApp
     configure do
       set :app_name, 'HieraViz'
       set :configdata, Hieraviz::Config.load
-      set :basepaths, Hieraviz::Config.basepaths
       set :store, Hieraviz::Store.new(settings.configdata['tmpdir'])
       enable :session
       enable :logging
@@ -79,8 +78,8 @@ module HieravizApp
       end
 
       def get_path(path)
-        if settings.basepaths
-          settings.basepaths.select do |file|
+        if settings.configdata['basepath_dir']
+          Hieraviz::Config.basepaths.select do |file|
             path == File.basename(file)
           end
         else

data/app/public/css/main.css

@@ -212,7 +212,7 @@ input {
   margin-left: 330px;
   position: relative;
   height: 100%;
-  overflow-y: auto;
+  padding-bottom: 3.8em;
 }
 .meat.text {
   padding: 1em 2em;
@@ -278,6 +278,8 @@ input {
 .meat .rows {
   margin-top: 3.8em;
   margin-right: 330px;
+  height: 100%;
+  overflow: auto;
 }
 .meat .row {
   word-wrap: break-word;

data/app/views/_head.erb

@@ -5,8 +5,8 @@
 </div>
 
 <div class="nav">
-<% if session[:access_token] && @username != ''  and @base %>
-<% if settings.basepaths %>
+<% if session[:access_token] && @username != '' and @base %>
+<% if Hieraviz::Config.basepaths %>
 <div class="base">
 <span class="current"><%= @base_name %></span>
 <div class="all">
@@ -15,7 +15,7 @@
 <input type="text" name="filter" />
 </form>
 
-<% settings.basepaths.map { |p| File.basename(p) }.each do |e| %>
+<% Hieraviz::Config.basepaths.map { |p| File.basename(p) }.each do |e| %>
 <div class="select"><%= e %></div>
 <% end %>
 </div>
@@ -23,7 +23,7 @@
 <% end %>
 <% end %>
 
-<% if session[:access_token] %>
+<% if session[:access_token] && @username != '' and @base %>
 <a href="<%= @base %>/nodes" class="nodes">Nodes</a>
 <a href="<%= @base %>/farms" class="farms">Farms</a>
 <a href="<%= @base %>/modules" class="modules">Modules</a>

data/app/views/_layout.erb

@@ -7,7 +7,7 @@
     <link href="/css/main.css" rel="stylesheet" type="text/css">
     <script src="/js/fetch.js"></script>
     <script src="/js/main.js"></script>
-    <% if settings.basepaths %>
+    <% if settings.configdata['basepath_dir'] %>
     <script src="/js/base-switch.js"></script>
     <% end %>
     <% if session['access_token'] %>

data/app/web.rb

@@ -119,7 +119,7 @@ module HieravizApp
     end
 
     get '/' do
-      if settings.basepaths
+      if settings.configdata['basepath_dir']
         redirect "/#{File.basename(settings.configdata['basepath'])}"
       else
         @username = username

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 unless ENV['BUILD']
-  require 'rubygems'
-  require 'bundler'
+  #require 'rubygems'
+  #require 'bundler'
 
   if ENV['COV']
     require 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieraviz
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-29 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.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement