brewer 0.0.91 → 0.0.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 746d9ad1ef9499a452104dafee8d2050ee9e23e6
-  data.tar.gz: 411773a35835954dd35f7052c039210b5293890d
+  metadata.gz: 4c755e13a364fc36a15b6b6bf8322eb659a0e989
+  data.tar.gz: 0cd30f9c517ba49a9c1df3fd85dc56d20274237b
 SHA512:
-  metadata.gz: a0dc5c48f26a7ed2f82a474299b937c64cf7db558661e1d7655771db5119e856ca668652bf0574d19a5f2e292405245c5a3d2532ae5c6e8c17603ba2c34bdceb
-  data.tar.gz: 344adf9d708285bfd486fd3852dfae0100c5d639dab074a7e8a7c089f9d2a298f3f4339d8f485c33198cf0c144362d879122785a328eddb999408ab9a5bf4500
+  metadata.gz: 1faa193fad4f23676479df686d0116df05197a8fd5bb22232ffbcc3dd937068e5ed7f0125913c28b2ef9e4540236037cb20a800e78dd642f5f8f7e173a321087
+  data.tar.gz: 7a2d2de0a3b03a981f2569958c505be5313c5312f51492252a9f52eb4c92766caa0397a864ad47dc43648fea6d5a0733d37234d3518289c35ac35c858c55b637

data/bin/brewer

@@ -6,6 +6,5 @@ slack         = Brewer::Slacker.new
 brewer      = Brewer::Brewer.new
 procedures  = Brewer::Procedures.new
 
-puts "🍺  have fun 🍺"
 binding.pry(quiet: true)
 # 🍺🍺🍺

data/lib/brewer/adaptibrew.rb

@@ -3,50 +3,49 @@ require_relative "helpers.rb"
 include Helpers
 
 module Brewer
-  # This class handles the adaptibrew repo
-  # It is stored in ~/.brewer/adaptibrew/
   class Adaptibrew
 
+    attr_accessor :disable_network_operations
+
     def initialize
+      @disable_network_operations = network? ? false : true
+      @adaptibrew_url = 'https://github.com/llamicron/adaptibrew.git'
+
       if !Dir.exists?(adaptibrew_dir)
         Dir.mkdir(adaptibrew_dir)
       end
     end
 
-    # This will clone adaptibrew into ~/.brewer/adaptibrew/
     def clone
-      raise "🛑  Cannot clone, no network connection" unless network?
+      if @disable_network_operations
+        return false
+      end
 
       if !Dir.exists?(adaptibrew_dir)
-        Git.clone('https://github.com/llamicron/adaptibrew.git', 'adaptibrew', :path => brewer_dir)
+        Git.clone(@adaptibrew_url, 'adaptibrew', :path => brewer_dir)
+        return true
       end
-
-      self
+      false
     end
 
-    # Danger zone...
-    # This deletes adaptibrew
     def clear
-      # :nocov: since this requires network to be off
-      if !network?
-        print "Warning: you have no network connection. If you clear, you will not be able to clone again, and you'll be stuck without the adaptibrew source. Are you sure? "
-        confirm ? nil : abort
+      if @disable_network_operations
+        return false
+      end
+      if present?
+        FileUtils.rm_rf(adaptibrew_dir)
+        return true
       end
-      # :nocov:
-      FileUtils.rm_rf(adaptibrew_dir)
-      self
+      false
     end
 
-     # This is a good catch-all method
-     # This deletes and re-clones adaptibrew
     def refresh
-      raise "🛑  Cannot refresh, no network connection" unless network?
-      clear
-      clone
-      self
+      if clear and clone
+        return true
+      end
+      false
     end
 
-    # Returns true if adaptibrew is present
     def present?
       return Dir.exists?(adaptibrew_dir) ? true : false
     end

data/lib/brewer/brewer.rb

@@ -36,7 +36,7 @@ module Brewer
     # Turning the pump off will turn the pid off too, as it should not be on when the pump is off
     def pump(state="status")
       if state == "status"
-        return relay_status($settings['pumpRelay'])
+        return relay_status($settings['pump'])
       end
 
       if state == 1
@@ -150,7 +150,7 @@ module Brewer
       statuses = {}
       all_relays_status.shift(4).each do |status|
         relay_num, status = status.match(/relay [0-9+]([0-9]+): (on|off)/).captures
-        relay_names = $settings.select { |key, value| key.to_s.match(/Relay/) }
+        relay_names = $settings.select { |key, value| key.to_s.match(/hlt|rims[^A]|pump/) }
         statuses[relay_names.key(relay_num.to_i)] = status
       end
       statuses
@@ -173,9 +173,9 @@ module Brewer
     def rims_to(location)
       if location == "mash"
         # we ended up swapping this relay, so the name is backwards
-        relay($settings['rimsToMashRelay'], 0)
+        relay($settings['rimsToMash'], 0)
       elsif location == "boil"
-        relay($settings['rimsToMashRelay'], 1)
+        relay($settings['rimsToMash'], 1)
       else
         raise "Not a valid location for rims valve"
       end
@@ -185,9 +185,9 @@ module Brewer
     # Diverts hlt valve to mash or boil tun
     def hlt_to(location)
       if location == "mash"
-        relay($settings['spargeToMashRelay'], 0)
+        relay($settings['hltToMash'], 0)
       elsif location == "boil"
-        relay($settings['spargeToMashRelay'], 1)
+        relay($settings['hltToMash'], 1)
       else
         raise "Not a valid location for the hlt valve"
       end
@@ -196,7 +196,7 @@ module Brewer
 
     # Opens or closes hlt valve
     def hlt(state)
-      relay($settings['spargeRelay'], state)
+      relay($settings['hlt'], state)
       self
     end
 

data/lib/brewer/recipe.rb

@@ -31,7 +31,10 @@ module Brewer
         return true
       end
 
-      print "Enter a recipe name to load an existing recipe, or nothing to start a new one: "
+      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
 
       unless name.empty?
@@ -123,6 +126,12 @@ module Brewer
       recipes
     end
 
+    def list_as_table
+      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
+    end
+
     def loaded_recipe?
       if File.exists?(recipe_dir(@vars['name']) + ".yml")
         return true

data/lib/brewer/settings.rb

@@ -8,7 +8,7 @@ module Brewer
 
     def initialize(testing=false)
 
-      @source = adaptibrew_dir('settings.py')
+      @source = adaptibrew_dir('print_settings.py')
       @cache_file = brewer_dir('settings.yml')
 
       @settings = Hash.new
@@ -51,19 +51,15 @@ module Brewer
       false
     end
 
-    # Parse the settings from the source file into @settings
+    # Parse the settings from @source 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
+      settings_file_output = `python #{@source}`.chomp
+      settings_array = settings_file_output.split("\n")
+      settings_array.each do |setting|
+        key, value = setting.match(/(.+)=(.+)/).captures
+        @settings[key.strip.chomp] = value.strip.chomp
       end
-      false
+      true
     end
 
     # Creates the cache if there isn't one already
@@ -108,6 +104,7 @@ module Brewer
     # and for backwards compatability purposes
     def load_global
       raise "settings instance variable does not exist yet. Run Settings#parse first" unless !@settings.empty?
+      type_cast
       $settings = @settings
     end
 
@@ -123,14 +120,14 @@ module Brewer
     def type_cast
       # Super janky
       change({
-        'rimsaddressint' => @settings['rimsaddressint'].to_i,
-        'switchaddressint' => @settings['switchaddressint'].to_i,
-        'baudrate' => @settings['baudrate'].to_i,
+        'rimsAddress' => @settings['rimsAddress'].to_i,
+        'switchAddress' => @settings['switchAddress'].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,
+        'hltToMash' => @settings['hltToMash'].to_i,
+        'hlt' => @settings['hlt'].to_i,
+        'rimsToMash' => @settings['rimsToMash'].to_i,
+        'pump' => @settings['pump'].to_i,
         'DEBUG' => @settings['DEBUG'].to_b,
       })
     end

data/spec/adaptibrew_spec.rb

@@ -1,89 +1,98 @@
 require_relative 'spec_helper'
 
-describe Adaptibrew do
+include Helpers
+
+describe Brewer::Adaptibrew do
 
   before :each do
-    @adaptibrew = Adaptibrew.new.refresh
+    @adaptibrew = Adaptibrew.new
+    @adaptibrew.refresh
+  end
+
+  after :all do
+    Adaptibrew.new.clone
   end
 
   describe "#new" do
-    specify { expect(Adaptibrew.new).to be_an_instance_of Adaptibrew }
+    it "makes a new Adaptibrew object" do
+      expect(Adaptibrew.new).to be_an_instance_of Adaptibrew
+    end
   end
 
   describe ".clear" do
     context "when the repo exists" do
-      let(:adaptibrew) { Adaptibrew.new }
-      specify { expect(adaptibrew.present?).to be true }
-
-      it "deletes the repo" do
-        @adaptibrew.clear
+      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
-      let(:adaptibrew) { Adaptibrew.new }
-      before { adaptibrew.clear }
-      specify { expect(adaptibrew.present?).to be false }
-
-      it "does nothing" do
-        @adaptibrew.clear
+      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 does not exist" do
-      let(:adaptibrew) { Adaptibrew.new }
-      before { adaptibrew.clear }
-      specify { expect(adaptibrew.present?).to be false }
-
-      it "clones the repo" do
-        @adaptibrew.clone
+    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 exists" do
-      let(:adaptibrew) { Adaptibrew.new }
-      before { adaptibrew.clone }
-      specify { expect(adaptibrew.present?).to be true }
-
-      it "does nothing" do
-        @adaptibrew.clone
+    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
-    let(:adaptibrew) { Adaptibrew.new }
-    before { adaptibrew.refresh }
-
-    it "clears and clones the repo" do # regardless of wether or not it's there
-      expect(@adaptibrew.present?).to be true
-      @adaptibrew.refresh
-      expect(@adaptibrew.present?).to be true
+    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
-      let(:adaptibrew) { Adaptibrew.new }
-      before { adaptibrew.refresh }
-      specify { expect(Dir.exists?(Dir.home + '/.brewer/adaptibrew')).to be true }
-
+      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
-      let(:adaptibrew) { Adaptibrew.new }
-      before { adaptibrew.clear }
-      specify { expect(Dir.exists?('adaptibrew')).to be false }
+      before { @adaptibrew.clear }
+      specify { expect(Dir.exists?(adaptibrew_dir)).to be false }
       it "returns false" do
         expect(@adaptibrew.present?).to be false
       end

data/spec/hardware_spec.rb

@@ -92,10 +92,10 @@ describe Brewer do
 
   describe ".relay_status" do
     it "returns the status of a relay" do
-      @brewer.relay($settings['rimsToMashRelay'], 1)
-      expect(@brewer.relay_status($settings['rimsToMashRelay'].to_i)).to eq("on")
-      @brewer.relay($settings['rimsToMashRelay'], 0)
-      expect(@brewer.relay_status($settings['rimsToMashRelay'].to_i)).to eq("off")
+      @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")
     end
   end
 
@@ -104,7 +104,7 @@ describe Brewer 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
+      expect(statuses['hlt']).to be_an_instance_of String
     end
   end
 
@@ -120,25 +120,25 @@ describe Brewer do
         'hlt' => 1,
         'pump' => 0,
       })
-      expect(@brewer.relay_status($settings['spargeRelay'])).to eq("on")
+      expect(@brewer.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['spargeRelay'])).to eq("off")
+      expect(@brewer.relay_status($settings['hlt'])).to eq("off")
       @brewer.hlt(1)
-      expect(@brewer.relay_status($settings['spargeRelay'])).to eq("on")
+      expect(@brewer.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['rimsToMashRelay'])).to eq("on")
+      expect(@brewer.relay_status($settings['rimsToMash'])).to eq("on")
       @brewer.rims_to("mash")
-      expect(@brewer.relay_status($settings['rimsToMashRelay'])).to eq("off")
+      expect(@brewer.relay_status($settings['rimsToMash'])).to eq("off")
     end
 
     context "when the location is not valid" do
@@ -151,9 +151,9 @@ describe Brewer do
   describe ".hlt_to" do
     it "diverts the hlt relay to boil or mash tuns" do
       @brewer.hlt_to("boil")
-      expect(@brewer.relay_status($settings['spargeToMashRelay'])).to eq("on")
+      expect(@brewer.relay_status($settings['hltToMash'])).to eq("on")
       @brewer.hlt_to("mash")
-      expect(@brewer.relay_status($settings['spargeToMashRelay'])).to eq("off")
+      expect(@brewer.relay_status($settings['hltToMash'])).to eq("off")
     end
 
     context "when the location is not valid" do

data/spec/spec_helper.rb

@@ -7,4 +7,5 @@ SimpleCov.start
 
 require_relative "../lib/brewer"
 
+include Helpers
 include Brewer

metadata

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