ardtweeno 0.3.1 → 0.4.0

data/test/node_test.rb

@@ -1,4 +1,10 @@
-require 'rubygems'
+####################################################################################################
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno::Node test fixtures
+#
+# @date         2013-08-18
+####################################################################################################
+
 require 'test/unit'
 require 'rack/test'
 require 'ardtweeno'
@@ -12,8 +18,6 @@ class NodeTest < Test::Unit::TestCase
 
   include Rack::Test::Methods
   
-  attr_accessor :node
-  
   
   # Test suite fixtures
   def setup

data/test/nodemanager_test.rb

@@ -1,4 +1,10 @@
-require 'rubygems'
+####################################################################################################
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno::NodeManager test fixtures
+#
+# @date         2013-08-18
+####################################################################################################
+
 require 'test/unit'
 require 'rack/test'
 require 'ardtweeno'
@@ -12,8 +18,6 @@ class NodeManagerTest < Test::Unit::TestCase
 
   include Rack::Test::Methods
   
-  attr_accessor :dispatch
-  
   
   # Test suite fixtures
   def setup
@@ -159,7 +163,7 @@ class NodeManagerTest < Test::Unit::TestCase
     end
     
     assert_nothing_raised do
-      assert_equal(true, @nodemanager.watched?(@init[0]))  
+      assert_equal(true, @nodemanager.watched?("node6"))  
     end
     
     assert_nothing_raised do
@@ -167,7 +171,7 @@ class NodeManagerTest < Test::Unit::TestCase
     end
     
     assert_nothing_raised do
-      assert_equal(false, @nodemanager.watched?(@init[0]))  
+      assert_equal(false, @nodemanager.watched?("node6"))  
     end
     
   end

data/test/packet_test.rb

@@ -1,4 +1,10 @@
-require 'rubygems'
+###################################################################################################
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno::Packet test fixtures
+#
+# @date         2013-08-18
+####################################################################################################
+
 require 'test/unit'
 require 'rack/test'
 require 'ardtweeno'
@@ -12,8 +18,6 @@ class PacketTest < Test::Unit::TestCase
 
   include Rack::Test::Methods
   
-  attr_accessor :packetArray
-  
   
   # Test suite fixtures, setup before each test is executed
   def setup

data/test/parser_test.rb

@@ -2,7 +2,7 @@
 # @author       David Kirwan https://github.com/davidkirwan/ardtweeno
 # @description  Ardtweeno serialparser subsystem test fixtures
 #
-# @date         05-06-2013
+# @date         2013-08-18
 ####################################################################################################
 
 require 'rubygems'
@@ -20,8 +20,6 @@ class ParserTest < Test::Unit::TestCase
 
   include Rack::Test::Methods
   
-  attr_accessor :parser, :mock, :modem, :validdata, :invaliddata, :validdata_invalidnode
-  
   
   # Test suite fixtures
   def setup

data/test/rest_api_test.rb

@@ -275,4 +275,12 @@ class RESTAPITest < Test::Unit::TestCase
   end
   
   
+  # Test the watch list commands
+  def test_watch_node
+    
+    
+      
+  end
+  
+  
 end

data/test/ringbuffer_test.rb

@@ -0,0 +1,64 @@
+####################################################################################################
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno::RingBuffer test fixtures
+#
+# @date         2013-08-17
+####################################################################################################
+
+require 'test/unit'
+require 'ardtweeno'
+require 'rack/test'
+require 'logger'
+require 'json'
+
+
+ENV['RACK_ENV'] = 'test'
+
+
+class RingBufferTest < Test::Unit::TestCase
+  
+  include Rack::Test::Methods 
+  
+  
+  # Test suite fixtures
+  def setup
+    @buffer = Array.new
+    @size = 50
+    @ringbuffer = Ardtweeno::RingBuffer.new(@size)
+    
+    50.times do |i|
+      @buffer.push(i)      
+      @ringbuffer.push(i)  
+    end
+    
+  end
+  
+  
+  
+  # tear down the test fixtures between each test
+  def teardown
+    @buffer = nil
+    @size = nil
+    @ringbuffer = nil
+  end
+  
+
+  
+  # Test to ensure the Ardtweeno::RingBuffer#to_s method functions correctly
+  def test_tostring
+    assert_equal(@buffer.to_s, @ringbuffer.to_s)
+  end
+  
+  # Test to ensure the Ardtweeo::RingBuffer#to_a method functions correctly
+  def test_toarray
+    assert_equal(@buffer, @ringbuffer.to_a)
+  end
+  
+  # Test to ensure the Ardtweeno::RingBuffer#clear method functions correctly
+  def test_clear
+    @ringbuffer.clear
+    assert_equal([], @ringbuffer.to_a)
+  end
+  
+
+end

