rscout 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09a165d2b395eb9e4db65ab07c24e2ec29d3d9e8
-  data.tar.gz: 8b5075d608401440fd30e2cb466cb47556779d0c
+  metadata.gz: 45f571e06d7a70225b4405cf9c83e7f89b5b5acf
+  data.tar.gz: a0002b5ccd2e9f0e2d7219d3e224b3ee236a8180
 SHA512:
-  metadata.gz: 29c8f182a81acdbaf51840142d627735bc161e627f432e4fd9c161c7d3c1172c1c09289174ba778e04c2b5d837abe97266f2045e73c9ca43f8f8fb4ac8ea4dab
-  data.tar.gz: 09a3f88d2d69a5c4cc07a619598fa49b06593abfef35dbdd13ea3d7582de257935bfaf704dc02f131feb7d008cd5809284aa27e7d63e8c39871cd4f4c21d15e3
+  metadata.gz: 320b3c8f5fa0ec3e76e94492d24f84183705d8835a5ca8f08457e91ddac4ebb71fa655f0bbd77aa67beb1f6d059a71197156cf0b93db7c54ffefd4346c238ad6
+  data.tar.gz: bf383251be2a6da418f0247087f1fab031040e0d7c7e448adff283215a41c2ea9f3f00568e93253dd3ae41b5fa2e5f217049ae8848f750dc8abed7ddf79a1503

data/bin/rscout

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'thor'
 require 'dotenv'
+require 'logger'
 require 'rscout'
 require 'mail'
 
@@ -14,6 +15,8 @@ class RscoutCommand < Thor
   method_option :verbose, type: :boolean, aliases: [:v], default: false, lazy_default: true, desc: 'Show verbose messaging.'
   def test
     Mail.defaults do
+      from ENV['RSCOUT_EMAIL']
+
       smtp = {}
 
       smtp[:user_name] = ENV['SMTP_USERNAME'] if ENV['SMTP_USERNAME']
@@ -27,7 +30,11 @@ class RscoutCommand < Thor
       delivery_method :smtp, smtp
     end
 
-    RScout.run_suite Dir.pwd, options.env
+    RScout.options[:logger] = Logger.new(ENV['RSCOUT_LOG']) if ENV['RSCOUT_LOG']
+    RScout.options[:env] = options.env
+    RScout.options[:verbose] = options.verbose
+
+    RScout.run_suite Dir.pwd
   end
 end
 

data/lib/rscout/version.rb

@@ -1,3 +1,3 @@
 module Rscout
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rscout.rb

@@ -13,136 +13,148 @@ require 'rspec/core/formatters/documentation_formatter'
 require 'rspec/core/formatters/html_formatter'
 
 module RScout
-  def self.logger
-    @@LOGGER ||= begin
-      logger = Logger.new STDOUT
-      logger.level = Logger::ERROR
-      logger
+  DEFAULT_LOGGER  = Logger.new(STDOUT)
+  DEFAULT_OPTIONS = {
+    logger: DEFAULT_LOGGER,
+    verbose: false,
+    env: 'development'
+  }
+
+  class << self
+    def options
+      @@options ||= DEFAULT_OPTIONS.clone
     end
-  end
-
-  def self.run_suite(dir, env)
-    verbose = false
-    gemfile = File.join(dir, 'Gemfile')
-    configfile = File.join(dir, 'config', 'rscout.yml')
-
-    Bundler.with_clean_env do
-      Dir.chdir(dir) do
-        yaml = Hashie::Mash.new(YAML.load_file configfile)
-        config = yaml[env]
-
-        output = Hashie::Mash.new({
-          txt: StringIO.new,
-          html: StringIO.new,
-          json: StringIO.new,
-          stdout: nil,
-          results: nil,
-          error: Hashie::Mash.new({backtrace:[], message:nil})
-        })
-
-        failed = false
-        begin
-          html_formatter = RSpec::Core::Formatters::HtmlFormatter.new output.html
-          txt_formatter = RSpec::Core::Formatters::DocumentationFormatter.new output.txt
-          json_formatter = RSpec::Core::Formatters::JsonFormatter.new output.json
-
-          reporter = RSpec::Core::Reporter.new(json_formatter, txt_formatter, html_formatter)
 
-          rspec = RSpec.configuration
-          rspec.instance_variable_set(:@reporter, reporter)
+    def log(msg)
+      options[:logger].add(options[:severity]) { msg }
+    end
 
-          tests = Dir.glob File.join(dir, 'spec/**/*_spec.rb')
+    def logger
+      options[:logger]
+    end
 
-          rspec_task = lambda { RSpec::Core::Runner.run tests }
+    def env
+      options[:env]
+    end
 
-          if verbose
-            rspec_task.call
-          else
-            output.stdout = RScout.capture_stdout &rspec_task
+    def run_suite(dir)
+      verbose = options[:verbose]
+      gemfile = File.join(dir, 'Gemfile')
+      configfile = File.join(dir, 'config', 'rscout.yml')
+
+      Bundler.with_clean_env do
+        Dir.chdir(dir) do
+          yaml = Hashie::Mash.new(YAML.load_file configfile)
+          config = yaml[env]
+
+          output = Hashie::Mash.new({
+            txt: StringIO.new,
+            html: StringIO.new,
+            json: StringIO.new,
+            stdout: nil,
+            results: nil,
+            error: Hashie::Mash.new({backtrace:[], message:nil})
+          })
+
+          failed = false
+          begin
+            html_formatter = RSpec::Core::Formatters::HtmlFormatter.new output.html
+            txt_formatter = RSpec::Core::Formatters::DocumentationFormatter.new output.txt
+            json_formatter = RSpec::Core::Formatters::JsonFormatter.new output.json
+
+            reporter = RSpec::Core::Reporter.new(json_formatter, txt_formatter, html_formatter)
+
+            rspec = RSpec.configuration
+            rspec.instance_variable_set(:@reporter, reporter)
+
+            tests = Dir.glob File.join(dir, 'spec/**/*_spec.rb')
+
+            rspec_task = lambda { RSpec::Core::Runner.run tests }
+
+            if verbose
+              rspec_task.call
+            else
+              output.stdout = capture_stdout &rspec_task
+            end
+
+            output.results = json_formatter.output_hash
+
+            failed = output.results[:summary][:failure_count] > 0
+            failure_count = output.results[:summary][:failure_count].to_s
+          rescue => e
+            failed = true
+            logger.error "Exception encountered while running RSpec: #{e.message}"
+            logger.error e.backtrace
+            output.error = e
+          ensure
+            output.txt.close unless output.txt.closed?
+            output.html.close unless output.html.closed?
+            output.json.close unless output.json.closed?
           end
 
-          output.results = json_formatter.output_hash
+          if failed
+            logger.info "Tests failed."
+            send_failure_notifications config, env, output
+          end
 
-          failed = output.results[:summary][:failure_count] > 0
-          failure_count = output.results[:summary][:failure_count].to_s
-        rescue => e
-          failed = true
-          RScout.logger.error "Exception encountered while running RSpec: #{e.message}"
-          RScout.logger.error e.backtrace
-          output.error = e
-        ensure
-          output.txt.close unless output.txt.closed?
-          output.html.close unless output.html.closed?
-          output.json.close unless output.json.closed?
+          failed
         end
+      end
 
-        if failed
-          RScout.logger.info "Tests failed."
-          RScout.send_failure_notifications config, env, output
-        end
+    def send_failure_notifications(config, env, output)
+      email_body = [output.txt.string, output.error.backtrace.join("\n")].join("\n")
+      if config.email_enabled && config.email
+        logger.info "Sending emails alert to #{config.email}"
+        begin
+          mail = Mail.new do
+            to       config.email
+            subject  "RScout Alert: Tests failing on #{config.name.to_s.humanize.titleize} (#{env})"
+            add_file filename: 'results.html', content: output.html.string
 
