brewer 0.0.83 → 0.0.89

data/lib/brewer/recipe.rb

@@ -1,56 +1,57 @@
 require_relative "../brewer"
 
-class Recipe
+module Brewer
+  class Recipe
 
-  attr_accessor :mash_temp, :mash_time, :mashout_temp, :water, :grain, :grain_temp, :desired_mash_temp, :strike_water_temp, :starting_strike_temp
+    attr_accessor :mash_temp, :mash_time, :mashout_temp, :water, :grain, :grain_temp, :desired_mash_temp, :strike_water_temp, :starting_strike_temp
 
-  def initialize(brewer)
-    @brewer = brewer
-  end
+    def initialize(brewer)
+      @brewer = brewer
+    end
 
-  def get_recipe_vars(vars=false)
-    if vars
-      raise "Vars must be a hash" unless vars.is_a? Hash
-      vars.each do |recipe_key, value|
-        instance_variable_set("@" + recipe_key, value)
+    def get_recipe_vars(vars=false)
+      if vars
+        raise "Vars must be a hash" unless vars.is_a? Hash
+        vars.each do |recipe_key, value|
+          instance_variable_set("@" + recipe_key, value)
+        end
       end
-    end
 
-    puts "Variables for heating strike water"
-    get_strike_temp
+      puts Rainbow("Variables for the brew").green
 
-    puts "Variables for mash ---"
-    print "Enter mash temperature: "
-    @mash_temp = gets.chomp.to_f
-    print "Enter mash time in minutes: "
-    @mash_time = to_seconds(gets.chomp.to_f)
+      get_strike_temp
 
-    puts "Variables for mashout ---"
-    print "Enter mashout temp: "
-    @mashout_temp = gets.chomp.to_f
-  end
+      print Rainbow("Enter mash temperature: ").yellow
+      @mash_temp = gets.chomp.to_f
+      print Rainbow("Enter mash time in minutes: ").yellow
+      @mash_time = to_seconds(gets.chomp.to_f)
 
-  def get_strike_temp
-    print "Input amount of water in quarts: "
-    @water = gets.chomp.to_f
+      print Rainbow("Enter mashout temp: ").yellow
+      @mashout_temp = gets.chomp.to_f
+    end
 
-    print "Input amount of grain in lbs: "
-    @grain = gets.chomp.to_f
+    def get_strike_temp
+      print Rainbow("Input amount of water in quarts: ").yellow
+      @water = gets.chomp.to_f
 
-    print "Input current grain temp (#{@brewer.pv.to_s} F): "
-    @grain_temp = gets.chomp.to_f
-    if @grain_temp == ""
-      @grain_temp = @brewer.pv
-    end
+      print Rainbow("Input amount of grain in lbs: ").yellow
+      @grain = gets.chomp.to_f
 
-    print "Input desired mash temp (150 F): "
-    @desired_mash_temp = gets.chomp
-    if @desired_mash_temp == ""
-      @desired_mash_temp = 150
+      print Rainbow("Input current grain temp (#{@brewer.pv.to_s} F): ").yellow
+      @grain_temp = gets.chomp.to_f
+      if @grain_temp == ""
+        @grain_temp = @brewer.pv
+      end
+
+      print Rainbow("Input desired mash temp (150 F): ").yellow
+      @desired_mash_temp = gets.chomp
+      if @desired_mash_temp == ""
+        @desired_mash_temp = 150
+      end
+      @desired_mash_temp
+
+      @strike_water_temp = @brewer.script('get_strike_temp', "#{@water} #{@grain} #{@grain_temp} #{@desired_mash_temp}").to_f
     end
-    @desired_mash_temp
 
-    @strike_water_temp = script('get_strike_temp', "#{@water} #{@grain} #{@grain_temp} #{@desired_mash_temp}").to_f
   end
-
 end

data/lib/brewer/settings.rb

@@ -1,137 +1,139 @@
-require_relative "../brewer"
+require_relative "adaptibrew"
 
-class Settings
+module Brewer
+  class Settings
 
-  attr_accessor :settings
-  attr_reader :cache_file, :source
+    attr_accessor :settings
+    attr_reader :cache_file, :source
 
-  def initialize(testing=false)
+    def initialize(testing=false)
 
-    @source = adaptibrew_dir('settings.py')
-    @cache_file = brewer_dir('settings.yml')
+      @source = adaptibrew_dir('settings.py')
+      @cache_file = brewer_dir('settings.yml')
 
-    @settings = Hash.new
+      @settings = Hash.new
 
-    if !testing
-      Adaptibrew.new.clone
+      if !testing
+        Adaptibrew.new.clone
 
-      unless cache?
-        parse_and_cache
-      else
-        load_cached_settings
-      end
+        if !cache?
+          parse_and_cache
+        else
+          load_cached_settings
+        end
 
-      load_global
+        load_global
+      end
     end
-  end
 
-  # This will create the cache and populate
-  # it with settings from settings.py
-  def parse_and_cache
-    parse
-    cache
-  end
+    # This will create the cache and populate
+    # it with settings from settings.py
+    def parse_and_cache
+      parse
+      cache
+    end
 
-  # Loads cached settings
-  # If no cached settings, it returns false
-  def load_cached_settings
-    if cache?
-      @settings = YAML.load(File.open(@cache_file))
-      return true
+    # Loads cached settings
+    # If no cached settings, it returns false
+    def load_cached_settings
+      if cache?
+        @settings = YAML.load(File.open(@cache_file))
+        return true
+      end
+      false
     end
-    false
-  end
 
-  # Checks if there are settings in the cache
-  def cache?
-    if File.exists?(@cache_file) and File.readlines(@cache_file).grep(/DEBUG/).size > 0
-      return true
+    # Checks if there are settings in the cache
+    def cache?
+      if File.exists?(@cache_file) and File.readlines(@cache_file).grep(/DEBUG/).size > 0
+        return true
+      end
+      false
     end
-    false
-  end
 
-  # Parse the settings from the source file into @settings
-  def parse
-    File.open(@source, 'r') do |file|
-      file.each_line do |line|
-        if line.include? "=" and line[0] != "#"
-          key, value = line.match(/(.+)=(.+)/).captures
-          @settings[key.strip.chomp] = value.strip.chomp
+    # Parse the settings from the source file into @settings
+    def parse
+      File.open(@source, 'r') do |file|
+        file.each_line do |line|
+          if line.include? "=" and line[0] != "#"
+            key, value = line.match(/(.+)=(.+)/).captures
+            @settings[key.strip.chomp] = value.strip.chomp
+          end
         end
+        type_cast
+        return true
       end
-      type_cast
-      return true
+      false
+    end
+
+    # Creates the cache if there isn't one already
+    def create_cache
+      unless File.exists?(@cache_file)
+        File.open(@cache_file, 'w')
+      end
+      true
     end
-    false
-  end
 
-  # Creates the cache if there isn't one already
-  def create_cache
-    unless File.exists?(@cache_file)
-      File.open(@cache_file, 'w')
+    # This will add a new element to the @settings hash
+    # AND re-cache the settings
+    def add(setting)
+      raise "Setting needs to be a hash" unless setting.is_a? Hash
+      setting.each do |key, value|
+        @settings[key] = value
+      end
+      cache
     end
-    true
-  end
 
-  # This will add a new element to the @settings hash
-  # AND re-cache the settings
-  def add(setting)
-    raise "Setting needs to be a hash" unless setting.is_a? Hash
-    setting.each do |key, value|
-      @settings[key] = value
+    # Stores the currents @settings in settings.yml
+    def cache
+      create_cache
+      store = YAML::Store.new @cache_file
+      store.transaction {
+        @settings.each do |k, v|
+          store[k] = v
+        end
+      }
+      true
     end
-    cache
-  end
 
-  # Stores the currents @settings in settings.yml
-  def cache
-    create_cache
-    store = YAML::Store.new @cache_file
-    store.transaction {
-      @settings.each do |k, v|
-        store[k] = v
+    # This deletes the cache file
+    def clear_cache
+      if File.exists?(@cache_file)
+        FileUtils.rm_f @cache_file
       end
-    }
-    true
-  end
+      true
+    end
 
-  # This deletes the cache file
-  def clear_cache
-    if File.exists?(@cache_file)
-      FileUtils.rm_f @cache_file
+    # This is so that the settings are easier to use in my code
+    # and for backwards compatability purposes
+    def load_global
+      raise "settings instance variable does not exist yet. Run Settings#parse first" unless !@settings.empty?
+      $settings = @settings
     end
-    true
-  end
 
-  # This is so that the settings are easier to use in my code
-  # and for backwards compatability purposes
-  def load_global
-    parse_and_cache
-    $settings = @settings
-  end
+    def change(values)
+      raise "Values to change must be a hash" unless values.is_a? Hash
+      values.each do |k, v|
+        @settings[k] = v
+      end
+      return true
+    end
 
-  def change(values)
-    raise "Values to change must be a hash" unless values.is_a? Hash
-    values.each do |k, v|
-      @settings[k] = v
+    # This method is r/badcode, i know
+    def type_cast
+      # Super janky
+      change({
+        'rimsaddressint' => @settings['rimsaddressint'].to_i,
+        'switchaddressint' => @settings['switchaddressint'].to_i,
+        'baudrate' => @settings['baudrate'].to_i,
+        'timeout' => @settings['timeout'].to_i,
+        'spargeToMashRelay' => @settings['spargeToMashRelay'].to_i,
+        'spargeRelay' => @settings['spargeRelay'].to_i,
+        'rimsToMashRelay' => @settings['rimsToMashRelay'].to_i,
+        'pumpRelay' => @settings['pumpRelay'].to_i,
+        'DEBUG' => @settings['DEBUG'].to_b,
+      })
     end
-    return true
-  end
 
-  # This method is r/badcode, i know
-  def type_cast
-    # Super janky
-    change({
-      'rimsaddressint' => @settings['rimsaddressint'].to_i,
-      'switchaddressint' => @settings['switchaddressint'].to_i,
-      'baudrate' => @settings['baudrate'].to_i,
-      'timeout' => @settings['timeout'].to_i,
-      'spargeToMashRelay' => @settings['spargeToMashRelay'].to_i,
-      'spargeRelay' => @settings['spargeRelay'].to_i,
-      'rimsToMashRelay' => @settings['rimsToMashRelay'].to_i,
-      'pumpRelay' => @settings['pumpRelay'].to_i,
-      'DEBUG' => @settings['DEBUG'].to_b,
-    })
   end
-
 end

data/lib/gems.rb

@@ -0,0 +1,11 @@
+require 'pry'
+require "require_all"
+require 'git'
+require 'fileutils'
+require 'slack-notifier'
+require 'yaml'
+require 'yaml/store'
+require 'net/ping'
+require 'wannabe_bool'
+require 'terminal-table'
+require "rainbow"

data/spec/brewer_spec.rb

@@ -3,7 +3,7 @@ require_relative 'spec_helper'
 describe Brewer do
 
   before :each do
-    @brewer = Brewer.new
+    @brewer = Brewer::Brewer.new
   end
 
   before :all do
@@ -12,10 +12,10 @@ describe Brewer do
 
   describe "#new" do
     it "returns a brewer object" do
-      expect(Brewer.new).to be_an_instance_of Brewer
+      expect(Brewer::Brewer.new).to be_an_instance_of Brewer::Brewer
     end
     it "does not accept args" do
-      expect { Brewer.new('heres an arg') }.to raise_exception(ArgumentError)
+      expect {Brewer::Brewer.new('heres an arg')}.to raise_exception(ArgumentError)
     end
   end
 

data/spec/hardware_spec.rb

@@ -2,26 +2,24 @@ require_relative 'spec_helper'
 
 describe Brewer do
   before :each do
-    @brewer = Brewer.new
+    @brewer = Brewer::Brewer.new
   end
 
   before :all do
-    Adaptibrew.new.refresh
+    Brewer::Adaptibrew.new.refresh
   end
 
   after :all do
     # in case something goes wrong, everything needs to be reset
-    @brewer = Brewer.new
+    @brewer = 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
@@ -41,20 +39,17 @@ describe Brewer do
 
   describe ".relay" do
     it "turns the relay on" do
-      expect(@brewer.relay(2, 1)).to eq("relay 2 on")
-      @brewer.wait(7)
+      expect(@brewer.relay(2, 1)).to be true
     end
 
     it "turns the relay off" do
-      expect(@brewer.relay(2, 0)).to eq("relay 2 off")
-      @brewer.wait(7)
+      expect(@brewer.relay(2, 0)).to be true
     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
@@ -69,20 +64,20 @@ describe Brewer do
   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
+        expect(@brewer.sv).to be_an_instance_of Float
       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
+        expect(@brewer.sv(150)).to be_an_instance_of Float
       end
     end
   end
 
   describe ".pv" do
     it "returns the pv" do
-      expect(@brewer.pv).to be_an_instance_of String
+      expect(@brewer.pv).to be_an_instance_of Float
     end
   end
 
@@ -92,4 +87,13 @@ describe Brewer do
     end
   end
 
+  describe ".relays_status" do
+    it "returns the status of the 4 main relays" do
+      statuses = @brewer.relays_status
+      expect(statuses).to be_an_instance_of Hash
+      expect(statuses).to_not be_empty
+      expect(statuses['spargeRelay']).to be_an_instance_of String
+    end
+  end
+
 end