brewer 0.0.97 → 0.0.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 954f08b0f0f7a708b3408d27c0524c488efe9f22
-  data.tar.gz: 0cd5a49e289ada705ed47c9041fde6464c762548
+  metadata.gz: ad359c3a32aaadf2c8c915016a25826a42be6a53
+  data.tar.gz: 9a7bf80ab7832cd3b7d54fcaf8268a7896f91167
 SHA512:
-  metadata.gz: 0449cb3f51fd13ad2ccc6f29f1c579627ca4cf94bf2e66fc06c9a7ece1dd405830bb838453d850b80871b779cc2992cee95652b04621b9be929e859e2a81ca47
-  data.tar.gz: 80e7455f3845e458e1d82f86e86b7c63f3c72cac58b7a98ddf982886153e64e866341c2956a4ef2b172399ab9e4cfb59870d1d9dc504b5177e98b6fefd379115
+  metadata.gz: 0cd35a5382e5d37df326473777e9a179009f0d8c8a91db6510ce071df40897f8645ede980201d4a9993360b6a0356c4f2651c59cc679ea87f05bcd277998325e
+  data.tar.gz: 139e62eaefece3c38a0acf40ec4981d7e378a37e3299fad82b2a976f07567e75b7af2591839eb514a0f6a245e6ea2664ed090fa0302899caf98c44371bfc62e5

data/README.md

@@ -21,7 +21,7 @@ brewer
 ```
 
 
-You can now run the master procedure (the entire standard brewing process) with:
+You can run the master procedure (the entire standard brewing process) with:
 
 ```ruby
 >> procedures.master
@@ -31,30 +31,10 @@ You can now run the master procedure (the entire standard brewing process) with:
 You will be prompted to enter a slack `webhook_url`, which you can get from the `incoming-webhooks` integration on your slack channel.
 
 
-The shell will ask you for recipe variables in the beginning, and will warn you when you need to intervene.
+You will be asked to load a recipe, or create a new one. These recipes store information like mash time, mash temperature, etc.
 
 # Web Interface (in development)
