brewer 0.0.98 → 0.0.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad359c3a32aaadf2c8c915016a25826a42be6a53
-  data.tar.gz: 9a7bf80ab7832cd3b7d54fcaf8268a7896f91167
+  metadata.gz: 27936fae5bc6ff03cde72555ce4532338399db01
+  data.tar.gz: 8b7171fb4426d690a2862590783be76bf2af2966
 SHA512:
-  metadata.gz: 0cd35a5382e5d37df326473777e9a179009f0d8c8a91db6510ce071df40897f8645ede980201d4a9993360b6a0356c4f2651c59cc679ea87f05bcd277998325e
-  data.tar.gz: 139e62eaefece3c38a0acf40ec4981d7e378a37e3299fad82b2a976f07567e75b7af2591839eb514a0f6a245e6ea2664ed090fa0302899caf98c44371bfc62e5
+  metadata.gz: 02213a68d2b6466916269d4848e4893544f84b3dec809aa7f889e28a3624100d8349f6ca09aaff4f7c8a6200937a09f4cb717de8e558eb50c142328806f39166
+  data.tar.gz: 6eb2b4e3fa2d476ae0c48a47e94b6bb70b6241dd67b6836a9b24befdf01cab55cf93e0ac9dd6bf7e5a3d34c1ab6956bd7a722e2645ba4095ca2f16ea37893807

data/Gemfile.lock

@@ -0,0 +1,73 @@
+PATH
+  remote: .
+  specs:
+    brewer (0.0.98)
+      brewer-adaptibrew
+      git (~> 1.3, >= 1.3.0)
+      net-ping (~> 1.7)
+      pry
+      rainbow
+      require_all
+      slack-notifier (= 2.1)
+      terminal-table
+      wannabe_bool
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    brewer-adaptibrew (0.1.2)
+      git (~> 1.3, >= 1.3.0)
+    coderay (1.1.1)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    git (1.3.0)
+    json (2.1.0)
+    method_source (0.8.2)
+    net-ping (1.7.8)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.0)
+    rdoc (5.1.0)
+    require_all (1.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.1)
+    slack-notifier (2.1.0)
+    slop (3.6.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.2.1)
+    wannabe_bool (0.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  brewer!
+  rake (~> 12.0, >= 12.0.0)
+  rdoc (~> 5.1, >= 5.1.0)
+  rspec (~> 3.5.0, >= 3.5.0)
+  simplecov (~> 0.13.0)
+  simplecov-html (~> 0.10.0)
+
+BUNDLED WITH
+   1.14.6

data/Rakefile

@@ -1,31 +1,14 @@
 require 'git'
-require 'launchy'
 require 'rdoc/task'
 require 'rspec/core/rake_task'
 
 task default: %w[spec]
 
-# Unit testing
-# You can specify a specific test case to use
-# rake spec SPEC=spec/adaptibrew_spec.rb SPEC_OPTS="-e \"#new\""
-#
-# task :spec, [:tc] do |t, tc|
-#   RSpec::Core::RakeTask.new(:spec)
-# end
-
 RSpec::Core::RakeTask.new do |t|
   t.pattern = "spec/*_spec.rb"
   t.verbose = false
 end
 
-# Opens code coverage in your browser
-# This may be a bit shaky. Only tested on Mac.
-# TODO: test on windows
-# You can just open 'coverage/index.html' in your browser.
-task :coverage do
-  Launchy.open(Dir.pwd + '/coverage/index.html')
-end
-
 # Generate or update documentation
 # Generates in `doc/`
 RDoc::Task.new do |rdoc|

data/bin/brewer

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
 require_relative "../lib/brewer"
 
-adaptibrew  = Brewer::Adaptibrew.new
-adaptibrew.refresh
+Brewer::Adaptibrew::build
 
 kitchen     = Brewer::Kitchen.new
 slack       = Brewer::Slacker.new
-brewer      = Brewer::Brewer.new
+controller  = Brewer::Controller.new
 procedures  = Brewer::Procedures.new
 
 binding.pry(quiet: true)

data/lib/brewer.rb

@@ -3,3 +3,6 @@ require_relative "gems"
 require_rel 'brewer/'
 
 include Helpers
+include Brewer
+
+Brewer::Adaptibrew::build

data/lib/brewer/{brewer.rb → controller.rb}

@@ -3,19 +3,14 @@ require_relative "../brewer"
 module Brewer
   # This class handles the physical brewing rig.
   # Turning on valves, the pump, RIMS and such
-  class Brewer
+  class Controller
 
     attr_reader :base_path
     attr_accessor :temps, :relays
 
     def initialize
-      if !Dir.exists?(brewer_dir)
-        # :nocov:
-        Dir.mkdir(brewer_dir)
-        # :nocov:
-      end
       @base_path = Dir.home + '/.brewer'
-      Settings.new
+      Brewer::load_settings
       @temps = {}
     end
 

data/lib/brewer/helpers.rb

@@ -90,4 +90,9 @@ module Helpers
     }
   end
 
+  def dd(message="died here")
+    puts message
+    abort
+  end
+
 end

data/lib/brewer/kitchen.rb

@@ -85,7 +85,7 @@ module Brewer
         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
+        return true
       end
     end
 

data/lib/brewer/procedures.rb

@@ -6,7 +6,7 @@ module Brewer
     attr_accessor :com, :brewer, :recipe
 
     def initialize
-      @brewer = Brewer.new
+      @controller = Controller.new
       @com = Slacker.new
       @kitchen = Kitchen.new
     end
@@ -34,7 +34,7 @@ module Brewer
 
     def boot
       puts Rainbow("Booting...").yellow
-      @brewer.relay_config({
+      @controller.relay_config({
         'pid' => 0,
         'pump' => 0,
         'rims_to' => 'mash',
@@ -61,17 +61,17 @@ module Brewer
       confirm ? nil : abort
 
       # confirm RIMS relay is on
-      @brewer.rims_to('mash')
+      @controller.rims_to('mash')
 
       # turn on pump
-      @brewer.pump(1)
+      @controller.pump(1)
 
       print Rainbow("Is the pump running properly? ").yellow
       unless confirm
         puts "restarting pump"
-        @brewer.pump(0)
+        @controller.pump(0)
         wait(2)
-        @brewer.pump(1)
+        @controller.pump(1)
       end
 
       # confirm that strike water is circulating well
@@ -82,26 +82,26 @@ module Brewer
 
       # calculate strike temp & set PID to strike temp
       # this sets PID SV to calculated strike temp automagically
-      @brewer.sv(@kitchen.recipe.vars['strike_water_temp'])
+      @controller.sv(@kitchen.recipe.vars['strike_water_temp'])
       puts "SV has been set to calculated strike water temp"
       # turn on RIMS heater
-      @brewer.pid(1)
+      @controller.pid(1)
 
       # measure current strike water temp and save
-      @kitchen.recipe.vars['starting_strike_temp'] = @brewer.pv
-      puts "current strike water temp is #{@brewer.pv}."
-      puts "Heating to #{@brewer.sv}"
+      @kitchen.recipe.vars['starting_strike_temp'] = @controller.pv
+      puts "current strike water temp is #{@controller.pv}."
+      puts "Heating to #{@controller.sv}"
 
       @com.ping("Strike water beginning to heat. This may take a few minutes.")
 
       # when strike temp is reached, @com.ping slack
-      @brewer.watch
+      @controller.watch
       puts Rainbow("Strike water heated. Maintaining temp.").green
       true
     end
 
     def dough_in
-      @brewer.relay_config({
+      @controller.relay_config({
         'pid' => 0,
         'pump' => 0
       })
@@ -117,18 +117,18 @@ module Brewer
     end
 
     def mash
-      @brewer.sv(@kitchen.recipe.vars['mash_temp'])
+      @controller.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.")
 
-      @brewer.relay_config({
+      @controller.relay_config({
         'rims_to' => 'mash',
         'pid'  => 1,
         'pump' => 1
       })
 
-      @brewer.watch
+      @controller.watch
       @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.")
@@ -141,15 +141,15 @@ module Brewer
       puts Rainbow("start heating sparge water").yellow
       puts Rainbow("Mashout started").green
 
-      @brewer.sv(@kitchen.recipe.vars['mashout_temp'])
+      @controller.sv(@kitchen.recipe.vars['mashout_temp'])
 
-      @brewer.relay_config({
+      @controller.relay_config({
         'pid'  => 1,
         'pump' => 1
       })
-      @com.ping("Heating to #{@brewer.sv}... this could take a few minutes.")
-      puts Rainbow("Heating to #{@brewer.sv}... this could take a few minutes.").yellow
-      @brewer.watch
+      @com.ping("Heating to #{@controller.sv}... this could take a few minutes.")
+      puts Rainbow("Heating to #{@controller.sv}... this could take a few minutes.").yellow
+      @controller.watch
       @com.ping("Mashout complete.")
       puts Rainbow("Mashout complete").green
     end
@@ -160,7 +160,7 @@ module Brewer
 
       puts Rainbow("Sparging started").green
 
-      @brewer.relay_config({
+      @controller.relay_config({
         'hlt_to' => 'mash',
         'hlt' => 1
       })
@@ -169,7 +169,7 @@ module Brewer
       puts Rainbow("Regulate sparge balance.").yellow
       wait(10)
 
-      @brewer.relay_config({
+      @controller.relay_config({
         'rims_to' => 'boil',
         'pump' => 1
       })
@@ -180,7 +180,7 @@ module Brewer
       print Rainbow("Waiting for intervention to turn off pump (y): ").yellow
       confirm ? nil : nil
 
-      @brewer.relay_config({
+      @controller.relay_config({
         'pid' => 0,
         'pump' => 0,
         'hlt' => 0
@@ -193,7 +193,7 @@ module Brewer
     def top_off
       puts Rainbow("Top off started").green
 
-      @brewer.relay_config({
+      @controller.relay_config({
         'hlt_to' => 'boil',
         'hlt' => 1
       })
@@ -201,7 +201,7 @@ module Brewer
       print Rainbow("waiting for intervention to turn off hlt (y): ").yellow
       confirm ? nil : abort
 
-      @brewer.hlt(0)
+      @controller.hlt(0)
 
       @com.ping('Topping off complete')
       puts Rainbow("Topping off complete").green

data/lib/brewer/recipe.rb

@@ -6,9 +6,10 @@ module Brewer
     attr_accessor :vars
 
     def initialize(name=nil, blank: false)
-      @brewer = Brewer.new
+      @controller = Controller.new
 
       @vars = {}
+
       if blank
         return true
       end
@@ -37,7 +38,7 @@ module Brewer
       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("Current grain temp (#{@controller.pv.to_s} F): ").ask_for("grain_temp", default: @controller.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)
@@ -50,7 +51,7 @@ module Brewer
 
     # :nocov:
     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
+      @vars['strike_water_temp'] = @controller.script('get_strike_temp', "#{@vars['water']} #{@vars['grain']} #{@vars['grain_temp']} #{@vars['desired_mash_temp']}").to_f
     end
     # :nocov:
 

data/lib/brewer/settings.rb

@@ -1,5 +1,3 @@
-require_relative "adaptibrew"
-
 module Brewer
   class Settings
 
@@ -12,11 +10,11 @@ module Brewer
       @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")
 
-      if !cache?
+      if cache?
+        load_cached_settings
+      else
         parse
         cache
-      else
-        load_cached_settings
       end
 
       load_global
@@ -128,3 +126,17 @@ module Brewer
 
   end
 end
+
+
+module Brewer
+  def self.load_settings
+    settings = Settings.new
+    if !settings.cache?
+      settings.parse
+      settings.cache
+    else
+      settings.load_cached_settings
+    end
+    settings.load_global
+  end
+end

data/lib/brewer/slacker.rb

@@ -1,14 +1,15 @@
 require_relative "../brewer"
+
 # :nocov:
 module Brewer
   # This class is responsible for slack communication
   class Slacker
 
-    attr_accessor :slack, :brewer
+    attr_accessor :slack, :controller
 
     def initialize(webhook=false)
       @settings = Settings.new
-      @brewer = Brewer.new
+      @controller = Controller.new
       @slack = configure_slack(webhook)
     end
 
@@ -42,18 +43,18 @@ module Brewer
 
     def monitor(delay=10)
       while true do
-        table = @brewer.status_table
+        table = @controller.status_table
 
-        before_temp = @brewer.pv
+        before_temp = @controller.pv
         wait(to_seconds(delay))
-        diff = @brewer.pv - before_temp
+        diff = @controller.pv - before_temp
 
         clear_screen
         puts table
 
         ping([
-          "Current Temperature: #{@brewer.pid['pv_temp']} F",
-          "Set Value Temperature: #{@brewer.pid['sv_temp']} F",
+          "Current Temperature: #{@controller.pid['pv_temp']} F",
+          "Set Value Temperature: #{@controller.pid['sv_temp']} F",
           "Current temperature has climed #{diff} F since #{delay} minute(s) ago",
           "Sent at #{Time.now.strftime("%H:%M")}"
         ])

data/lib/gems.rb

@@ -1,11 +1,18 @@
 require 'pry'
-require "require_all"
+require 'require_all'
 require 'git'
 require 'fileutils'
+# `slack-notifier` version 2.2 is currently broken. These lines fix it,
+# but I am using 2.1 in my gebremspec until it gets patched.
+#
+# module Slack; end
+# class Slack::Notifier; end
+
 require 'slack-notifier'
 require 'yaml'
 require 'yaml/store'
 require 'net/ping'
 require 'wannabe_bool'
 require 'terminal-table'
-require "rainbow"
+require 'rainbow'
+require 'brewer/adaptibrew'

data/spec/adaptibrew_spec.rb

@@ -1,102 +1,18 @@
-require_relative 'spec_helper'
-
-include Helpers
+require "spec_helper"
 
 describe Brewer::Adaptibrew do
 
-  before :each do
-    @adaptibrew = Adaptibrew.new
-    @adaptibrew.clone
-  end
-
-  after :all do
-    Adaptibrew.new.clone
+  it "has a version number" do
+    expect(Brewer::Adaptibrew::VERSION).not_to be_empty
   end
 
-  describe "#new" do
-    it "makes a new Adaptibrew object" do
-      expect(Adaptibrew.new).to be_an_instance_of Adaptibrew
-    end
+  before {
+    FileUtils.rm_rf(Dir.home + "/.brewer")
+  }
+  
+  it "can build" do
+    expect(Dir.exists?(Dir.home + "/.brewer")).to be false
+    expect(Brewer::Adaptibrew::build).to be true
+    expect(Dir.exists?(Dir.home + "/.brewer")).to be true
   end
-
-  describe ".clear" do
-    context "when the repo exists" do
-      before  { @adaptibrew.clone }
-      specify { expect(@adaptibrew.present?).to be true }
-      it "deletes the repo and returns true" do
-        expect(@adaptibrew.clear).to be true
-        expect(@adaptibrew.present?).to be false
-      end
-    end
-
-    context "when the repo does not exist" do
-      before  { @adaptibrew.clear }
-      specify { expect(@adaptibrew.present?).to be false }
-      it "does nothing and returns false" do
-        expect(@adaptibrew.clear).to be false
-        expect(@adaptibrew.present?).to be false
-      end
-    end
-  end
-
-  describe ".clone" do
-    context "when the repo exists" do
-      before { @adaptibrew.clone }
-      it "does nothing and returns false" do
-        expect(@adaptibrew.clone).to be false
-        expect(@adaptibrew.present?).to be true
-      end
-    end
-
-    context "when the repo does not exist" do
-      before { @adaptibrew.clear }
-      it "clones it and returns true" do
-        expect(@adaptibrew.clone).to be true
-        expect(@adaptibrew.present?).to be true
-      end
-    end
-
-    context "when network operations are disabled" do
-      # Clearing it here so that @adaptibrew.clone would otherwise return true
-      before { @adaptibrew.clear}
-      before { @adaptibrew.disable_network_operations = true}
-      it "does nothing and returns false" do
-        expect(@adaptibrew.clone).to be false
-      end
-      after { @adaptibrew.disable_network_operations = false}
-    end
-  end
-
-  describe ".refresh" do
-    context "when network operations are disabled" do
-      before { @adaptibrew.disable_network_operations = true}
-      it "does nothing and returns false" do
-        expect(@adaptibrew.refresh).to be false
-      end
-      after { @adaptibrew.disable_network_operations = false}
-    end
-
-    it "clears and clones the repo then returns true" do
-      expect(@adaptibrew.refresh).to be true
-    end
-  end
-
-  describe ".present?" do
-    context "when the exists" do
-      before { @adaptibrew.clone }
-      specify { expect(Dir.exists?(adaptibrew_dir)).to be true }
-      it "returns true" do
-        expect(@adaptibrew.present?).to be true
-      end
-    end
-
-    context "when the repo does not exist" do
-      before { @adaptibrew.clear }
-      specify { expect(Dir.exists?(adaptibrew_dir)).to be false }
-      it "returns false" do
-        expect(@adaptibrew.present?).to be false
-      end
-    end
-  end
-
 end

data/spec/brewer_spec.rb

@@ -1,21 +1,21 @@
 require_relative 'spec_helper'
 
-describe Brewer do
+describe Brewer::Controller do
 
   before :each do
-    @brewer = Brewer::Brewer.new
+    @controller = Brewer::Controller.new
   end
 
   before :all do
-    Adaptibrew.new.refresh
+    Brewer::Adaptibrew::build
   end
 
   describe "#new" do
     it "returns a brewer object" do
-      expect(Brewer::Brewer.new).to be_an_instance_of Brewer::Brewer
+      expect(Brewer::Controller.new).to be_an_instance_of Brewer::Controller
     end
     it "does not accept args" do
-      expect {Brewer::Brewer.new('heres an arg')}.to raise_exception(ArgumentError)
+      expect {Brewer::Controller.new('heres an arg')}.to raise_exception(ArgumentError)
     end
   end
 
@@ -32,7 +32,7 @@ describe Brewer do
 
   describe ".script" do
     it "can run a python script and get output" do
-      expect(@brewer.script('python_tester')).to eq("it worked")
+      expect(@controller.script('python_tester')).to eq("it worked")
     end
   end
 

data/spec/hardware_spec.rb

@@ -1,18 +1,18 @@
 require_relative 'spec_helper'
 
-describe Brewer do
+describe Brewer::Controller do
   before :each do
-    @brewer = Brewer::Brewer.new
+    @controller = Brewer::Controller.new
   end
 
   before :all do
-    Brewer::Adaptibrew.new.refresh
+    Brewer::Adaptibrew::build
   end
 
   after :all do
     # in case something goes wrong, everything needs to be reset
-    @brewer = Brewer::Brewer.new
-    @brewer.relay_config({
+    @controller = Brewer::Controller.new
+    @controller.relay_config({
       'pump' => 0,
       'pid' => 0,
       'rims_to' => 'mash',
@@ -24,84 +24,84 @@ describe Brewer do
   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")
+      expect(@controller.pump(1)).to eq("pump on")
     end
 
     # If the pump is already off it does nothing
     it "turns the pump off" do
-      expect(@brewer.pump(0)).to eq("pump off")
+      expect(@controller.pump(0)).to eq("pump off")
     end
 
     it "returns the pump status" do
-      expect(@brewer.pump).to be_an_instance_of String
+      expect(@controller.pump).to be_an_instance_of String
     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) }
+      before { @controller.pid(1) }
       it "turns the pump and pid off" do
-        expect(@brewer.pump(0)).to eq("pump off")
+        expect(@controller.pump(0)).to eq("pump off")
       end
     end
   end
 
   describe ".relay" do
     it "turns the relay on" do
-      expect(@brewer.relay(2, 1)).to be true
+      expect(@controller.relay(2, 1)).to be true
     end
 
     it "turns the relay off" do
-      expect(@brewer.relay(2, 0)).to be true
+      expect(@controller.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")
+      expect(@controller.pid(1)).to eq("Pump and PID are now on")
     end
 
     it "turns the pid off" do
-      expect(@brewer.pid(0)).to eq("PID off")
+      expect(@controller.pid(0)).to eq("PID off")
     end
 
     it "returns the pid status" do
-      expect(@brewer.pid).to be_an_instance_of Hash
+      expect(@controller.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 Float
+        expect(@controller.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 Float
+        expect(@controller.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 Float
+      expect(@controller.pv).to be_an_instance_of Float
     end
   end
 
   describe ".relay_status" do
     it "returns the status of a relay" do
-      @brewer.relay($settings['rimsToMash'], 1)
-      expect(@brewer.relay_status($settings['rimsToMash'].to_i)).to eq("on")
-      @brewer.relay($settings['rimsToMash'], 0)
-      expect(@brewer.relay_status($settings['rimsToMash'].to_i)).to eq("off")
+      @controller.relay($settings['rimsToMash'], 1)
+      expect(@controller.relay_status($settings['rimsToMash'].to_i)).to eq("on")
+      @controller.relay($settings['rimsToMash'], 0)
+      expect(@controller.relay_status($settings['rimsToMash'].to_i)).to eq("off")
     end
   end
 
   describe ".relays_status" do
     it "returns the status of the 4 main relays" do
-      statuses = @brewer.relays_status
+      statuses = @controller.relays_status
       expect(statuses).to be_an_instance_of Hash
       expect(statuses).to_not be_empty
       expect(statuses['hlt']).to be_an_instance_of String
@@ -110,55 +110,55 @@ describe Brewer do
 
   describe ".status_table" do
     it "returns a current status table" do
-      expect(@brewer.status_table).to be_an_instance_of Terminal::Table
+      expect(@controller.status_table).to be_an_instance_of Terminal::Table
     end
   end
 
   describe ".relay_config" do
     it "sets the relays to the configuration" do
-      @brewer.relay_config({
+      @controller.relay_config({
         'hlt' => 1,
         'pump' => 0,
       })
-      expect(@brewer.relay_status($settings['hlt'])).to eq("on")
+      expect(@controller.relay_status($settings['hlt'])).to eq("on")
     end
   end
 
   describe ".hlt" do
     it "opens or closes the hlt valve" do
-      @brewer.hlt(0)
-      expect(@brewer.relay_status($settings['hlt'])).to eq("off")
-      @brewer.hlt(1)
-      expect(@brewer.relay_status($settings['hlt'])).to eq("on")
+      @controller.hlt(0)
+      expect(@controller.relay_status($settings['hlt'])).to eq("off")
+      @controller.hlt(1)
+      expect(@controller.relay_status($settings['hlt'])).to eq("on")
     end
   end
 
   describe ".rims_to" do
     it "diverts the rims relay to boil or mash tuns" do
-      @brewer.rims_to("boil")
-      expect(@brewer.relay_status($settings['rimsToMash'])).to eq("on")
-      @brewer.rims_to("mash")
-      expect(@brewer.relay_status($settings['rimsToMash'])).to eq("off")
+      @controller.rims_to("boil")
+      expect(@controller.relay_status($settings['rimsToMash'])).to eq("on")
+      @controller.rims_to("mash")
+      expect(@controller.relay_status($settings['rimsToMash'])).to eq("off")
     end
 
     context "when the location is not valid" do
       it "raises an error" do
-        expect { @brewer.rims_to("not_valid") }.to raise_error(/valid location/)
+        expect { @controller.rims_to("not_valid") }.to raise_error(/valid location/)
       end
     end
   end
 
   describe ".hlt_to" do
     it "diverts the hlt relay to boil or mash tuns" do
-      @brewer.hlt_to("boil")
-      expect(@brewer.relay_status($settings['hltToMash'])).to eq("on")
-      @brewer.hlt_to("mash")
-      expect(@brewer.relay_status($settings['hltToMash'])).to eq("off")
+      @controller.hlt_to("boil")
+      expect(@controller.relay_status($settings['hltToMash'])).to eq("on")
+      @controller.hlt_to("mash")
+      expect(@controller.relay_status($settings['hltToMash'])).to eq("off")
     end
 
     context "when the location is not valid" do
       it "raises an error" do
-        expect { @brewer.hlt_to("not_valid") }.to raise_error(/valid location/)
+        expect { @controller.hlt_to("not_valid") }.to raise_error(/valid location/)
       end
     end
   end

data/spec/helpers_spec.rb

@@ -2,7 +2,7 @@ require_relative 'spec_helper'
 
 include Helpers
 
-describe "Helpers" do
+describe Helpers do
 
   describe "#time" do
     it "can return the date/time" do

data/spec/kitchen_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'spec_helper'
 
-describe Kitchen do
+describe Brewer::Kitchen do
   before :each do
     @kitchen = Brewer::Kitchen.new
   end
@@ -88,7 +88,7 @@ describe Kitchen do
     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 }
+        capture_stdout { expect(@kitchen.list_recipes_as_table).to be true }
       end
     end
   end

data/spec/settings_spec.rb

@@ -1,10 +1,10 @@
 require_relative 'spec_helper'
 
 
-describe Settings do
+describe Brewer::Settings do
 
   before :all do
-    @adaptibrew = Adaptibrew.new.clone
+    Brewer::Adaptibrew::build
     @settings = Settings.new(cache_file: "test_settings.yml")
   end
 

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 # This is the helper file for rspec
 # For the spec of helpers.rb, see helper_spec.b
+
 # Code Coverage
 require 'simplecov'
 SimpleCov.command_name 'RSpec'
@@ -9,3 +10,5 @@ require_relative "../lib/brewer"
 
 include Helpers
 include Brewer
+
+Brewer::Adaptibrew::build

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brewer
 version: !ruby/object:Gem::Version
-  version: 0.0.98
+  version: 0.0.99
 platform: ruby
 authors:
 - Luke Sweeney
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: brewer-adaptibrew
+  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: git
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +76,16 @@ dependencies:
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
@@ -168,26 +182,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -244,12 +238,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bin/brewer
 - lib/brewer.rb
-- lib/brewer/adaptibrew.rb
-- lib/brewer/brewer.rb
+- lib/brewer/controller.rb
 - lib/brewer/helpers.rb
 - lib/brewer/kitchen.rb
 - lib/brewer/procedures.rb
@@ -286,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A shell interface for adaptibrew

data/lib/brewer/adaptibrew.rb

@@ -1,60 +0,0 @@
-require_relative "helpers.rb"
-
-include Helpers
-
-module Brewer
-  class Adaptibrew
-
-    attr_accessor :disable_network_operations
-
-    def initialize
-      @disable_network_operations = network? ? false : true
-      @adaptibrew_url = 'https://github.com/llamicron/adaptibrew.git'
-
-      unless Dir.exists?(brewer_dir)
-        Dir.mkdir(brewer_dir)
-      end
-    end
-
-    def clone
-      if @disable_network_operations
-        return false
-      end
-
-      if !present?
-        Git.clone(@adaptibrew_url, 'adaptibrew', :path => brewer_dir)
-        return true
-      end
-      false
-    end
-
-    def clear
-      if @disable_network_operations
-        return false
-      end
-
-      if present?
-        FileUtils.rm_rf(adaptibrew_dir)
-        return true
-      end
-      false
-    end
-
-    def refresh
-      if clear and clone
-        return true
-      end
-      false
-    end
-
-    def present?
-      if Dir.exists?(adaptibrew_dir)
-        if Dir.entries(adaptibrew_dir).length > 2
-          return true
-        end
-      end
-      false
-    end
-
-  end
-end