brewer 0.0.70 → 0.0.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c655c6d8ba7ce57f7c070c08ab1e91522bfbaca
-  data.tar.gz: 00e256b45d4a5c69d90f162e72a4204a00c8fbcf
+  metadata.gz: dd9b1df8720156b66f88424e65d7ebd530440ecf
+  data.tar.gz: 98e6e8df275b44be023a37cff481fced3ac20888
 SHA512:
-  metadata.gz: 4a1c5a24b3fcd10c61699c07581e0e9a61d59b26ddc18f17e413f4998a2e28b2444d181655ce2ad73e61b2d267085eb5603f0cfbbcc205815a997c63a5faa0ac
-  data.tar.gz: 012545ecda2b43f92014e6bbc226c6ec767e0461639a192f9220803f70d5ea8eeb4239fab439146e80683308ebc5c1445b497a36c0cbdeeec334177fe66cc1f7
+  metadata.gz: a6d1f4a460c83ee94be5ec03fdcba1460c2fcdd196409412c5b690e9032ea2977b15f869995a36a62f9c8da1d8cf73b2c61f410d3642eae7249e97e2244a3ab2
+  data.tar.gz: 2163b804379374756c9ed1161bca468dae3993ae3cd079d6da16474cec2150b36ce8c6c6d9dda858c9eddafe0665c65403059e3c75e9cb17b378079e7f6a1425

data/bin/brewer

@@ -1,17 +1,10 @@
 #!/usr/bin/env ruby
-# This executable will start a Ripl shell with a 'brewer' and 'adaptibrew' objects
+require_relative "../lib/autoload"
 
-require 'ripl'
-
-require_relative "../lib/adaptibrew"
-require_relative "../lib/brewer"
-require_relative "../lib/helpers"
-
-include Helpers
-
-# Refresh to make sure we have the lastest version of adaptibrew
 brewer = Brewer.new
 adaptibrew = Adaptibrew.new.refresh
+com = Communicator.new
+procedures = Procedures.new
 
 puts "🍺  have fun 🍺"
 Ripl.start :binding => binding

data/brewer.gemspec

@@ -2,7 +2,7 @@ require 'rake'
 
 Gem::Specification.new do |s|
   s.name               = "brewer"
-  s.version            = "0.0.70"
+  s.version            = "0.0.71"
   s.default_executable = "brewer"
 
   s.authors = ["Luke Sweeney"]
@@ -24,7 +24,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'git', '~> 1.3', '>= 1.3.0'
   s.add_runtime_dependency 'ripl', '~> 0.7.0'
   s.add_runtime_dependency 'net-ping', '~> 1.7'
+  s.add_runtime_dependency 'wannabe_bool', '~> 1.7'
   s.add_runtime_dependency 'slack-notifier'
+  s.add_runtime_dependency 'require_all'
+  s.add_runtime_dependency 'terminal-table'
+
 
   # Dev dependencies
   s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'

data/lib/adaptibrew.rb

@@ -1,8 +1,4 @@
-require 'git'
-require 'fileutils'
-require_relative 'helpers'
-
-include Helpers
+require_relative "autoload"
 
 # This is the 'manager' for the adaptibrew repo. It handles cloning and such.
 class Adaptibrew

data/lib/autoload.rb

@@ -0,0 +1,14 @@
+require "require_all"
+require 'git'
+require 'fileutils'
+require 'slack-notifier'
+require 'yaml'
+require 'yaml/store'
+require 'net/ping'
+require 'ripl'
+require 'wannabe_bool'
+require 'terminal-table'
+
+require_all 'lib'
+
+include Helpers

data/lib/brewer.rb

@@ -1,20 +1,14 @@
-# TODO: Test monitor method
-require_relative 'helpers'
-require_relative 'adaptibrew'
-require_relative 'settings'
-
-include Helpers
+require_relative "autoload"
 
 class Brewer
 
   attr_reader :base_path
-  attr_accessor :out, :log, :temps
+  attr_accessor :out, :temps
 
   def initialize
     @base_path = Dir.home + '/.brewer'
     # Output of adaptibrew
     @out = []
-    @log = @base_path + '/logs/output'
     @temps = {}
   end
 
@@ -24,23 +18,10 @@ class Brewer
   # general utilities for the brewer class
 
   def wait(time=30)
-    sleep(time)
+    sleep(time.to_f)
     true
   end
 
