assert 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb4aa7ad09c0655c7575c8cd7b65d7477a4074bf
-  data.tar.gz: 7baa88b16be41c504944626e5d29e1a51d0c7502
+  metadata.gz: fa3c97970bacaed419dd9a2986302c8f7381ef8c
+  data.tar.gz: 0bf830c19a718be854960e6ddbb6b6bdf30f78fa
 SHA512:
-  metadata.gz: 900bfce4dbbda0860cd97d2719be1e9d0e7151fefb93d9f8190c4e3537f65d36fe1359e8df7e829208c69c698b272dfcc5991baa5d097d42d90c6595b2e75746
-  data.tar.gz: 02c7a331e37799de0e8a74f2885aa935bc9a59a4f0af300f66927ec05d408cfe6e822682d63a6116fdfdfc0e7bc946d32fee10ee3bf721deca257b2b03a3a67a
+  metadata.gz: e7dffb68840de736888b0f7aa2c4159677eb820d75a83be49c2568b1ab796ad28135cae9e397eb341b857fb2aa6bbc577d890720094d626c6b4bb3ba3042779c
+  data.tar.gz: 772c42c5f472a9973d9d59bbc0d3e61a44886e58a7ed25d9f3cd0d6a1d15bc651da563a06ae1a455b6afd8d232cd64e3222014aaeb8e92e2cf7620b49128d909

data/README.md

@@ -297,16 +297,26 @@ Using the CLI:
 $ assert [-c|--changed-only|--no-changed-only]
 ```
 
+You can also optionally send a "reference" value to evaluate changes against.  This can be any value and it is passed to the proc that detects changes (see below).  Using the default git changed proc, this value would be any commit reference (ie HEAD, master, etc).
+
+Using the CLI:
+
+```sh
+$ assert -c [-r|--changed-ref] REF_VALUE
+```
+
+Note: This option has no effect unless used with the `-c` option.  One practical use of this is to test changes 1) after they have been staged (`assert -cr HEAD`) or 2) after they have been committed to a branch (`assert -cr master`) (for example).
+
 #### Changed Test File Detection
 
 The changed files are detected using two git commands by default:
 
 ```sh
-git diff --no-ext-diff --name-only        # changed files
+git diff --no-ext-diff --name-only {ref}  # changed files
 git ls-files --others --exclude-standard  # added files
 ```
 
-The git cmds have ` -- #{test_paths}` appended to them to scope their results to just the test paths specified by the CLI and are run together using ` && `.
+The git cmds have ` -- #{test_paths}` appended to them to scope their results to just the test paths specified by the CLI and are run together using ` && `.  The `{ref}` above is any reference value given using the `-r` CLI opt.
 
 This, of course, assumes you are working in a git repository.  If you are not or you want to use custom logic to determine the changed files, configure a custom proc.  The proc should take two parameters: the config and an array of test paths specified by the CLI.
 

data/lib/assert/assert_runner.rb

@@ -27,6 +27,11 @@ module Assert
         Assert::CLI.bench('Require test helper'){ require h }
       end
 
+      if self.config.list
+        $stdout.puts test_files
+        halt
+      end
+
       # load the test files
       self.config.view.fire(:before_load, test_files)
       Assert::CLI.bench("Require #{test_files.count} test files") do
@@ -43,7 +48,11 @@ module Assert
       self.config.runner.run(self.config.suite, self.config.view)
     end
 
-    protected
+    private
+
+    def halt
+      throw(:halt)
+    end
 
     def apply_user_settings
       safe_require("#{ENV['HOME']}/#{USER_SETTINGS_FILE}") if ENV['HOME']
@@ -61,8 +70,6 @@ module Assert
       self.config.runner_seed ENV['ASSERT_RUNNER_SEED'].to_i if ENV['ASSERT_RUNNER_SEED']
     end
 
-    private
-
     def test_files(test_paths)
       file_paths = if self.config.changed_only
         changed_test_files(test_paths)

data/lib/assert/cli.rb

@@ -27,36 +27,46 @@ module Assert
     def initialize(*args)
       @args = args
       @cli = CLIRB.new do
-        option 'runner_seed', 'Use a given seed to run tests', {
+        option 'runner_seed', 'use a given seed to run tests', {
           :abbrev => 's', :value => Fixnum
         }
-        option 'capture_output', 'capture stdout and display in result details', {
-          :abbrev => 'o'
-        }
-        option 'halt_on_fail', 'halt a test when it fails', {
-          :abbrev => 'h'
-        }
         option 'changed_only', 'only run test files with changes', {
           :abbrev => 'c'
         }
+        option 'changed_ref', 'reference for changes, use with `-c` opt', {
+          :abbrev => 'r', :value => ''
+        }
         option 'pp_objects', 'pretty-print objects in fail messages', {
           :abbrev => 'p'
         }
+        option 'capture_output', 'capture stdout and display in result details', {
+          :abbrev => 'o'
+        }
+        option 'halt_on_fail', 'halt a test when it fails', {
+          :abbrev => 'h'
+        }
         option 'profile', 'output test profile info', {
           :abbrev => 'e'
         }
         option 'verbose', 'output verbose runtime test info', {
           :abbrev => 'v'
         }
+        option 'list', 'list test files on $stdout', {
+          :abbrev => 'l'
+        }
         # show loaded test files, cli err backtraces, etc
-        option 'debug', 'run in debug mode'
+        option 'debug', 'run in debug mode', {
+          :abbrev => 'd'
+        }
       end
     end
 
     def run
       begin
         @cli.parse!(@args)
-        Assert::AssertRunner.new(Assert.config, @cli.args, @cli.opts).run
+        catch(:halt) do
+          Assert::AssertRunner.new(Assert.config, @cli.args, @cli.opts).run
+        end
       rescue CLIRB::HelpExit
         puts help
       rescue CLIRB::VersionExit

data/lib/assert/config.rb

@@ -14,10 +14,10 @@ module Assert
     end
 
     settings :view, :suite, :runner
-    settings :test_dir, :test_helper, :test_file_suffixes, :runner_seed
+    settings :test_dir, :test_helper, :test_file_suffixes
     settings :changed_proc, :pp_proc, :use_diff_proc, :run_diff_proc
-    settings :capture_output, :halt_on_fail, :changed_only, :pp_objects
-    settings :debug, :profile, :verbose
+    settings :runner_seed, :changed_only, :changed_ref, :pp_objects
+    settings :capture_output, :halt_on_fail, :profile, :verbose, :list, :debug
 
     def initialize(settings = nil)
       @suite  = Assert::Suite.new(self)
@@ -27,21 +27,23 @@ module Assert
       @test_dir    = "test"
       @test_helper = "helper.rb"
       @test_file_suffixes = ['_tests.rb', '_test.rb']
-      @runner_seed   = begin; srand; srand % 0xFFFF; end.to_i
 
       @changed_proc  = Assert::U.git_changed_proc
       @pp_proc       = Assert::U.stdlib_pp_proc
       @use_diff_proc = Assert::U.default_use_diff_proc
       @run_diff_proc = Assert::U.syscmd_diff_proc
 
-      # mode flags
-      @capture_output = false
-      @halt_on_fail   = true
+      # option settings
+      @runner_seed    = begin; srand; srand % 0xFFFF; end.to_i
       @changed_only   = false
+      @changed_ref    = ''
       @pp_objects     = false
-      @debug          = false
+      @capture_output = false
+      @halt_on_fail   = true
       @profile        = false
       @verbose        = false
+      @list           = false
+      @debug          = false
 
       self.apply(settings || {})
     end

data/lib/assert/utils.rb

@@ -63,8 +63,8 @@ module Assert
       Proc.new do |config, test_paths|
         files = []
         cmd = [
-          "git diff --no-ext-diff --name-only",       # changed files
-          "git ls-files --others --exclude-standard"  # added files
+          "git diff --no-ext-diff --name-only #{config.changed_ref}", # changed files
+          "git ls-files --others --exclude-standard"                  # added files
         ].map{ |c| "#{c} -- #{test_paths.join(' ')}" }.join(' && ')
         Assert::CLI.bench('Load only changed files') do
           files = `#{cmd}`.split("\n")

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "2.13.0"
+  VERSION = "2.14.0"
 end

data/test/unit/config_tests.rb

@@ -11,11 +11,11 @@ class Assert::Config
     subject{ @config }
 
     should have_imeths :suite, :view, :runner
-    should have_imeths :test_dir, :test_helper, :test_file_suffixes, :runner_seed
+    should have_imeths :test_dir, :test_helper, :test_file_suffixes
     should have_imeths :changed_proc, :pp_proc, :use_diff_proc, :run_diff_proc
-    should have_imeths :capture_output, :halt_on_fail, :changed_only, :pp_objects
-    should have_imeths :debug, :profile, :verbose
-    should have_imeths :apply
+    should have_imeths :runner_seed, :changed_only, :changed_ref, :pp_objects
+    should have_imeths :capture_output, :halt_on_fail, :profile, :verbose, :list
+    should have_imeths :debug, :apply
 
     should "default the view, suite, and runner" do
       assert_kind_of Assert::View::DefaultView, subject.view
@@ -23,11 +23,10 @@ class Assert::Config
       assert_kind_of Assert::Runner, subject.runner
     end
 
-    should "default the test dir/helper/suffixes/seed" do
+    should "default the test dir/helper/suffixes" do
       assert_equal 'test', subject.test_dir
       assert_equal 'helper.rb', subject.test_helper
       assert_equal ['_tests.rb', "_test.rb"], subject.test_file_suffixes
-      assert_not_nil subject.runner_seed
     end
 
     should "default the procs" do
@@ -37,14 +36,17 @@ class Assert::Config
       assert_not_nil subject.run_diff_proc
     end
 
-    should "default the mode flags" do
-      assert_not subject.capture_output
-      assert     subject.halt_on_fail
-      assert_not subject.changed_only
-      assert_not subject.pp_objects
-      assert_not subject.debug
-      assert_not subject.profile
-      assert_not subject.verbose
+    should "default the option settings" do
+      assert_not_nil subject.runner_seed
+      assert_not     subject.changed_only
+      assert_empty   subject.changed_ref
+      assert_not     subject.pp_objects
+      assert_not     subject.capture_output
+      assert         subject.halt_on_fail
+      assert_not     subject.profile
+      assert_not     subject.verbose
+      assert_not     subject.list
+      assert_not     subject.debug
     end
 
     should "apply settings given from a hash" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assert
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Kelly Redding
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi