sniff 0.6.7 → 0.6.8

data/lib/sniff.rb

@@ -1,3 +1,5 @@
+require 'data_miner'
+
 module Sniff
   extend self
 
@@ -5,6 +7,13 @@ module Sniff
     File.join(File.dirname(__FILE__), '..')
   end
 
+  def logger
+    @logger ||= Logger.new nil
+  end
+  def logger=(val)
+    @logger = val
+  end
+
   # Prepares the environment for running tests against Earth data and emitter 
   # gems.
   #
@@ -13,12 +22,16 @@ module Sniff
   # options: 
   # * :earth is the list of domains Earth.init should load (default: none)
   # * :load_data determines whether fixture data is loaded (default: true)
-  # * :sqllogdev is a Logger log device used by ActiveRecord (default: nil)
+  # * :logger is a Logger log device used by Sniff and ActiveRecord (default: nil)
+  #           logger: nil = no log, string = file path, STDOUT for terminal
   # * :fixtures_path is the path to your gem's fixtures (default: local_root/lib/db/fixtures)
-  # * :logdev is a Logger log device used for general logging (default: nil)
   def init(local_root, options = {})
     options[:earth] ||= :none
 
+    logger = options.delete(:logger) || ENV['LOGGER']
+    Sniff.logger = Logger.new logger
+    DataMiner.logger = Sniff.logger
+
     Sniff::Database.init local_root, options
 
     if options[:cucumber]

data/lib/sniff/database.rb

@@ -12,9 +12,7 @@ module Sniff
       # options: 
       # * :earth is the list of domains Earth.init should load (default: none)
       # * :load_data determines whether fixture data is loaded (default: true)
-      # * :sqllogdev is a Logger log device used by ActiveRecord (default: nil)
       # * :fixtures_path is the path to your gem's fixtures (default: local_root/lib/db/fixtures)
-      # * :logdev is a Logger log device used for general logging (default: nil)
       def init(local_root, options = {})
         db_init options
         earth_init(options[:earth])
@@ -40,7 +38,7 @@ module Sniff
       def db_init(options)
         options[:db_adapter] ||= 'sqlite3'
         options[:db_name] ||= ':memory:'
-        ActiveRecord::Base.logger = Logger.new options[:sqllogdev]
+        ActiveRecord::Base.logger = Sniff.logger
         ActiveRecord::Base.establish_connection :adapter => options[:db_adapter],
           :database => options[:db_name]
       end
@@ -65,7 +63,7 @@ module Sniff
       self.lib_path = File.join(root, 'lib', 'test_support')
       self.load_data = options[:load_data]
       self.fixtures_path = options[:fixtures_path]
-      self.logger = Logger.new options[:logdev]
+      self.logger = Sniff.logger
     end
 
     def log(str)

data/lib/sniff/version.rb

@@ -1,3 +1,3 @@
 module Sniff
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/lib/test_support/cucumber/step_definitions/carbon_steps.rb

@@ -53,7 +53,7 @@ end
 
 Then /^the emission value should be within "([\d\.]+)" kgs of "([\d\.]+)"$/ do |cusion, emissions|
   @emission.should_not be_nil
-  @emission.should be_close(emissions.to_f, cusion.to_f)
+  @emission.should be_within(cusion.to_f).of(emissions.to_f)
 end
 
 Then /^the calculation should have used committees "(.*)"$/ do |committee_list|
@@ -64,7 +64,7 @@ Then /^the calculation should have used committees "(.*)"$/ do |committee_list|
 end
 
 Then /^the (.+) committee should be close to "([^,]+)", \+\/-"(.+)"$/ do |committee, value, cusion|
-  @characteristics[committee.to_sym].to_f.should be_close(value.to_f, cusion.to_f)
+  @characteristics[committee.to_sym].to_f.should be_within(cusion.to_f).of(value.to_f)
 end
 
 Then /^the (.+) committee should be exactly "(.*)"$/ do |committee, value|

data/lib/test_support/cucumber/support/values.rb

@@ -41,7 +41,7 @@ module CucumberValueParser
       a.should == b
     elsif b =~ /\d+\.\d+/
       b = b.to_f
-      a.to_f.should be_close(b, 0.00001)
+      a.to_f.should be_within(0.00001).of(b)
     elsif b =~ /^0/
       a.to_s.should == b
     elsif b =~ /^\d+$/

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Derek Kastner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -04:00
+date: 2011-05-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -290,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4292578396046065138
+      hash: -3586275988234089794
       segments: 
       - 0
       version: "0"