brewer 0.0.46 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 631103298e3b03a620cf2685b98de4badda41dde
-  data.tar.gz: 5ad112f308ace464b72b45528e2f302d2f92b5a1
+  metadata.gz: 4b64a285ed132424529cae2bee9cefe0acac647a
+  data.tar.gz: 11a20637683536d2072822de7e56a7e674c6d92b
 SHA512:
-  metadata.gz: 9b3aa10a4a56c5e8fee6df0eaaf5fdc1a31eed2f31972f2d8eaf97b8d50dd86035d97e54975f7c6bce982bcc2f38f6db2a5f9c1aa286a575b33603b186662a1f
-  data.tar.gz: 0d494424f3ba1039c9f24de9ff7805e4c9af38500e6cd1649f3590b0df48d366fc55dac7e2d997528d1efa4e14268d60094ebf3480bdbbb668f04d88ea4c08d9
+  metadata.gz: 081b6a644613fa2465b651351fc3fec63fbe767c4da00186ef353ea499714a6a0eca1f19a70d0bf2d976e8e7b72eed402c075ed9b9698616ec5c1effe1dd1adc
+  data.tar.gz: 17526d90dfeb30d86a548f2e911eec030cad868c0ea5e24a3b9dcd2f241f31220699fe742f391db86b196a26bc50c789d691a8f3f94663243a5513c6a40f2a92

data/brewer.gemspec

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

data/lib/adaptibrew.rb

@@ -7,11 +7,15 @@ include Helpers
 # This is the 'manager' for the adaptibrew repo. It handles cloning and such.
 class Adaptibrew
 
+  def initialize
+    @install_dir = Dir.home + "/.brewer/"
+  end
+
   # If used in IRB, Ripl, etc. it will clone into the directory IRB was started in
-  def clone(path=nil)
+  def clone
     raise "🛑  Cannot clone, no network connection" unless network?
-    if !Dir.exists?('adaptibrew')
-      Git.clone('https://github.com/llamicron/adaptibrew.git', 'adaptibrew', :path => path)
+    if !Dir.exists?(@install_dir + "adaptibrew")
+      Git.clone('https://github.com/llamicron/adaptibrew.git', 'adaptibrew', :path => @install_dir)
     end
     self
   end
@@ -26,7 +30,7 @@ class Adaptibrew
       end
     end
     # :nocov:
-    FileUtils.rm_rf('adaptibrew')
+    FileUtils.rm_rf(@install_dir + 'adaptibrew')
     self
   end
 
@@ -38,7 +42,7 @@ class Adaptibrew
   end
 
   def present?
-    if Dir.exists?('adaptibrew')
+    if Dir.exists?(@install_dir + 'adaptibrew/')
       return true
     end
     false

data/lib/brewer.rb

@@ -10,7 +10,7 @@ class Brewer
   attr_accessor :out, :log, :temps
 
   def initialize
-    @base_path = Dir.pwd
+    @base_path = Dir.home + '/.brewer'
     # Output of adaptibrew
     @out = []
     @log = @base_path + '/logs/output'
@@ -24,7 +24,7 @@ class Brewer
 
   def wait(time=30)
     sleep(time)
-    self
+    true
   end
 
   # Sends a slack message in #brewing
@@ -44,23 +44,21 @@ class Brewer
   # 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
+    @out.first
   end
 
   # Clears the @out array
   # Writes current @out to log
   def clear
-    write_log(@log, @out)
     @out = []
-    self
   end
 
   # This lil' divider is default for large return blocks
   def echo(string=nil)
     if string == nil
-      return @out.first
+      puts @out.first
     end
-    string
+    puts string
   end
 
 
@@ -69,74 +67,73 @@ class Brewer
 
   def pump(state=0)
     if state == 1
-      script("set_pump_on")
-    else
-      script("set_pump_off")
+      return script("set_pump_on")
+    elsif state == 0
+      if pid['pid_running'] == "True"
+        pid(0)
+        echo
+      end
+      return script("set_pump_off")
     end
-    self
-  end
-
-  def relay(relay, state)
-    script("set_relay", "#{relay} #{state}")
-    self
   end
 
   # 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 "PID is running? " + echo
-      sv.echo
-      pv.echo
+      return {
+        'pid_running' => script("is_pid_running"),
+        'sv_temp' => sv,
+        'pv_temp' => pv
+      }
     end
 
     if state == 1
       script('set_pid_on')
-      puts "PID is now on"
       pump(1)
-      puts "Pump is now on"
+      return "Pump and PID are now on"
     elsif state == 0
-      script("set_pid_off")
-      puts "PID is now off"
+      return script("set_pid_off")
     end
 
-    self
-  end
-
-  def all_relays_status
-    script("get_relay_status_test")
-    puts @out.first.split('\n')
-    @out.shift
-    self
-  end
-
-  def relay_status(relay)
-    raise "Relay number needs to be an integer" unless relay.is_a? Integer
-    script("get_relay_status", "#{relay}")
-    puts @out.first
-    self
+    true
   end
 
   def sv(temp=nil)
     if temp
       raise "Temperature input needs to be an integer" unless temp.is_a? Integer
-      script('set_sv', temp)
+      return script('set_sv', temp)
     else
-      script('get_sv')
+      return script('get_sv')
     end
-    self
+    true
   end
 
   def pv
     script('get_pv')
-    self
+  end
+
+  def relay(relay, state)
+    script("set_relay", "#{relay} #{state}")
+  end
+
+  def all_relays_status
+    script("get_relay_status_test")
+    puts @out.first.split('\n')
+    @out.shift
+    true
+  end
+
+  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
 
   def watch
-    until pv.out.first.to_i == sv.out.first.to_i do
+    until pv.to_i == sv.to_i do
       wait(8)
     end
+    true
   end
 
   # WaterVolInQuarts, GrainMassInPounds, GrainTemp, MashTemp
@@ -147,10 +144,10 @@ class Brewer
     print "Input amount of grain in lbs: "
     grain = gets.chomp
 
-    print "Input current grain temp (#{pv.echo}): "
+    print "Input current grain temp (#{pv}): "
     grain_temp = gets.chomp
     if grain_temp == ""
-      grain_temp = pv.echo.to_i
+      grain_temp = pv.to_i
     end
 
     print "Input desired mash temp (150): "
@@ -161,10 +158,9 @@ class Brewer
     @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
+    @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.echo} degrees"
+    puts "SV has been set to #{sv} degrees"
   end
 
   # Master Procedures -----------------------------------------------------
@@ -172,12 +168,16 @@ class Brewer
   def boot
     # These are the states required for starting. Should be called on boot.
     # Print PID status at end
-    pid(0).pump(0).relay($settings['rimsToMashRelay'], 1).all_relays_status.pid
+    pid(0)
+    pump(0)
+    relay($settings['rimsToMashRelay'], 1)
+    all_relays_status
+    puts pid
 
-    @out.shift(4)
-    @out.unshift("Boot successful")
-    puts @out[0] + "!"
-    self
+    clear
+    puts "Boot successful!"
+    @out.unshift("successful boot")
+    true
   end
 
   def heat_strike_water
@@ -193,31 +193,34 @@ class Brewer
     pump(1)
     puts "Pump is now on"
 
-    time = 30
+    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 stop now)"
-    wait(time)
+    wait(time.to_i)
 
     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."
+    @temps['starting_strike_temp'] = pv.to_i
+    puts "current strike water temp is #{pv}. 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
+    true
   end
 
 end

data/lib/settings.rb

@@ -1,7 +1,7 @@
 # This just parses the adaptibrew/settings.py
 $settings = {}
 
-File.open('adaptibrew/settings.py') do |file|
+File.open(Dir.home + '/adaptibrew/settings.py') do |file|
   file.each_line do |line|
     if line.match(/=/) == nil
       next

data/lib/slacker.rb

@@ -2,10 +2,12 @@ require 'slack-notifier'
 require 'yaml'
 require 'yaml/store'
 
-if !File.file?('.slack.yml')
+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.yml'
+  store = YAML::Store.new slack_file
 
   # you can get this from your slack app integrations page
   print "Enter your Slack webhook url: "
@@ -17,7 +19,7 @@ if !File.file?('.slack.yml')
   end
 
   # Here's a comment in .slack.yml so if you find it by accident you'll know what it does
-  File.open(".slack.yml", 'a') do |file|
+  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
@@ -26,4 +28,4 @@ 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.yml'))['webhook_url']
+$slack = Slack::Notifier.new YAML.load(File.open(slack_file))['webhook_url']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brewer
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.50
 platform: ruby
 authors:
 - Luke Sweeney