data/views/home.erb

@@ -24,4 +24,5 @@ The system is designed as a PaaS (platform as a service) for the
     <% end %>
   <% end %>
     
-</div>
+</div>
+<script type="text/javascript">keepUpdating = false;</script>

data/views/index.erb

@@ -4,9 +4,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>Ardtweeno Application Gateway</title>
   <link href="/main.css" media="screen" rel="stylesheet" type="text/css" />
-  <link rel="icon" href="/favicon.ico" type="image/x-icon">
-  <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
-  
+  <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
   <link rel="stylesheet" href="/highlightjs/styles/monokai.css" />
   
 </head>
@@ -30,6 +28,7 @@
       <ul class="mytabs" id="tabs">
         <li class="current"><a href="/home">Home</a></li>
         <li><a href="/status">Status</a></li>
+        <li><a href="/topology">Topology</a></li>
       </ul>
       <div class="mytabs-container" id="tabs-container">
         <img src="/img/ajax_preloader.gif" width="64" height="64" class="preloader" />
@@ -40,15 +39,20 @@
     <div id="footer">
   	  <hr/>
       <p id="licence">
-        All content is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc/3.0/deed.en_US">Attribution-NonCommercial 3.0 Unported</a>.<br /><br /><a rel="license" href="http://creativecommons.org/licenses/by-nc/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="/img/BY-NC.png" /></a>
+        Unless otherwise stated, all content is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc/3.0/deed.en_US">Attribution-NonCommercial 3.0 Unported</a>.<br /><br /><a rel="license" href="http://creativecommons.org/licenses/by-nc/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="/img/BY-NC.png" /></a>
       </p>
     </div>
-  
-    <script type="text/javascript" src="/jquery-1.8.2.min.js"></script>
-  	<!--<script type="text/javascript" src="/jquery-2.0.1.min.js"></script>-->
-  	<script src="/highcharts.js"></script>
+    
+    <!--<script type="text/javascript" src="/jquery/jquery-1.8.2.min.js"></script>-->
+    <!--<script type="text/javascript" src="/jquery/jquery-1.9.1.min.js"></script>-->
+  	<!--<script type="text/javascript" src="/jquery/jquery-2.0.1.min.js"></script>-->
+	<script type="text/javascript" src="/jquery/jquery-2.0.2.min.js"></script>
+	<script type="text/javascript" src="/raphael/raphael-min.js"></script>
+	<link href="/flot/examples.css" rel="stylesheet" type="text/css">
+  	<script language="javascript" type="text/javascript" src="/flot/jquery.flot.js"></script>
+    <script language="javascript" type="text/javascript" src="/flot/jquery.flot.time.js"></script>
   	<script type="text/javascript" src="/main.js"></script>
-  	<script src="/highlightjs/highlight.pack.js"></script>
-  	<script>hljs.initHighlightingOnLoad();</script>
+  	<script type="text/javascript" src="/highlightjs/highlight.pack.js"></script>
+  	<script type="text/javascript">hljs.initHighlightingOnLoad();</script>
   </body>
 </html>

data/views/punchcard.erb

@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <% unless node.nil? %>
+    <title>Ardtweeno <%= node %> Punchcard Graph</title>
+  <% else %>
+    <title>Ardtweeno Punchcard Graph</title>
+  <% end %>
+  <link href="/main.css" media="screen" rel="stylesheet" type="text/css" />
+  
+  <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+  
+  <link href="/bootstrap/bootstrap.min.css" media="screen" rel="stylesheet" type="text/css" />
+  <script type="text/javascript" src="/jquery/jquery-2.0.2.min.js"></script>
+  <script type="text/javascript" src="/bootstrap/bootstrap.min.js"></script>
+
+  
+  <script type="text/javascript" src="/raphael/raphael-min.js"></script>
+  <script type="text/javascript" src="/raphael/g.raphael.js"></script>
+  <script type="text/javascript" src="/raphael/g.dot.js"></script>
+  <script type="text/javascript">
+      window.onload = function () {
+        var r = Raphael("punchcard-holder"),
+        xs = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
+        ys = [7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
+        
+        <% unless ourGraphData.nil? %>
+          data = <%= ourGraphData.to_s %>
+        <% end %>
+        
+        <% unless ourGraphDays.nil? %>
+        axisy = <%= ourGraphDays %>,
+        <% end %>
+        axisx = ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23"];
+
+        r.dotchart(10, 10, 620, 260, xs, ys, data, {symbol: "o", max: 10, heat: true, axis: "0 0 1 1", axisxstep: 23, axisystep: 6, axisxlabels: axisx, axisxtype: " ", axisytype: " ", axisylabels: axisy}).hover(function () {
+          this.marker = this.marker || r.tag(this.x, this.y, this.value, 0, this.r + 2).insertBefore(this);
+          this.marker.show();
+        }, function () {
+          this.marker && this.marker.hide();
+        });
+      };
+    </script>
+    <script type="text/javascript">keepUpdating = false;</script>
+  </head>
+ 
+  <body>
+    <div id="content"><a href="/"><button id="punchcard-home" class="btn btn-large btn-inverse" type="button">Home</button></a></div>
+    <h3 id="punchcard-title">Punchcard Graph for <%= node %></h3>
+    <p id="punchcard-range"><%= ourGraphRange %></p>
+    <div id="punchcard-holder"></div>
+  </body>
+ 
+</html>

data/views/status.erb

@@ -1,158 +1,71 @@
 <p id="blurb">
-	System Status
+  System Status
 </p>
 
 <script type="text/javascript">
-$(function () {
-    $(document).ready(function() {
-        Highcharts.setOptions({
-            global: {
-                useUTC: false
-            }
-        });
-    
-        var chart;
-        $('#loadgraph').highcharts({
-            chart: {
-                type: 'spline',
-                animation: Highcharts.svg, // don't animate in old IE
-                height: 400,
-                marginRight: 10,
-                events: {
-                    load: function() {
-    
-                        // set up the updating of the chart each second
-                        var series0 = this.series[0];
-                        var series1 = this.series[1];
-                        setInterval(function() {
+  $(function() {
 
-                            var x = (new Date()).getTime(); // current time
+    var options = {
+      xaxis: { mode: 'time' },
+            legend: { show: true,
+            	      container: null, 
+            		  position: 'ne', 
+            		  backgroundColor: '#DBBFFF', 
+            		  backgroundOpacity: 0.5 }
+    };
 
-                            $.ajax({
-                                url: '/api/v1/system/status',
-                                dataType: 'json',
-                                success: function(data){
-                                	var theData = JSON.parse(JSON.stringify(data));
-                                	console.log(theData.running);
-                                	console.log(theData.cpuload);
-                                	console.log(theData.memload);
-                                	
-                                	var x = (new Date()).getTime();
-                                	var y = parseFloat(theData.cpuload);
-                                	var z = parseFloat(theData.memload);
-                                	
-                                	series0.addPoint([x, y], true, true);
-                            		series1.addPoint([x, z], true, true);
-                                },
-                                error: function(xhr, status, error){
-                                    console.log("fail");
-                                }
-                            });
+    var data = [];
+    alreadyFetched = {};
+    $.plot("#placeholder", data, options);
 
-                        }, 10000);
-                    }
-                }
-            },
-            title: {
-                text: 'Ardtweeno Gateway Statistics'
-            },
-            xAxis: {
-                type: 'datetime',
-                tickPixelInterval: 150
-            },
-            yAxis: {
-                title: {
-                    text: '% Load'
-                },
-                plotLines: [{
-                    value: 0,
-                    width: 0.1,
-                    color: '#808080'
-                }]
-            },
-            tooltip: {
-                formatter: function() {
-                        return '<b>'+ this.series.name +'</b><br/>'+
-                        Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) +'<br/>'+
-                        Highcharts.numberFormat(this.y, 2);
-                }
-            },
-            legend: {
-                enabled: true
-            },
-            exporting: {
-                enabled: false
-            },
-            series: [{
-                name: 'CPU Load',
-                marker: {
-                    symbol: 'square'
-                },
-                color: 'red',
-                data: (function() {
-                    // generate an array of random data
-                    var data = [],
-                        time = (new Date()).getTime(),
-                        i;
-    
-                    for (i = -89; i <= 0; i++) {
-                        data.push({
-                            x: time + i * 10000,
-                            y: 0.0
-                        });
-                    }
-                    return data;
-                })()
-            },
-            {
-                name: 'Mem Load',
-                marker: {
-                    symbol: 'triangle'
-                },
-                data: (function() {
-                    // generate an array of random data
-                    var data = [],
-                        time = (new Date()).getTime(),
-                        i;
-    
-                    for (i = -89; i <= 0; i++) {
-                        data.push({
-                            x: time + i * 10000,
-                            y: 0.0
-                        });
-                    }
-                    return data;
-                })()
-            }]
-        });
-    });
-    
-});                    
+      function fetchData() {
+        function onDataReceived(series) {
+          var thePlot = [series.buffer[0], series.buffer[1]];
+          $.plot("#placeholder", thePlot, options);
+        }
+
+      $.ajax({
+        url: "/api/v1/system/status/list",
+        type: "GET",
+        dataType: "json",
+        success: onDataReceived
+      });
+
+      setTimeout(fetchData, 10000);
+    }
+
+    setTimeout(fetchData, 1000);
+  });
 </script>  
 
 <table class="table table-bordered">
   <thead>
   	<tr>
-  	  <td>header</td>
-  	  <td>header1</td>
-  	  <td>header2</td>
+  	  <td><b>Device</b></td>
+  	  <td><b>Size</b></td>
+  	  <td><b>Used</b></td>
+  	  <td><b>Avail</b></td>
+  	  <td><b>Percent Used</b></td>
+  	  <td><b>Mount</b></td>
   	</tr>
   </thead>
   
   <tbody>
+<% diskusage.each do |i| %>
   	<tr>
-  	  <td>test</td>
-  	  <td>test2</td>
-  	  <td>test3</td>
-  	</tr>
-  	<tr>
-  	  <td>test</td>
-  	  <td>test2</td>
-  	  <td>test3</td>
+  	  <td><%= i[:device] %></td>
+  	  <td><%= i[:size] %></td>
+  	  <td><%= i[:used] %></td>
+  	  <td><%= i[:avail] %></td>
+  	  <td><%= i[:use] %></td>
+  	  <td><%= i[:mount] %></td>
   	</tr>
+<% end %>
   </tbody>	
 </table>
   
   
-<div id="loadgraph">
+<div class="graph-container">
+  <div id="placeholder" class="graph-placeholder"></div>
+  
 </div>

data/views/topology.erb

@@ -0,0 +1,12 @@
+<p id="blurb">
+	System Topology
+</p>
+
+<script type='text/javascript'>
+  <% unless theTopology.nil? %>
+	<%= theTopology %>
+  <% end %>
+</script>
+<script type="text/javascript">keepUpdating = false;</script>
+
+<div id="topology-canvas"></div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ardtweeno
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - David Kirwan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: rufus-scheduler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +94,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: foreman
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.63.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.63.0
 description: "Ardtweeno - Application Gateway bridges device connected through a serial
   link to devices connected \nover Internet Protocol. It is designed as a PaaS capable
   of being run on the ARM powered Raspberry Pi\nModel B. It exposes a RESTAPI powered
@@ -142,6 +114,7 @@ files:
 - lib/ardtweeno/nodemanager.rb
 - lib/ardtweeno/packet.rb
 - lib/ardtweeno/restapi.rb
+- lib/ardtweeno/ringbuffer.rb
 - lib/ardtweeno/serialparser.rb
 - CHANGELOG
 - COPYING
@@ -151,16 +124,15 @@ files:
 - Procfile
 - README.md
 - Rakefile
-- public/bootstrap.min.js
-- public/highcharts.js
-- public/jquery-1.8.2.min.js
-- public/jquery-2.0.1.min.js
+- public/favicon.ico
 - public/main.css
 - public/main.js
 - views/createpost.erb
 - views/home.erb
 - views/index.erb
+- views/punchcard.erb
 - views/status.erb
+- views/topology.erb
 - resources/conf.yaml
 - resources/nodelist.yaml
 - resources/posts.yaml
@@ -192,6 +164,7 @@ files:
 - test/packet_test.rb
 - test/parser_test.rb
 - test/rest_api_test.rb
+- test/ringbuffer_test.rb
 - test/serialport_mock.rb
 - test/test_helper.rb
 homepage: http://rubygems.org/gems/ardtweeno