brewer 0.0.71 → 0.0.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd9b1df8720156b66f88424e65d7ebd530440ecf
-  data.tar.gz: 98e6e8df275b44be023a37cff481fced3ac20888
+  metadata.gz: 8aa172acc226aadb16fb03b06b575210280922b9
+  data.tar.gz: c96b3a8880704a56dc86788fbc67dd829cd2f430
 SHA512:
-  metadata.gz: a6d1f4a460c83ee94be5ec03fdcba1460c2fcdd196409412c5b690e9032ea2977b15f869995a36a62f9c8da1d8cf73b2c61f410d3642eae7249e97e2244a3ab2
-  data.tar.gz: 2163b804379374756c9ed1161bca468dae3993ae3cd079d6da16474cec2150b36ce8c6c6d9dda858c9eddafe0665c65403059e3c75e9cb17b378079e7f6a1425
+  metadata.gz: dd81a20b19545d25ccdd75758c54155d5123a90e7b96e400866e04bc7a80bf9c3d371d5b6c5a0ccdb6c53e4a891c1a096467c6ca90ba9561250852ea436c55ef
+  data.tar.gz: 68d0ae3b51235a0760cd49c7b4586afe381092898f72c6eba83d9aa83f52554af148997b7fb0355532dd215da50c942785b6bd609787f6625c2fbbc38135d753

data/bin/brewer

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 require_relative "../lib/autoload"
 
+com = Communicator.new
 brewer = Brewer.new
 adaptibrew = Adaptibrew.new.refresh
-com = Communicator.new
 procedures = Procedures.new
 
 puts "🍺  have fun 🍺"

data/lib/adaptibrew.rb

@@ -7,6 +7,7 @@ class Adaptibrew
 
   def initialize
     @install_dir = Dir.home + "/.brewer/"
+    refresh
   end
 
   # If used in IRB, Ripl, etc. it will clone into the directory IRB was started in

data/lib/autoload.rb

@@ -8,6 +8,7 @@ require 'net/ping'
 require 'ripl'
 require 'wannabe_bool'
 require 'terminal-table'
+require "rainbow"
 
 require_all 'lib'
 

data/lib/communicator.rb

@@ -10,14 +10,14 @@ class Communicator
   end
 
   def configure_slack
-    slack_file = Dir.home + "/.brewer/.slack.yml"
-    if !File.file?(slack_file)
-      store = YAML::Store.new slack_file
+    raise "settings.rb must be called before slack is configured" unless $settings
+    unless File.readlines($settings['settings_cache']).grep(/webhook_url/).size > 0
+      store = YAML::Store.new $settings['settings_cache']
       print "Enter your Slack webhook url: "
       webhook_url = gets.chomp
       store.transaction { store['webhook_url'] = webhook_url }
     end
-    return Slack::Notifier.new YAML.load(File.open(slack_file))['webhook_url']
+    return Slack::Notifier.new YAML.load(File.open($settings['settings_cache']))['webhook_url']
   end
 
   def ping(message="ping at #{Time.now}")

data/lib/procedures.rb

@@ -63,7 +63,7 @@ class Procedures
   end
 
   def boot
-    puts "booting..."
+    puts Rainbow("booting...").yellow
     @brewer.pid(0)
     @brewer.pump(0)
     @brewer.rims_to('mash')
@@ -72,9 +72,9 @@ class Procedures
     puts @brewer.pid
 
     @brewer.clear
-    puts "Boot successful!"
+    puts Rainbow("Boot finished!").green
     @brewer.out.unshift("successful boot at #{Time.now}")
-    @com.ping("🍺 boot successful 🍺")
+    @com.ping("🍺 boot finished 🍺")
     true
   end
 
@@ -83,16 +83,16 @@ class Procedures
     puts "heat-strike-water procedure started"
 
     # Confirm strike water is in the mash tun
-    print "Is the strike water in the mash tun? "
+    print Rainbow("Is the strike water in the mash tun? ").yellow
     # -> response
     confirm ? nil : abort
 
     # confirm return manifold is in the mash tun
-    print "Is the return manifold in the mash tun? "
+    print Rainbow("Is the return manifold in the mash tun? ").yellow
     # -> response
     confirm ? nil : abort
 
-    print "Is the mash tun valve open? "
+    print Rainbow("Is the mash tun valve open? ").yellow
     confirm ? nil : abort
 
     # confirm RIMS relay is on
@@ -103,7 +103,8 @@ class Procedures
     @brewer.pump(1)
     puts "Pump is now on"
 
-    puts "Is the pump running properly? "
+    puts Rainbow("Is the pump running properly? ").yellow
+    # TODO: Test this
     until confirm
       puts "restarting pump"
       @brewer.pump(0)
@@ -112,7 +113,7 @@ class Procedures
     end
 
     # confirm that strike water is circulating well
-    print "Is the strike water circulating well? "
+    print Rainbow("Is the strike water circulating well? ").yellow
     # -> response
     confirm ? nil : abort
 
@@ -134,10 +135,7 @@ class Procedures
     # when strike temp is reached, @com.ping slack
     @brewer.watch
     @com.ping("Strike water heated to #{@brewer.pv}. Maintaining temperature.")
-    @com.ping("Next step: dough in")
-    puts "Next step: dough in"
-    puts "command: brewer.dough_in"
-
+    puts Rainbow("Strike water heated. Maintaining temp.").green
     true
   end
   # :nocov:
@@ -149,11 +147,11 @@ class Procedures
     @brewer.pid(0)
     @brewer.wait(3)
     @com.ping("Ready to dough in")
-    puts "Ready to dough in"
+    puts Rainbow("Ready to dough in").green
 
     # pour in grain
 
-    print "Confirm when you're done with dough-in (y): "
+    print Rainbow("Confirm when you're done with dough-in (y): ").yellow
     confirm ? nil : abort
     true
   end
@@ -161,7 +159,7 @@ class Procedures
   def mash
     @brewer.sv(@recipe['mash_temp'])
 
-    puts "mash stated. This will take a while."
+    puts Rainbow("mash stated. This will take a while.").green
     @com.ping("Mash started. This will take a while.")
 
     @brewer.rims_to('mash')
@@ -173,7 +171,7 @@ class Procedures
     @com.ping("Mash temp (#{@brewer.pv} F) reached. Starting timer for #{@recipe['mash_time']} minutes.")
     @brewer.wait(@recipe['mash_time'])
     @com.ping("🍺 Mash complete 🍺. Check for starch conversion.")
-    puts "Mash complete"
+    puts Rainbow("Mash complete").green
     puts "Check for starch conversion"
   end
 
@@ -191,13 +189,14 @@ class Procedures
   end
 
   def sparge
-    print "Is the sparge water heated to the correct temperature? "
+    print Rainbow("Is the sparge water heated to the correct temperature? ").yellow
     confirm ? nil : abort
 
     @brewer.hlt_to('mash')
     @brewer.hlt(1)
 
-    puts "Waiting for 10 seconds. Regulate sparge balance."
+    print "Waiting for 10 seconds. "
+    puts Rainbow("Regulate sparge balance.").yellow
     puts "(ctrl-c to abort proccess)"
     @brewer.wait(30)
 
@@ -206,7 +205,7 @@ class Procedures
 
     @com.ping("Please check the sparge balance and ignite boil tun burner")
 
-    puts "Waiting until intervention to turn off pump (y): "
+    puts Rainbow("Waiting until intervention to turn off pump (y): ").yellow
     confirm ? nil : abort
 
     @brewer.pid(0)
@@ -220,12 +219,13 @@ class Procedures
 
     @brewer.hlt(1)
 
-    print "waiting for intervention to turn off hlt (y): "
+    print Rainbow("waiting for intervention to turn off hlt (y): ").yellow
     confirm ? nil : abort
 
     @brewer.hlt(0)
 
-    @com.ping('Topping off completed')
+    @com.ping('Topping off complete')
+    puts Rainbow("Topping off complete").green
   end
 
   def boil
@@ -237,7 +237,8 @@ class Procedures
     @brewer.wait(to_seconds(13))
     @com.ping("Add finishing hops")
     @brewer.wait(30)
-    @com.ping("All done")
+    @com.ping("Done.")
+    puts Rainbow("Done.").green
   end
 
 end

data/lib/settings.rb

@@ -1,25 +1,49 @@
 require_relative "autoload"
 
-adaptibrew = Adaptibrew.new
+$settings = {}
 
+adaptibrew = Adaptibrew.new
 # 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
+# End nonsense
 
-$settings = {}
+$settings['settings_cache'] = Dir.home + "/.brewer/.settings.yml"
+adaptibrew_settings_file = Dir.home + '/.brewer/adaptibrew/settings.py'
+
+if !File.exists?($settings['settings_cache'])
+  File.open($settings['settings_cache'], 'w')
+end
 
-File.open(Dir.home + '/.brewer/adaptibrew/settings.py') do |file|
-  file.each_line do |line|
-    if line.match(/=/) == nil
+def parse_setting_from_line(line)
+  key, value = line.match(/(.+)=(.+)/).captures
+  value.slice!(/#.+/)
+  $settings[key.strip.chomp] = value.strip.chomp
+end
+
+unless File.readlines(adaptibrew_settings_file).grep(/DEBUG/).size > 0
+  File.readlines(adaptibrew_settings_file) do |line|
+    if !line.include? "="
+      next
+    end
+    parse_setting_from_line(line)
+  end
+
+  store = YAML::Store.new $settings['settings_cache']
+  store.transaction {
+    $settings.each do |k, v|
+      store[k] = v
+    end
+  }
+else
+  File.readlines(adaptibrew_settings_file).each do |line|
+    if !line.include? "="
       next
     end
-    key, value = line.match(/(.+)=(.+)/).captures
-    value.slice!(/#.+/)
-    $settings[key.strip.chomp] = value.strip.chomp
+    parse_setting_from_line(line)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brewer
 version: !ruby/object:Gem::Version
-  version: 0.0.71
+  version: 0.0.74
 platform: ruby
 authors:
 - Luke Sweeney
@@ -62,16 +62,16 @@ dependencies:
   name: wannabe_bool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -230,11 +244,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/brewer
-- brewer.gemspec
 - lib/adaptibrew.rb
 - lib/autoload.rb
 - lib/brewer.rb
@@ -242,7 +254,6 @@ files:
 - lib/helpers.rb
 - lib/procedures.rb
 - lib/settings.rb
-- notes.md
 - spec/adaptibrew_spec.rb
 - spec/brewer_spec.rb
 - spec/hardware_spec.rb
@@ -270,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A shell interface for adaptibrew

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    brewer (0.0.40)
-      git (~> 1.3, >= 1.3.0)
-      net-ping (~> 1.7)
-      ripl (~> 0.7.0)
-      slack-notifier
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    bond (0.5.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    git (1.3.0)
-    json (2.0.3)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    net-ping (1.7.8)
-    public_suffix (2.0.4)
-    rake (12.0.0)
-    rdoc (5.1.0)
-    ripl (0.7.1)
-      bond (~> 0.5.1)
-    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.0)
-    slack-notifier (2.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  brewer!
-  launchy (~> 2.4, >= 2.4.0)
-  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.12.5

data/brewer.gemspec

@@ -1,40 +0,0 @@
-require 'rake'
-
-Gem::Specification.new do |s|
-  s.name               = "brewer"
-  s.version            = "0.0.71"
-  s.default_executable = "brewer"
-
-  s.authors = ["Luke Sweeney"]
-  s.date = %q{2017-03-08}
-  s.description = %q{A Ruby API for adaptiman/adaptibrew}
-  s.post_install_message = "🍺  have fun 🍺"
-  s.email = %q{luke@thesweeneys.org}
-  s.files = FileList.new(['lib/*.rb', 'bin/*', '[A-Z]*', 'spec/*.rb']).to_a
-  s.executables = ['brewer']
-  s.bindir = 'bin'
-  s.test_files = FileList.new(["spec/*.rb"]).to_a
-  s.homepage = %q{https://rubygems.org/gems/brewer}
-  s.require_paths = ["lib", "lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A shell interface for adaptibrew}
-  s.license = 'MIT'
-
-  # Runtime dependencies
-  s.add_runtime_dependency 'git', '~> 1.3', '>= 1.3.0'
-  s.add_runtime_dependency 'ripl', '~> 0.7.0'
-  s.add_runtime_dependency 'net-ping', '~> 1.7'
-  s.add_runtime_dependency 'wannabe_bool', '~> 1.7'
-  s.add_runtime_dependency 'slack-notifier'
-  s.add_runtime_dependency 'require_all'
-  s.add_runtime_dependency 'terminal-table'
-
-
-  # Dev dependencies
-  s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
-  s.add_development_dependency 'rspec', '~> 3.5.0', '>= 3.5.0'
-  s.add_development_dependency 'launchy', '~> 2.4', '>= 2.4.0'
-  s.add_development_dependency 'simplecov', '~> 0.13.0'
-  s.add_development_dependency 'simplecov-html', '~> 0.10.0'
-  s.add_development_dependency 'rdoc', '~> 5.1', '>= 5.1.0'
-end

data/notes.md

@@ -1,16 +0,0 @@
-class roles:
-Brewer:
-  - Directly control each component of the physical brew rig
-
-Procedures:
-  - compile brewer methods into scripted procedures
-
-Helpers:
-  - assorted methods, helpers module
-
-Adaptibrew:
-  - Clone and maintain the adaptibrew directory
-
-Communicator:
-  - Communicates the status of the brew rig
-  - Communicates actions the brew rig is doing/actions that the brewer class does