hieraviz 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49399d4e687c122f2333b3a02f475d5ec8d769bd
-  data.tar.gz: a376b1c4332bac9deddd0d60491b3ac4d4627236
+  metadata.gz: c977dce78504ac761d4d7d6acd75ad95e873d2a7
+  data.tar.gz: 9afaf6f7186ec5365fe685ff73ad4ce49a401f8d
 SHA512:
-  metadata.gz: 03e9edf186cd492acd366519a017fcf998d47e1a2ee083ec3344060afec06ae90134aedf364a47eff989120dfe4f48d938e252464104ec8b91a1a8c5825b1ae5
-  data.tar.gz: 09845cede54c3d470d4482e42be46e9efd8aaba6a9b884c219fb6bcab444b227e7f71dc32e09d8d38da163b558c4c2b63dba4267dd914d61437287e500649164
+  metadata.gz: ee55dacc40305aec815eb61c1b718aff566fe8d8697f50eccd60dc6f645940ca27632395e1b3f1a11391e1223d003e85f698c551a93d8fd9fb7a1e20df072cbf
+  data.tar.gz: 80e725f5a210c00e2e17b56ec50b1497dfe736292dbc9a8c0c1e70d3e1da69a9082cc5f0ddb097c4d15e3d191913af229c1980702dd376c0b8713c61e4130d73

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 Hieraviz Changelog
 ========================
 
+### v0.1.1 - 2016-01-29
+- add multibase ability
+- fix node navigation info/params/allparams
+
 ### v0.1.0 - 2016-01-20
 - extend test coverage
 

data/README.md

@@ -11,6 +11,8 @@ Hieraviz
 
 Hieraviz is a simple web application for accessing Puppet development code and production data in a unified interface. Its main goal is to enable a better visibility on the Puppet architecture for more actors to be able to interact with it.
 
+![Hieraviz Screenshot 1](https://raw.githubusercontent.com/wiki/Gandi/hieraviz/screenshots/hieraviz1.png)
+
 It's currently in very early stages of development, use at your own risk.
 
 Installation 

data/app/apiv1.rb

@@ -31,38 +31,44 @@ module HieravizApp
       end
     end
 
-    get '/nodes' do
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
       check_authorization
-      json Hieracles::Registry.nodes(settings.config)
+      hieracles_config = prepare_config(base)
+      json Hieracles::Registry.nodes(hieracles_config)
     end
 
-    get '/node/:n/info' do |node|
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/info} do |base, node|
       check_authorization
-      node = Hieracles::Node.new(node, settings.config)
+      hieracles_config = prepare_config(base)
+      node = Hieracles::Node.new(node, hieracles_config)
       json node.info
     end
 
-    get '/node/:n/params' do |node|
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/params} do |base, node|
       check_authorization
-      node = Hieracles::Node.new(node, settings.config)
+      hieracles_config = prepare_config(base)
+      node = Hieracles::Node.new(node, hieracles_config)
       json node.params
     end
 
-    get '/node/:n/allparams' do |node|
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)/allparams} do |base, node|
       check_authorization
-      node = Hieracles::Node.new(node, settings.config)
+      hieracles_config = prepare_config(base)
+      node = Hieracles::Node.new(node, hieracles_config)
       json node.params(false)
     end
 
-    get '/node/:n' do |node|
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/node/([-_\.a-zA-Z0-9]+)$} do |base, node|
       check_authorization
-      node = Hieracles::Node.new(node, settings.config)
+      hieracles_config = prepare_config(base)
+      node = Hieracles::Node.new(node, hieracles_config)
       json node.params
     end
 
-    get '/farms' do
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
       check_authorization
-      json Hieracles::Registry.farms(settings.config)
+      hieracles_config = prepare_config(base)
+      json Hieracles::Registry.farms(hieracles_config)
     end
 
     # get '/farm/:n' do |farm|

data/app/common.rb

@@ -8,9 +8,54 @@ module HieravizApp
       set :app_name, 'HieraViz'
       set :configdata, Hieraviz::Config.load
       set :config, Hieracles::Config.new({ config: Hieraviz::Config.configfile })
+      set :basepaths, Hieraviz::Config.basepaths
       enable :session
       enable :logging
     end
 
+    helpers do
+      def prepare_config(e)
+        e = File.basename(settings.configdata['basepath']) unless e
+        path = get_path(e)[0]
+        if path
+          @base = get_base(path)
+          @base_name = @base.gsub(/\//,'')
+          get_config(path)
+        end
+      end
+      def prepare_params(e)
+        e = File.basename(settings.configdata['basepath']) unless e
+        path = get_path(e)[0]
+        if path
+          settings.configdata['basepath'] = path
+          settings.configdata
+        end        
+      end
+      def get_path(path)
+        if settings.basepaths
+          settings.basepaths.select do |p|
+            path == File.basename(p)
+          end
+        else
+          [ settings.configdata['basepath'] ]
+        end
+      end
+      def get_config(path)
+        if path
+          Hieracles::Config.new({ 
+            config: Hieraviz::Config.configfile,
+            basepath: path
+            })
+        else
+          Hieracles::Config.new({ 
+            config: Hieraviz::Config.configfile
+            })
+        end     
+      end
+      def get_base(path)
+        "/#{File.basename(path)}"
+      end
+    end
+
   end
 end

data/app/public/css/main.css

@@ -41,11 +41,53 @@ input {
   line-height: .5em;
   margin-right: 1em;
 }
-.head .nav {
+.head .nav, .head .nav .base {
   position: relative;
   float: left;
   display: inline-block;
 }
+
+.head .base .current {
+  position: relative;
+  color: #fff;
+  background-color: #666;
+  padding: .5em 1em;
+  border-radius: .2em;
+  font-weight: bold;
+  margin-right: 1em;  
+  cursor: pointer;
+}
+.head .base .all {
+  position: absolute;
+  display: none;
+  background-color: #fff;
+  width: auto;
+  overflow-x: visible;
+  margin-top: 1em;
+  border: 1px solid #666;
+}
+.head .base .all.focus {
+  display: block;
+}
+.head .base .all .filter {
+  margin: 0;
+  background-color: #999;
+  font-size: 1.2em;
+}
+.head .base .all .filter input {
+  width: 100%;
+  margin-bottom: .1em;
+  padding: .1em 1em;
+}
+.head .base .all .select {
+  padding: .2em 1em;
+  color: #666;
+  cursor: pointer;
+}
+.head .base .all .select:hover {
+  color: #000;
+  background-color: #ddd;
+}
 .head .nav a {
   position: relative;
   color: #fff;
@@ -62,12 +104,18 @@ input {
   background-color: #fff;
   color: #000;
 }
+.head .base {
+  position: relative;
+  float: right;
+  display: inline-block;
+  margin-left: 2em;
+}
 .head .auth {
   position: relative;
   display: inline-block;
   float: right;
 }
-.head .auth a {
+.head .auth a.link {
   color: #fff;
   padding: .5em 1em;
   border-radius: .2em;
@@ -76,7 +124,7 @@ input {
   border-radius: .2em;
   cursor: pointer;
 }
-.head .auth a:hover {
+.head .auth a.link:hover {
   background-color: #fff;
   color: #000;
 }
@@ -86,7 +134,11 @@ input {
 }
 .head .auth .username {
   display: inline-block;
-  margin-right: 1em;
+  margin-right: .2em;
+}
+.head .auth .username .link {
+  color: #fff;
+  background-color: #999;
 }
 /* ----- Content ---- */
 .content {
@@ -100,6 +152,9 @@ input {
 .error {
   padding: 2em;
 }
+.info tr td {
+  padding-right: 2em;
+}
 /* ----- Sidebar ---- */
 .side {
   background-color: #eee;
@@ -114,6 +169,10 @@ input {
   margin: 0;
   background-color: #999;
   font-size: 1.2em;
+  line-height: 1.4em;
+  height: 1.4em;
+  width: 100%;
+  position: fixed;
 }
 .side .filter input {
   width: 100%;
@@ -123,6 +182,7 @@ input {
 .side ul {
   margin: 0;
   padding: 0;
+  margin-top: 1.8em;
   list-style: none;
   border-right: 1px solid #ccc;
 }
@@ -191,6 +251,12 @@ input {
 .meat .nodenav span.focus {
   background-color: #fff;
 }
+.meat .filter {
+  height: 4em;
+  position: fixed;
+  left: 330px;
+  right: 0;
+}
 .meat .paramfilter {
   margin: 0;
   padding: 0 1em;
@@ -203,6 +269,9 @@ input {
   margin-bottom: .1em;
   padding: .1em 1em;
 }
+.meat .rows {
+  margin-top: 3.8em;
+}
 .meat .row {
   word-wrap: break-word;
 }
@@ -245,6 +314,24 @@ input {
 .meat.farms div:hover {
   background-color: #f3f3de;
 }
+/* ----- info ---- */
+.meat .info {
+  margin-top: 4.8em;
+  display: table;
+}
+.meat .info .row {
+  display: table-row;
+}
+.meat .info .row .infokey {
+  display: table-cell;
+  padding: .1em 1em;
+  text-align: right;
+}
+.meat .info .row .infovalue {
+  display: table-cell;
+  font-family: monospace;
+  padding: .1em 1em;
+}
 /* ----- Foot ---- */
 .foot {
   padding: 1em;

data/app/public/js/base-switch.js

@@ -0,0 +1,27 @@
+
+ready( () => {
+  var bases = document.querySelectorAll('.base .all .select');
+  var button = document.querySelector(".base .current");
+  var menu = document.querySelector(".base .all");
+  var menuvisible = false;
+  filterBox(".base .all .filter input", bases);
+
+  button.addEventListener('click', (ev) => {
+    if (menuvisible) {
+      removeClass(menu, "focus");
+    } else {
+      addClass(menu, "focus");
+    }
+    menuvisible = !menuvisible;
+  });
+
+  /* declaration of events for the bases menu */
+  Array.prototype.forEach.call(bases, (item, i) => {
+    item.addEventListener('click', (ev) => {
+      var url = window.location;
+      base = ev.target.textContent;
+      url.pathname = url.pathname.replace(/^\/[^\/]+/,"/"+base);
+    });
+  });
+
+});

data/app/public/js/main.js

@@ -27,7 +27,7 @@ function make_base_auth(user, password) {
 }
 
 function addClass(el, className) {
-  if (el.classList)
+  if (el.classList != null)
     el.classList.add(className);
   else
     el.className += ' ' + className;
@@ -84,19 +84,6 @@ function end_wait(meat) {
   removeClass(meat, 'wait');
 }
 
-function restore_url(list) {
-  if (window.location.hash != '') {
-    var target = window.location.hash.replace(/#/,'');
-    Array.prototype.forEach.call(list, (item, i) => {
-      if (item.textContent == target) {
-        var event = document.createEvent('HTMLEvents');
-        event.initEvent('click', true, false);
-        item.dispatchEvent(event);
-      }
-    });
-  }
-}
-
 function update_footer(path) {
   var debug = document.querySelector('.foot .debug');
   debug.innerHTML = "curl -s http://" + window.location.host + path + " | jq '.'";
@@ -111,6 +98,8 @@ function auth_header() {
 
 ready( () => {
 
+  var meat = document.querySelector('div.meat');
+
   var flash = document.querySelectorAll('div.flash');
   Array.prototype.forEach.call(flash, (item, i) => {
     item.addEventListener('click', (ev) => {
@@ -118,4 +107,11 @@ ready( () => {
     });
   });
 
+  var login = document.querySelector('#login');
+  if (login != null) {
+    login.addEventListener('click', (ev) => {
+      start_wait(meat);
+    });
+  }
+
 });

data/app/public/js/nodes.js

@@ -13,8 +13,28 @@ ready( () => {
 
   var meat = document.querySelector('div.meat');
   var nodes = document.querySelectorAll('li.node');
+  var base = window.location.pathname.split('/')[1];
   focusNav('nodes');
-  filterBox(".filter input", nodes);
+  filterBox(".side .filter input", nodes);
+
+  function restore_url(list) {
+    if (window.location.hash != '') {
+      var target = window.location.hash.replace(/#/,'');
+      var parts = target.split('/');
+      Array.prototype.forEach.call(list, (item, i) => {
+        if (item.textContent == parts[0]) {
+          if (parts[1] != undefined) {
+            Node[parts[1]](parts[0]);
+          } else {
+            var event = document.createEvent('HTMLEvents');
+            event.initEvent('click', true, false);
+            item.dispatchEvent(event);
+          }
+        }
+      });
+    }
+  }
+
 
   function build_line(top, file, key, value, overriden) {
     if (overriden === true) {
@@ -46,25 +66,45 @@ ready( () => {
   }
 
   function build_top(title) {
-    meat.innerHTML = "<h3>Node "+title+"</h3>";
-    addTo(meat,  "<div class=\"nodenav\">" +
+    meat.innerHTML = "";
+    addTo(meat,  "<div class=\"filter\">" + 
+                 "<h3>Node "+title+"</h3>" +
+                 "<div class=\"nodenav\">" +
                  "<span class=\"showinfo\" data-item=\""+title+"\">Info</span>" +
                  "<span class=\"showparams\" data-item=\""+title+"\">Params</span>" +
                  "<span class=\"showallparams\" data-item=\""+title+"\">AllParams</span>" +
-                 "</div>");
-    addTo(meat,  "<div class=\"paramfilter\">" + 
+                 "</div><div class=\"paramfilter\">" + 
                  "<input type=\"text\" name=\"paramfilter\" />" +
-                 "</div>");
+                 "</div></div>");
    }
 
   function build_info(top, title, hash) {
-
+    if (Object.keys(hash).length > 0) {
+      var wrapper = document.createElement('div');
+      wrapper.className = 'rows info';
+      top.appendChild(wrapper);
+      Array.prototype.forEach.call(Object.keys(hash), (item, k) => {
+        console.log(item);
+        addTo(wrapper,  "<div class=\"row\">" +
+                        "<span class=\"infokey\">" + item + "</span>" +
+                        "<span class=\"infovalue\">" + JSON.stringify(hash[item], null, 2) + "</span>" +
+                        "</div");
+      });
+      var rows = document.querySelectorAll('div.row');
+      filterBox(".paramfilter input", rows);
+    } else {
+      addTo(top, "<div>There is no params in this node.</div>\n");
+    }
+    window.location.hash = '#' + title +'/info';
   }
 
   function build_params(top, title, hash) {
     if (Object.keys(hash).length > 0) {
+      var wrapper = document.createElement('div');
+      wrapper.className = 'rows';
+      top.appendChild(wrapper);
       Array.prototype.forEach.call(Object.keys(hash), (item, k) => {
-        build_row(top, item, hash[item]);
+        build_row(wrapper, item, hash[item]);
       });
       var rows = document.querySelectorAll('div.row');
       filterBox(".paramfilter input", rows);
@@ -79,15 +119,9 @@ ready( () => {
     var nodelinks = document.querySelectorAll('div.nodenav span');
     Array.prototype.forEach.call(nodelinks, (item, i) => {
       item.addEventListener('click', (ev) => {
-        start_wait();
         el = ev.target;
         action = el.textContent.toLowerCase();
-        fetch('/v1/node/' + title + '/' + action).
-          then(res => res.json()).
-          then(j => {
-            focus_on(nodelinks, el);
-            end_wait();
-          });
+        Node[action](el.dataset.item);
       });
     });
   }
@@ -97,49 +131,60 @@ ready( () => {
   }
 
   var Node = {
-    params: function(el) {
+    params: function(node) {
       start_wait(meat);
-      title = el.dataset.item;
-      fetch('/v1/node/' + title, auth_header()).
+      fetch('/v1/' + base + '/node/' + node, auth_header()).
         then(res => res.json()).
         then(j => {
           console.log(auth_header().headers.getAll('x-auth'));
+          build_top(node);
           if (j.error != undefined) {
             show_error(meat, j['error']);
           } else {
-            build_top(title);
-            build_params(meat, title, j);
-            rebuild_nav(title);
-            update_footer('/v1/node/' + title);            
+            build_params(meat, node, j);
+            rebuild_nav(node);
+            update_footer('/v1/' + base + '/node/' + node);
+            but = document.querySelector('.showparams');
+            addClass(but, 'focus');
           }
           end_wait(meat);
         });
     },
 
-    info: function(el) {
+    info: function(node) {
       start_wait(meat);
-      title = el.dataset.item;
-      fetch('/v1/node/' + title + '/info', auth_header()).
+      fetch('/v1/' + base + '/node/' + node + '/info', auth_header()).
         then(res => res.json()).
         then(j => {
-          build_top(title);
-          build_info(meat, title, j);
-          rebuild_nav(title);
-          update_footer('/v1/node/' + title + '/info');
+          build_top(node);
+          if (j.error != undefined) {
+            show_error(meat, j['error']);
+          } else {
+            build_info(meat, node, j);
+            rebuild_nav(node);
+            update_footer('/v1/' + base + '/node/' + node + '/info');
+            but = document.querySelector('.showinfo');
+            addClass(but, 'focus');
+          }
           end_wait(meat);
         });
     },
 
-    allparams: function(el) {
+    allparams: function(node) {
       start_wait(meat);
-      title = el.dataset.item;
-      fetch('/v1/node/' + title + '/all', auth_header()).
+      fetch('/v1/' + base + '/node/' + node + '/allparams', auth_header()).
         then(res => res.json()).
         then(j => {
-          build_top(title);
-          build_info(meat, title, j);
-          rebuild_nav(title);
-          update_footer('/v1/node/' + title + '/all');
+          build_top(node);
+          if (j.error != undefined) {
+            show_error(meat, j['error']);
+          } else {
+            build_params(meat, node, j);
+            rebuild_nav(node);
+            update_footer('/v1/' + base + '/node/' + node + '/allparams');
+            but = document.querySelector('.showallparams');
+            addClass(but, 'focus');
+          }
           end_wait(meat);
         });
     },
@@ -148,7 +193,7 @@ ready( () => {
   /* declaration of events for the nodes menu */
   Array.prototype.forEach.call(nodes, (item, i) => {
     item.addEventListener('click', (ev) => {
-      Node.params(ev.target);
+      Node.params(ev.target.textContent);
     });
   });
 

data/app/views/_head.erb

@@ -3,21 +3,41 @@
 <%= settings.app_name %>
 </a>
 </div>
-<% if session[:access_token] -%>
+
+<% if session[:access_token] && @username != ''  and @base -%>
 <div class="nav">
-<a href="/nodes" class="nodes">Nodes</a>
-<a href="/farms" class="farms">Farms</a>
-<a href="/modules" class="modules">Modules</a>
-<a href="/resources" class="resources">Resources</a>
+<% if settings.basepaths -%>
+<div class="base">
+<span class="current"><%= @base_name %></span>
+<div class="all">
+
+<form class="filter">
+<input type="text" name="filter" />
+</form>
+
+<% settings.basepaths.map { |p| File.basename(p) }.each do |e| -%>
+<div class="select"><%= e %></div>
+<% end -%>
+</div>
 </div>
+<% end -%>
+
+<a href="<%= @base %>/nodes" class="nodes">Nodes</a>
+<a href="<%= @base %>/farms" class="farms">Farms</a>
+<a href="<%= @base %>/modules" class="modules">Modules</a>
+<a href="<%= @base %>/resources" class="resources">Resources</a>
+</div>
+<% end -%>
+
+<% if session[:access_token] && @username != '' -%>
 <div class="auth">
 <div class="username">
-identified as <b><%= @username %></b>
+identified as <a href="<%= @base %>/user" class="link"><%= @username %></a>
 </div>
-<a href="/logout" id="logout">Logout</a>
+<a href="/logout" class="link" id="logout">Logout</a>
 </div>
 <% else -%>
 <div class="auth">
-<a href="/login" id="login">Connect</a>
+<a href="/login" class="link" id="login">Connect</a>
 </div>
 <% end -%>

data/app/views/_layout.erb

@@ -4,9 +4,12 @@
     <title>Hieraviz
     <%= @title if @title %>
     </title>
-    <link href="css/main.css" rel="stylesheet" type="text/css">
-    <script src="js/fetch.js"></script>
-    <script src="js/main.js"></script>
+    <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 -%>
+    <script src="/js/base-switch.js"></script>
+    <% end -%>
     <% if session['access_token'] -%>
     <script>var session_key = "<%= session['access_token'] %>";</script>
     <% end -%>

data/app/views/farms.erb

@@ -1,5 +1,5 @@
 <% content_for :more_js do %>
-<script src="js/farms.js"></script>
+<script src="/js/farms.js"></script>
 <% end %>
 
 <div class="side">
@@ -8,7 +8,7 @@
 </form>
 <ul>
 <% @farms.each do |farm| %>
-<li class="farm" data-item="<%= farm %>"><%= farm %></li>
+<li class="farm" data-env="<%= @base %>" data-item="<%= farm %>"><%= farm %></li>
 <% end %>
 </ul>
 </div>

data/app/views/logout.erb

@@ -1,5 +1,5 @@
 <% content_for :more_js do %>
-<script src="js/logout.js"></script>
+<script src="/js/logout.js"></script>
 <% end %>
 
 <div class="meat text">

data/app/views/modules.erb

@@ -1,8 +1,8 @@
 <% content_for :more_js do %>
-<script async="async" src="js/modules.js"></script>
+<script async="async" src="/js/modules.js"></script>
 <% end %>
 
-<div class="meat">
+<div class="meat text">
 <br>
 <div>Work In Progress</div>
 </div>

data/app/views/nodes.erb

@@ -1,5 +1,5 @@
 <% content_for :more_js do %>
-<script src="js/nodes.js"></script>
+<script src="/js/nodes.js"></script>
 <% end %>
 
 <div class="side">
@@ -8,7 +8,7 @@
 </form>
 <ul>
 <% @nodes.each do |node| %>
-<li class="node" data-item="<%= node %>"><%= node %></li>
+<li class="node" data-env="<%= @base %>" data-item="<%= node %>"><%= node %></li>
 <% end %>
 </ul>
 </div>

data/app/views/not_found.erb

@@ -1,3 +1,3 @@
-<div class="meat">
+<div class="meat text">
 Page not found
 </div>

data/app/views/resources.erb

@@ -1,8 +1,8 @@
 <% content_for :more_js do %>
-<script src="js/resources.js"></script>
+<script src="/js/resources.js"></script>
 <% end %>
 
-<div class="meat">
+<div class="meat text">
 <br>
 <div>Work In Progress</div>
 </div>

data/app/views/user.erb

@@ -0,0 +1,22 @@
+<% content_for :more_js do %>
+<script>
+ready( () => {
+  var debug = document.querySelector('.foot .debug');
+  debug.innerHTML = "export HIERAVIZ_KEY=\"<%= session['access_token'] %>\"";
+});
+</script>
+<% end %>
+<div class="meat text">
+<h1>User information</h1>
+<% if @userinfo['avatar_url'] -%>
+<img src="<%= @userinfo['avatar_url'] %>" align="left" style="margin-top:.4em;margin-right:1em;" />
+<% end -%>
+<table class="info">
+<% @userinfo.each do |k,v| -%>
+<% if %w(username id created_at email).include? k -%>
+<tr><td><%= k %></td><td><%= v %></td></tr>
+<% end -%>
+<% end -%>
+<tr><td>Session Key</td><td><%= session['access_token'] %></td></tr>
+</table>
+</div>

data/app/web.rb

@@ -44,6 +44,9 @@ module HieravizApp
         def get_username
           settings.configdata['http_auth']['username']
         end
+        def get_userinfo
+          { 'username' => settings.configdata['http_auth']['username'] }
+        end
         def check_authorization
           true
         end
@@ -65,6 +68,10 @@ module HieravizApp
           end
         end
 
+        def get_userinfo
+          Hieraviz::Store.get(session['access_token'], settings.configdata['session_renew'])
+        end
+
         def check_authorization
           if !session['access_token']
             redirect settings.oauth.login_url(request)
@@ -83,7 +90,7 @@ module HieravizApp
           end
         end
       end
-      
+
       get '/login' do
         redirect settings.oauth.login_url(request)
       end
@@ -104,55 +111,75 @@ module HieravizApp
     else
     end
 
-
     get '/' do
-      @username = get_username
-      erb :home
+      if settings.basepaths
+        redirect "/#{File.basename(settings.configdata['basepath'])}"
+      else
+        @username = get_username
+        hieracles_config = prepare_config(nil)
+        erb :home
+      end
     end
 
-    get '/nodes' do
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/nodes} do |base|
       @username = check_authorization
-      @nodes = Hieracles::Registry.nodes(settings.config)
-      erb :nodes
+      hieracles_config = prepare_config(base)
+      @nodes = Hieracles::Registry.nodes(hieracles_config)
+      erb :nodes 
     end
 
-    get '/farms' do
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/farms} do |base|
       @username = check_authorization
-      @farms = Hieracles::Registry.farms(settings.config)
+      hieracles_config = prepare_config(base)
+      @farms = Hieracles::Registry.farms(hieracles_config)
       erb :farms
     end
 
-    get '/modules' do
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/modules} do |base|
       @username = check_authorization
+      hieracles_config = prepare_config(base)
       erb :modules
     end
 
-    get '/resources' do
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/resources} do |base|
       @username = check_authorization
+      hieracles_config = prepare_config(base)
       erb :resources
     end
 
+    get %r{^/?([-_\.a-zA-Z0-9]+)?/user} do |base|
+      @username = check_authorization
+      hieracles_config = prepare_config(base)
+      if session[:access_token]
+        @userinfo = get_userinfo 
+      else
+        @userinfo = {}
+      end
+      erb :user
+    end
+
+    get %r{^/([-_\.a-zA-Z0-9]+)$} do |base|
+      @username = get_username
+      hieracles_config = prepare_config(base)
+      erb :home
+    end
+
     # debug pages --------------------
     # get '/store' do
     #   # Hieraviz::Store.set 'woot', 'nada'
     #   erb :store
     # end
-
-    # get '/user' do
-    #   if session[:access_token]
-    #     @data = settings.oauth.user_info(session[:access_token])
-    #   else
-    #     @data = 'nada'
-    #   end
-    #   erb :data
-    # end
-
     # error 401 do
     #   'Access forbidden'
     # end
+    # get '/paths' do
+    #   @data = settings.basepaths.map { |p| File.basename(p) }
+    #   erb :data
+    # end
     # debug pages --------------------
 
     not_found do
+      @username = get_username
       erb :not_found, layout: :_layout
     end
 

data/lib/hieraviz/config.rb

@@ -7,14 +7,26 @@ module Hieraviz
     end
 
     def configfile
-      file = ENV['HIERAVIZ_CONFIG_FILE'] || File.join("config", "hieraviz.yml")
-      file = File.join(root, file) unless file[0] == '/'
-      file
+      root_path(ENV['HIERAVIZ_CONFIG_FILE'] || File.join("config", "hieraviz.yml"))
+    end
+
+    def basepaths
+      if @_config && @_config['basepath_dir']
+        Dir.glob(root_path(@_config['basepath_dir'])).map { |p| File.expand_path(p) }
+      end
     end
 
     def root
       File.expand_path('../../../', __FILE__)
     end
 
+    def root_path(path)
+      if path[0] == '/'
+        path
+      else
+        File.join(root, path)
+      end
+    end
+
   end
 end

data/spec/app/web_spec.rb

@@ -39,8 +39,8 @@ describe HieravizApp::Web do
       before { get '/resources' }
       it { expect(last_response.body).to include 'Work In Progress' }
     end
-    describe "GET /toto" do
-      before { get '/toto' }
+    describe "GET /tata/toto" do
+      before { get '/tata/toto' }
       it { expect(last_response.status).to eq 404 }
       it { expect(last_response.body).to include 'Page not found' }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hieraviz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - mose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -225,6 +225,7 @@ files:
 - app/main.rb
 - app/public/css/main.css
 - app/public/img/loader.gif
+- app/public/js/base-switch.js
 - app/public/js/farms.js
 - app/public/js/fetch.js
 - app/public/js/logout.js
@@ -244,6 +245,7 @@ files:
 - app/views/not_found.erb
 - app/views/resources.erb
 - app/views/store.erb
+- app/views/user.erb
 - app/web.rb
 - bin/hv-ctl
 - config.ru