grspec 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4abdcf7f8708b6c96caa5d31a34921ae17a9477eca30a5b690eaf7bcc5a83d60
-  data.tar.gz: c413562adce5015317e3baf2cbce2b54a2b9a4d03ff31f5e59865ed33f56d219
+  metadata.gz: 37e98f517772ef358da9d9eb36f553d571ae17204eeb7c47dfd45bbc2f9868ac
+  data.tar.gz: 5e14f29212bc6a384418ef5f2aa16429a10b166b2a6a4f2c744a79227871dd90
 SHA512:
-  metadata.gz: 230116a9de943ff6081a22cdd188e6cf3b1b897f1a460a4e673785c22c46a1b4f4b041bde0aeb3a7880aa55fcb3df25e3e9da258b2d44fec4ae4d7f0326b7d01
-  data.tar.gz: 2ac42186c768e92bfb4334068968b248197dabc7ee864e2f395ed57780feb44cf0cd11818dd4f8f5853fe7f4fe7411a5d67805748cab721e6bdfb1ed8d3612d7
+  metadata.gz: f50f800264cc862c3f666ef47441e0fb051d99d31bf35ea41f62395378bb6727140b3dc89b7034f44f20ae0445f3bb700ff1374007362d6990962d6a3b1f9b16
+  data.tar.gz: b221ca121a365098c6edfc1e26e80e77049453636f9413752c3529fe954ee330272916fc3ebad3bb06abe60eed8120467d0fa130c8e17042827aa128b5d1eb57

data/bin/grspec

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+
 require 'active_support/core_ext/array/access'
 
-require 'find_changed_files'
-require 'find_matching_specs'
-require 'spec_runner'
+require_relative '../lib/find_changed_files'
+require_relative '../lib/find_matching_specs'
+require_relative '../lib/spec_runner'
 
 def display_listing(header, listing)
   puts
@@ -24,9 +25,9 @@ if changed_files.any?
   matching_specs = FindMatchingSpecs.new(changed_files).call
 
   if matching_specs.any?
-    display_listing('Matching specs:', matching_specs)
+    display_listing('Matching specs:', matching_specs.map {|matching_spec| matching_spec.join(' -> ') })
 
-    SpecRunner.run(matching_specs)
+    SpecRunner.run(matching_specs.map(&:second).uniq)
   else
     puts "No matching specs found"
   end

data/lib/find_changed_files/between_refs.rb

@@ -1,4 +1,6 @@
 class FindChangedFiles::BetweenRefs < FindChangedFiles
+  require 'English'
+
   attr_reader :base_ref, :diff_ref
 
   GIT_MERGE_BASE_COMMAND = 'git merge-base'.freeze
@@ -17,7 +19,7 @@ class FindChangedFiles::BetweenRefs < FindChangedFiles
   def merge_base_ref
     merge_base = `#{GIT_MERGE_BASE_COMMAND} #{base_ref} #{diff_ref} #{REDIRECT_STDERR_TO_STDOUT}`
 
-    raise ArgumentError.new("Bad git diff arguments; #{base_ref} #{diff_ref}") unless $?.success?
+    raise ArgumentError.new("Bad git diff arguments; #{base_ref} #{diff_ref}") unless $CHILD_STATUS.success?
 
     merge_base.strip
   end
@@ -26,7 +28,7 @@ class FindChangedFiles::BetweenRefs < FindChangedFiles
     @differed_files ||= begin
       diff_output = `#{GIT_DIFF_COMMAND} #{from_ref} #{to_ref} #{GIT_DIFF_OPTIONS} #{REDIRECT_STDERR_TO_STDOUT}`
 
-      raise ArgumentError.new("Bad git diff arguments; #{base_ref} #{diff_ref}") unless $?.success?
+      raise ArgumentError.new("Bad git diff arguments; #{base_ref} #{diff_ref}") unless $CHILD_STATUS.success?
 
       diff_output.split("\n")
     end

data/lib/find_matching_specs.rb

@@ -11,7 +11,7 @@ class FindMatchingSpecs
 
   def call
     ruby_files = files.select { |filename| ruby_file?(filename) }
-    spec_files = ruby_files.map { |filename| specs_for(filename) }.flatten
+    spec_files = ruby_files.map { |filename| specs_for(filename) }
 
     spec_files.compact.uniq
   end
@@ -31,14 +31,16 @@ class FindMatchingSpecs
   end
 
   def specs_for(filename)
-    return [filename] if spec_file?(filename)
+    return [filename, filename] if spec_file?(filename)
 
-    spec_file_listing.select do |spec_file|
+    spec_match = spec_file_listing.detect do |spec_file|
       file_for_spec = spec_file.gsub(/\/?spec\//, '/')
       file_for_spec.sub!(SPEC_PREFIX_AND_EXTENSION, RUBY_FILE_EXTENSION)
       file_for_spec.sub!(/^\//, '')
 
       file_for_spec == filename
     end
+
+    [filename, spec_match] unless spec_match.nil?
   end
 end

data/lib/spec_runner.rb

@@ -2,6 +2,10 @@ class SpecRunner
   RSPEC_COMMAND = 'rspec'.freeze
 
   def self.run(matching_specs)
-    exec "#{RSPEC_COMMAND} #{matching_specs.join(' ')}" if matching_specs.any?
+    specs_to_run, removed_files = matching_specs.partition { |spec_file| File.file?(spec_file) }
+
+    system "#{RSPEC_COMMAND} #{specs_to_run.join(' ')}" if specs_to_run.any?
+
+    [specs_to_run, removed_files]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grspec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jordane Lew