-  # Sends a slack message in #brewing
-  def ping(message="ping at #{Time.now}")
-    require_relative 'slacker'
-    $slack.ping(message)
-  end
-
-  # Only works on Mac :(
-  # :nocov:
-  def say(message="done")
-    system("say #{message}")
-  end
-  # :nocov:
-
   # Runs an adaptibrew script
   # Output will be stored in @out
   # you may see `echo` quite a bit. This will almost always be directly after calling a script
@@ -50,31 +31,22 @@ class Brewer
     @out.first
   end
 
-  # Clears the @out array
-  # Writes current @out to log
   def clear
     @out = []
   end
 
-  # This lil' divider is default for large return blocks
-  def echo(string=nil)
-    if string == nil
-      puts @out.first
-      return @out.first
-    end
-    puts string
-    return string
-  end
-
-
   # Adaptibrew methods ----------------------------------------------
   # for working with the rig
 
-  def pump(state=0)
+  def pump(state="status")
+    if state == "status"
+      return relay_status($settings['pumpRelay'])
+    end
+
     if state == 1
       return script("set_pump_on")
-    elsif state == 0
-      if pid['pid_running'] == "True"
+    else
+      if pid['pid_running'].to_b
         pid(0)
         echo
       end
@@ -96,27 +68,30 @@ class Brewer
       script('set_pid_on')
       pump(1)
       return "Pump and PID are now on"
-    elsif state == 0
+    else
       return script("set_pid_off")
     end
   end
 
   def sv(temp=nil)
     if temp
-      raise "Temperature input needs to be an integer" unless temp.is_a? Integer
-      return script('set_sv', temp)
-    else
-      return script('get_sv')
+      return script('set_sv', temp).to_f
     end
+    script('get_sv').to_f
   end
 
   def pv
-    return script('get_pv')
+    script('get_pv').to_f
   end
 
   def relay(relay, state)
+    # If you try to turn the relay to a state that it is already in, this skips the wait
+    if relay_status(relay).to_b == state.to_b
+      return true
+    end
     script("set_relay", "#{relay} #{state}")
     wait(10)
+    true
   end
 
   def all_relays_status
@@ -126,59 +101,24 @@ class Brewer
     true
   end
 
-  # TODO: Fix the return value here
   def relay_status(relay)
-    raise "Relay number needs to be an integer" unless relay.is_a? Integer
     script("get_relay_status", "#{relay}")
-    return @out.first.split('\n')
-  end
-
-  # :nocov:
-  def watch
-    until pv.to_f >= sv.to_f do
-      wait(8)
-    end
-    true
-  end
-  # :nocov:
-
-  def monitor
-    while true do
-      ping("#{puts pid}")
-      wait(10)
+    if @out.include? "on"
+      return "on"
+    else
+      return "off"
     end
   end
 
-  # WaterVolInQuarts, GrainMassInPounds, GrainTemp, MashTemp
   # :nocov:
-  def get_strike_temp
-    print "Input amount of water in quarts: "
-    water = gets.chomp
-
-    print "Input amount of grain in lbs: "
-    grain = gets.chomp
-
-    print "Input current grain temp (#{pv}): "
-    grain_temp = gets.chomp
-    if grain_temp == ""
-      grain_temp = pv.to_i
-    end
-
-    print "Input desired mash temp (150): "
-    desired_mash_temp = gets.chomp
-    if desired_mash_temp == ""
-      desired_mash_temp = 150
+  def watch
+    until pv >= sv do
+      wait(2)
     end
-    @temps['desired_mash'] = desired_mash_temp
-
-    # this is where the magic happens
-    @temps['strike_water_temp'] = script('get_strike_temp', "#{water} #{grain} #{grain_temp} #{desired_mash_temp}")
-    sv(echo.to_i)
-    puts "SV has been set to #{sv} degrees"
+    self
   end
   # :nocov:
 
-  # Relays ----------
   def rims_to(location)
     if location == "mash"
       # we ended up swapping this relay, so the name is backwards
@@ -186,7 +126,7 @@ class Brewer
     elsif location == "boil"
       relay($settings['rimsToMashRelay'], 1)
     end
-    true
+    self
   end
 
   def hlt_to(location)
@@ -195,221 +135,16 @@ class Brewer
     elsif location == "boil"
       relay($settings['spargeToMashRelay'], 1)
     end
-    true
+    self
   end
 
   def hlt(state)
-    if state == "open"
+    if state.to_b
       relay($settings['spargeRelay'], 1)
-    elsif state == "close"
+    elsif !state.to_b
       relay($settings['spargeRelay'], 0)
     end
-    true
-  end
-
-  # Master Procedures -----------------------------------------------------
-  # The main steps in the brewing proccess
-  def boot
-    # These are the states required for starting. Should be called on boot.
-    # Print PID status at end
-    ping("booting...")
-    pid(0)
-    pump(0)
-    rims_to('mash')
-    hlt_to('mash')
-    all_relays_status
-    puts pid
-
-    clear
-    puts "Boot successful!"
-    @out.unshift("successful boot at #{Time.now}")
-    ping("🍺 boot successful 🍺")
-    true
-  end
-
-  # :nocov:
-  def heat_strike_water
-    puts "heat-strike-water procedure started"
-    # Confirm strike water is in the mash tun
-    print "Is the strike water in the mash tun? "
-    # -> response
-    confirm ? nil : abort
-
-    # confirm return manifold is in the mash tun
-    print "Is the return manifold in the mash tun? "
-    # -> response
-    confirm ? nil : abort
-
-    print "Is the mash tun valve open? "
-    confirm ? nil : abort
-
-    # confirm RIMS relay is on
-    rims_to('mash')
-    puts "RIMS-to-mash relay is now on"
-
-    # turn on pump
-    pump(1)
-    puts "Pump is now on"
-
-    # wait ~30 seconds
-    print "How long do you want to wait for the water to start circulating? (30) "
-    time = gets.chomp
-    if time == ""
-      time = 30
-    end
-    puts "Waiting for #{time} seconds for strike water to start circulating"
-    puts "(ctrl-c to exit proccess now)"
-    wait(time.to_i)
-
-    # confirm that strike water is circulating well
-    print "Is the strike water circulating well? "
-    # -> response
-    confirm ? nil : abort
-
-
-    # calculate strike temp & set PID to strike temp
-    # this sets PID SV to calculated strike temp automagically
-    get_strike_temp
-    # turn on RIMS heater
-    pid(1)
-
-    # measure current strike water temp and save
-    @temps['starting_strike_temp'] = pv.to_i
-    puts "current strike water temp is #{pv}. Saved."
-    puts "Heating to #{sv}"
-
-    ping("Strike water beginning to heat. This may take a few minutes.")
-
-    # when strike temp is reached, ping slack
-    watch
-    ping("Strike water heated to #{pv}. Maintaining temperature.")
-    ping("Next step: dough in")
-    puts "Next step: dough in"
-    puts "command: brewer.dough_in"
-
-    true
-  end
-  # :nocov:
-
-  def dough_in
-    ping("dough-in procedure started")
-    puts "dough-in procedure started"
-    # turn pump off
-  	# turn PID off
-    pump(0)
-    ping("Ready to dough in")
-    puts "Ready to dough in"
-
-    print "Confirm when you're done with dough-in (y): "
-    confirm ? nil : abort
-
-    ping("next step: mash")
-    puts "Next step: mash"
-    puts "command: brewer.mash"
-    # pour in grain
-    true
-  end
-
-  def mash
-    print "Enter mash temperature (#{@temps['desired_mash'].to_s} F): "
-    temp = gets.chomp
-
-    if temp != ""
-      @temps['desired_mash'] = temp.to_i
-    end
-
-    sv(@temps['desired_mash'])
-
-    print "Enter mash time in seconds (3600 seconds for 1 hour). This timer will start once mash temp has been reached: "
-    mash_time_input = gets.chomp
-
-    puts "This will take a while. You'll get a slack message next time you need to do something."
-    ping("Mash started. This will take a while. You'll get a slack message next time you need to do something.")
-
-    if mash_time_input == ""
-      mash_time = 3600
-    else
-      mash_time = mash_time_input.to_i
-    end
-
-    rims_to('mash')
-
-    pump(1)
-    pid(1)
-
-    watch
-    ping("Mash temp (#{pv} F) reached. Starting timer for #{mash_time} seconds. You'll get a slack message next time you need to do something.")
-    puts "Mash temp (#{pv} F) reached. Starting timer for #{mash_time} seconds. You'll get a slack message next time you need to do something."
-    wait(mash_time)
-    ping("🍺 Mash complete 🍺. Check for starch conversion. Next step: mashout")
-    puts "Mash complete"
-    puts "Check for starch conversion"
-    puts "next step: mashout"
-    puts "command: brewer.mashout"
-  end
-
-  def mashout
-    puts "mashout procedure started"
-
-    print "Enter mashout temp (172 F): "
-    mashout_temp_input = gets.chomp
-
-    ping("Start heating sparge water")
-
-    if mashout_temp_input == ""
-      mashout_temp = 172.0
-    else
-      mashout_temp == mashout_temp_input.to_f
-    end
-
-    sv(mashout_temp)
-
-    pump(1)
-    pid(1)
-
-    ping("Heating to #{sv}... this could take a few minutes.")
-    watch
-    ping("Mashout temperature (#{pv}) reached. Mashout complete.")
-  end
-
-  def sparge
-    print "Is the sparge water heated to the correct temperature? "
-    confirm ? nil : abort
-
-    hlt_to('mash')
-    hlt('open')
-
-    puts "Waiting for 30 seconds. Regulate sparge balance."
-    puts "(ctrl-c to abort proccess)"
-    wait(30)
-
-    rims_to('boil')
-    pump(1)
-
-    ping("Please check the sparge balance and ignite boil tun burner")
-
-    puts "Waiting until intervention to turn off pump (y): "
-    confirm ? nil : abort
-
-    pid(0)
-    pump(0)
-
-    hlt('close')
-
-    ping("Sparge complete")
-  end
-
-  def top_off
-    hlt_to('boil')
-
-    hlt('open')
-
-    print "waiting for intervention to turn off hlt (y): "
-    confirm ? nil : abort
-
-    hlt('close')
-
-    ping('Topping off completed')
+    self
   end
 
 end

data/lib/communicator.rb

@@ -0,0 +1,66 @@
+require_relative "autoload"
+
+class Communicator
+
+  attr_accessor :slack, :brewer
+
+  def initialize
+    @slack = configure_slack
+    @brewer = Brewer.new
+  end
+
+  def configure_slack
+    slack_file = Dir.home + "/.brewer/.slack.yml"
+    if !File.file?(slack_file)
+      store = YAML::Store.new slack_file
+      print "Enter your Slack webhook url: "
+      webhook_url = gets.chomp
+      store.transaction { store['webhook_url'] = webhook_url }
+    end
+    return Slack::Notifier.new YAML.load(File.open(slack_file))['webhook_url']
+  end
+
+  def ping(message="ping at #{Time.now}")
+    if message.is_a? Array
+      final = message.join("\n")
+      @slack.ping(final)
+    end
+    @slack.ping(message)
+  end
+
+  # TODO: test these methods
+  def slack_monitor(delay=10)
+    while true do
+      before_temp = @brewer.pv
+      @brewer.wait(to_seconds(delay))
+      diff = @brewer.pv - before_temp
+
+      ping([
+        "Current Temperature: #{@brewer.pid['pv_temp']} F",
+        "Set Value Temperature: #{@brewer.pid['sv_temp']} F",
+        "Current temperature has climed #{diff} F since #{delay} minute(s) ago",
+        "Sent at #{Time.now.strftime("%H:%M")}",
+        ""
+      ])
+    end
+    true
+  end
+
+  def monitor
+    while true do
+      status_table_rows = [
+        ["Current Temp", @brewer.pv],
+        ["Set Value Temp", @brewer.sv],
+        ["PID is: ", @brewer.pid['pid_running'].to_b ? "on" : "off"],
+        ["Pump is: ", @brewer.pump]
+      ]
+
+      status_table = Terminal::Table.new :headings ["Item", "Status"], :rows => status_table_rows
+
+      clear_screen
+      puts status_table
+      sleep(1)
+    end
+  end
+
+end

data/lib/helpers.rb

@@ -1,11 +1,7 @@
-require 'net/ping'
+require_relative "autoload"
 
 module Helpers
 
-  def log
-    Dir.pwd + '/logs/output'
-  end
-
   # Formatted as: 03/07/2017 14:26
   def time
     Time.now.strftime("%m/%d/%Y %H:%M")
@@ -16,22 +12,23 @@ module Helpers
     connection.ping?
   end
 
-  def clear_log(log)
-    File.truncate(log, 0)
+  def confirm(input=gets.chomp)
+    if input.to_b
+      return true
+    end
+    false
   end
 
-  def write_log(log, lines)
-    File.open(log, 'a') do |file|
-      lines.each do |line|
-        file.puts "[#{time}]: #{line}"
-      end
-    end
+  def to_minutes(seconds)
+    seconds.to_f / 60
   end
 
-  def confirm(input=gets.chomp)
-    if ["y", "Y", "yes", "Yes", "YES", "k"].include? input
-      true
-    end
+  def to_seconds(minutes)
+    minutes.to_f * 60
+  end
+
+  def clear_screen
+    Gem.win_platform? ? (system "cls") : (system "clear")
   end
 
 end

data/lib/procedures.rb

@@ -0,0 +1,243 @@
+require_relative "autoload"
+
+include Helpers
+
+class Procedures
+
+  attr_accessor :com, :brewer, :recipe
+
+  def initialize
+    @brewer = Brewer.new
+    @com = Communicator.new
+    @recipe = {}
+  end
+
+  def get_recipe_vars
+    puts "Variables for heating strike water ---"
+    get_strike_temp
+
+    puts "Variables for mash ---"
+    print "Enter mash temperature: "
+    @recipe['mash_temp'] = gets.chomp.to_f
+    print "Enter mash time in minutes: "
+    @recipe['mash_time'] = to_seconds(gets.chomp.to_f)
+
+    puts "Variables for mashout ---"
+    print "Enter mashout temp: "
+    @recipe['mashout_temp'] = gets.chomp.to_f
+  end
+
+  def get_strike_temp
+    print "Input amount of water in quarts: "
+    @recipe['water'] = gets.chomp.to_f
+
+    print "Input amount of grain in lbs: "
+    @recipe['grain'] = gets.chomp.to_f
+
+    print "Input current grain temp (#{pv.to_s} F): "
+    @recipe['grain_temp'] = gets.chomp.to_f
+    if @recipe['grain_temp'] == ""
+      @recipe['grain_temp'] = pv
+    end
+
+    print "Input desired mash temp (150 F): "
+    @recipe['desired_mash_temp'] = gets.chomp
+    if @recipe['desired_mash_temp'] == ""
+      @recipe['desired_mash_temp'] = 150
+    end
+    @recipe['desired_mash_temp']
+
+    @recipe['strike_water_temp'] = script('get_strike_temp', "#{water} #{grain} #{grain_temp} #{@recipe['desired_mash_temp']}").to_f
+  end
+
+  def master
+    get_recipe_vars
+    boot
+    heat_strike_water
+    dough_in
+    mash
+    mashout
+    sparge
+    top_off
+    boil
+  end
+
+  def boot
+    puts "booting..."
+    @brewer.pid(0)
+    @brewer.pump(0)
+    @brewer.rims_to('mash')
+    @brewer.hlt_to('mash')
+    @brewer.all_relays_status
+    puts @brewer.pid
+
+    @brewer.clear
+    puts "Boot successful!"
+    @brewer.out.unshift("successful boot at #{Time.now}")
+    @com.ping("🍺 boot successful 🍺")
+    true
+  end
+
+  # :nocov:
+  def heat_strike_water
+    puts "heat-strike-water procedure started"
+
+    # Confirm strike water is in the mash tun
+    print "Is the strike water in the mash tun? "
+    # -> response
+    confirm ? nil : abort
+
+    # confirm return manifold is in the mash tun
+    print "Is the return manifold in the mash tun? "
+    # -> response
+    confirm ? nil : abort
+
+    print "Is the mash tun valve open? "
+    confirm ? nil : abort
+
+    # confirm RIMS relay is on
+    @brewer.rims_to('mash')
+    puts "RIMS-to-mash relay is now on"
+
+    # turn on pump
+    @brewer.pump(1)
+    puts "Pump is now on"
+
+    puts "Is the pump running properly? "
+    until confirm
+      puts "restarting pump"
+      @brewer.pump(0)
+      @brewer.wait(2)
+      @brewer.pump(1)
+    end
+
+    # confirm that strike water is circulating well
+    print "Is the strike water circulating well? "
+    # -> response
+    confirm ? nil : abort
+
+
+    # calculate strike temp & set PID to strike temp
+    # this sets PID SV to calculated strike temp automagically
+    @brewer.sv(@recipe['strike_water_temp'])
+    puts "SV has been set to calculated strike water temp"
+    # turn on RIMS heater
+    @brewer.pid(1)
+
+    # measure current strike water temp and save
+    @recipe['starting_strike_temp'] = @brewer.pv
+    puts "current strike water temp is #{@brewer.pv}. Saved."
+    puts "Heating to #{@brewer.sv}"
+
+    @com.ping("Strike water beginning to heat. This may take a few minutes.")
+
+    # when strike temp is reached, @com.ping slack
+    @brewer.watch
+    @com.ping("Strike water heated to #{@brewer.pv}. Maintaining temperature.")
+    @com.ping("Next step: dough in")
+    puts "Next step: dough in"
+    puts "command: brewer.dough_in"
+
+    true
+  end
+  # :nocov:
+
+  def dough_in
+    # turn pump off
+    @brewer.pump(0)
+    # turn PID off
+    @brewer.pid(0)
+    @brewer.wait(3)
+    @com.ping("Ready to dough in")
+    puts "Ready to dough in"
+
+    # pour in grain
+
+    print "Confirm when you're done with dough-in (y): "
+    confirm ? nil : abort
+    true
+  end
+
+  def mash
+    @brewer.sv(@recipe['mash_temp'])
+
+    puts "mash stated. This will take a while."
+    @com.ping("Mash started. This will take a while.")
+
+    @brewer.rims_to('mash')
+
+    @brewer.pump(1)
+    @brewer.pid(1)
+
+    @brewer.watch
+    @com.ping("Mash temp (#{@brewer.pv} F) reached. Starting timer for #{@recipe['mash_time']} minutes.")
+    @brewer.wait(@recipe['mash_time'])
+    @com.ping("🍺 Mash complete 🍺. Check for starch conversion.")
+    puts "Mash complete"
+    puts "Check for starch conversion"
+  end
+
+  def mashout
+    @com.ping("Start heating sparge water")
+
+    @brewer.sv(@recipe['mashout_temp'])
+
+    @brewer.pump(1)
+    @brewer.pid(1)
+
+    @com.ping("Heating to #{@brewer.sv}... this could take a few minutes.")
+    @brewer.watch
+    @com.ping("Mashout temperature (#{@brewer.pv}) reached. Mashout complete.")
+  end
+
+  def sparge
+    print "Is the sparge water heated to the correct temperature? "
+    confirm ? nil : abort
+
+    @brewer.hlt_to('mash')
+    @brewer.hlt(1)
+
+    puts "Waiting for 10 seconds. Regulate sparge balance."
+    puts "(ctrl-c to abort proccess)"
+    @brewer.wait(30)
+
+    @brewer.rims_to('boil')
+    @brewer.pump(1)
+
+    @com.ping("Please check the sparge balance and ignite boil tun burner")
+
+    puts "Waiting until intervention to turn off pump (y): "
+    confirm ? nil : abort
+
+    @brewer.pid(0)
+    @brewer.pump(0)
+
+    @brewer.hlt(0)
+  end
+
+  def top_off
+    @brewer.hlt_to('boil')
+
+    @brewer.hlt(1)
+
+    print "waiting for intervention to turn off hlt (y): "
+    confirm ? nil : abort
+
+    @brewer.hlt(0)
+
+    @com.ping('Topping off completed')
+  end
+
+  def boil
+    @com.ping("starting boil procedure")
+    @brewer.wait(to_seconds(5))
+    @com.ping("Add boil hops")
+    @brewer.wait(to_seconds(40))
+    @com.ping("Add flovering hops")
+    @brewer.wait(to_seconds(13))
+    @com.ping("Add finishing hops")
+    @brewer.wait(30)
+    @com.ping("All done")
+  end
+
+end

data/lib/settings.rb

@@ -1,5 +1,4 @@
-# This just parses the adaptibrew/settings.py
-require 'adaptibrew'
+require_relative "autoload"
 
 adaptibrew = Adaptibrew.new
 

data/notes.md

@@ -0,0 +1,16 @@
+class roles:
+Brewer:
+  - Directly control each component of the physical brew rig
+
+Procedures:
+  - compile brewer methods into scripted procedures
+
+Helpers:
+  - assorted methods, helpers module
+
+Adaptibrew:
+  - Clone and maintain the adaptibrew directory
+
+Communicator:
+  - Communicates the status of the brew rig
+  - Communicates actions the brew rig is doing/actions that the brewer class does

data/spec/brewer_spec.rb

@@ -10,14 +10,6 @@ describe Brewer do
     Adaptibrew.new.refresh
   end
 
-  after :all do
-    # in case something goes wrong, everything needs to be reset
-    @brewer = Brewer.new
-    @brewer.pump(0)
-    @brewer.pid(0)
-    @brewer.boot
-  end
-
   describe "#new" do
     it "returns a brewer object" do
       expect(Brewer.new).to be_an_instance_of Brewer
@@ -32,9 +24,9 @@ describe Brewer do
     it "can wait for a number of seconds" do
       #  not using let(:current_time) etc. because
       # the var is created upon the first calling, which is in the expect()
-      current_time = Time.now.to_i
+      current_time = Time.now.to_f
       @brewer.wait(1)
-      expect(current_time + 1).to eq(Time.now.to_i)
+      expect(current_time + 1).to eq(Time.now.to_f)
     end
   end
 
@@ -57,100 +49,4 @@ describe Brewer do
     end
   end
 
-  describe ".pump" do
-    # If the pump is already on it does nothing
-    it "turns the pump on" do
-      expect(@brewer.pump(1)).to eq("pump on")
-      @brewer.wait(2)
-    end
-
-    # If the pump is already off it does nothing
-    it "turns the pump off" do
-      expect(@brewer.pump(0)).to eq("pump off")
-    end
-
-    # cant really test this one...
-    context "when the pid is also on" do
-      # This turns on both pump and pid
-      before { @brewer.pid(1) }
-      it "turns the pump and pid off" do
-        expect(@brewer.pump(0)).to eq("pump off")
-      end
-    end
-  end
-
-  describe ".relay" do
-    it "turns the relay on" do
-      expect(@brewer.relay(2, 1)).to eq("relay 2 on")
-      @brewer.wait(7)
-    end
-
-    it "turns the relay off" do
-      expect(@brewer.relay(2, 0)).to eq("relay 2 off")
-      @brewer.wait(7)
-    end
-  end
-
-  describe ".pid" do
-    it "turns the pid on" do
-      expect(@brewer.pid(1)).to eq("Pump and PID are now on")
-      @brewer.wait(2)
-    end
-
-    it "turns the pid off" do
-      expect(@brewer.pid(0)).to eq("PID off")
-    end
-
-    it "returns the pid status" do
-      expect(@brewer.pid).to be_an_instance_of Hash
-    end
-  end
-
-  describe ".sv" do
-    context "when there is no argument" do
-      it "returns the sv temp" do
-        expect(@brewer.sv).to be_an_instance_of String
-      end
-    end
-
-    context "when there is an argument" do
-      it "sets the sv temp" do
-        expect(@brewer.sv(150)).to be_an_instance_of String
-      end
-    end
-  end
-
-  describe ".pv" do
-    it "returns the pv" do
-      expect(@brewer.pv).to be_an_instance_of String
-    end
-  end
-
-  describe ".ping" do
-    it "pings slack" do
-      expect(@brewer.ping("Tests are passing :D")).to be_an_instance_of Net::HTTPOK
-    end
-  end
-
-  describe ".echo" do
-    context "when there is an argument" do
-      it "prints the arg" do
-        expect(@brewer.echo("just part of a test")).to eq("just part of a test")
-      end
-    end
-
-    context "when there is no argument" do
-      before { @brewer.pv }
-      it "prints the last output" do
-        expect(@brewer.echo).to be_an_instance_of String
-      end
-    end
-  end
-
-  describe ".relay_status" do
-    it "returns the status of a relay" do
-      expect(@brewer.relay_status($settings['rimsToMashRelay'].to_i)).not_to be_empty
-    end
-  end
-
 end

data/spec/hardware_spec.rb

@@ -0,0 +1,95 @@
+require_relative 'spec_helper'
+
+describe Brewer do
+  before :each do
+    @brewer = Brewer.new
+  end
+
+  before :all do
+    Adaptibrew.new.refresh
+  end
+
+  after :all do
+    # in case something goes wrong, everything needs to be reset
+    @brewer = Brewer.new
+    @brewer.pump(0)
+    @brewer.pid(0)
+    @brewer.boot
+  end
+
+  describe ".pump" do
+    # If the pump is already on it does nothing
+    it "turns the pump on" do
+      expect(@brewer.pump(1)).to eq("pump on")
+      @brewer.wait(2)
+    end
+
+    # If the pump is already off it does nothing
+    it "turns the pump off" do
+      expect(@brewer.pump(0)).to eq("pump off")
+    end
+
+    # cant really test this one...
+    context "when the pid is also on" do
+      # This turns on both pump and pid
+      before { @brewer.pid(1) }
+      it "turns the pump and pid off" do
+        expect(@brewer.pump(0)).to eq("pump off")
+      end
+    end
+  end
+
+  describe ".relay" do
+    it "turns the relay on" do
+      expect(@brewer.relay(2, 1)).to eq("relay 2 on")
+      @brewer.wait(7)
+    end
+
+    it "turns the relay off" do
+      expect(@brewer.relay(2, 0)).to eq("relay 2 off")
+      @brewer.wait(7)
+    end
+  end
+
+  describe ".pid" do
+    it "turns the pid on" do
+      expect(@brewer.pid(1)).to eq("Pump and PID are now on")
+      @brewer.wait(2)
+    end
+
+    it "turns the pid off" do
+      expect(@brewer.pid(0)).to eq("PID off")
+    end
+
+    it "returns the pid status" do
+      expect(@brewer.pid).to be_an_instance_of Hash
+    end
+  end
+
+  describe ".sv" do
+    context "when there is no argument" do
+      it "returns the sv temp" do
+        expect(@brewer.sv).to be_an_instance_of String
+      end
+    end
+
+    context "when there is an argument" do
+      it "sets the sv temp" do
+        expect(@brewer.sv(150)).to be_an_instance_of String
+      end
+    end
+  end
+
+  describe ".pv" do
+    it "returns the pv" do
+      expect(@brewer.pv).to be_an_instance_of String
+    end
+  end
+
+  describe ".relay_status" do
+    it "returns the status of a relay" do
+      expect(@brewer.relay_status($settings['rimsToMashRelay'].to_i)).not_to be_empty
+    end
+  end
+
+end

data/spec/helpers_spec.rb

@@ -4,12 +4,6 @@ include Helpers
 
 describe "Helpers" do
 
-  describe "#log" do
-    it "returns the log file path" do
-      expect(log).to eq(Dir.pwd + '/logs/output')
-    end
-  end
-
   describe "#time" do
     it "can return the date/time" do
       # This might not be consistent???
@@ -19,26 +13,6 @@ describe "Helpers" do
     end
   end
 
-  describe "#write_log and #clear_log" do
-    context "when the log is empty" do
-      before { clear_log(log) }
-      specify { expect(File.zero?(log)).to be true }
-      it "can write to the log" do
-        write_log(log, ['log entry'])
-        expect(File.zero?(log)).to be false
-      end
-    end
-
-    context "when the log is not empty" do
-      write_log(log, ['log entry'])
-      specify { expect(File.zero?(log)).to be false }
-      it "can clear the log" do
-        clear_log(log)
-        expect(File.zero?(log)).to be true
-      end
-    end
-  end
-
   describe "#confirm" do
     it "should return true" do
       expect(confirm('y')).to be true

data/spec/spec_helper.rb

@@ -5,7 +5,4 @@ require 'simplecov'
 SimpleCov.command_name 'RSpec'
 SimpleCov.start
 
-require_relative '../lib/adaptibrew.rb'
-require_relative '../lib/brewer.rb'
-require_relative '../lib/helpers.rb'
-require_relative '../lib/settings.rb'
+require_relative "../lib/autoload"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brewer
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.71
 platform: ruby
 authors:
 - Luke Sweeney
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: wannabe_bool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +86,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,12 +236,16 @@ files:
 - bin/brewer
 - brewer.gemspec
 - lib/adaptibrew.rb
+- lib/autoload.rb
 - lib/brewer.rb
+- lib/communicator.rb
 - lib/helpers.rb
+- lib/procedures.rb
 - lib/settings.rb
-- lib/slacker.rb
+- notes.md
 - spec/adaptibrew_spec.rb
 - spec/brewer_spec.rb
+- spec/hardware_spec.rb
 - spec/helpers_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
@@ -231,6 +277,7 @@ summary: A shell interface for adaptibrew
 test_files:
 - spec/adaptibrew_spec.rb
 - spec/brewer_spec.rb
+- spec/hardware_spec.rb
 - spec/helpers_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb

data/lib/slacker.rb

@@ -1,31 +0,0 @@
-require 'slack-notifier'
-require 'yaml'
-require 'yaml/store'
-
-slack_file = Dir.home + "/.brewer/.slack.yml"
-
-if !File.file?(slack_file)
-
-  # this will create the file if it doesn't exists, which it doesn't in this context
-  store = YAML::Store.new slack_file
-
-  # you can get this from your slack app integrations page
-  print "Enter your Slack webhook url: "
-  webhook_url = gets.chomp
-
-  # This just stores the webhook_url so you only have to enter it once
-  store.transaction do
-    store['webhook_url'] = webhook_url
-  end
-
-  # Here's a comment in .slack.yml so if you find it by accident you'll know what it does
-  File.open(slack_file, 'a') do |file|
-    file.puts "# This is the slack configuration file for the brewer gem"
-    file.puts "# You can delete this file and brewer will re-create it on start-up"
-  end
-end
-
-
-# finally, start up a global variable for the brewer class to use
-# A full `Slacker` class is not needed, since this only does one thing
-$slack = Slack::Notifier.new YAML.load(File.open(slack_file))['webhook_url']