solarium 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0c5c4f5db3d02c348ed02e9b9ba42629372c598
-  data.tar.gz: 437ee53bb835aa18834057fc8ca2f0ba72ed52bd
+  metadata.gz: f51387872e85c4048dbb50439732faad9a04dfc3
+  data.tar.gz: 4ba2ef0da46fcb385a3588752f0ac0b7775fd720
 SHA512:
-  metadata.gz: 8ca7ba6a541d4ee16612e006ef10f4df1f047bf93bf74761042b5ca738891c3821d07732aba4d85d35fc93b48943ac58e285170f48fadabb2d4e42123179ff6f
-  data.tar.gz: 7f4d02d5ed1658045d82cadbf07b20efcbf3c3c27810e31b046b07479075fbaee2c9c730ade15517c2a83f0c409285bc30e45eb1894e906d4684e0aeca42584a
+  metadata.gz: a7145c67e114dceafb1503b5c96d286e63b242533eb96b692a5a23d25853ccaecf259f87fab6ab46e09d7948536cbd55bec25ea03e3978775b731f38e343fb8a
+  data.tar.gz: b99846c1c02f687f0688d94bb2cbdba63da8775e2925a1379b12abecc128ee40834a0cfbe66aa7d9509316d26b98e863d5d67fa00c29ed616c8b6e3fda8e70ab

data/bin/solarium-chart

@@ -0,0 +1,51 @@
+#!/usr/bin/env ruby
+# Solarium (C) 2017 Peter "SaberUK" Powell <petpow@saberuk.com>
+
+APP_ROOT = File.dirname __dir__
+if Dir.exist? "#{APP_ROOT}/.git"
+	$LOAD_PATH.unshift "#{APP_ROOT}/lib"
+end
+
+%w(solarium trollop).each do |lib|
+	begin
+		require lib
+	rescue ::Exception => error
+		STDERR.puts "A fatal error was encountered whilst loading #{lib}:"
+		STDERR.puts "#{error.class}: #{error.message}"
+		exit 1
+	end
+end
+
+APP_NAME = File.basename $PROGRAM_NAME
+options = Trollop::options do
+	banner "Usage: #{APP_NAME} [OPTIONS]"
+	version Solarium::VERSION
+
+	opt :chart_format, 'The output format to use for chart generation', default: 'dygraph'
+	opt :database_url, 'The URL for connecting to the SQL database', default: 'sqlite://solarium.sq3'
+	opt :include_days, 'The number of days to include in the chart', default: 30
+	opt :output_dir, 'The directory to write generated charts to', default: "#{Dir.pwd}/solarium-chart"
+end
+
+Trollop::die :database_url, 'is not a valid URL' unless options[:database_url] =~ /^#{URI.regexp}$/
+Trollop::die :include_days, 'is not a valid day count' unless options[:include_days] > 0
+
+begin
+	name = options[:chart_format].downcase
+	require "solarium/#{name}/#{name}"
+rescue ::Exception => error
+	STDERR.puts "A fatal error was encountered whilst loading the #{name} module:"
+	STDERR.puts "#{error.class}: #{error.message}"
+	exit 1
+end
+
+database = Solarium::Database.new options[:database_url]
+unless database.error.nil?
+	STDERR.puts "A fatal error was encountered whilst connecting to the database:"
+	STDERR.puts "#{database.error.class}: #{database.error.message}"
+	STDERR.puts database.error.backtrace
+	exit 1
+end
+
+data = database.select_days options[:include_days]
+Solarium::Chart.generate options[:output_dir], data

data/bin/solarium-collect

@@ -21,7 +21,7 @@ options = Trollop::options do
 	banner "Usage: #{APP_NAME} [OPTIONS]"
 	version Solarium::VERSION
 
-	opt :database_url, 'The URL for connecting to the SQL database', default: 'sqlite://production.sq3'
+	opt :database_url, 'The URL for connecting to the SQL database', default: 'sqlite://solarium.sq3'
 	opt :envoy_url, 'The URL of the Envoy web interface', default: 'http://192.168.1.200/'
 	opt :print_stats, 'Print generation statistics after collection', default: false	
 end

data/lib/solarium/database.rb

@@ -31,6 +31,16 @@ module Solarium
 			@connection[:solarium].insert row
 		end
 
+		# Public: Reads the specified number of days worth of data from the database.
+		#
+		# days - The number of days worth of data to read.
+		def select_days days
+			data = @connection[:solarium].where do
+				time > DateTime.now - days
+			end
+			return data.to_a
+		end
+
 		# Internal: Connects to the database and creates the table if required.
 		#
 		# url - The URL for connecting to the SQL database.

data/lib/solarium/dygraph/dygraph.rb

@@ -0,0 +1,39 @@
+# Solarium (C) 2017 Peter "SaberUK" Powell <petpow@saberuk.com>
+
+require 'fileutils'
+
+module Solarium
+
+	# Public: Generates charts using the Dygraph API
+	module Chart
+
+		# Public: Generates charts and writes them to the output directory.
+		#
+		# output_dir - The directory to write the generated charts to.
+		# data - The data to use when generating the chart.
+		def self.generate output_dir, data
+			FileUtils.mkdir_p output_dir unless Dir.exist? output_dir
+			FileUtils.cp "#{__dir__}/index.html", output_dir
+
+			self.generate_csv "#{output_dir}/generation.csv", data, 'Watts', :now
+			self.generate_csv "#{output_dir}/today.csv", data, 'Watt Hours', :today
+			self.generate_csv "#{output_dir}/week.csv", data, 'Watt Hours', :week
+			self.generate_csv "#{output_dir}/lifetime.csv", data, 'Watt Hours', :lifetime
+		end
+
+		# Internal: Generates a CSV table for a single chart.
+		#
+		# file - The file to write the CSV table to.
+		# data - The data to use when generating the CSV table.
+		# title - The title to use for this table.
+		# column - The column of data to use for this CSV table.
+		def self.generate_csv file, data, title, column
+			File.open file, 'w' do |fh|
+				fh.puts "Time, #{title}"
+				data.each do |entry|
+					fh.puts "#{entry[:time]}, #{entry[column]}"
+				end
+			end
+		end
+	end
+end

data/lib/solarium/version.rb

@@ -6,7 +6,7 @@ module Solarium
 	VERSION_MAJOR = 0
 
 	# Public: The version number which is incremented when new features are added.
-	VERSION_MINOR = 1
+	VERSION_MINOR = 2
 
 	# Public: The version number which is incremented when bugs are fixed.
 	VERSION_PATCH = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solarium
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter "SaberUK" Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -112,10 +112,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/solarium-chart
 - bin/solarium-collect
 - lib/solarium.rb
 - lib/solarium/collector.rb
 - lib/solarium/database.rb
+- lib/solarium/dygraph/dygraph.rb
 - lib/solarium/version.rb
 homepage: https://github.com/SaberUK/solarium
 licenses: