test_launcher 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee375d2d54fa4515002e279d1be2d1311265ef15
-  data.tar.gz: 45d2b818b60b50a9b1a973b41cba18ad49d79518
+  metadata.gz: f991a1c539b38368a85a9f61ab2a0cb63043b715
+  data.tar.gz: '09fa671d444c7f6d25ace960d958d8e72aee2a53'
 SHA512:
-  metadata.gz: a2eba4180a96e7ddb178ff3516106cb1ad600782f864b8c0f5125cc19950610e3d593d99bf1f6febbf690d3bb3346096953061928682a34f76bb1084b27525c1
-  data.tar.gz: 9452932c5136e3fd33d7616c65d33d52a992df0e1f397e7618a2180c1eaa2b6f8c20dfce23eec1053420a18cbb279e57bff83226b4c4e408212ac60cd55b792a
+  metadata.gz: 6216a818f743b22661e4318f14a27d0768db9de86aa6ea009a432c1734feb33adbc9895e345a856f9428bb4052a76b0843cba5dfa6b28a1600cca95b00f196b9
+  data.tar.gz: d427d0feec470480453ad91c55c24271e1573773d3ca7f32c87a43dc85ebd671b020bafd5d5a6299ba44d129ffecd5e3d731d363dc466b4f504b432f85150efe

data/lib/test_launcher/queries.rb

@@ -29,10 +29,6 @@ module TestLauncher
         commandify(FullRegexQuery)
       end
 
-      def single_search_term
-        commandify(SingleTermQuery)
-      end
-
       def full_search
         commandify(SearchQuery)
       end
@@ -143,6 +139,7 @@ module TestLauncher
 
     class MultiPathQuery < BaseQuery
       def command
+        return unless request.search_string.include?(" ")
         return if test_cases.empty?
 
         shell.notify("Found #{pluralize(file_count, "file")}.")
@@ -343,7 +340,8 @@ module TestLauncher
       LINE_SPLIT_REGEX = /\A(?<file>.*):(?<line_number>\d+)\Z/
 
       def command
-        return unless search_results.any?
+        return unless match
+        return unless test_cases.any?
 
         if one_file?
           shell.notify "Found #{pluralize(file_count, "file")}."
@@ -368,7 +366,6 @@ module TestLauncher
 
       def search_results
         @search_results ||= begin
-          match = request.search_string.match(LINE_SPLIT_REGEX)
           if match
             searcher.by_line(match[:file], match[:line_number].to_i)
           else
@@ -376,33 +373,22 @@ module TestLauncher
           end
         end
       end
+
+      def match
+        @match ||= request.search_string.match(LINE_SPLIT_REGEX)
+      end
     end
 
-    class SingleTermQuery < BaseQuery
+    class SearchQuery < BaseQuery
       def command
         [
+          :line_number,
           :by_path,
+          :multi_path_query,
           :example_name,
           :multi_example_name,
           :from_full_regex,
-        ]
-          .each { |command_type|
-            command = command_finder.public_send(command_type)
-            return command if command
-          }
-        nil
-      end
-    end
-
-    class SearchQuery < BaseQuery
-      def command
-        {
-          multi_path_query: request.search_string.include?(" "),
-          line_number: request.search_string.include?(":"),
-          single_search_term: true
-        }.each {|command_type, valid|
-          next unless valid
-
+        ].each {|command_type|
           command = command_finder.public_send(command_type)
           return command if command
         }

data/lib/test_launcher/search.rb

@@ -4,15 +4,15 @@ require 'test_launcher/search/git'
 module TestLauncher
   module Search
     def self.searcher(shell)
-      `which ag`
-      implementation =
-        if $?.success?
-          Search::Ag
-        else
-          Search::Git
-        end
+      # `which ag`
+      # implementation =
+      #   if $?.success?
+      #     Search::Ag
+      #   else
+      #     Search::Git
+      #   end
 
-      implementation.new(shell)
+      Search::Git.new(shell)
     end
   end
 end

data/lib/test_launcher/search/ag.rb

@@ -45,7 +45,7 @@ module TestLauncher
       end
 
       def grep(regex, file_pattern: '*')
-        results = interface.grep(regex, file_pattern)
+        results = interface.grep(regex, strip_system_path(file_pattern))
         results.map do |result|
           interpret_grep_result(result)
         end

data/lib/test_launcher/version.rb

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

data/test/test_launcher/search/ag_test.rb

@@ -0,0 +1,42 @@
+require "test_helper"
+require "test_launcher/search/ag"
+require "test_helpers/mocks"
+
+module TestLauncher
+  module Search
+    class AgTest < TestCase
+      include DefaultMocks
+
+      def setup
+        super
+        Dir.stubs(:chdir)
+      end
+
+      def test_find_files__strips_absolute_path_for_search
+        interface = mock {
+          expects(:root_path).returns("/path/to/repo")
+          expects(:ls_files).with("relative/file_test.rb").returns(["inline_gem/relative/file_test.rb"])
+        }
+
+        searcher = Ag.new(nil, interface)
+        files = searcher.find_files("/path/to/repo/relative/file_test.rb")
+
+        assert_equal ["/path/to/repo/inline_gem/relative/file_test.rb"], files
+      end
+
+      def test_grep__strips_absolute_path_of_file_pattern
+        interface = mock {
+          expects(:root_path).returns("/path/to/repo")
+          expects(:grep).with("regex", "relative/file_test.rb").returns([
+            "relative/file_test.rb:20:    def test_regex"
+          ])
+        }
+
+        searcher = Ag.new(nil, interface)
+        files = searcher.grep("regex", file_pattern: "/path/to/repo/relative/file_test.rb")
+
+        assert_equal [{file: "/path/to/repo/relative/file_test.rb", line_number: 20, line: "def test_regex"}], files
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_launcher
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Pete Kinnecom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,7 +56,6 @@ files:
 - lib/test_launcher/base_error.rb
 - lib/test_launcher/cli.rb
 - lib/test_launcher/cli/input_parser.rb
-- lib/test_launcher/cli/query.rb
 - lib/test_launcher/cli/request.rb
 - lib/test_launcher/frameworks/base.rb
 - lib/test_launcher/frameworks/ex_unit.rb
@@ -94,9 +93,9 @@ files:
 - test/test_launcher/queries/line_number_query_test.rb
 - test/test_launcher/queries/multi_path_query_test.rb
 - test/test_launcher/queries/path_query_test.rb
-- test/test_launcher/queries/search_query_test.rb
 - test/test_launcher/rspec_integration_test.rb
 - test/test_launcher/rubymine_test.rb
+- test/test_launcher/search/ag_test.rb
 - test/test_launcher/search/git_test.rb
 - test_launcher.gemspec
 homepage: http://github.com/petekinnecom/test_launcher
@@ -145,7 +144,8 @@ test_files:
 - test/test_launcher/queries/line_number_query_test.rb
 - test/test_launcher/queries/multi_path_query_test.rb
 - test/test_launcher/queries/path_query_test.rb
-- test/test_launcher/queries/search_query_test.rb
 - test/test_launcher/rspec_integration_test.rb
 - test/test_launcher/rubymine_test.rb
+- test/test_launcher/search/ag_test.rb
 - test/test_launcher/search/git_test.rb
+has_rdoc: 

data/lib/test_launcher/cli/query.rb

@@ -1,30 +0,0 @@
-require "test_launcher/base_error"
-require "test_launcher/queries"
-require "test_launcher/cli/request"
-
-module TestLauncher
-  module CLI
-    class Query < BaseQuery
-      attr_reader :shell, :searcher
-
-      def command
-      def queries
-        requests.map {|request| Queries::GenericQuery.new(request: request)}
-      end
-
-      def requests
-        @frameworks.map {|framework|
-          Request.new(
-            framework: framework,
-            search_string: @search_string,
-            run_all: @run_all,
-            disable_spring: @disable_spring,
-            example_name: @example_name,
-            shell: shell,
-            searcher: searcher
-          )
-        }
-      end
-    end
-  end
-end

data/test/test_launcher/queries/search_query_test.rb

@@ -1,54 +0,0 @@
-require "test_helper"
-require "test_helpers/mocks"
-require "test_launcher/queries"
-
-module TestLauncher
-  module Queries
-    class SearchQueryTest < TestCase
-      include DefaultMocks
-
-      def test__multi_search_term__hits
-        command_finder = Mock.new(Queries::CommandFinder, multi_path_query: :multi_path_query)
-        request = MockRequest.new(search_string: "a b")
-
-        assert_equal :multi_path_query, SearchQuery.new(request, command_finder).command
-      end
-
-      def test__multi_search_term__misses
-        command_finder = Mock.new(Queries::CommandFinder, multi_path_query: nil, single_search_term: :single_search_term)
-        request = MockRequest.new(search_string: "a b")
-
-        assert_equal :single_search_term, SearchQuery.new(request, command_finder).command
-      end
-
-      def test__line_number__hits
-        command_finder = Mock.new(Queries::CommandFinder, line_number: :line_number)
-        request = MockRequest.new(search_string: "a:1")
-
-        assert_equal :line_number, SearchQuery.new(request, command_finder).command
-      end
-
-      def test__line_number__misses
-        command_finder = Mock.new(Queries::CommandFinder, line_number: nil, single_search_term: :single_search_term)
-        request = MockRequest.new(search_string: "a:1")
-
-        assert_equal :single_search_term, SearchQuery.new(request, command_finder).command
-      end
-
-      def test__single_search_term
-        command_finder = Mock.new(Queries::CommandFinder, single_search_term: :single_search_term)
-        request = MockRequest.new(search_string: "a")
-
-        assert_equal :single_search_term, SearchQuery.new(request, command_finder).command
-      end
-
-      def test__none
-        command_finder = Mock.new(Queries::CommandFinder, single_search_term: nil)
-        request = MockRequest.new(search_string: "a")
-
-        assert_equal nil, SearchQuery.new(request, command_finder).command
-      end
-
-    end
-  end
-end