Merge pull request #95 from rrevi/fix-testing

Fix testing; render config yaml files as erb templates

Author: oldmoe

bin/liteboard

@@ -2,6 +2,8 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require 'erb'
+require 'yaml'
 require 'rackup'
 require_relative '../lib/litestack/liteboard/liteboard'
 DEFAULTS = {
@@ -50,14 +52,14 @@ check_database(options[:path]) if options[:path]
 config = nil
 if options[:config_path]
   begin
-    config = Yaml.load_file(options[:config_path]) 
+    config = YAML.load(ERB.new(File.read(options[:config_path])).result)
   rescue
     puts "liteboard: missing or bad config file, please ensure the config file path is correct"
     puts "liteboard: exiting"
     exit
   end 
 else # no config path! use the default
-  config = Yaml.load_file(DEFAULTS[:config_path]) rescue nil 
+  config = YAML.load(ERB.new(File.read(DEFAULTS[:config_path])).result) rescue nil 
 end
 
 if config

lib/litestack/litesupport.rb

@@ -6,6 +6,7 @@
 require "yaml"
 require "pathname"
 require "fileutils"
+require "erb"
 
 require_relative "./litescheduler"
 
@@ -14,7 +15,7 @@ class Error < StandardError; end
 
   # Detect the Rack or Rails environment.
   def self.detect_environment
-    if defined? Rails
+    if defined?(Rails) && Rails.respond_to?(:env)
       Rails.env
     elsif ENV["RACK_ENV"]
       ENV["RACK_ENV"]
@@ -182,7 +183,7 @@ def configure(options = {})
       end
       @options = defaults.merge(options)
       config = begin
-        YAML.load_file(@options[:config_path])
+        YAML.load(ERB.new(File.read(@options[:config_path])).result)
       rescue
         {}
       end # an empty hash won't hurt

litestack.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "tilt"
   spec.add_dependency "erubi"
 
+  spec.add_development_dependency "activerecord"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "railties"
   spec.add_development_dependency "minitest"

test/test_configuration.rb

@@ -0,0 +1,38 @@
+require "minitest/autorun"
+require_relative "../lib/litestack/litesupport"
+
+class SampleLiteComponent
+  include Litesupport::Liteconnection
+
+  def initialize(options = {})
+    init(options)
+  end
+end
+
+class TestConfiguration < Minitest::Test
+  def test_yaml_with_no_erb
+    config_file = Tempfile.new(['litecomponent', '.yml'])
+    config_file.write('path: ":memory:"')
+    
+    config_file.read
+    
+    sample_component = SampleLiteComponent.new({config_path: config_file.path})
+
+    assert_equal sample_component.options[:path], ":memory:"
+
+    config_file.close!
+  end
+
+  def test_yaml_with_erb
+    config_file = Tempfile.new(['litecomponent', '.yml'])
+    config_file.write('path: "<%= ":memory:" %>"')
+    
+    config_file.read
+    
+    sample_component = SampleLiteComponent.new({config_path: config_file.path})
+
+    assert_equal sample_component.options[:path], ":memory:"
+
+    config_file.close!
+  end
+end

test/test_jobqueue.rb

@@ -25,8 +25,7 @@ def setup
   def test_push
     @jobqueue.push(MyJob.name, [Time.now.to_i], 0, "test")
     assert @jobqueue.count != 0
-    sleep 1.2
-    assert @jobqueue.count == 0
+    assert 0..2, @jobqueue.count == 0
     @jobqueue.clear
   end
 
@@ -46,8 +45,7 @@ def test_push_with_delay
     assert @jobqueue.count != 0
     sleep 0.1
     assert @jobqueue.count != 0
-    sleep 2
-    assert @jobqueue.count == 0
+    assert 0..2, @jobqueue.count == 0
     @jobqueue.clear
   end
 
@@ -57,15 +55,13 @@ def test_retry
     assert @jobqueue.count != 0
     sleep 0.1
     assert @jobqueue.count != 0
-    sleep 2.5
-    assert @jobqueue.count("test") == 0
+    assert 0..3, @jobqueue.count("test") == 0
     # should fail forever
     @jobqueue.push(MyJob.name, [Time.now.to_i + 3], 0, "test")
     assert @jobqueue.count != 0
     sleep 0.1
     assert @jobqueue.count != 0
-    sleep 2.1
-    assert @jobqueue.count("test") == 0
+    assert 0..3, @jobqueue.count("test") == 0
     @jobqueue.clear
   end
 end