Improve code formatting
This commit is contained in:
parent
5a1e6c78a9
commit
acf8d4275d
2 changed files with 182 additions and 178 deletions
|
|
@ -10,3 +10,7 @@ Layout/IndentationWidth:
|
|||
Enabled: false
|
||||
Layout/FirstArgumentIndentation:
|
||||
Enabled: false
|
||||
Layout/LineLength:
|
||||
Enabled: false
|
||||
Metrics/BlockLength:
|
||||
Enabled: false
|
||||
|
|
|
|||
80
main.rb
80
main.rb
|
|
@ -11,7 +11,7 @@ options = {
|
|||
:user_name => ENV['SMTP_UNAME'],
|
||||
:password => ENV['SMTP_PWORD'],
|
||||
:authentication => :plain, # :plain, :login, :cram_md5, no auth by default
|
||||
:domain => ENV['SMTP_DOMAIN'], # the HELO domain provided by the client to the server
|
||||
:domain => ENV['SMTP_DOMAIN'] # the HELO domain provided by the client to the server
|
||||
}
|
||||
|
||||
begin
|
||||
|
|
@ -22,9 +22,10 @@ begin
|
|||
password: ENV['MARIA_PWORD'],
|
||||
database: ENV['MARIA_DBASE']
|
||||
)
|
||||
puts "Successfully connected to MariaDB!"
|
||||
|
||||
puts "Compiling data..."
|
||||
puts 'Successfully connected to MariaDB!'
|
||||
|
||||
puts 'Compiling data...'
|
||||
results_today = client.query(%(
|
||||
SELECT LogDateTime, temp, dew, hum, rrate, rmonth, ryear
|
||||
FROM Realtime
|
||||
|
|
@ -85,59 +86,59 @@ begin
|
|||
# Max Temp
|
||||
if result['temp'] >= maxmin[:temp][:max][:value]
|
||||
maxmin[:temp][:max][:value] = result['temp'].to_f
|
||||
maxmin[:temp][:max][:time] = result['LogDateTime'].strftime("%H:%M")
|
||||
maxmin[:temp][:max][:time] = result['LogDateTime'].strftime('%H:%M')
|
||||
end
|
||||
|
||||
# Min Temp
|
||||
if result['temp'] <= maxmin[:temp][:min][:value]
|
||||
maxmin[:temp][:min][:value] = result['temp'].to_f
|
||||
maxmin[:temp][:min][:time] = result['LogDateTime'].strftime("%H:%M")
|
||||
maxmin[:temp][:min][:time] = result['LogDateTime'].strftime('%H:%M')
|
||||
end
|
||||
|
||||
# Max Dew Point
|
||||
if result['dew'] >= maxmin[:dew][:max][:value]
|
||||
maxmin[:dew][:max][:value] = result['dew'].to_f
|
||||
maxmin[:dew][:max][:time] = result['LogDateTime'].strftime("%H:%M")
|
||||
maxmin[:dew][:max][:time] = result['LogDateTime'].strftime('%H:%M')
|
||||
end
|
||||
|
||||
# Min Dew Point
|
||||
if result['dew'] <= maxmin[:dew][:min][:value]
|
||||
maxmin[:dew][:min][:value] = result['dew'].to_f
|
||||
maxmin[:dew][:min][:time] = result['LogDateTime'].strftime("%H:%M")
|
||||
maxmin[:dew][:min][:time] = result['LogDateTime'].strftime('%H:%M')
|
||||
end
|
||||
|
||||
# Max Humidity
|
||||
if result['hum'] >= maxmin[:hum][:max][:value]
|
||||
maxmin[:hum][:max][:value] = result['hum']
|
||||
maxmin[:hum][:max][:time] = result['LogDateTime'].strftime("%H:%M")
|
||||
maxmin[:hum][:max][:time] = result['LogDateTime'].strftime('%H:%M')
|
||||
end
|
||||
|
||||
# Min Humidity
|
||||
if result['hum'] <= maxmin[:hum][:min][:value]
|
||||
maxmin[:hum][:min][:value] = result['hum']
|
||||
maxmin[:hum][:min][:time] = result['LogDateTime'].strftime("%H:%M")
|
||||
maxmin[:hum][:min][:time] = result['LogDateTime'].strftime('%H:%M')
|
||||
end
|
||||
|
||||
# Max Rain Rate
|
||||
if result['rrate'] >= maxmin[:rainrate][:max][:value]
|
||||
maxmin[:rainrate][:max][:value] = result['rrate'].to_f
|
||||
maxmin[:rainrate][:max][:time] = result['LogDateTime'].strftime("%H:%M")
|
||||
maxmin[:rainrate][:max][:time] = result['LogDateTime'].strftime('%H:%M')
|
||||
end
|
||||
end
|
||||
|
||||
puts "Data compiled!"
|
||||
puts 'Data compiled!'
|
||||
|
||||
puts "Generating e-mail body..."
|
||||
puts 'Generating e-mail body...'
|
||||
|
||||
table = Terminal::Table.new :title => "Weather Summary as of #{now["LogDateTime"].strftime("%l:%M %p, %a %b %d %Y")}" do |t|
|
||||
table = Terminal::Table.new :title => "Weather Summary as of #{now['LogDateTime'].strftime('%l:%M %p, %a %b %d %Y')}" do |t|
|
||||
t << [
|
||||
{ :value => "Temperature", :colspan => 2, :alignment => :center},
|
||||
{ :value => "Dew Point", :colspan => 2, :alignment => :center}
|
||||
{ :value => 'Temperature', :colspan => 2, :alignment => :center },
|
||||
{ :value => 'Dew Point', :colspan => 2, :alignment => :center }
|
||||
]
|
||||
t << :separator
|
||||
t << [
|
||||
"Current", "#{now["temp"].to_s("F")}C",
|
||||
"Current", "#{now["dew"].to_s("F")}C"
|
||||
'Current', "#{now['temp'].to_s('F')}C",
|
||||
'Current', "#{now['dew'].to_s('F')}C"
|
||||
]
|
||||
t << [
|
||||
"Today's High", "#{maxmin[:temp][:max][:value]}C at #{maxmin[:temp][:max][:time]}",
|
||||
|
|
@ -149,53 +150,53 @@ begin
|
|||
]
|
||||
t << :separator
|
||||
t << [
|
||||
{ :value => "Humidity", :colspan => 2, :alignment => :center},
|
||||
{ :value => "Barometric Pressure (SL)", :colspan => 2, :alignment => :center}
|
||||
{ :value => 'Humidity', :colspan => 2, :alignment => :center },
|
||||
{ :value => 'Barometric Pressure (SL)', :colspan => 2, :alignment => :center }
|
||||
]
|
||||
t << :separator
|
||||
t << [
|
||||
"Current", "#{now["hum"]}%",
|
||||
"Current", "#{now["press"].to_s("F")} mb"
|
||||
'Current', "#{now['hum']}%",
|
||||
'Current', "#{now['press'].to_s('F')} mb"
|
||||
]
|
||||
t << [
|
||||
"Today's High", "#{maxmin[:hum][:max][:value]}% at #{maxmin[:hum][:max][:time]}",
|
||||
"Trend", "#{now["presstrendval"]} mb/hr"
|
||||
'Trend', "#{now['presstrendval']} mb/hr"
|
||||
]
|
||||
t << [
|
||||
"Today's Low", "#{maxmin[:hum][:min][:value]}% at #{maxmin[:hum][:min][:time]}",
|
||||
"",""
|
||||
'', ''
|
||||
]
|
||||
t << :separator
|
||||
t << [
|
||||
{ :value => "Rain", :colspan => 2, :alignment => :center},
|
||||
{ :value => "Wind", :colspan => 2, :alignment => :center}
|
||||
{ :value => 'Rain', :colspan => 2, :alignment => :center },
|
||||
{ :value => 'Wind', :colspan => 2, :alignment => :center }
|
||||
]
|
||||
t << :separator
|
||||
t << [
|
||||
"Current Rate", "#{now["rrate"]} #{now["rainunit"]}",
|
||||
"Current Speed", "#{now["wspeed"].to_s} #{now["windunit"]}"
|
||||
'Current Rate', "#{now['rrate']} #{now['rainunit']}",
|
||||
'Current Speed', "#{now['wspeed']} #{now['windunit']}"
|
||||
]
|
||||
t << [
|
||||
"Today's High Rate", "#{maxmin[:rainrate][:max][:value]} #{now["rainunit"]} at #{maxmin[:rainrate][:max][:time]}",
|
||||
"Gust", "#{now["wgust"].to_s} #{now["windunit"]}"
|
||||
"Today's High Rate", "#{maxmin[:rainrate][:max][:value]} #{now['rainunit']} at #{maxmin[:rainrate][:max][:time]}",
|
||||
'Gust', "#{now['wgust']} #{now['windunit']}"
|
||||
]
|
||||
t << [
|
||||
"Today's Total", "#{now["rfall"].to_s("F")} #{now["rainunit"]}",
|
||||
"Today's High Speed", "#{now["windTM"].to_s} #{now["windunit"]} at #{now["TwindTM"]}"
|
||||
"Today's Total", "#{now['rfall'].to_s('F')} #{now['rainunit']}",
|
||||
"Today's High Speed", "#{now['windTM']} #{now['windunit']} at #{now['TwindTM']}"
|
||||
]
|
||||
t << [
|
||||
"Monthly Total","#{today["rmonth"].to_s("F")} #{now["rainunit"]}",
|
||||
"Today's High Gust", "#{now["wgustTM"]} #{now["windunit"]} at #{now["TwgustTM"]}"
|
||||
'Monthly Total', "#{today['rmonth'].to_s('F')} #{now['rainunit']}",
|
||||
"Today's High Gust", "#{now['wgustTM']} #{now['windunit']} at #{now['TwgustTM']}"
|
||||
]
|
||||
t << [
|
||||
"Yearly Total","#{today["ryear"].to_s("F")} #{now["rainunit"]}",
|
||||
"", ""
|
||||
'Yearly Total', "#{today['ryear'].to_s('F')} #{now['rainunit']}",
|
||||
'', ''
|
||||
]
|
||||
end
|
||||
|
||||
puts "E-mail body generated!"
|
||||
puts 'E-mail body generated!'
|
||||
|
||||
puts "Sending e-mail..."
|
||||
puts 'Sending e-mail...'
|
||||
|
||||
Pony.mail(
|
||||
:to => ENV['MAIL_RECIPIENT'],
|
||||
|
|
@ -206,9 +207,8 @@ begin
|
|||
:via_options => options
|
||||
)
|
||||
|
||||
puts "E-mail sent!"
|
||||
puts "DONE!"
|
||||
|
||||
puts 'E-mail sent!'
|
||||
puts 'DONE!'
|
||||
rescue Mysql2::Error => e
|
||||
puts "Error connecting to database: #{e.message}"
|
||||
ensure
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue