test_launcher 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f991a1c539b38368a85a9f61ab2a0cb63043b715
-  data.tar.gz: '09fa671d444c7f6d25ace960d958d8e72aee2a53'
+  metadata.gz: 1f1ee0a4fbf3c9e6973fd82d15b3cbe1c0751153
+  data.tar.gz: b35970bb6e285cd651b83f7441af0138a5f3cc8a
 SHA512:
-  metadata.gz: 6216a818f743b22661e4318f14a27d0768db9de86aa6ea009a432c1734feb33adbc9895e345a856f9428bb4052a76b0843cba5dfa6b28a1600cca95b00f196b9
-  data.tar.gz: d427d0feec470480453ad91c55c24271e1573773d3ca7f32c87a43dc85ebd671b020bafd5d5a6299ba44d129ffecd5e3d731d363dc466b4f504b432f85150efe
+  metadata.gz: 3019301764f5ab3dc68b3dde5af0641c6457660f4bda05d828476a76b3297d75cbb3de01fafbcedd6c392e6d76fc67eec0c2b1fa8b0816736c646bb230776ab0
+  data.tar.gz: 2c842f83bbb877e31b6271093aa31ee86522989852e3e5ca909bc7a7a9a1898091d1d3fbc2dbe6ce03553c8239fb6e750b96c8ab26a15212054f72d11d40714a

data/README.md

@@ -2,6 +2,15 @@
 
 Test Launcher takes a search query and tries to figure out what test you want to run. It makes running tests on the command line easy! Super bonus!
 
+For example:
+
+```
+test_launcher test_name
+
+#=> Found 1 example in 1 file
+#=> ruby -I test test/models/blog_post_test.rb --name=test_name
+```
+
 You might use Test Launcher for two reasons:
 
 1. You run tests from the command line a lot.
@@ -9,7 +18,19 @@ You might use Test Launcher for two reasons:
 
 It was built for Minitest, but it also has basic support for RSpec and ExUnit.
 
-See the __Usages__ section below for some examples.
+---
+
+### Table of Contents
+1. [Installation](#installation)
+1. [Examples](#examples)
+1. [Usage and Options](#usage-and-options)
+1. [Search Prioty](#search-priority)
+1. [Running all changed tests](#running-all-changed-tests)
+1. [Aliases](#quit-typing-so-much)
+1. [RubyMine Support](#rubymine-support)
+1. [Visual Studio Code Support](#visual-studio-code-support)
+1. [Atom Support](#atom-support)
+1. [What's going on in there?](#whats-going-on-in-there)
 
 # Installation
 
@@ -21,7 +42,7 @@ gem install test_launcher
 
 Under the hood, it uses git to determine your project root. If you're on an app that's not using git, let me know and I can remove that dependency.
 
-### Usage
+# Examples
 
 Let's suppose you want to run the test `test_name` in your `blog_post_test.rb`.
 
@@ -138,30 +159,47 @@ test_launcher springified_test
 
 Test Launcher will not use spring if the `DISABLE_SPRING=1` environment variable is set.
 
-### Priorities
+# Usage and Options
+
+```
+Common Usage: `test_launcher "search string" [--all]`
+
+VERSION: 2.2.0
+
+    -a, --all                        Run all matching tests. Defaults to false.
+    -h, --help                       Prints this help
+    -v, --version                    Display the version info
+    -f, --framework framework        The testing framework being used. Valid options: ['minitest', 'rspec', 'ex_unit', 'guess']. Defaults to 'guess'
+    -n, --name name                  Name of testcase/example to run. This will pass through to the selected framework without verifying that the example actually exists. This option really only exists to work with tooling that will automatically run your tests. You shouldn't have much need for this.
+        --example example            alias of name
+    -r, --rerun                      Rerun the previous test. This flag cannot be set when entering search terms
+        --disable-spring             Disable spring. You can also set the env var: DISABLE_SPRING=1
+```
+
+# Search Priority
 
 Test Launcher searches for tests based on your input.
 
 Suppose you type `test_launcher thing`.  It will run tests using this priority preference:
 
 1. A single test file
-  - matches on `thing_test.rb`
+    - matches on `thing_test.rb`
 
 1. A single, specific test method name or partial name
-  - `def test_the_thing`
+    - `def test_the_thing`
 
 1. Multiple test method names in the same file
-  - `def test_the_thing` and `def test_the_other_thing`
+    - `def test_the_thing` and `def test_the_other_thing`
 
 1. Any test file based on a generic search
-  - runs `stuff_test.rb` because it found the word `thing` inside of it
+    - runs `stuff_test.rb` because it found the word `thing` inside of it
 
 If your query looks like it's specifying a line number (e.g. `file_test.rb:17`), that search will be preferred.
 
 Any time it matches multiple files, it will default to running the most recently edited file.  You can append `--all` if you want to run all matching tests, even if they are in different engines/gems!
 
 
-### Running all tests you've changed:
+# Running all changed tests
 
 This will find all uncommitted `*_test.rb` files  and pass them to test_launcher to be run.  Use this before you commit so you don't accidentally commit a test you've broken.
 
@@ -193,7 +231,7 @@ tdiff origin/master
 
 Super fun!
 
-### Setup
+# Quit typing so much!
 
 This gem installs one executable called `test_launcher`.
 
@@ -205,14 +243,43 @@ For me, that's way too much to type, so I recommend adding an alias to your `.ba
 
 ```
 alias t='test_launcher'
-
-# If you are using RVM, use this: (see below for more details)
-alias t='NOEXEC_DISABLE=1 test_launcher'
 ```
 
 Now you can just type `t` instead of `test_launcher`.  Much nicer!
 
 
+## Optimizing with RVM
+
+By default, RVM installs a hook to remove the need to run `bundle exec`.  When you run a gem command, it will search your bundle to see if that command is included in your bundle.  If it is, it will run that version of the command.  If it's not in your bundle, then it will fall back to the global gem.  You can read more about it on [rubygems-bundler](https://github.com/rvm/rubygems-bundler).
+
+Test Launcher is not installed in your bundle.  This means that the time that Bundler spends resolving your Gemfile to check if there's a test\_launcher executable in your bundle is wasted.  For most projects, the amount of time this takes is probably unnoticeable.
+
+On projects with lots of dependencies, this wasted time can be significant.
+
+For example, in a large project, we get a nice improvement:
+
+```
+$: time test_launcher something_that_no_test_says
+#=> Could not find any tests.
+
+#=> real  0m2.214s
+#=> user  0m1.407s
+#=> sys	  0m1.062s
+
+$: time NOEXEC_DISABLE=1 test_launcher something_that_no_test_says
+#=> Could not find any tests.
+
+#=> real  0m1.412s
+#=> user  0m0.745s
+#=> sys   0m0.945s
+```
+
+I suggest that if you are using RVM, you may as well make this your alias:
+
+```
+alias t='NOEXEC_DISABLE=1 test_launcher'
+```
+
 # RubyMine Support
 
 When working with inline gems/engines, RubyMine has a hard time figuring out what `test` folders to push into the load path for Minitest.  RubyMine also does not understand that in a project with inline engines, some of them may use Spring and some may not.  When working with inline gems/engines/apps in RubyMine, you end up having to 'Edit Configurations...' many times a day.  This is a bummer.
@@ -243,36 +310,62 @@ Replace it with:
 
 Using Test Launcher to hijack your RubyMine run configuration should allow you to debug any test as well without issue.
 
-# Optimizing with RVM
-
-By default, RVM installs a hook to remove the need to run `bundle exec`.  When you run a gem command, it will search your bundle to see if that command is included in your bundle.  If it is, it will run that version of the command.  If it's not in your bundle, then it will fall back to the global gem.  You can read more about it on [rubygems-bundler](https://github.com/rvm/rubygems-bundler).
-
-Test Launcher is not installed in your bundle.  This means that the time that Bundler spends resolving your Gemfile to check if there's a test\_launcher executable in your bundle is wasted.  For most projects, the amount of time this takes is probably unnoticeable.
+# Visual Studio Code Support
 
-On projects with lots of dependencies, this wasted time can be significant.
+To run tests from the editor, we need to define some tasks. I like to have three tasks defined: run the test that contains the cursor, run the whole test file, and rerun the last test.
 
-For example, in a large project, we get a nice improvement:
+You can add these to your `.vscode/tasks.json` file:
 
 ```
-$:time test_launcher something_that_no_test_says
-#=> Could not find any tests.
-
-#=> real	0m2.214s
-#=> user	0m1.407s
-#=> sys	  0m1.062s
-
-$:time NOEXEC_DISABLE=1 test_launcher something_that_no_test_says
-#=> Could not find any tests.
+{
+  "version": "0.1.0",
+  "tasks": [
+    {
+      "taskName": "run-test-line",
+      "command": "test_launcher",
+      "args": ["${file}:${lineNumber}"]
+    },
+    {
+      "taskName": "run-test-file",
+      "command": "test_launcher",
+      "args": ["${file}"]
+    },
+    {
+      "taskName": "rerun-last-test",
+      "command": "test_launcher",
+      "args": ["--rerun"]
+    }
+  ]
+}
+```
 
-#=> real	0m1.412s
-#=> user	0m0.745s
-#=> sys	  0m0.945s
+Next, we need some key-combos to trigger each task. Add this to your `.vscode/keybindings.json` and tweak the key-combos to your liking:
+```
+...
+    {
+        "key": "shift+cmd+r",
+        "command": "workbench.action.tasks.runTask",
+        "args": "run-test-line"
+    },
+    {
+        "key": "alt+cmd+r",
+        "command": "workbench.action.tasks.runTask",
+        "args": "run-test-file"
+    },
+    {
+        "key": "cmd+r",
+        "command": "workbench.action.tasks.runTask",
+        "args": "rerun-last-test"
+    }
+...
 ```
 
-I suggest that if you are using RVM, you may as well make this your alias:
+# Atom Support
+
+The [ruby-test](https://github.com/moxley/atom-ruby-test) extension works well for testing ruby apps, so there's only a need to use test\_launcher if you work on a project with inline engines/gems.  If that's the case, you can set it to use test\_launcher in the settings like so:
 
 ```
-alias t='NOEXEC_DISABLE=1 test_launcher'
+test_launcher {relative_path} --name={regex}
 ```
 
 # What's going on in there?

data/lib/test_launcher/cli.rb

@@ -1,13 +1,12 @@
-require "test_launcher/shell/runner"
+require "test_launcher/shell/history_runner"
 require "test_launcher/search"
 require "test_launcher/cli/input_parser"
 require "test_launcher/queries"
+require "test_launcher/cli/request"
 
 module TestLauncher
   module CLI
-
-    class MultiRequestQuery < Struct.new(:requests)
-
+    class MultiFrameworkQuery < Struct.new(:cli_options)
       def command
         command = nil
         command_finders.each do |command_finder|
@@ -18,19 +17,34 @@ module TestLauncher
       end
 
       def command_finders
-        requests.map {|request| Queries::CommandFinder.new(request)}
+        cli_options.frameworks.map do |framework|
+          Queries::CommandFinder.new(request_for(framework))
+        end
+      end
+
+      def request_for(framework)
+        Request.new(
+          framework: framework,
+          search_string: cli_options.search_string,
+          rerun: cli_options.rerun,
+          run_all: cli_options.run_all,
+          disable_spring: cli_options.disable_spring,
+          example_name: cli_options.example_name,
+          shell: cli_options.shell,
+          searcher: cli_options.searcher,
+        )
       end
     end
 
-    def self.launch(argv, env, shell: Shell::Runner.new(log_path: "/tmp/test_launcher.log"), searcher: Search.searcher(shell))
-      requests = CLI::InputParser.new(
+    def self.launch(argv, env, shell: Shell::HistoryRunner.new, searcher: Search.searcher(shell))
+      options = CLI::InputParser.new(
         argv,
         env
-      ).requests(shell: shell, searcher: searcher)
-
-      command = MultiRequestQuery.new(requests).command
+      ).parsed_options(shell: shell, searcher: searcher)
 
-      if command
+      if options.rerun
+        shell.reexec
+      elsif command = MultiFrameworkQuery.new(options).command
         shell.exec command
       else
         shell.warn "No tests found."

data/lib/test_launcher/cli/input_parser.rb

@@ -5,7 +5,7 @@ require "test_launcher/version"
 require "test_launcher/frameworks/rspec"
 require "test_launcher/frameworks/minitest"
 require "test_launcher/frameworks/ex_unit"
-require "test_launcher/cli/request"
+require "test_launcher/cli/options"
 
 module TestLauncher
   module CLI
@@ -35,8 +35,16 @@ VERSION: #{TestLauncher::VERSION}
         exit
       end
 
-      def requests(shell:, searcher:)
-        if @search_string.size == 0
+      def parsed_options(shell:, searcher:)
+        if @search_string.size == 0 && !@options[:rerun]
+          puts "Enter a search term"
+          puts "----"
+          puts option_parser
+          exit
+        elsif @search_string.size > 0 && @options[:rerun]
+          puts "Cannot specify search terms and use --rerun flag"
+          puts "----"
+
           puts option_parser
           exit
         end
@@ -52,17 +60,16 @@ VERSION: #{TestLauncher::VERSION}
             [Frameworks::Minitest, Frameworks::RSpec, Frameworks::ExUnit]
           end
 
-        frameworks.map {|framework|
-          Request.new(
-            search_string: @search_string.join(" "),
-            run_all: !!@options[:run_all],
-            disable_spring: !!@env["DISABLE_SPRING"],
-            example_name: @options[:name],
-            framework: framework,
-            shell: shell,
-            searcher: searcher
-          )
-        }
+        Options.new(
+          search_string: @search_string.join(" "),
+          run_all: !!@options[:run_all],
+          rerun: !!@options[:rerun],
+          disable_spring: @options[:disable_spring] || !!@env["DISABLE_SPRING"],
+          example_name: @options[:name],
+          frameworks: frameworks,
+          shell: shell,
+          searcher: searcher
+        )
       end
 
       def options
@@ -100,6 +107,14 @@ VERSION: #{TestLauncher::VERSION}
           opts.on("--example example", "alias of name") do |example|
             options[:name] = example
           end
+
+          opts.on("-r", "--rerun", "Rerun the previous test. This flag cannot be set when entering search terms") do
+            options[:rerun] = true
+          end
+
+          opts.on("--disable-spring", "Disable spring. You can also set the env var: DISABLE_SPRING=1") do
+            options[:disable_spring] = true
+          end
         end
       end
     end

data/lib/test_launcher/cli/options.rb

@@ -0,0 +1,19 @@
+module TestLauncher
+  module CLI
+    class Options < Struct.new(
+      :search_string,
+      :frameworks,
+      :rerun,
+      :run_all,
+      :disable_spring,
+      :example_name,
+      :shell,
+      :searcher
+    )
+      def initialize(**args)
+        raise ArgumentError.new("These keys are allowed and required: #{members}") unless args.keys.sort == members.sort
+        args.each { |k, v| self[k] = v }
+      end
+    end
+  end
+end

data/lib/test_launcher/cli/request.rb

@@ -4,6 +4,7 @@ module TestLauncher
       def initialize(
         search_string:,
         framework:,
+        rerun: false,
         run_all: false,
         disable_spring: false,
         example_name: nil,
@@ -12,6 +13,7 @@ module TestLauncher
       )
         @search_string = search_string
         @framework = framework
+        @rerun = rerun
         @run_all = run_all
         @disable_spring = disable_spring
         @example_name = example_name
@@ -27,6 +29,10 @@ module TestLauncher
         @run_all
       end
 
+      def rerun?
+        @rerun
+      end
+
       def disable_spring?
         @disable_spring
       end

data/lib/test_launcher/queries.rb

@@ -41,6 +41,10 @@ module TestLauncher
         commandify(LineNumberQuery)
       end
 
+      def rerun
+        commandify(RerunQuery)
+      end
+
       def request
         @request
       end
@@ -83,7 +87,7 @@ module TestLauncher
       end
 
       def one_file?
-         file_count == 1
+        file_count == 1
       end
 
       def file_count
@@ -137,6 +141,14 @@ module TestLauncher
       end
     end
 
+    class RerunQuery < BaseQuery
+      def command
+        if File.exists?("/tmp/test_launcher__last_run")
+          File.read("/tmp/test_launcher__last_run").chomp
+        end
+      end
+    end
+
     class MultiPathQuery < BaseQuery
       def command
         return unless request.search_string.include?(" ")
@@ -398,7 +410,9 @@ module TestLauncher
 
     class GenericQuery < BaseQuery
       def command
-        if request.example_name
+        if request.rerun?
+          command_finder.rerun
+        elsif request.example_name
           command_finder.specified_name
         else
           command_finder.full_search

data/lib/test_launcher/shell/history_runner.rb

@@ -0,0 +1,41 @@
+require "delegate"
+require "test_launcher/shell/runner"
+
+module TestLauncher
+  module Shell
+    class HistoryRunner < SimpleDelegator
+      # delegates to @shell
+
+      def initialize(shell: Shell::Runner.new, history_path: "/tmp/test_launcher__history")
+        @shell = shell
+        @history_path = history_path
+      end
+
+      def exec(cmd)
+        record(cmd)
+        @shell.exec(cmd)
+      end
+
+      def reexec
+        if recall
+          @shell.exec(recall)
+        else
+          warn "Cannot rerun: history file not found or is empty"
+          exit
+        end
+      end
+
+      def record(cmd)
+        File.write(@history_path, cmd)
+      end
+
+      def recall
+        @recall ||= File.file?(@history_path) && File.read(@history_path).chomp
+      end
+
+      def __getobj__
+        @shell
+      end
+    end
+  end
+end

data/lib/test_launcher/version.rb

@@ -1,3 +1,3 @@
 module TestLauncher
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/test/test_helpers/integration_helper.rb

@@ -3,6 +3,7 @@ require "test_launcher/shell/runner"
 
 require "test_launcher/cli"
 require "test_helpers/mocks"
+require "test_launcher/shell/history_runner"
 
 module TestLauncher
   module IntegrationHelper
@@ -25,7 +26,6 @@ module TestLauncher
 
     private
 
-
     def shell_mock
       @shell_mock ||= IntegrationShell.new
     end

data/test/test_launcher/cli/input_parser_test.rb

@@ -6,66 +6,73 @@ module TestLauncher
     class InputParserTest < TestCase
 
       def test_request__defaults
-        requests = parse("a_string", {})
+        options = parse("a_string", {})
 
-        assert_equal "a_string", requests.first.search_string
-        assert_equal false, requests.first.run_all?
-        assert_equal false, requests.first.disable_spring?
-        assert_equal nil, requests.first.example_name
+        assert_equal "a_string", options.search_string
+        assert_equal false, options.run_all
+        assert_equal false, options.disable_spring
+        assert_equal nil, options.example_name
       end
 
       def test_request__all
-        requests = parse("a_string --all", {})
+        options = parse("a_string --all", {})
 
-        assert_equal "a_string", requests.first.search_string
-        assert_equal true, requests.first.run_all?
+        assert_equal "a_string", options.search_string
+        assert_equal true, options.run_all
       end
 
+      def test_request__rerun
+        options = parse("--rerun", {})
+
+        assert_equal true, options.rerun
+      end
+
+
       def test_request__disable_spring
-        requests = parse("a_string", {"DISABLE_SPRING" => "1"})
+        options = parse("a_string", {"DISABLE_SPRING" => "1"})
 
-        assert_equal "a_string", requests.first.search_string
-        assert_equal true, requests.first.disable_spring?
+        assert_equal "a_string", options.search_string
+        assert_equal true, options.disable_spring
       end
 
       def test_request__example_name
-        requests = parse("path/to/file_test.rb --name example_name", {})
+        options = parse("path/to/file_test.rb --name example_name", {})
 
-        assert_equal "path/to/file_test.rb", requests.first.search_string
-        assert_equal "example_name", requests.first.example_name
+        assert_equal "path/to/file_test.rb", options.search_string
+        assert_equal "example_name", options.example_name
       end
 
       def test_request__example_name__regex
-        requests = parse("path/to/file_test.rb --name /example_name/", {})
+        options = parse("path/to/file_test.rb --name /example_name/", {})
 
-        assert_equal "path/to/file_test.rb", requests.first.search_string
-        assert_equal "/example_name/", requests.first.example_name
+        assert_equal "path/to/file_test.rb", options.search_string
+        assert_equal "/example_name/", options.example_name
       end
 
       def test_request__example_name__with_equal_sign
-        requests = parse("path/to/file_test.rb --name=/example_name/", {})
+        options = parse("path/to/file_test.rb --name=/example_name/", {})
 
-        assert_equal "path/to/file_test.rb", requests.first.search_string
-        assert_equal "/example_name/", requests.first.example_name
+        assert_equal "path/to/file_test.rb", options.search_string
+        assert_equal "/example_name/", options.example_name
       end
 
       def test_request__example_name__short_option
-        requests = parse("path/to/file_test.rb -n /example_name/", {})
+        options = parse("path/to/file_test.rb -n /example_name/", {})
 
-        assert_equal "path/to/file_test.rb", requests.first.search_string
-        assert_equal "/example_name/", requests.first.example_name
+        assert_equal "path/to/file_test.rb", options.search_string
+        assert_equal "/example_name/", options.example_name
       end
 
       def test_joins_spaces
-        requests = parse("query with spaces", {})
+        options = parse("query with spaces", {})
 
-        assert_equal "query with spaces", requests.first.search_string
+        assert_equal "query with spaces", options.search_string
       end
 
       private
 
       def parse(input, env)
-        InputParser.new(input.split(" "), env).requests(shell: dummy_shell, searcher: nil)
+        InputParser.new(input.split(" "), env).parsed_options(shell: dummy_shell, searcher: nil)
       end
     end
   end

data/test/test_launcher/ex_unit_integration_test.rb

@@ -5,10 +5,10 @@ module TestLauncher
   class ExUnitIntegrationTest < TestCase
     include IntegrationHelper
 
-    def launch(query, env: {}, searcher:)
+    def launch(query, env: {}, searcher:, shell: shell_mock)
       query += " --framework ex_unit "
-      shell_mock.reset
-      CLI.launch(query.split(" "), env, shell: shell_mock, searcher: searcher)
+      shell.reset
+      CLI.launch(query.split(" "), env, shell: shell, searcher: searcher)
     end
 
     def test__by_example__single_method
@@ -388,5 +388,26 @@ module TestLauncher
       launch("file_1_test.exs:1", searcher: searcher)
       assert_equal "cd /src/inline/project && mix test /src/inline/project/test/file_1_test.exs:1", shell_mock.recall_exec
     end
+
+    def test__rerun
+      searcher = MemorySearcher.new do |searcher|
+        searcher.mock_file do |f|
+          f.path "/src/test/file_1_test.exs"
+          f.mtime Time.new(2014, 01, 01, 00, 00, 00)
+        end
+        searcher.mock_file do |f|
+          f.path "/src/test/file_2_test.exs"
+          f.mtime Time.new(2015, 01, 01, 00, 00, 00)
+        end
+      end
+
+history_shell = Shell::HistoryRunner.new(shell: shell_mock, history_path: File.expand_path(File.join(__dir__, '../../tmp/test_history.log')))
+
+      launch("file_1_test.exs", searcher: searcher, shell: history_shell)
+      assert_equal "cd /src && mix test /src/test/file_1_test.exs", history_shell.recall_exec
+
+      launch("--rerun", searcher: searcher, shell: history_shell)
+      assert_equal "cd /src && mix test /src/test/file_1_test.exs", history_shell.recall_exec
+    end
   end
 end

data/test/test_launcher/minitest_integration_test.rb

@@ -5,10 +5,10 @@ module TestLauncher
   class MinitestIntegrationTest < TestCase
     include IntegrationHelper
 
-    def launch(query, env: {}, searcher:)
+    def launch(query, env: {}, searcher:, shell: shell_mock)
       query += " --framework minitest "
-      shell_mock.reset
-      CLI.launch(query.split(" "), env, shell: shell_mock, searcher: searcher)
+      shell.reset
+      CLI.launch(query.split(" "), env, shell: shell, searcher: searcher)
     end
 
     def test__by_example__single_method
@@ -269,12 +269,14 @@ module TestLauncher
         end
       end
 
-
       launch("class_1_test.rb", env: {}, searcher: searcher)
       assert_equal "cd /src && bundle exec spring testunit /src/test/class_1_test.rb", shell_mock.recall_exec
 
       launch("class_1_test.rb", env: {"DISABLE_SPRING" => "1"}, searcher: searcher)
       assert_equal "cd /src && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/test/class_1_test.rb", shell_mock.recall_exec
+
+      launch("class_1_test.rb --disable-spring", searcher: searcher)
+      assert_equal "cd /src && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/test/class_1_test.rb", shell_mock.recall_exec
     end
 
     def test__by_regex__one_match
@@ -625,5 +627,27 @@ module TestLauncher
       launch("file_1_test.rb:1", searcher: searcher)
       assert shell_mock.recall(:warn).first.first.to_s.match(/Open an issue/)
     end
+
+    def test__rerun
+      searcher = MemorySearcher.new do |searcher|
+        searcher.mock_file do |f|
+          f.path "/src/test/file_1_test.rb"
+          f.mtime Time.new(2014, 01, 01, 00, 00, 00)
+        end
+
+        searcher.mock_file do |f|
+          f.path "/src/test/file_2_test.rb"
+          f.mtime Time.new(2015, 01, 01, 00, 00, 00)
+        end
+      end
+
+      history_shell = Shell::HistoryRunner.new(shell: shell_mock, history_path: File.expand_path(File.join(__dir__, '../../tmp/test_history.log')))
+
+      launch("file_1_test.rb", searcher: searcher, shell: history_shell)
+      assert_equal "cd /src && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/test/file_1_test.rb", history_shell.recall_exec
+
+      launch("--rerun", searcher: searcher, shell: history_shell )
+      assert_equal "cd /src && bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}' /src/test/file_1_test.rb", history_shell.recall_exec
+    end
   end
 end

data/test/test_launcher/queries/generic_query_test.rb

@@ -10,13 +10,13 @@ module TestLauncher
       def test__specified_name
         command_finder = Mock.new(Queries::CommandFinder, specified_name: :specified_name)
 
-        assert_equal :specified_name, GenericQuery.new(MockRequest.new(example_name: "name_present"), command_finder).command
+        assert_equal :specified_name, GenericQuery.new(MockRequest.new(example_name: "name_present", rerun?: false), command_finder).command
       end
 
       def test__example_name
         command_finder = Mock.new(Queries::CommandFinder, full_search: :full_search)
 
-        assert_equal :full_search, GenericQuery.new(MockRequest.new(example_name: nil), command_finder).command
+        assert_equal :full_search, GenericQuery.new(MockRequest.new(example_name: nil, rerun?: false), command_finder).command
       end
     end
   end

data/test/test_launcher/rspec_integration_test.rb

@@ -5,10 +5,10 @@ module TestLauncher
   class RspecIntegrationTest < TestCase
     include IntegrationHelper
 
-    def launch(query, env: {}, searcher:)
+    def launch(query, env: {}, searcher:, shell: shell_mock)
       query += " --framework rspec"
-      shell_mock.reset
-      CLI.launch(query.split(" "), env, shell: shell_mock, searcher: searcher)
+      shell.reset
+      CLI.launch(query.split(" "), env, shell: shell, searcher: searcher)
     end
 
     def test__by_example__single_example
@@ -548,5 +548,27 @@ module TestLauncher
       launch("file_1_spec.rb:1", searcher: searcher)
       assert_equal "cd /src/inline/gem && bundle exec rspec /src/inline/gem/spec/file_1_spec.rb:1", shell_mock.recall_exec
     end
+
+    def test__rerun
+      searcher = MemorySearcher.new do |searcher|
+        searcher.mock_file do |f|
+          f.path "/src/spec/file_1_spec.rb"
+          f.mtime Time.new(2014, 01, 01, 00, 00, 00)
+        end
+
+        searcher.mock_file do |f|
+          f.path "/src/spec/file_2_spec.rb"
+          f.mtime Time.new(2015, 01, 01, 00, 00, 00)
+        end
+      end
+
+      history_shell = Shell::HistoryRunner.new(shell: shell_mock, history_path: File.expand_path(File.join(__dir__, '../../tmp/test_history.log')))
+
+      launch("file_1_spec.rb", searcher: searcher, shell: history_shell)
+      assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb", history_shell.recall_exec
+
+      launch("--rerun", searcher: searcher, shell: history_shell)
+      assert_equal "cd /src && bundle exec rspec /src/spec/file_1_spec.rb", history_shell.recall_exec
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_launcher
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,6 +56,7 @@ files:
 - lib/test_launcher/base_error.rb
 - lib/test_launcher/cli.rb
 - lib/test_launcher/cli/input_parser.rb
+- lib/test_launcher/cli/options.rb
 - lib/test_launcher/cli/request.rb
 - lib/test_launcher/frameworks/base.rb
 - lib/test_launcher/frameworks/ex_unit.rb
@@ -70,6 +71,7 @@ files:
 - lib/test_launcher/search/ag.rb
 - lib/test_launcher/search/git.rb
 - lib/test_launcher/shell/color.rb
+- lib/test_launcher/shell/history_runner.rb
 - lib/test_launcher/shell/runner.rb
 - lib/test_launcher/version.rb
 - test/install
@@ -98,6 +100,7 @@ files:
 - test/test_launcher/search/ag_test.rb
 - test/test_launcher/search/git_test.rb
 - test_launcher.gemspec
+- tmp/.gitkeep
 homepage: http://github.com/petekinnecom/test_launcher
 licenses:
 - MIT
@@ -148,4 +151,3 @@ test_files:
 - test/test_launcher/rubymine_test.rb
 - test/test_launcher/search/ag_test.rb
 - test/test_launcher/search/git_test.rb
-has_rdoc: