brewer 0.0.43 → 0.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 601c53153ee16990ac2e6e1d3612a25d896ebd5d
-  data.tar.gz: 0806645dc59bbf7b181dddc65b4b0785982e95a9
+  metadata.gz: f16b7b9fb27e3bf8745e0f9ca0f676075dd61ec4
+  data.tar.gz: f666d434d21a5b920abdfc3919805b9cb2ec8bfc
 SHA512:
-  metadata.gz: a196fec395deb7cd4df18349d22d112cb88a21d62d1257b4c916bf605c7e39df1364f0dedecb0cc6ddc2de166d85244da24f0aead567ab04d06679ba38823cfc
-  data.tar.gz: 4a8d7e9d46852cc2a5de94074099fc66977b10e70992d055d40cea6f0cff23c30a7757575ea543e12d3b79a72e516daf64028a84d54ea54689d4222801566ed2
+  metadata.gz: 13fceb77a1f0bee56f8239218ab2461f89045ddf372f9b67304bbacc601bab59200acd7d1ce9b9dafd1c4cf6f6e0f7274813d4fcb91664f95646c0392fcd34e8
+  data.tar.gz: 5c92be2304da69a1f59209da50ccc03b76d8423c8698db9fad605a7dd550c54a676236ae7a2f8d4d63b57b5761fe86be477c6fb5e90285e33e7f2947a5f56b44

data/bin/brewer

@@ -17,7 +17,7 @@ end
 # Refresh to make sure we have the lastest version of adaptibrew
 adaptibrew = Adaptibrew.new
 if network?
-  adaptibrew.refresh
+  adaptibrew.clone
 end
 brewer = Brewer.new
 

data/brewer.gemspec

@@ -2,7 +2,7 @@ require 'rake'
 
 Gem::Specification.new do |s|
   s.name               = "brewer"
-  s.version            = "0.0.43"
+  s.version            = "0.0.45"
   s.default_executable = "brewer"
 
   s.authors = ["Luke Sweeney"]

data/lib/brewer.rb

@@ -1,23 +1,26 @@
 require_relative 'helpers'
 require_relative 'adaptibrew'
+require_relative 'settings'
 
 include Helpers
 
 class Brewer
 
   attr_reader :base_path
-  attr_accessor :out, :log
+  attr_accessor :out, :log, :temps
 
   def initialize
     @base_path = Dir.pwd
     # Output of adaptibrew
     @out = []
     @log = @base_path + '/logs/output'
+    @temps = {}
   end
 
   public
 
-  # General methods
+  # Brewer methods ------------------------------------------------------
+  # general utilities for the brewer class
 
   def wait(time=30)
     sleep(time)
@@ -37,6 +40,8 @@ class Brewer
 
   # 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
+  # It will be set to the output of the last script. I can't just return the output because i need to return self
   def script(script, params=nil)
     @out.unshift(`python #{@base_path}/adaptibrew/#{script}.py #{params}`.chomp)
     self
@@ -50,16 +55,24 @@ class Brewer
     self
   end
 
+  # This lil' divider is default for large return blocks
+  def echo(string=nil)
+    if string == nil
+      return @out.first
+    end
+    string
+  end
+
 
-  # Adaptibrew methods
+  # Adaptibrew methods ----------------------------------------------
+  # for working with the rig
 
   def pump(state=0)
     if state == 1
-      state_string = "on"
+      script("set_pump_on")
     else
-      state_string = "off"
+      script("set_pump_off")
     end
-    script("set_pump_#{state_string}")
     self
   end
 
@@ -71,13 +84,18 @@ class Brewer
   # Turns PID on or off, or gets state if no arg is provided
   def pid(state="status")
     if state == "status"
+      echo('----------')
       script("is_pid_running")
-      puts @out.first
+      puts "PID is running? " + echo
+      sv.echo
+      pv.echo
     end
 
     if state == 1
       script('set_pid_on')
       puts "PID is now on"
+      pump(1)
+      puts "Pump is now on"
     elsif state == 0
       script("set_pid_off")
       puts "PID is now off"
@@ -104,20 +122,57 @@ class Brewer
     if temp
       raise "Temperature input needs to be an integer" unless temp.is_a? Integer
       script('set_sv', temp)
-      puts "SV set to #{temp}"
     else
       script('get_sv')
-      puts "SV is currently " + @out.first
     end
     self
   end
 
-  # Procedures
+  def pv
+    script('get_pv')
+    self
+  end
+
+  def watch
+    until pv.out.first.to_i == sv.out.first.to_i do
+      wait(8)
+    end
+  end
+
+  # WaterVolInQuarts, GrainMassInPounds, GrainTemp, MashTemp
+  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.echo}): "
+    grain_temp = gets.chomp
+    if grain_temp == ""
+      grain_temp = pv.echo.to_i
+    end
+
+    print "Input desired mash temp (150): "
+    desired_mash_temp = gets.chomp
+    if desired_mash_temp == ""
+      desired_mash_temp = 150
+    end
+    @temps['desired_mash'] = desired_mash_temp
+
+    # this is where the magic happens
+    script('get_strike_temp', "#{water} #{grain} #{grain_temp} #{desired_mash_temp}")
+    @temps['strike_water_temp'] = @out.first.to_i
+    sv(echo.to_i)
+    puts "SV has been set to #{sv.echo} degrees"
+  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
-    pid(0).pump(0).relay(2, 1).all_relays_status
+    pid(0).pump(0).relay($settings['rimsToMashRelay'], 1).all_relays_status.pid
 
     @out.shift(4)
     @out.unshift("Boot successful")
@@ -132,18 +187,36 @@ class Brewer
     print "Is the return manifold in the mash tun? "
     confirm ? nil : abort
 
-    relay(2, 1)
-    puts "RIMS relay is now on"
+    relay($settings['rimsToMashRelay'], 1)
+    puts "RIMS-to-mash relay is now on"
 
     pump(1)
     puts "Pump is now on"
 
-    puts "Waiting for 30 seconds (ctrl-c to cancel)"
-    wait(30)
+    time = 30
+    puts "Waiting for #{time} seconds for strike water to start circulating"
+    puts "(ctrl-c to stop now)"
+    wait(time)
 
     print "Is the strike water circulating well? "
     confirm ? nil : abort
 
+    @temps['starting_strike_temp'] = pv.out.first.to_i
+    pv
+    puts "current strike water temp is #{echo}. Saved."
+    puts "Warning: if you exit this brewer shell, the strike water temp will be lost"
+    puts ""
+    puts "--- Calculate strike temp ---"
+    # this sets PID to strike temp
+    get_strike_temp
+    # turn on pid heater
+    # XXX: This?
+    pid(1)
+
+    # when strike temp is reached, ping
+    watch
+    ping("strike water is now at #{pv.echo} degrees")
+
     self
   end
 

data/lib/settings.rb

@@ -0,0 +1,13 @@
+# This just parses the adaptibrew/settings.py
+$settings = {}
+
+File.open('adaptibrew/settings.py') do |file|
+  file.each_line do |line|
+    if line.match(/=/) == nil
+      next
+    end
+    key, value = line.match(/(.+)=(.+)/).captures
+    value.slice!(/#.+/)
+    $settings[key.strip.chomp] = value.strip.chomp
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brewer
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.45
 platform: ruby
 authors:
 - Luke Sweeney
@@ -196,6 +196,7 @@ files:
 - lib/adaptibrew.rb
 - lib/brewer.rb
 - lib/helpers.rb
+- lib/settings.rb
 - lib/slacker.rb
 - spec/adaptibrew_spec.rb
 - spec/brewer_spec.rb