mutx 0.1.69 → 0.2.0

data/lib/mutx/view/{styles.mote → layout/styles.mote}

@@ -1,4 +1,14 @@
+<link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
+<!--
+  <link href='https://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/jumbotron-narrow.css' rel='stylesheet'>
+-->  
+<link href="/css/jquery.json-viewer.css" rel="stylesheet">
 <style>
+
+  body {
+    padding-top: 40px;
+  }
   label{
     font-family: Verdana;
     text-vertical-align: center;

data/lib/mutx/view/logs/{logs.mote → index.mote}

@@ -1,6 +1,6 @@
 <div class="btn-group" role="group" aria-label="...">
 % Mutx::Support::Logs.all.keys.each do |log|
-  <button type="button" class="btn btn-default">Left</button><a href='/logs/{{log}}'>{{log.split('_').first.capitalize}}</a></li>
+  <button type="button" class="btn btn-default">Left</button><a href='{{ path_for(:logs_show, log_name: log) }}'>{{ log.split('_').first.capitalize }}</a></li>
 % end
 
 </div>

data/lib/mutx/view/logs/show.mote

@@ -0,0 +1,3 @@
+<h3>{{ log_name.gsub("_"," ").capitalize }} Log</h3>
+% content = Mutx::Support::Logs.read_log_file_content_for log_name
+<pre style="height:400px; overflow:scroll; white-space:pre; word-wrap:normal;">{{ content }}</pre>

data/lib/mutx/view/repositories/_repository.mote

@@ -0,0 +1,7 @@
+<th>
+  <a href="#" onclick="goClean('{{ path_for(:repositories_show, repository_id: repository['_id']) }}');" >{{ repository["repo_name"] }}</a>
+</th>
+
+<th>
+  {{ repository["last_update"] }}
+</th>

data/lib/mutx/view/repositories/index.mote

@@ -0,0 +1,23 @@
+% if repositories.empty?
+  <br>
+  <br>
+  <div id='well'>
+    <h3>No Respositories defined</h3>
+  </div>
+  <br>
+  <br>
+% else
+  <div class="panel panel-default">
+    <div class="panel-heading"><h4>{{section.capitalize}}</h4></div>
+      <table class="table table-striped table-hover">
+        <tbody>
+          % repositories.each do |repository|
+            <tr>
+              {{ partial('repositories/_repository', repository: repository) }}
+            </tr>
+          % end
+        </tbody>
+      </table>
+    </div>
+  </div>
+% end

data/lib/mutx/view/repositories/show.mote

@@ -0,0 +1,21 @@
+<div class='starter-template'>
+  
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4>{{ repository['repo_name'] }}</h4>
+      <p class="text-right">Last Update {{ repository['last_update'] }} </p>
+    </div>
+    <div class="panel-body" >
+      <ul class='list-group'>
+      <li class="list-group-item">
+        <div id="json-viewer" style="min-height: 500px; max-height: 500px; overflow-y: scroll;">
+        </div>
+      </li>
+      </ul>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+  $('#json-viewer').jsonViewer({{ repository['value'].to_json }});
+</script>

data/lib/mutx/view/results/{detailed_info.mote → _result.mote}

@@ -77,7 +77,7 @@
                 <small>Execution data</small>
               </th>
               <th>
-                <a href="#" class='label label-default' onclick="window.open('/api/results/{{result["_id"]}}/data', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');">Click here to see</a>
+                <a href="#" class='label label-default' onclick="window.open('{{ path_for(:api_results_data, result_id: result["_id"]) }}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');">Click here to see</a>
               </th>
             </tr>
 
@@ -88,22 +88,22 @@
         </table>
 
         % if result["status"] == 'finished' and result["has_report"].eql? true
-          <a onclick="window.open('/results/report/{{result["_id"]}}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-{{Mutx::View.color(result["show_as"])}}'>
+          <a onclick="window.open('{{ path_for(:results_report, result_id: result["_id"]) }}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-{{Mutx::View.color(result["show_as"])}}'>
             See Report
           </a>
         % end
 
-        <a href='/results/{{result["_id"]}}/log', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600';" class='btn btn-info'>
+        <a href='{{ path_for(:results_log, result_id: result["_id"]) }}', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600';" class='btn btn-info'>
           Console Log
         </a>
 
-        <a onclick="window.open('/api/results/{{result["_id"]}}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
+        <a onclick="window.open('{{ path_for(:api_results_data, result_id: result["_id"]) }}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
           Raw
         </a>
 
         % unless result["status"] =~ /finished|stopped/
 
-          <a href='/results/{{result["_id"]}}/reset' class='btn btn-danger'>
+          <a href='{{ path_for(:results_reset, result_id: result["_id"]) }}' class='btn btn-danger'>
             Stop execution
           </a>
 

data/lib/mutx/view/results/console.mote

@@ -1,22 +1,9 @@
 
 <?
-result = Mutx::Results::Result.get(result_id)
 if result
   result.mark_as_saw! if (result.finished? or result.stopped?)
-  text = ""
-  #text += result.bundle_output.split("\n").join("</p><p>") if result.bundle_output
-  text += result.console_output.split("\n").join("</p><p>") if result.console_output
-  #if text.empty?
-  #  lines = []
-  #  begin
-  #    File.open("ls_#{result.id}.out","r").each_line do |line|
-  #      lines << line
-  #    end
-  #  rescue
-  #    lines << "Wait..."
-  #  end
-  #  text = lines.join("</small></p><p><small>")
-  #end
+  text = result.console_output.split("\n").join("</p><p>") if result.console_output
+
   size_of_lines = text.split("</p>").size
 
   task = Mutx::Tasks::Task.get(result.task_id)
@@ -25,101 +12,71 @@ if result
 
   execution_name = result.execution_name.empty? ? 'Not Defined' : result.execution_name.gsub('-_-',' ')
 
-  git_log = result.git_log.split('Author').first
-else
-
 end
 
-javascript = Mote.parse(File.read("#{Mutx::View.path}/javascript.mote"), self, []).call()
-
 ?>
-
-<html lang='en'>
-  <head>
-    <meta charset='utf-8'>
-    <meta http-equiv='X-UA-Compatible' content='IE=edge'>
-    <meta name='viewport' content='width=device-width, initial-scale=1'>
-    <!-- <meta http-equiv='refresh' content='{{Mutx::Support::Configuration.refresh_time}}'> -->
-    <link rel='icon' href='../../favicon.ico'>
-    <title>Result for {{result.task_name}}</title>
-    <!-- Bootstrap core CSS -->
-    <link href='https://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css' rel='stylesheet'>
-    <!-- Custom styles for this template -->
-    <link href='https://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/jumbotron-narrow.css' rel='stylesheet'>
-    {{javascript}}
-
-  </head>
-
-  <body>
-    % if result
-      <div class='container'>
-        <br>
-        <div class='well'>
-          <h3>Result for <b>{{result.task_name}}</b> execution {{result.stopped? ? '(Stopped)' : ''}}</h3>
-          <h6><b>Result ID:</b> {{result.id}}</h6>
-        % if Mutx::Support::Configuration.use_git?
-          <h6><b>Git log:</b> {{git_log}}</h6>
-        % end
-          <h6><b>Status: </b>{{result.status}}</h6>
-        % if result.timeout
-          <h6><b>Timeout:</b> Stopped After {{result.timeout}} seconds</h6>
-        % end
-        % if result.started_at
-          <h6><b>Duration:</b> {{result.elapsed_time}} seconds</h6>
-        % end
-          <h6><b>Execution Name: </b>{{execution_name}}</h6>
-          <h6><b>Custom parameters:</b>{{custom_params}}</h6>
-          <h6>&nbsp;</h6>
-          <h6>
-            <div>
-              <a onclick="window.history.go(-1);" style="cursor:pointer;" class='label label-default' >GO BACK</a>
-              <a href='#' class='label label-info' onclick="window.open('/api/results/{{result.id}}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
-                Result Data</a>
-              <a href='#' class='label label-warning' onclick="window.open('/api/results/{{result.id}}/data', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
-                Execution Data</a>
-            % unless result.status =~ /finished|stopped/
-              <a href='#' onclick="getAndClose('/results/{{result.id}}/reset');" class='label label-danger'>
-                Stop execution
-              </a>
-            % end
-            </div>
-          </h6>
-        </div>
-        <div class='page-header'>
-          <h4>Console Output</h4>
-        </div>
-        <div id='result'>
-          % if size_of_lines > 15
-            <button type='button' class='btn btn-default' title='Go down' onclick='goToBottom()' style='float: right'><span class='glyphicon glyphicon-chevron-down' aria-hidden='true'></span> Go down</button>
-            <br>
-          % end
-          <h3>
-            <small>
-              <pre style="height:400px; overflow:scroll; white-space:pre; word-wrap:normal;">
-                <b style='color:Black'>{{text}}</b>
-              </pre>
-            </small>
-          </h3>
-        % if size_of_lines > 15
-          <button type='button' class='btn btn-default' title='Go up' onclick='goToTop()' style='float: right'><span class='glyphicon glyphicon-chevron-up' aria-hidden='true'></span> Go up</button><br><br>
-        % end
-        </div>
-        <br>
+% if result
+    <br>
+    <div class='well'>
+      <h3>{{result.task['type'].capitalize}} <b>{{result.task_name}}</b> result execution {{result.stopped? ? '(Stopped)' : ''}}</h3>
+      <h6><b>ID:</b> {{result.id}}</h6>
+      <h6><b>Status: </b>{{result.status}}</h6>
+    % if result.timeout
+      <h6><b>Timeout:</b> Stopped After {{result.timeout}} seconds</h6>
+    % end
+    % if result.started_at
+      <h6><b>Duration:</b>{{Mutx::View.formatted_for result.elapsed_time}}</h6>
+    % end
+      <h6><b>Execution Name: </b>{{execution_name}}</h6>
+      <h6><b>Custom parameters:</b>{{custom_params}}</h6>
+      <h6>&nbsp;</h6>
+      <h6>
         <div>
-          <a onclick="window.history.go(-1);" style="cursor:pointer;" class='label label-default' >GO BACK</a>
-        </div>
-          <br>
-          <br>
-      </div>
-    % else
-      <div class='container'>
-        <br>
-        <div id='well'>
-          <h3>There is no result with id: <b>{{result_id}}</b></h3>
+          % if result.task['type'] == "task"
+            <a onclick="goClean('{{path_for(:tasks_show, task_name:result.task['name'])}}');" style="cursor:pointer;" class='btn btn-default' >
+              {{Mutx::View.icon_for("back")}}&nbsp;Return to task
+            </a>&nbsp;
+          % else
+            <a onclick="goClean('{{path_for(:tests_show, test_name:result.task['name'])}}');" style="cursor:pointer;" class='btn btn-default' >
+              {{Mutx::View.icon_for("back")}}&nbsp;Return to test
+            </a>&nbsp;
+          % end
+          <a href='#' onclick="window.open('{{ path_for(:api_results_show, result_id: result.id) }}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
+            JSON Data</a>
+          <a href='#' onclick="window.open('{{ path_for(:api_results_data, result_id: result.id) }}', '_blank', 'toolbar=no, scrollbars=yes, resizable=yes, top=300, left=300, width=800, height=600');" class='btn btn-default'>
+            Execution Data</a>
         </div>
+      </h6>
+    </div>
+    <div class='page-header'>
+      <h4>Console Output</h4>
+    </div>
+    <div id='result'>
+      % if size_of_lines > 15
+        <button type='button' class='btn btn-default' title='Go down' onclick='goToBottom()' style='float: right'><span class='glyphicon glyphicon-chevron-down' aria-hidden='true'></span> Go down</button>
         <br>
-        <a onclick="window.history.go(-1);" style="cursor:pointer;" class='label label-default' >GO BACK</a>
-      </div>
+      % end
+      <h3>
+        <small>
+          <pre style="height:400px; overflow:scroll; white-space:pre; word-wrap:normal;">
+            <b style='color:Black'>{{text}}</b>
+          </pre>
+        </small>
+      </h3>
+    % if size_of_lines > 15
+      <button type='button' class='btn btn-default' title='Go up' onclick='goToTop()' style='float: right'><span class='glyphicon glyphicon-chevron-up' aria-hidden='true'></span> Go up</button><br><br>
     % end
-  </body>
-</html>
+    </div>
+    <br>
+    <div>
+      <a onclick="window.history.go(-1);" style="cursor:pointer;" class='label label-default' >Return to task</a>
+    </div>
+      <br>
+      <br>
+% else
+  <div id='well'>
+    <h3>There is no result with id: <b>{{result_id}}</b></h3>
+  </div>
+  <br>
+  <a onclick="window.history.go(-1);" style="cursor:pointer;" class='label label-default' >Back</a>
+% end

data/lib/mutx/view/results/{all.mote → index.mote}

@@ -1,15 +1,11 @@
 <?
 
-  key = args[:query_string].keyword if (args[:query_string].keyword and !args[:query_string].keyword.empty?)
-  status = args[:query_string].status if (args[:query_string].status and !args[:query_string].status.empty?)
-  application = args[:query_string].application if (args[:query_string].application and !args[:query_string].application.empty?)
-
-
-  results = Mutx::API::Results.show()
-  results_list = results["results"]
+  key = query_string.keyword if (query_string.keyword and !query_string.keyword.empty?)
+  status = query_string.status if (query_string.status and !query_string.status.empty?)
+  application = query_string.application if (query_string.application and !query_string.application.empty?)
   if key
     keyword = key.downcase
-    results_list.select! do |result_data|
+    results.select! do |result_data|
       result_data["execution_name"].downcase.include? keyword or
       result_data["summary"].downcase.include? keyword or
       result_data["task"].inspect.downcase.include? keyword or
@@ -18,12 +14,12 @@
       result_data["custom_params"].inspect.downcase.include? keyword
     end
 
-    results_list.select!{|result_data| result_data["_id"]==key} if key.is_a? Fixnum
+    results.select!{|result_data| result_data["_id"]==key} if key.is_a? Fixnum
 
   end
 
   if status
-    results_list.select! do |res|
+    results.select! do |res|
       by_status = res["status"].downcase==status.downcase
       by_first_part_summary = res["summary"].split("step").first.downcase.include? status.downcase
       first_part = res["summary"].split("step").first
@@ -38,7 +34,7 @@
   end
 
   if application
-    results_list.select! do |res|
+    results.select! do |res|
       by_application = res["application"].downcase==application.downcase
       by_first_part_summary = res["summary"].split("step").first.downcase.include? application.downcase
       first_part = res["summary"].split("step").first
@@ -53,18 +49,18 @@
   end
 
   results_size_text = if (key or status)
-    "#{results_list.size} result#{'s' if results_list.size>1} found"
+    "#{results.size} result#{'s' if results.size>1} found"
   else
-    total_of_results = results_list.size
-    results_list = results_list[0..19] if total_of_results > 20
-    "Showing #{results_list.size} results of #{total_of_results}."
+    total_of_results = results.size
+    results = results[0..19] if total_of_results > 20
+    "Showing #{results.size} results of #{total_of_results}."
   end
 
 
 ?>
 
 <div class='well'>
-  <form name='search' method='get' action='/results/all'>
+  <form name='search' method='get' action='{{ path_for(:results_index) }}'>
     <input type='text' name='keyword' title='' placeholder='Search' value='{{key}}' style='height: 34px; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; color: #555; background-color: #fff; background-image: none; border: 1px solid #ccc; border-radius: 4px;' />
     <select id='status' name='status' style='height: 34px; padding: 6px 12px; font-size: 14px; line-height: 1.42857143; color: #555; background-color: #fff; background-image: none; border: 1px solid #ccc; border-radius: 4px;'>
       <option value='' {{'selected' if status.nil?}}>Any status</option>
@@ -80,10 +76,10 @@
     </select>
     <input type='submit' class='btn btn-success' value='Search'>&nbsp;&nbsp;
   % if key or status or application
-    <a class='btn btn-danger' href='/results/all' role='button'>Clear</a>
+    <a class='btn btn-danger' href='{{ path_for(:results_index) }}' role='button'>Clear</a>
   % end
 
-% if results_list.size > 0
+% if results.size > 0
   <div class='btn-group pull-right' role='group'>
     <button type='button' class='btn btn-default' aria-label='Left Align' title='Toggle collapse' onclick="autoCollapse()" title='collapse all panels'>
       <div id='collapse_icon'>
@@ -98,12 +94,10 @@
   <p style='text-align:right'>{{results_size_text}}</p>
 </div>
 
-% if results_list.size > 0
-  % result_info = Mote.parse(File.read("#{Mutx::View.path}/results/detailed_info.mote"), self, [:result])
-  % results_list.each do |result_data|
-    {{result_info.call(result:result_data)}}
-  % end
-% else
+% results.each do |result_data|
+  {{ partial('results/_result', result: result_data) }}
+% end
+% unless results.size > 0
   <br>
   <br>
   <div id='well'>

data/lib/mutx/view/sections.rb

@@ -4,33 +4,45 @@ module Mutx
     class Sections
 
       @@sections = {
-        "Edit Tasks" => "tasks/admin/list",
-        "Add Task" => "tasks/admin/new",
-        "Edit Task" => "tasks/admin/edit",
-        "View Task" => "tasks/admin/view",
-        "Delete Task" => "tasks/admin/delete",
-        "Tests" => "tasks/tasks",
-        "Test Message" => 'tasks/message',
-        "Tasks" => "tasks/tasks",
-        "Task Message" => 'tasks/message',
-        "Features" => "features/features",
-        "Feature" => "features/feature",
-        "Results"=>  "results/results",
-        "Console" => "results/console",
-        "Report" => "results/report",
-        "All Results"=> "results/all",
-        "Custom Params" => "custom/params/list",
-        "New Custom Param" => "custom/params/new",
-        "Edit Custom Param" => "custom/params/edit",
-        "Delete Custom Param" => "custom/params/delete",
+
+        "Admin Tasks" => "admin/tasks/index",
+        "Admin Tasks New" => "admin/tasks/new",
+        "Admin Tasks Edit" => "admin/tasks/edit",
+        "Admin Task" => "admin/tasks/show",
+        "Admin Tasks Delete" => "admin/tasks/delete",
+
+        "Admin Custom Params" => "admin/custom-params/index",
+        "Admin Custom Params New" => "admin/custom-params/new",
+        "Admin Custom Params Edit" => "admin/custom-params/edit",
+        "Admin Custom Params Delete" => "admin/custom-params/delete",
+
+        "Admin Repositories New" => "admin/repositories/new",
+        "Admin Repositories" => "admin/repositories/index",
+
+        'Tests' => "tests/index",
+        'Test' => "tests/show",
+        'Tasks' => "tasks/index",
+        'Task' => "tasks/show",
+        
+        'Task Results' => 'task_results/index',
+
+        "Results"=> "results/index",
+        "Result Console" => "results/console",
+        "Result Report" => "results/report",
+
+        "Features" => "features/index",
+        "Feature" => "features/file",
+
         "View Configuration" => "admin/config",
         "Edit Configuration" => "admin/config/edit",
         "Repo" => "",
-        "Logs" => "logs",
-        "Log" => "logs/log",
-        "Help" => "",
-        "New Repo" => "repos",
-        "List Repos" => "list_repos",
+        "Repositories" => "repositories/index",
+        "Repository" => "repositories/show",
+        "Logs" => "logs/index",
+        "Log" => "logs/show",
+        "Help" => "help/index",
+
+        "Error" => "error_handler"
       }
 
       def self.path_for section