-        failed
-      end
-    end
-  end
+            header["X-Priority"] = "1 (Highest)"
+            header["X-MSMail-Priority"] = "High"
+            header["Importance"] = "High"
 
-  def self.send_failure_notifications(config, env, output)
-    email_body = [output.txt.string, output.error.backtrace.join("\n")].join("\n")
-    if config.email_enabled && config.email
-      RScout.logger.info "Sending emails alert to #{config.email}"
-      begin
-        mail = Mail.new do
-          from     'Scout <platform+scout@evertrue.com>'
-          to       config.email
-          subject  "Scout Alert: Tests failing on #{config.name.to_s.humanize.titleize} (#{env})"
-          add_file filename: 'results.html', content: output.html.string
-
-          header["X-Priority"] = "1 (Highest)"
-          header["X-MSMail-Priority"] = "High"
-          header["Importance"] = "High"
-
-          text_part do
-            body email_body
+            text_part do
+              body email_body
+            end
           end
-        end
 
-        mail.deliver!
-      rescue => e
-        RScout.logger.error "Failed to send email alert!"
-        RScout.logger.error e.message + "\n " + e.backtrace.join("\n ")
+          mail.deliver!
+        rescue => e
+          logger.error "Failed to send email alert!"
+          logger.error e.message + "\n " + e.backtrace.join("\n ")
+        end
       end
-    end
 
-    if config.pagerduty_enabled && config.pagerduty_service_key
-      RScout.logger.info "Triggering PagerDuty incident to #{config.pagerduty_service_key}"
-      begin
-        if config.pagerduty_service_key.match(/@(.*)pagerduty.com$/)
-          mail = Mail.new do
-             from    'RScout <platform+rscout@evertrue.com>'
-             to      config.pagerduty_service_key
-             subject "DOWN alert: RScout tests failing on #{config.name.to_s.humanize.titleize} (#{env})"
-             body    email_body
+      if config.pagerduty_enabled && config.pagerduty_service_key
+        logger.info "Triggering PagerDuty incident to #{config.pagerduty_service_key}"
+        begin
+          if config.pagerduty_service_key.match(/@(.*)pagerduty.com$/)
+            mail = Mail.new do
+               to      config.pagerduty_service_key
+               subject "DOWN alert: RScout tests failing on #{config.name.to_s.humanize.titleize} (#{env})"
+               body    email_body
+            end
+
+            mail.deliver!
+          else
+            p = Pagerduty.new config.pagerduty_service_key, ['scout', env].join('_')
+            incident = p.trigger 'RScout tests failing!', output.results
           end
-
-          mail.deliver!
-        else
-          p = Pagerduty.new config.pagerduty_service_key, ['scout', env].join('_')
-          incident = p.trigger 'RScout tests failing!', output.results
+        rescue => e
+          logger.error "Failed to send PagerDuty alert!"
+          logger.error e.message + "\n " + e.backtrace.join("\n ")
         end
-      rescue => e
-        RScout.logger.error "Failed to send PagerDuty alert!"
-        RScout.logger.error e.message + "\n " + e.backtrace.join("\n ")
       end
     end
-  end
 
-  def self.capture_stdout(&block)
-    RScout.logger.debug "Starting stdout capture…"
-    previous_stdout, $stdout = $stdout, StringIO.new
-    yield
-    $stdout.string
-  ensure
-    $stdout = previous_stdout
-    RScout.logger.debug "Ended stdout capture."
+    def capture_stdout(&block)
+      previous_stdout, $stdout = $stdout, StringIO.new
+      yield
+      $stdout.string
+    ensure
+      $stdout = previous_stdout
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rscout
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Hammond (@andrhamm)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json