-Run the `brewer-server` binary the same way you would run the `brewer` binary. This will start a `sinatra` server on your pi's ip address. The default port is `8080`, but you can specify a custom port with:
-
-```shell
-sudo brewer-server -p YOUR_PORT
-```
-
-Keep in mind that any port below 1024 will need root access. I like to specify port `80` (http default) so that I can leave the port off and it will default to 80.
-
-You can add a line to `/etc/hosts` on your workstation and redirect a url to your pi's ip. For instance, the relevant line in my `/etc/hosts` looks like this:
-
-```shell
-192.168.0.224   navasota.brew
-```
-
-so I can visit `navasota.brew` and see the brewing homepage when `brewer-server` is running.
-
-# Starting the server on system startup
-
-You may want to start the `brewer-server` an system boot so that a workstation is not required to connect (ssh) to your pi.
-
-[See here for a StackOverflow solution](https://raspberrypi.stackexchange.com/a/8735) or read on below.
+[See here](http://github.com/llamicron/brewer-server)
 
 # Installation
 This is a gem, published on [rubygems.org](http://rubygems.org). Install it the recommended way with:
@@ -68,7 +48,7 @@ gem 'brewer'
 ```
 or `.gemspec` file:
 ```ruby
-s.add_runtime_dependency 'brewer'
+spec.add_runtime_dependency 'brewer'
 ```
 
 You may also download a .gem file from the [releases section on github](https://github.com/llamicron/brewer/releases) and install it that way, or further still build a new .gem file from the `brewer.gemspec` if you want the latest possible release. This is not recommended, as I do not regularly make releases on Github, just rubygems
@@ -84,5 +64,3 @@ to open an interactive shell to control your brew rig in realtime. Just like any
 Documentation is in `doc/` or on rubygems.org
 
 ---
-
-*This line is for Travis CI build triggers, please ignore*

data/Rakefile

@@ -29,7 +29,7 @@ end
 # Generate or update documentation
 # Generates in `doc/`
 RDoc::Task.new do |rdoc|
-  rm_rf "doc/"
+  # rm_rf "doc/"
   rdoc.rdoc_dir = 'doc/'
   rdoc.main = "README.md"
   # rdoc.rdoc_files.include("**/*.rb")
@@ -44,3 +44,16 @@ end
 task :clear_coverage do
   rm_rf('coverage/')
 end
+
+task :console do
+  require 'pry'
+  require_relative 'lib/brewer'
+
+  def reload!
+    files = $LOADED_FEATURES.select { |feat| feat =~ /\/brewer\// }
+    files.each { |file| load file }
+  end
+
+  ARGV.clear
+  Pry.start
+end

data/bin/brewer

@@ -4,10 +4,10 @@ require_relative "../lib/brewer"
 adaptibrew  = Brewer::Adaptibrew.new
 adaptibrew.refresh
 
+kitchen     = Brewer::Kitchen.new
 slack       = Brewer::Slacker.new
 brewer      = Brewer::Brewer.new
 procedures  = Brewer::Procedures.new
 
-
 binding.pry(quiet: true)
 # 🍺🍺🍺

data/lib/brewer/adaptibrew.rb

@@ -11,13 +11,9 @@ module Brewer
       @disable_network_operations = network? ? false : true
       @adaptibrew_url = 'https://github.com/llamicron/adaptibrew.git'
 
-      if !Dir.exists?(brewer_dir)
+      unless Dir.exists?(brewer_dir)
         Dir.mkdir(brewer_dir)
       end
-
-      if !Dir.exists?(adaptibrew_dir)
-        Dir.mkdir(adaptibrew_dir)
-      end
     end
 
     def clone
@@ -25,7 +21,7 @@ module Brewer
         return false
       end
 
-      if !Dir.exists?(adaptibrew_dir)
+      if !present?
         Git.clone(@adaptibrew_url, 'adaptibrew', :path => brewer_dir)
         return true
       end
@@ -36,6 +32,7 @@ module Brewer
       if @disable_network_operations
         return false
       end
+
       if present?
         FileUtils.rm_rf(adaptibrew_dir)
         return true
@@ -51,7 +48,12 @@ module Brewer
     end
 
     def present?
-      return Dir.exists?(adaptibrew_dir) ? true : false
+      if Dir.exists?(adaptibrew_dir)
+        if Dir.entries(adaptibrew_dir).length > 2
+          return true
+        end
+      end
+      false
     end
 
   end

data/lib/brewer/brewer.rb

@@ -21,12 +21,6 @@ module Brewer
 
     public
 
-    # sleeps for a number of seconds
-    def wait(time=30)
-      sleep(time.to_f)
-      self
-    end
-
     # Runs an adaptibrew script (written in python)
     def script(script, params=nil)
       `python #{@base_path}/adaptibrew/#{script}.py #{params}`.chomp

data/lib/brewer/helpers.rb

@@ -9,6 +9,10 @@ module Helpers
     Time.now.strftime("%m/%d/%Y %H:%M")
   end
 
+  def wait(time=30)
+    sleep(time.to_f)
+  end
+
   # Returns true if there is a network connection
   # :nocov:
   def network?
@@ -54,8 +58,8 @@ module Helpers
   end
 
   # Returns the path of the recipe storage
-  def recipe_dir(path="")
-    brewer_dir + "recipes/#{path}"
+  def kitchen_dir(path="")
+    brewer_dir + "kitchen/#{path}"
   end
 
   # Captures standard output, mostly used for testing

data/lib/brewer/kitchen.rb

@@ -0,0 +1,110 @@
+require_relative "../brewer"
+
+module Brewer
+  class Kitchen
+
+    attr_accessor :url, :recipe
+
+    def initialize
+      @url = "http://github.com/llamicron/kitchen.git"
+      @recipe = Recipe.new(blank: true)
+    end
+
+    def clear
+      if present?
+        FileUtils.rm_rf(kitchen_dir)
+        return true
+      end
+      false
+    end
+
+    def clone
+      if !present?
+        Git.clone(@url, "kitchen", :path => brewer_dir)
+        return true
+      end
+      false
+    end
+
+    def refresh
+      clear
+      clone
+      true
+    end
+
+    def present?
+      if Dir.exists?(kitchen_dir)
+        if Dir.entries(kitchen_dir).length > 2
+          return true
+        end
+      end
+      false
+    end
+
+    def load(recipe_name)
+      raise "Recipe name must be a string" unless recipe_name.is_a? String
+      raise "Recipe does not exist" unless recipe_exists?(recipe_name)
+      @recipe = Recipe.new(recipe_name)
+      true
+    end
+
+    def store
+      raise "Recipe not loaded. Load a recipe or create a new one" unless !@recipe.vars.empty?
+      store = YAML::Store.new kitchen_dir(@recipe.vars['name'] + ".yml")
+      store.transaction do
+        @recipe.vars.each do |k, v|
+          store[k] = v
+        end
+        store['created_on'] = Time.now
+      end
+      true
+    end
+
+    def new_recipe
+      @recipe = Recipe.new
+    end
+
+    def delete_recipe(recipe)
+      if recipe_exists?(recipe)
+        File.delete(kitchen_dir(recipe + ".yml"))
+        return true
+      end
+      false
+    end
+
+    def list_recipes
+      list = Dir.entries(kitchen_dir).select {|file| file.match(/\.yml/) }
+      list.each {|recipe_name| recipe_name.slice!(".yml") }
+      return list
+    end
+
+    def list_recipes_as_table
+      if list_recipes.empty?
+        return "No Saved Recipes"
+      else
+        recipes_table_rows = list_recipes.each_slice(5).to_a
+        recipes_table = Terminal::Table.new :title => "All Recipes", :rows => recipes_table_rows
+        puts recipes_table
+        return recipes_table
+      end
+    end
+
+    def recipe_exists?(recipe)
+      raise "Recipe name must be a string" unless recipe.is_a? String
+      if list_recipes.include?(recipe)
+        return true
+      end
+      false
+    end
+
+    def loaded_recipe?
+      if @recipe
+        if @recipe.name
+          return true
+        end
+      end
+      false
+    end
+
+  end
+end

data/lib/brewer/procedures.rb

@@ -8,11 +8,19 @@ module Brewer
     def initialize
       @brewer = Brewer.new
       @com = Slacker.new
-      @recipe = Recipe.new(@brewer)
+      @kitchen = Kitchen.new
     end
 
     def master
-      @recipe.get_recipe_vars
+      puts "Enter a recipe name or nothing to make a new one."
+      @kitchen.list_recipes_as_table
+      print ">> "
+      choice = gets.chomp.strip
+      if choice.empty?
+        @kitchen.new_recipe
+      else
+        @kitchen.load(choice)
+      end
       boot
       heat_strike_water
       dough_in
@@ -25,22 +33,19 @@ module Brewer
     end
 
     def boot
-      puts Rainbow("booting...").yellow
+      puts Rainbow("Booting...").yellow
       @brewer.relay_config({
         'pid' => 0,
         'pump' => 0,
         'rims_to' => 'mash',
         'hlt_to' => 'mash'
       })
-      # puts @brewer.all_relays_status
-      # puts @brewer.pid
 
       puts Rainbow("Boot finished!").green
       @com.ping("🍺 boot finished 🍺")
       true
     end
 
-
     def heat_strike_water
       puts Rainbow("About to heat strike water").green
 
@@ -65,7 +70,7 @@ module Brewer
       unless confirm
         puts "restarting pump"
         @brewer.pump(0)
-        @brewer.wait(2)
+        wait(2)
         @brewer.pump(1)
       end
 
@@ -77,13 +82,13 @@ module Brewer
 
       # calculate strike temp & set PID to strike temp
       # this sets PID SV to calculated strike temp automagically
-      @brewer.sv(@recipe.vars['strike_water_temp'])
+      @brewer.sv(@kitchen.recipe.vars['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.vars['starting_strike_temp'] = @brewer.pv
+      @kitchen.recipe.vars['starting_strike_temp'] = @brewer.pv
       puts "current strike water temp is #{@brewer.pv}."
       puts "Heating to #{@brewer.sv}"
 
@@ -95,13 +100,12 @@ module Brewer
       true
     end
 
-
     def dough_in
       @brewer.relay_config({
         'pid' => 0,
         'pump' => 0
       })
-      @brewer.wait(3)
+      wait(3)
       @com.ping("Ready to dough in")
       puts Rainbow("Ready to dough in").green
 
@@ -113,7 +117,7 @@ module Brewer
     end
 
     def mash
-      @brewer.sv(@recipe.vars['mash_temp'])
+      @brewer.sv(@kitchen.recipe.vars['mash_temp'])
 
       puts Rainbow("Mash started. This will take a while.").green
       @com.ping("Mash started. This will take a while.")
@@ -125,8 +129,8 @@ module Brewer
       })
 
       @brewer.watch
-      @com.ping("Starting timer for #{to_minutes(@recipe.vars['mash_time'])} minutes.")
-      @brewer.wait(@recipe.vars['mash_time'])
+      @com.ping("Starting timer for #{to_minutes(@kitchen.recipe.vars['mash_time'])} minutes.")
+      wait(@kitchen.recipe.vars['mash_time'])
       @com.ping("🍺 Mash complete 🍺. Check for starch conversion.")
       puts Rainbow("Mash complete").green
       puts "Check for starch conversion"
@@ -137,7 +141,7 @@ module Brewer
       puts Rainbow("start heating sparge water").yellow
       puts Rainbow("Mashout started").green
 
-      @brewer.sv(@recipe.vars['mashout_temp'])
+      @brewer.sv(@kitchen.recipe.vars['mashout_temp'])
 
       @brewer.relay_config({
         'pid'  => 1,
@@ -163,7 +167,7 @@ module Brewer
 
       print "Waiting for 10 seconds. "
       puts Rainbow("Regulate sparge balance.").yellow
-      @brewer.wait(10)
+      wait(10)
 
       @brewer.relay_config({
         'rims_to' => 'boil',
@@ -206,13 +210,13 @@ module Brewer
     def boil
       puts Rainbow("Timers started for 1 hour... You'll be notified when you need to add hops.").yellow
       @com.ping("starting boil procedure")
-      @brewer.wait(to_seconds(5))
+      wait(to_seconds(5))
       @com.ping("Add boil hops")
-      @brewer.wait(to_seconds(40))
+      wait(to_seconds(40))
       @com.ping("Add flovering hops")
-      @brewer.wait(to_seconds(13))
+      wait(to_seconds(13))
       @com.ping("Add finishing hops")
-      @brewer.wait(30)
+      wait(30)
       @com.ping("Done.")
       puts Rainbow("Done.").green
       true

data/lib/brewer/recipe.rb

@@ -5,154 +5,72 @@ module Brewer
 
     attr_accessor :vars
 
-    def initialize(brewer)
-      @brewer = brewer
-      @vars = Hash.new(0)
-      make_recipe_dir
-    end
-
-    def make_recipe_dir
-      if !Dir.exists?(recipe_dir)
-        Dir.mkdir(recipe_dir)
-      end
-      true
-    end
-
-    def new_dummy
-      @vars = dummy_recipe_vars
-    end
+    def initialize(name=nil, blank: false)
+      @brewer = Brewer.new
 
-    # These methods require a lot of user input. Not going to test them.
-    # :nocov:
-    def get_recipe_vars(vars=false)
-      if vars
-        raise "Vars must be a hash" unless vars.is_a? Hash
-        @vars = vars
+      @vars = {}
+      if blank
         return true
       end
 
-      if !list_recipes.empty?
-        clear_screen
-        puts "Enter a recipe name to load an existing recipe, or nothing to start a new one."
-        puts list_as_table
-        print "> "
-        name = gets.chomp.strip
-      else
-        puts Rainbow("No available recipes").yellow
-        name = ""
-      end
-
-      unless name.empty?
+      if name
         load(name)
         return true
+      else
+        get_recipe_vars
+        typecast_vars
       end
+    end
 
-      puts Rainbow("Creating a new recipe").green
+    def name
+      return @vars['name'] if @vars['name']
+    end
 
-      get_strike_temp
+    def load(recipe)
+      @vars = YAML.load(File.open(kitchen_dir(recipe) + ".yml"))
+    end
 
-      print Rainbow("Enter mash temperature: ").yellow
-      @vars['mash_temp'] = gets.chomp.to_f
-      print Rainbow("Enter mash time in minutes: ").yellow
-      @vars['mash_time'] = to_seconds(gets.chomp.to_f)
+    # :nocov:
+    def get_recipe_vars
+      puts Rainbow("Creating a new recipe").green
 
-      print Rainbow("Enter mashout temp: ").yellow
-      @vars['mashout_temp'] = gets.chomp.to_f
+      using_message("Name this recipe: ").ask_for("name")
+      using_message("Amount of water in quarts: ").ask_for("water")
+      using_message("Amount of grain in lbs: ").ask_for("grain")
+      using_message("Current grain temp (#{@brewer.pv.to_s} F): ").ask_for("grain_temp", default: @brewer.pv)
+      using_message("Desired mash temp (150 F): ").ask_for("desired_mash_temp", default: 150)
+      using_message("Mash temperature: ").ask_for("mash_temp")
+      using_message("Mash time in minutes (60): ").ask_for("mash_time", default: 60)
+      using_message("Mashout temp: ").ask_for("mashout_temp")
 
+      @vars['mash_time'] = to_seconds(@vars['mash_time'])
       true
     end
     # :nocov:
 
     # :nocov:
-    def get_strike_temp
-      print Rainbow("Input amount of water in quarts: ").yellow
-      @vars['water'] = gets.chomp.to_f
-
-      print Rainbow("Input amount of grain in lbs: ").yellow
-      @vars['grain'] = gets.chomp.to_f
-
-      print Rainbow("Input current grain temp (#{@brewer.pv.to_s} F): ").yellow
-      @vars['grain_temp'] = gets.chomp.to_f
-      if @vars['grain_temp'] == ""
-        @vars['grain_temp'] = @brewer.pv
-      end
-
-      print Rainbow("Input desired mash temp (150 F): ").yellow
-      @vars['desired_mash_temp'] = gets.chomp
-      if @vars['desired_mash_temp'] == ""
-        @vars['desired_mash_temp'] = 150
-      end
-      @vars['desired_mash_temp']
-
+    def calculate_strike_temp
       @vars['strike_water_temp'] = @brewer.script('get_strike_temp', "#{@vars['water']} #{@vars['grain']} #{@vars['grain_temp']} #{@vars['desired_mash_temp']}").to_f
     end
     # :nocov:
 
-    def store(name=false)
-      raise "Nothing to store! Please run `.get_recipe_vars` to fill in the recipe variables before storing." unless !@vars.empty?
-
-      # :nocov:
-      if @vars['name'].empty?
-        if !name
-          print "Please enter a name for this recipe: "
-          @vars['name'] = gets.chomp
-        else
-          @vars['name'] = name
-        end
-      end
-      # :nocov:
-
-      store = YAML::Store.new recipe_dir(@vars['name'] + ".yml")
-      store.transaction {
-        store["name"] = @vars['name']
-        @vars.each do |k, v|
-          store[k] = v
-        end
-        store["created_on"] = time
-      }
-      true
-    end
-
-    def load(recipe)
-      raise "Recipe does not exist" unless File.exists?(recipe_dir(recipe) + ".yml")
-      @vars = YAML.load(File.open(recipe_dir(recipe) + ".yml"))
-      puts "Recipe Loaded"
-      true
-    end
-
-    def list_recipes
-      recipes = Dir.entries(recipe_dir)
-      recipes.delete(".")
-      recipes.delete("..")
-      recipes.each do |recipe|
-        recipe.slice! ".yml"
-      end
-      recipes
+    def using_message(message)
+      raise "Message needs to be a string" unless message.is_a? String
+      print message
+      self
     end
 
-    def list_as_table
-      if list_recipes.empty?
-        return "No Saved Recipes."
-      end
-      recipes_table_rows = list_recipes.each_slice(5).to_a
-      recipes_table = Terminal::Table.new :title => "All Recipes", :rows => recipes_table_rows
-      return recipes_table
+    def ask_for(var, default: nil)
+      @vars[var] = default
+      input = gets.chomp.strip
+      @vars[var] = input if !input.empty?
     end
 
-    def loaded_recipe?
-      if File.exists?(recipe_dir(@vars['name']) + ".yml")
-        return true
+    def typecast_vars
+      @vars.each do |key, value|
+        # All values in @vars should be floats
+        @vars[key] = value.to_f if key != "name"
       end
-      false
-    end
-
-    def clear
-      @vars = {}
-    end
-
-    def delete_recipe_file
-      FileUtils.rm_rf(recipe_dir + @vars['name'] + ".yml")
-      true
     end
 
   end

data/lib/brewer/settings.rb

@@ -4,43 +4,22 @@ module Brewer
   class Settings
 
     attr_accessor :settings
-    attr_reader :cache_file, :source
+    attr_reader :cache_file, :source_file
 
-    def initialize(testing=false)
+    def initialize(source_file: false, cache_file: false)
 
-      @source = adaptibrew_dir('print_settings.py')
-      @cache_file = brewer_dir('settings.yml')
+      @settings = {}
+      @source_file = source_file ? adaptibrew_dir(source_file) : adaptibrew_dir("print_settings.py")
+      @cache_file = cache_file ? brewer_dir(cache_file) : brewer_dir("settings.yml")
 
-      @settings = Hash.new
-
-      if !testing
-        Adaptibrew.new.clone
-
-        if !cache?
-          parse_and_cache
-        else
-          load_cached_settings
-        end
-
-        load_global
+      if !cache?
+        parse
+        cache
+      else
+        load_cached_settings
       end
-    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
-      end
-      false
+      load_global
     end
 
     # Checks if there are settings in the cache
@@ -51,11 +30,10 @@ module Brewer
       false
     end
 
-    # Parse the settings from @source into @settings
+    # Parse the settings from @source_file into @settings
     def parse
-      settings_file_output = `python #{@source}`.chomp
-      settings_array = settings_file_output.split("\n")
-      settings_array.each do |setting|
+      settings_file_output = `python #{@source_file}`.chomp
+      settings_file_output.split("\n").each do |setting|
         key, value = setting.match(/(.+)=(.+)/).captures
         @settings[key.strip.chomp] = value.strip.chomp
       end
@@ -64,12 +42,27 @@ module Brewer
 
     # Creates the cache if there isn't one already
     def create_cache
-      unless File.exists?(@cache_file)
-        File.open(@cache_file, 'w')
-      end
+      File.open(@cache_file, 'w')
       true
     end
 
+    # Stores the currents @settings in settings.yml
+    def cache
+      raise "Settings cache could not be created. Check permissions on ~/.brewer/" unless create_cache
+      store(@settings)
+      true
+    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
+      end
+      false
+    end
+
     # This will add a new element to the @settings hash
     # AND re-cache the settings
     def add(setting)
@@ -77,18 +70,6 @@ module Brewer
       setting.each do |key, value|
         @settings[key] = value
       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
-        end
-      }
       true
     end
 
@@ -116,6 +97,8 @@ module Brewer
       return true
     end
 
+    private
+
     # This method is r/badcode, i know
     def type_cast
       # Super janky
@@ -132,5 +115,16 @@ module Brewer
       })
     end
 
+    # This writes directly to the @cache_file file
+    def store(settings={})
+      raise "You must provide a hash to store" if settings.empty?
+      store = YAML::Store.new @cache_file
+      store.transaction {
+        settings.each do |setting, value|
+          store[setting] = value
+        end
+      }
+    end
+
   end
 end

data/lib/brewer/slacker.rb

@@ -12,7 +12,6 @@ module Brewer
       @slack = configure_slack(webhook)
     end
 
-    # This will look for a webhook in settings.yml and ask you for one if it doesn't find one
     def configure_slack(webhook)
       if webhook
         return Slack::Notifier.new webhook
@@ -33,21 +32,20 @@ module Brewer
       webhook_url
     end
 
-    # This sends a message in slack.
-    # If an array is passed in, it will send it as one message with
-    # new lines between each array item
-    def ping(message="ping at #{Time.now}")
-      @slack.ping(message)
+    def ping(message="Ping as #{Time.now}")
+      if message.is_a? Array
+        @slack.ping(message.join("\n"))
+      else
+        @slack.ping(message)
+      end
     end
 
-    # This does the same thing as Brewer#monitor, but it also sends a slack message
-    # after a specified wait, normally 10 minutes
     def monitor(delay=10)
       while true do
         table = @brewer.status_table
 
         before_temp = @brewer.pv
-        @brewer.wait(to_seconds(delay))
+        wait(to_seconds(delay))
         diff = @brewer.pv - before_temp
 
         clear_screen
@@ -58,7 +56,7 @@ module Brewer
           "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")}"
-        ].join("\n"))
+        ])
       end
       true
     end

