ardtweeno 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53873386c274f4259d283b97c153f7edeb1649a7
-  data.tar.gz: 9bec1a6d15af011369aa6b7e59c1e64ce3df77d1
+  metadata.gz: 1e5dbc57fff437a1ee58663fdebc105f4470a45d
+  data.tar.gz: a1db5c7da0ec79f0eaf6b55c95bd2708e881925c
 SHA512:
-  metadata.gz: 9036d28f3317a76cc2a1ef61f7106916536507babf822a1b458ca7da206b9863e3c385ef01e803c358f43b3a9e4623d0e2ce2f79e4401affc24cd6b2f656e91f
-  data.tar.gz: df69ac9c1589916f2b9450327a93d99d415b0d3b0bac67484d0e1e035be36792501621dae198d9882bf96f531dfd43926a3e11b72214abbd95e127ea6829ae63
+  metadata.gz: 26d88093c6b9d59acc5d02c92f7682d5b4810163244cf3f65be1c434c1f1ecaf481143c57225c6e0a62bda6e76a2f820f763adc934a2fddf4374d97d97eccd33
+  data.tar.gz: 67a021570361f954ad74b7c64a9d73e80ea0008bb94bd92041914e9ce18597609152c9cfe4e9339afad3b51094b7f81568cd132cca00d69162b1a166d0254848

data/COPYING

@@ -1,7 +1,14 @@
-This software is released under the Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0) licence.
-for more information see: http://creativecommons.org/licenses/by-nc/3.0/
+This file is part of Ardtweeno.
 
-All code is distributed in the hope that it will be useful, but WITHOUT 
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-FITNESS FOR A PARTICULAR PURPOSE.
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
 
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Ardtweeno.  If not, see <http://www.gnu.org/licenses/>.

data/Gemfile

@@ -1,28 +1,19 @@
 source "http://rubygems.org"
 
-# The Ardtweeno Application Gateway
-gem "ardtweeno"
-
-# Utility
-gem "rake"
-gem "nokogiri"
-gem "rack", ">= 1.1"
-gem "foreman"
-gem "json"
-gem "typhoeus", ">= 0.6.3"
-
-# For the Database
-gem "mongo", ">= 1.6.2"
-gem "bson_ext", ">= 1.6.2"
 
 # For Testing
 gem "rack-test"
 gem "test-unit"
+gem "pry"
+gem "pry-byebug"
 gem "rspec", :require => "spec"
 
-# For the SerialParser 
-gem "serialport", ">= 1.1.0"
-
 # For the HTTP REST API
-gem "sinatra", ">= 1.3.3"
-gem "thin", ">= 1.5.0"
+gem "ardtweeno", "0.6.0", :path => "./"
+gem "rake"
+gem "sinatra"
+gem "puma"
+gem "typhoeus", ">= 0.6.3"
+gem "serialport", ">= 1.1.0"
+gem "mongo"
+gem "bson_ext"

data/Gemfile.lock

@@ -1,60 +1,65 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ardtweeno (0.4.0)
+    ardtweeno (0.5.0)
       bson_ext (>= 1.6.2)
       bundler (>= 1.2.3)
       mongo (>= 1.6.2)
       sinatra (>= 1.3.3)
       thin (>= 1.5.0)
       typhoeus (>= 0.6.3)
-    bson (1.10.0)
-    bson_ext (1.10.0)
-      bson (~> 1.10.0)
-    daemons (1.1.9)
+    bson (1.12.5)
+    bson_ext (1.12.5)
+      bson (~> 1.12.5)
+    daemons (1.2.3)
     diff-lcs (1.2.5)
-    dotenv (0.10.0)
-    ethon (0.7.0)
+    ethon (0.8.1)
       ffi (>= 1.3.0)
-    eventmachine (1.0.3)
-    ffi (1.9.3)
-    foreman (0.63.0)
-      dotenv (>= 0.7)
-      thor (>= 0.13.6)
-    json (1.8.1)
-    mini_portile (0.5.3)
-    mongo (1.10.0)
-      bson (~> 1.10.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    rack (1.5.2)
-    rack-protection (1.5.2)
+    eventmachine (1.0.9.1)
+    ffi (1.9.10)
+    foreman (0.78.0)
+      thor (~> 0.19.1)
+    json (1.8.3)
+    mini_portile2 (2.0.0)
+    mongo (1.12.5)
+      bson (= 1.12.5)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    power_assert (0.2.7)
+    rack (1.6.4)
+    rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.2.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    serialport (1.3.0)
-    sinatra (1.4.4)
+    rake (10.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    serialport (1.3.1)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    test-unit (2.5.5)
-    thin (1.6.2)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
+      tilt (>= 1.3, < 3)
+    test-unit (3.1.7)
+      power_assert
+    thin (1.6.4)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (~> 1.0)
     thor (0.19.1)
-    tilt (1.4.1)
-    typhoeus (0.6.8)
-      ethon (>= 0.7.0)
+    tilt (2.0.2)
+    typhoeus (1.0.1)
+      ethon (>= 0.8.0)
 
 PLATFORMS
   ruby
@@ -75,3 +80,6 @@ DEPENDENCIES
   test-unit
   thin (>= 1.5.0)
   typhoeus (>= 0.6.3)
+
+BUNDLED WITH
+   1.11.2

data/INSTALL

@@ -2,15 +2,17 @@
 # @author       David Kirwan https://github.com/davidkirwan/ardtweeno
 # @description  Ardtweeno Gem Installation Instructions
 #
-# @date         02-07-2013
+# @date         2014-05-20
 ####################################################################################################
 
-# Ardtweeno MVP - Installation instructions
+# Ardtweeno - Installation instructions
 The Ardtweeno system can be installed from https://rubygems.org/gems/ardtweeno through the _gem_ utility, or by checking 
 out the code from the git repository on https://github.com/davidkirwan/ardtweeno. To install change directory to the
-_ardtweeno-gem_ directory then use the _bundle_ utility to install the dependencies. Use the _rake_ utility to build and 
-install the gem.
+_ardtweeno-gem_ directory then:
 
-Tests can be run with the _rake test_ command from the _ardtweeno-gem_ folder.
+_bundle install_
+_rake install_
 
-To launch the system, simply type _foreman start -f Procfile -p <port>_ from the _ardtweeno-gem_ folder.
+Tests can be run with the _rake test_ command from the ./ardtweeno-gem folder.
+
+To launch the system, simply type _rackup_ from the _ardtweeno-gem_ folder.

data/README.md

@@ -28,8 +28,8 @@ If you would like to collaborate with me on this project please fork the reposit
 through a pull request! I gladly welcome constructive input!
 
 # COPYING / Licence
-This software is released under the Creative Commons Attribution-NonCommercial 3.0 Unported (CC BY-NC 3.0)
-for more information see the full details of this licence here: http://creativecommons.org/licenses/by-nc/3.0/
+This software is released under the GNU General Public License 3.0 (GPL 3.0)
+for more information see the full details of this licence here: http://www.gnu.org/licenses/
 
 For information regarding commercial use of the Ardtweeno Gateway, please contact the author at:
 davidkirwanirl (_at_) gmail dot com or through Twitter at @kirwan\_david

data/Rakefile

@@ -1,10 +1,27 @@
+=begin
 ####################################################################################################
 # @author       David Kirwan https://github.com/davidkirwan/ardtweeno
-# @description  Ardtweeno Gem Rakefile
+# @description  Ardtweeno Gateway
 #
-# @date         02-07-2013
+# @date         2014-08-12
 ####################################################################################################
 
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 begin
   require 'bundler'
   Bundler::GemHelper.install_tasks
@@ -13,7 +30,7 @@ rescue Exception => e
 end
 
 
-task :default => 'menu'
+task :default => 'test'
 
 task :menu do
   puts welcomeMsg = <<-MSG

data/lib/ardtweeno.rb

@@ -1,12 +1,30 @@
+=begin
 ####################################################################################################
 # @author       David Kirwan https://github.com/davidkirwan/ardtweeno
 # @description  Ardtweeno Gateway
 #
-# @date         14-06-2013
+# @date         2014-08-12
 ####################################################################################################
 
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 require 'logger'
 require 'fileutils'
+require 'pry'
 require 'ardtweeno/serialparser'
 require 'ardtweeno/dispatcher'
 require 'ardtweeno/exceptions'

data/lib/ardtweeno/api.rb

@@ -1,15 +1,33 @@
+=begin
 ####################################################################################################
 # @author       David Kirwan https://github.com/davidkirwan/ardtweeno
-# @description  API class for the Ardtweeno system
+# @description  Ardtweeno Gateway
 #
-# @date         2013-08-05
+# @date         2014-08-12
 ####################################################################################################
 
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 # Imports
 require 'logger'
 require 'yaml'
 require 'json'
 require 'date'
+require 'time'
 
 module Ardtweeno
 
@@ -479,18 +497,25 @@ module Ardtweeno
         @log.debug "handleLength function executing"
         
         modifiedArray = Array.new
+        length = 0
         
         if theParams.has_key?(:length) and theParams[:length].to_i < 100
           length = theParams[:length].to_i
+          
           @log.debug "theParams has a length value of #{length}"
         else
           length = 100
           @log.debug "Defaulting to the default length of #{length}"
         end
         
-          
         if theArray.size > length
           @log.debug "Length is smaller than the size of theArray"
+          
+          if theParams[:graph] 
+            length = theArray.size;
+            @log.debug "This is a graph, setting packets length to max size"
+          end
+          
           (0..(length - 1)).step(1) do |i|
             modifiedArray << theArray[i]
           end
@@ -708,7 +733,6 @@ module Ardtweeno
       end
       
       
-      
       ##
       # Ardtweeno::API#buildPunchcard generate the data used in the Punchcard graph
       #
@@ -724,20 +748,17 @@ module Ardtweeno
         @log = Ardtweeno.options[:log] ||= Logger.new(STDOUT)
         @log.level = Ardtweeno.options[:level] ||= Logger::WARN
         
-        theParams = Hash.new
-        theParams[:node] = params[:node]
-        
         data = Array.new
         days = Array.new
         
         today = DateTime.now
-                
+        
         theStart = today - 6
 
         theStartDay = "%02d" % theStart.day
         theStartMonth = "%02d" % theStart.month
         theStartYear = theStart.year.to_s
-              
+        
         theEndDay = "%02d" % today.day
         theEndMonth = "%02d" % today.month
         theEndYear = today.year.to_s
@@ -752,12 +773,12 @@ module Ardtweeno
           theDay = theStart.strftime('%a')
           days << theDay
           @log.debug theDay
-           
+          
           (0..23).each do |j|
             theDate = theStart.year.to_s + "-" + "%02d" % theStart.month + "-" + "%02d" % i.day
             theHour = "%02d" % j
             
-            theParams = {:hour=>theHour, :date=>theDate}
+            theParams = {:hour=>theHour, :date=>theDate, :node=>params[:node], :graph=>true}
             
             nodes = Ardtweeno::API.retrievepackets(nodeList, theParams)
             
@@ -773,6 +794,68 @@ module Ardtweeno
       end
       
       
+      ##
+      # Ardtweeno::API#buildLineplot generate the data used in the Line Plot graph
+      #
+      # * *Args*    :
+      #   - ++ ->     Array of Ardtweeno::Node, Hash params
+      # * *Returns* :
+      #   -           Array Fixnum, 168 data hourly packet total values for last week,
+      #               Array String previous 7 day names 
+      # * *Raises* :
+      #             
+      #
+      def buildLineplot(nodeList, params)
+        @log = Ardtweeno.options[:log] ||= Logger.new(STDOUT)
+        @log.level = Ardtweeno.options[:level] ||= Logger::WARN
+        
+        colour_codes = ["#40FF00", "#FFFF00", "#FF8000", "#FF4000", "#FE2E2E", "#FF0080", "#FF00FF", "#8000FF", "#0000FF", "#0080FF"]
+        
+        theParams = Hash.new
+        theParams[:node] = params[:node]
+        
+        data = Array.new
+        
+        nodes = Ardtweeno::API.retrievenodes(nodeList, {:name=>params[:node]})
+        packets = Ardtweeno::API.retrievepackets(nodeList, theParams)
+        
+        nodes[:nodes][0][:sensors].each_with_index do |i, index|
+          data << {"label"=>i, "color"=>colour_codes[index], "data"=>[]}
+        end
+        
+        unless packets[:packets].empty? 
+          packets[:packets].each do |i|
+            
+            year, month, day = i.date.split("-")
+            hour = i.hour
+            minute = i.minute
+            second = i.second
+            
+            time = Time.new(year, month, day, hour, minute, second).to_i * 1000
+            
+            unless i.data.empty?
+              i.data.each_with_index do |j, index|
+                data[index]["data"] << [time, j]
+              end
+            end
+            
+          end
+        end      
+        
+        return data.to_json
+      end      
+      
+      
+      ##
+      # Ardtweeno::API#status generate a status report for the system
+      #
+      # * *Args*    :
+      #   - ++ ->     
+      # * *Returns* :
+      #   -           {Fixednum :cpuload, Fixedmem :memload}
+      # * *Raises* :
+      #             
+      #
       def status
         @log = Ardtweeno.options[:log] ||= Logger.new(STDOUT)
         @log.level = Ardtweeno.options[:level] ||= Logger::DEBUG