brewer 0.0.53 → 0.0.60

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f29c295815d82e703dfdb7783c660a1e08af700
-  data.tar.gz: 2433eee7cfd944fa36ba122789bae154195852c9
+  metadata.gz: b5572b66bef3ac9b8ffbb2206436e7f913169ac1
+  data.tar.gz: 0dc67374ebdbea8ad2b074680062ba9e9ed47cd2
 SHA512:
-  metadata.gz: 529d6b37c55830843b8937ced832f9429a54fbfcc0385bfcdf38e5dc8e3aee37755e42569a6fda13bb6844fb861ad2e34902a323dd8616fe39896a7880c2d6d1
-  data.tar.gz: a713b0a35fbaebea80a9cf34e19f434af271b4a0ca007fe3b82750b7ff8de33fda871927ec5e7953c26e0336bca4567b0c4fa9693361c89d9d1a977632a36d83
+  metadata.gz: 7023e44fdaf9dae731af5be51870d49895e8bb0d1a63722d7569a7e4ccc88d2a710be613150d3acb324578ec2012238b6a335062241d07a73e7999f9347f5c7d
+  data.tar.gz: a2fefa86d4c98b5c859a4a8faaa2934dd3eb196a1ba1658d1ae2acb94f76ee403c52d67ea0366f3dcde49f42c7db7db5ac47a6ba934b1dc09cd50776b335742d

data/brewer.gemspec

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

data/lib/adaptibrew.rb

@@ -7,6 +7,8 @@ include Helpers
 # This is the 'manager' for the adaptibrew repo. It handles cloning and such.
 class Adaptibrew
 
+  attr_accessor :install_dir
+
   def initialize
     @install_dir = Dir.home + "/.brewer/"
   end

data/lib/brewer.rb

@@ -34,9 +34,11 @@ class Brewer
   end
 
   # Only works on Mac :(
+  # :nocov:
   def say(message="done")
     system("say #{message}")
   end
+  # :nocov:
 
   # Runs an adaptibrew script
   # Output will be stored in @out
@@ -57,8 +59,10 @@ class Brewer
   def echo(string=nil)
     if string == nil
       puts @out.first
+      return @out.first
     end
     puts string
+    return string
   end
 
 
@@ -94,8 +98,6 @@ class Brewer
     elsif state == 0
       return script("set_pid_off")
     end
-
-    true
   end
 
   def sv(temp=nil)
@@ -105,11 +107,10 @@ class Brewer
     else
       return script('get_sv')
     end
-    true
   end
 
   def pv
-    script('get_pv')
+    return script('get_pv')
   end
 
   def relay(relay, state)
@@ -123,20 +124,24 @@ class Brewer
     true
   end
 
+  # TODO: Fix the return value here
   def relay_status(relay)
     raise "Relay number needs to be an integer" unless relay.is_a? Integer
     script("get_relay_status", "#{relay}")
     return @out.first.split('\n')
   end
 
+  # :nocov:
   def watch
     until pv.to_i == sv.to_i do
       wait(8)
     end
     true
   end
+  # :nocov:
 
   # WaterVolInQuarts, GrainMassInPounds, GrainTemp, MashTemp
+  # :nocov:
   def get_strike_temp
     print "Input amount of water in quarts: "
     water = gets.chomp
@@ -162,6 +167,7 @@ class Brewer
     sv(echo.to_i)
     puts "SV has been set to #{sv} degrees"
   end
+  # :nocov:
 
   # Master Procedures -----------------------------------------------------
   # The main steps in the brewing proccess
@@ -180,6 +186,7 @@ class Brewer
     true
   end
 
+  # :nocov:
   def heat_strike_water
     print "Is the strike water in the mash tun? "
     confirm ? nil : abort
@@ -222,5 +229,6 @@ class Brewer
 
     true
   end
+  # :nocov:
 
 end

data/lib/settings.rb

@@ -3,10 +3,15 @@ require 'adaptibrew'
 
 adaptibrew = Adaptibrew.new
 
-if !adaptibrew.present?
+# This might not make sense, its for tests
+def get_repo_for_settings(adaptibrew)
   adaptibrew.clone
 end
 
+if !adaptibrew.present?
+  get_repo_for_settings(adaptibrew)
+end
+
 $settings = {}
 
 File.open(Dir.home + '/.brewer/adaptibrew/settings.py') do |file|

data/spec/adaptibrew_spec.rb

@@ -11,7 +11,7 @@ describe Adaptibrew do
   end
 
   describe ".clear" do
-    context "when the repo already exists" do
+    context "when the repo exists" do
       let(:adaptibrew) { Adaptibrew.new }
       specify { expect(adaptibrew.present?).to be true }
 
@@ -70,17 +70,17 @@ describe Adaptibrew do
   end
 
   describe ".present?" do
-    context "when the repo is present" do
+    context "when the exists" do
       let(:adaptibrew) { Adaptibrew.new }
       before { adaptibrew.refresh }
-      specify { expect(Dir.exists?('adaptibrew')).to be true }
+      specify { expect(Dir.exists?(Dir.home + '/.brewer/adaptibrew')).to be true }
 
       it "returns true" do
         expect(@adaptibrew.present?).to be true
       end
     end
 
-    context "when the repo is not present" do
+    context "when the repo does not exist" do
       let(:adaptibrew) { Adaptibrew.new }
       before { adaptibrew.clear }
       specify { expect(Dir.exists?('adaptibrew')).to be false }

data/spec/brewer_spec.rb

@@ -15,6 +15,7 @@ describe Brewer do
     @brewer = Brewer.new
     @brewer.pump(0)
     @brewer.pid(0)
+    @brewer.boot
   end
 
   describe "#new" do
@@ -39,8 +40,7 @@ describe Brewer do
 
   describe ".script" do
     it "can run a python script and get output" do
-      @brewer.script('python_tester')
-      expect(@brewer.out.include?("it worked")).to be true
+      expect(@brewer.script('python_tester')).to eq("it worked")
     end
   end
 
@@ -60,41 +60,96 @@ describe Brewer do
   describe ".pump" do
     # If the pump is already on it does nothing
     it "turns the pump on" do
-      @brewer.pump(1)
+      expect(@brewer.pump(1)).to eq("pump on")
       @brewer.wait(2)
-      expect(@brewer.out.include?("pump on")).to be true
     end
 
     # If the pump is already off it does nothing
     it "turns the pump off" do
-      @brewer.pump(0)
-      expect(@brewer.out.include?("pump off")).to be true
+      expect(@brewer.pump(0)).to eq("pump off")
+    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) }
+      it "turns the pump and pid off" do
+        expect(@brewer.pump(0)).to eq("pump off")
+      end
     end
   end
 
   describe ".relay" do
     it "turns the relay on" do
-      @brewer.relay(2, 1)
+      expect(@brewer.relay(2, 1)).to eq("relay 2 on")
       @brewer.wait(7)
-      expect(@brewer.out.include?("relay 2 on"))
     end
 
     it "turns the relay off" do
-      @brewer.relay(2, 0)
+      expect(@brewer.relay(2, 0)).to eq("relay 2 off")
       @brewer.wait(7)
-      expect(@brewer.out.include?("relay 2 off"))
     end
   end
 
   describe ".pid" do
     it "turns the pid on" do
-      @brewer.pid(1)
-      expect(@brewer.out.include?("PID on")).to be true
+      expect(@brewer.pid(1)).to eq("Pump and PID are now on")
+      @brewer.wait(2)
     end
 
     it "turns the pid off" do
-      @brewer.pid(0)
-      expect(@brewer.out.include?("PID off")).to be true
+      expect(@brewer.pid(0)).to eq("PID off")
+    end
+
+    it "returns the pid status" do
+      expect(@brewer.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 String
+      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
+      end
+    end
+  end
+
+  describe ".pv" do
+    it "returns the pv" do
+      expect(@brewer.pv).to be_an_instance_of String
+    end
+  end
+
+  describe ".ping" do
+    it "pings slack" do
+      expect(@brewer.ping("Tests are passing :D")).to be_an_instance_of Net::HTTPOK
+    end
+  end
+
+  describe ".echo" do
+    context "when there is an argument" do
+      it "prints the arg" do
+        expect(@brewer.echo("just part of a test")).to eq("just part of a test")
+      end
+    end
+
+    context "when there is no argument" do
+      before { @brewer.pv }
+      it "prints the last output" do
+        expect(@brewer.echo).to be_an_instance_of String
+      end
+    end
+  end
+
+  describe ".relay_status" do
+    it "returns the status of a relay" do
+      expect(@brewer.relay_status($settings['rimsToMashRelay'].to_i)).not_to be_empty
     end
   end
 

data/spec/settings_spec.rb

@@ -0,0 +1,30 @@
+require_relative 'spec_helper'
+
+
+describe "Settings" do
+
+  before :all do
+    @adaptibrew = Adaptibrew.new
+  end
+
+  describe "settings" do
+    it "can print the settings" do
+      expect($settings).to be_an_instance_of Hash
+      expect($settings).not_to be_empty
+    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
+        get_repo_for_settings(@adaptibrew)
+        expect(@adaptibrew.present?).to be true
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -8,3 +8,4 @@ SimpleCov.start
 require_relative '../lib/adaptibrew.rb'
 require_relative '../lib/brewer.rb'
 require_relative '../lib/helpers.rb'
+require_relative '../lib/settings.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brewer
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.60
 platform: ruby
 authors:
 - Luke Sweeney
@@ -201,6 +201,7 @@ files:
 - spec/adaptibrew_spec.rb
 - spec/brewer_spec.rb
 - spec/helpers_spec.rb
+- spec/settings_spec.rb
 - spec/spec_helper.rb
 homepage: https://rubygems.org/gems/brewer
 licenses:
@@ -231,4 +232,5 @@ test_files:
 - spec/adaptibrew_spec.rb
 - spec/brewer_spec.rb
 - spec/helpers_spec.rb
+- spec/settings_spec.rb
 - spec/spec_helper.rb