data/spec/adaptibrew_spec.rb

@@ -6,7 +6,7 @@ describe Brewer::Adaptibrew do
 
   before :each do
     @adaptibrew = Adaptibrew.new
-    @adaptibrew.refresh
+    @adaptibrew.clone
   end
 
   after :all do
@@ -17,20 +17,11 @@ describe Brewer::Adaptibrew do
     it "makes a new Adaptibrew object" do
       expect(Adaptibrew.new).to be_an_instance_of Adaptibrew
     end
-
-    context "when the adaptibrew and brewer directories dont exist" do
-      before { FileUtils.rm_rf(brewer_dir) }
-      it "creates them" do
-        a = Adaptibrew.new
-        expect(Dir.exists?(brewer_dir)).to be true
-        expect(Dir.exists?(adaptibrew_dir)).to be true
-      end
-    end
   end
 
   describe ".clear" do
     context "when the repo exists" do
-      before  { @adaptibrew.clone    }
+      before  { @adaptibrew.clone }
       specify { expect(@adaptibrew.present?).to be true }
       it "deletes the repo and returns true" do
         expect(@adaptibrew.clear).to be true

data/spec/brewer_spec.rb

@@ -25,7 +25,7 @@ describe Brewer 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
-      @brewer.wait(1)
+      wait(1)
       expect(current_time + 1).to eq(Time.now.to_i)
     end
   end

data/spec/helpers_spec.rb

@@ -33,6 +33,12 @@ describe "Helpers" do
     end
   end
 
+  describe ".kitchen_dir" do
+    it "returns the path to the recipe storage dir" do
+      expect(kitchen_dir).to eq(Dir.home + "/.brewer/kitchen/")
+    end
+  end
+
   describe ".adaptibrew_dir" do
     it "returns the .adaptibrew directory" do
       expect(adaptibrew_dir).to eq(Dir.home + "/.brewer/adaptibrew/")
@@ -51,12 +57,6 @@ describe "Helpers" do
     end
   end
 
-  describe ".recipe_dir" do
-    it "returns the path to the recipe storage dir" do
-      expect(recipe_dir).to eq(Dir.home + "/.brewer/recipes/")
-    end
-  end
-
   describe ".dummy_recipe_vars" do
     it "returns a hash of dummy recipe vars" do
       dummy = dummy_recipe_vars

data/spec/kitchen_spec.rb

@@ -0,0 +1,173 @@
+require_relative 'spec_helper'
+
+describe Kitchen do
+  before :each do
+    @kitchen = Brewer::Kitchen.new
+  end
+
+  describe "#new" do
+    it "returns a kitchen object" do
+      expect(Brewer::Kitchen.new).to be_an_instance_of Brewer::Kitchen
+    end
+  end
+
+  describe ".present?" do
+    context "when the kitchen is there" do
+      before { @kitchen.clone }
+      it "returns true" do
+        expect(@kitchen.present?).to be true
+      end
+    end
+
+    context "when the kitchen is not there" do
+      before { @kitchen.clear }
+      it "returns false" do
+        expect(@kitchen.present?).to be false
+      end
+    end
+  end
+
+  describe ".clone" do
+    context "when the kitchen is not there" do
+      before { @kitchen.clear }
+      specify { expect(@kitchen.present?).to be false }
+      it "clones it" do
+        @kitchen.clone
+        expect(@kitchen.present?).to be true
+      end
+    end
+
+    context "when the kitchen is there" do
+      before { @kitchen.clone }
+      specify { expect(@kitchen.present?).to be true }
+      it "does nothing" do
+        expect(@kitchen.clone).to be false
+        expect(@kitchen.present?).to be true
+      end
+    end
+  end
+
+  describe ".clone" do
+    context "when the kitchen is there" do
+      before { @kitchen.clone }
+      specify { expect(@kitchen.present?).to be true }
+      it "returns false" do
+        expect(@kitchen.clone).to be false
+        expect(@kitchen.present?).to be true
+      end
+    end
+
+    context "when the kitchen is not there" do
+      before { @kitchen.clear }
+      specify{ expect(@kitchen.present?).to be false }
+      it "clones the kitchen and returns true" do
+        expect(@kitchen.clone).to be true
+        expect(@kitchen.present?).to be true
+      end
+    end
+  end
+
+  describe ".list_recipes" do
+    it "returns an array of recipes" do
+      expect(@kitchen.list_recipes).to be_an_instance_of Array
+    end
+  end
+
+  describe ".list_recipes_as_table" do
+    context "when the recipe list is empty" do
+      before {
+        @kitchen.clear
+        # Need an empty directory
+        Dir.mkdir(kitchen_dir)
+      }
+      it "returns a message" do
+        capture_stdout { expect(@kitchen.list_recipes_as_table).to eq("No Saved Recipes") }
+      end
+    end
+
+    context "when the recipe list is not empty" do
+      before { @kitchen.refresh }
+      it "returns a TerminalTable of the recipes" do
+        capture_stdout { expect(@kitchen.list_recipes_as_table).to be_an_instance_of Terminal::Table }
+      end
+    end
+  end
+
+  describe ".refresh" do
+    before { @kitchen.clone }
+    it "clears and clones the repo" do
+      expect(@kitchen.present?).to be true
+      expect(@kitchen.refresh).to be true
+      expect(@kitchen.present?).to be true
+    end
+  end
+
+  describe ".load" do
+    before { @kitchen.clone }
+    specify { expect(@kitchen.recipe_exists?("dummy_recipe")).to be true }
+    it "loads a recipe into the @recipe variable" do
+      expect(@kitchen.load("dummy_recipe")).to be true
+      expect(@kitchen.recipe).to be_an_instance_of Recipe
+    end
+  end
+
+  describe ".store" do
+    context "when a recipe is loaded" do
+      before {
+        @kitchen.recipe = Recipe.new(blank: true)
+        @kitchen.recipe.vars['name'] = "test_recipe"
+      }
+      it "stores the recipe" do
+        expect(@kitchen.store).to be true
+      end
+    end
+  end
+
+  describe ".recipe_exists?" do
+    context "when the recipe exists" do
+      before {
+        @kitchen.recipe = Brewer::Recipe.new(blank: true)
+        @kitchen.recipe.vars['name'] = "test_recipe"
+        @kitchen.store
+      }
+      it "returns true" do
+        expect(@kitchen.recipe_exists?("test_recipe")).to be true
+      end
+    end
+
+    context "when the recipe does not exist" do
+      it "returns false" do
+        expect(@kitchen.recipe_exists?("doesnt_exist")).to be false
+      end
+    end
+  end
+
+  describe ".loaded_recipe?" do
+    context "when there is a loaded recipe" do
+      before {
+        @kitchen.recipe = Brewer::Recipe.new(blank: true)
+        @kitchen.recipe.vars = dummy_recipe_vars
+      }
+      it "returns true" do
+        expect(@kitchen.load("dummy_recipe")).to be true
+        expect(@kitchen.loaded_recipe?).to be true
+      end
+    end
+
+    context "when there is not loaded recipe" do
+      before { @kitchen.recipe = nil }
+      it "returns false" do
+        expect(@kitchen.loaded_recipe?).to be false
+      end
+    end
+  end
+
+  describe ".delete_recipe" do
+    it "deletes a recipe" do
+      expect(@kitchen.recipe_exists?("dummy_recipe")).to be true
+      expect(@kitchen.delete_recipe("dummy_recipe")).to be true
+      expect(@kitchen.recipe_exists?("dummy_recipe")).to be false
+    end
+  end
+
+end

