assert 2.3.2 → 2.3.3

data/bin/assert

@@ -3,5 +3,10 @@
 # Copyright (c) 2011-Present Kelly Redding and Collin Redding
 #
 
+require 'assert'
 require 'assert/cli'
-Assert::CLI.run *ARGV
+
+Assert.config.debug ENV['ASSERT_DEBUG'] == 'true' || Assert::CLI.debug?(ARGV)
+
+Assert::CLI.bench('CLI init and parse'){ @cli = Assert::CLI.new(*ARGV) }
+@cli.run

data/lib/assert.rb

@@ -15,19 +15,6 @@ module Assert
   def self.config; Config; end
   def self.configure; yield Config if block_given?; end
 
-  def self.init(test_files, opts)
-    # load any test helper file
-    if p = opts[:test_dir_path]
-      helper_file = File.join(p, Config.test_helper)
-      require helper_file if File.exists?(helper_file)
-    end
-
-    # load the test files
-    Assert.view.fire(:before_load, test_files)
-    test_files.each{ |p| require p }
-    Assert.view.fire(:after_load)
-  end
-
   class Config
     include Singleton
     # map any class methods to the singleton
@@ -55,17 +42,7 @@ module Assert
       @runner = Assert::Runner.new
       @test_dir    = "test"
       @test_helper = "helper.rb"
-
-      # use git, by default, to determine which files have changes
-      @changed_files = proc do |test_paths|
-        cmds = [
-          "git diff --no-ext-diff --name-only",       # changed files
-          "git ls-files --others --exclude-standard"  # added files
-        ]
-        cmd = cmds.map{ |c| "#{c} -- #{test_paths.join(' ')}" }.join(' && ')
-        puts "  `#{cmd}`" if Assert.config.debug
-        `#{cmd}`.split("\n")
-      end
+      @changed_files = Assert::AssertRunner::DEFAULT_CHANGED_FILES_PROC
 
       # default option values
       @runner_seed    = begin; srand; srand % 0xFFFF; end.to_i

data/lib/assert/assert_runner.rb

@@ -1,3 +1,5 @@
+require 'assert/cli'
+
 module Assert
 
   class AssertRunner
@@ -5,18 +7,49 @@ module Assert
     USER_SETTINGS_FILE  = ".assert/init.rb"
     LOCAL_SETTINGS_FILE = ".assert.rb"
 
-    def initialize(test_paths, test_options)
-      require 'assert'  # inits config singleton with the default settings
+    DEFAULT_CHANGED_FILES_PROC = Proc.new do |test_paths|
+      # use git to determine which files have changes
+      files = []
+      cmd = [
+        "git diff --no-ext-diff --name-only",       # changed files
+        "git ls-files --others --exclude-standard"  # added files
+      ].map{ |c| "#{c} -- #{test_paths.join(' ')}" }.join(' && ')
 
-      apply_user_settings
-      apply_local_settings
-      apply_option_settings(test_options)
-      apply_env_settings
+      Assert::CLI.bench('Load only changed files') do
+        files = `#{cmd}`.split("\n")
+      end
+      puts Assert::CLI.debug_msg("  `#{cmd}`") if Assert.config.debug
+      files
+    end
+
+    def initialize(test_paths, test_options)
+      Assert::CLI.bench('Apply settings') do
+        apply_user_settings
+        apply_local_settings
+        apply_option_settings(test_options)
+        apply_env_settings
+      end
 
       files = test_files(test_paths.empty? ? [*Assert.config.test_dir] : test_paths)
-      Assert.init(files, {
-        :test_dir_path => path_of(Assert.config.test_dir, files.first)
-      })
+      init(files, path_of(Assert.config.test_dir, files.first))
+    end
+
+    def init(test_files, test_dir)
+      # load any test helper file
+      if test_dir && (h = File.join(test_dir, Config.test_helper)) && File.exists?(h)
+        Assert::CLI.bench('Require test helper'){ require h }
+      end
+
+      # load the test files
+      Assert.view.fire(:before_load, test_files)
+      Assert::CLI.bench("Require #{test_files.count} test files") do
+        test_files.each{ |p| require p }
+      end
+      if Assert.config.debug
+        puts Assert::CLI.debug_msg("Test files:")
+        test_files.each{ |f| puts Assert::CLI.debug_msg("  #{f}") }
+      end
+      Assert.view.fire(:after_load)
     end
 
     def run
@@ -56,7 +89,6 @@ module Assert
     end
 
     def changed_test_files(test_paths)
-      puts "Loading only changed files:" if Assert.config.debug
       globbed_test_files(Assert.config.changed_files.call(test_paths))
     end
 

data/lib/assert/cli.rb

@@ -1,3 +1,4 @@
+require 'benchmark'
 require 'set'
 require 'assert/assert_runner'
 require 'assert/version'
@@ -6,11 +7,24 @@ module Assert
 
   class CLI
 
-    def self.run(*args)
-      self.new.run(*args)
+    def self.debug?(args)
+      args.include?('-d') || args.include?('--debug')
     end
 
-    def initialize
+    def self.debug_msg(msg, time_in_ms = nil)
+      "[DEBUG] #{msg}#{" (#{time_in_ms} ms)" if time_in_ms}"
+    end
+
+    def self.bench(msg, &block)
+      if !Assert.config.debug
+        block.call; return
+      end
+      RoundedMillisecondTime.new(Benchmark.measure(&block).real).tap do |time_in_ms|
+        puts debug_msg(msg, time_in_ms)
+      end
+    end
+
+    def initialize(*args)
       @cli = CLIRB.new do
         option 'runner_seed', 'Use a given seed to run tests', {
           :abbrev => 's', :value => Fixnum
@@ -27,15 +41,11 @@ module Assert
         # show loaded test files, cli err backtraces, etc
         option 'debug', 'run in debug mode'
       end
+      @cli.parse!(args)
     end
 
-    def run(*args)
-      # default debug_mode to the env var
-      debug_mode = ENV['ASSERT_DEBUG'] == 'true'
+    def run
       begin
-        # parse manually in the case that parsing fails before the debug arg
-        debug_mode ||= args.include?('-d') || args.include?('--debug')
-        @cli.parse!(args)
         Assert::AssertRunner.new(@cli.args, @cli.opts).run
       rescue CLIRB::HelpExit
         puts help
@@ -43,7 +53,7 @@ module Assert
         puts Assert::VERSION
       rescue CLIRB::Error => exception
         puts "#{exception.message}\n\n"
-        puts  debug_mode ? exception.backtrace.join("\n") : help
+        puts  Assert.config.debug ? exception.backtrace.join("\n") : help
         exit(1)
       rescue Exception => exception
         puts "#{exception.class}: #{exception.message}"
@@ -61,6 +71,14 @@ module Assert
 
   end
 
+  module RoundedMillisecondTime
+    ROUND_PRECISION = 3
+    ROUND_MODIFIER = 10 ** ROUND_PRECISION
+    def self.new(time_in_seconds)
+      (time_in_seconds * 1000 * ROUND_MODIFIER).to_i / ROUND_MODIFIER.to_f
+    end
+  end
+
   class CLIRB  # Version 1.0.0, https://github.com/redding/cli.rb
     Error    = Class.new(RuntimeError);
     HelpExit = Class.new(RuntimeError); VersionExit = Class.new(RuntimeError)

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "2.3.2"
+  VERSION = "2.3.3"
 end

data/lib/assert/view/default_view.rb

@@ -19,10 +19,6 @@ module Assert::View
     option 'ignore_styles', :magenta
 
     def before_load(test_files)
-      if Assert.config.debug
-        puts "Loading test files:"
-        test_files.each{ |f| puts "  #{f}" }
-      end
     end
 
     def after_load

data/test/unit/assert_tests.rb

@@ -9,7 +9,7 @@ module Assert
     desc "the Assert module"
     subject { Assert }
 
-    should have_imeths :view, :suite, :runner, :config, :configure, :init
+    should have_imeths :view, :suite, :runner, :config, :configure
 
     should "know its config singleton" do
       assert_same Config, subject.config

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 3
-  - 2
-  version: 2.3.2
+  - 3
+  version: 2.3.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-29 00:00:00 Z
+date: 2013-11-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ansi