data/spec/recipe_spec.rb

@@ -1,100 +1,19 @@
 require_relative "spec_helper"
-require 'fileutils'
 
-include Helpers
-
-describe Recipe do
+describe Brewer::Recipe do
   before :each do
-    @brewer = Brewer::Brewer.new
-    @recipe = Brewer::Recipe.new(@brewer)
-    @recipe.new_dummy
-    @recipe.store
+    @kitchen = Brewer::Kitchen.new
+    @kitchen.recipe.vars = dummy_recipe_vars
+    @kitchen.store
+    @recipe = Brewer::Recipe.new("dummy_recipe")
   end
 
   describe "#new" do
     it "returns a new recipe object" do
-      expect(Brewer::Recipe.new(@brewer)).to be_an_instance_of Brewer::Recipe
-    end
-  end
-
-  describe ".new_dummy" do
-    before { @recipe.clear }
-    it "returns a new dummy recipe" do
-      expect(@recipe.vars).to be_empty
-      @recipe.new_dummy
-      expect(@recipe.vars).not_to be_empty
-      expect(@recipe.vars['name']).to eq("dummy_recipe")
-    end
-  end
-
-  describe ".make_recipe_dir" do
-    before  { FileUtils.rm_rf(recipe_dir) }
-    specify { !Dir.exists?(recipe_dir)    }
-    it "makes the recipe storage directory" do
-      expect(@recipe.make_recipe_dir).to be true
-    end
-    specify { Dir.exists?(recipe_dir) }
-  end
-
-  describe ".store" do
-    context "when there is a loaded recipe" do
-      before { @recipe.delete_recipe_file }
-      it "stores the loaded recipe" do
-        expect(@recipe.loaded_recipe?).to be false
-        @recipe.store
-        expect(@recipe.loaded_recipe?).to be true
-      end
-    end
-
-    context "when there is no loaded recipe" do
-      before { @recipe.clear }
-      specify { expect(@recipe.vars).to be_empty }
-      it "raises an exception" do
-        expect { @recipe.store }.to raise_error(/store/)
-      end
+      expect(Brewer::Recipe.new(blank: true)).to be_an_instance_of Brewer::Recipe
+      expect(Brewer::Recipe.new("dummy_recipe")).to be_an_instance_of Brewer::Recipe
     end
   end
 
-  describe ".load" do
-    context "when the recipe exists" do
-      before { @recipe.clear }
-      it "loads the recipe" do
-        capture_stdout { expect(@recipe.load("dummy_recipe")).to be true }
-        expect(@recipe.loaded_recipe?).to be true
-      end
-    end
-
-    context "when the recipe does not exist" do
-      it "raises an error" do
-        expect { @recipe.load("not_a_real_recipe") }.to raise_error(/does not exist/)
-      end
-    end
-  end
-
-  describe ".list_recipes" do
-    it "returns an array of recipes" do
-      expect(@recipe.list_recipes).to be_an_instance_of Array
-      expect(@recipe.list_recipes).not_to be_empty
-    end
-  end
-
-  describe ".list_as_table" do
-    context "when there are no recipes" do
-      before { FileUtils.rm_rf(Dir.glob(recipe_dir("*"))) }
-      it "returns without a table" do
-        expect(@recipe.list_as_table).to eq("No Saved Recipes.")
-      end
-    end
-
-    context "when there are recipes" do
-      before {
-        @recipe.new_dummy
-        @recipe.store
-      }
-      it "returns a TerminalTable" do
-        expect(@recipe.list_as_table).to be_an_instance_of Terminal::Table
-      end
-    end
-  end
 
 end

data/spec/settings_spec.rb

@@ -5,13 +5,14 @@ describe Settings do
 
   before :all do
     @adaptibrew = Adaptibrew.new.clone
-    @settings = Settings.new(true)
+    @settings = Settings.new(cache_file: "test_settings.yml")
   end
 
   describe ".load_cached_settings" do
     context "when there are cached settings" do
       before {
-        @settings.parse_and_cache
+        @settings.parse
+        @settings.cache
         @settings.settings = {}
       }
 
@@ -35,7 +36,8 @@ describe Settings do
   describe ".cache?" do
     context "when the cache exists" do
       before {
-        @settings.parse_and_cache
+        @settings.parse
+        @settings.cache
       }
       it "returns true" do
         expect(@settings.cache?).to be true
@@ -62,7 +64,10 @@ describe Settings do
 
   describe ".create_cache" do
     context "when the cache exists" do
-      before { @settings.parse_and_cache }
+      before {
+        @settings.parse
+        @settings.cache
+      }
 
       specify { expect(@settings.cache?).to be true }
       it "returns true" do
@@ -82,7 +87,7 @@ describe Settings do
   end
 
   describe ".add" do
-    before { @settings = Settings.new }
+    before { @settings = Settings.new(cache_file: "test_settings.yml") }
     specify { expect(@settings.settings['test_key']).to be nil }
     it "adds a new setting to the cache" do
       @settings.add({'test_key' => 'test_value'})
@@ -102,7 +107,10 @@ describe Settings do
   end
 
   describe ".clear_cache" do
-    before { @settings.parse_and_cache}
+    before {
+      @settings.parse
+      @settings.cache
+    }
 
     specify { expect(@settings.cache?).to be true }
     it "deletes the cache file" do
@@ -119,7 +127,10 @@ describe Settings do
   end
 
   describe ".change" do
-    before { @settings.parse_and_cache }
+    before {
+      @settings.parse
+      @settings.cache
+    }
 
     specify { expect(@settings.settings['DEBUG'].to_b).to be false}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brewer
 version: !ruby/object:Gem::Version
-  version: 0.0.97
+  version: 0.0.98
 platform: ruby
 authors:
 - Luke Sweeney
@@ -251,6 +251,7 @@ files:
 - lib/brewer/adaptibrew.rb
 - lib/brewer/brewer.rb
 - lib/brewer/helpers.rb
+- lib/brewer/kitchen.rb
 - lib/brewer/procedures.rb
 - lib/brewer/recipe.rb
 - lib/brewer/settings.rb
@@ -260,6 +261,7 @@ files:
 - spec/brewer_spec.rb
 - spec/hardware_spec.rb
 - spec/helpers_spec.rb
+- spec/kitchen_spec.rb
 - spec/recipe_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
@@ -293,6 +295,7 @@ test_files:
 - spec/brewer_spec.rb
 - spec/hardware_spec.rb
 - spec/helpers_spec.rb
+- spec/kitchen_spec.rb
 - spec/recipe_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb