grspec 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 59fe116700eead3b15f5d7784bd489e6b7a94639f10097a1ad8f47f5bf6fcd1e
-  data.tar.gz: abe423253db8f2ab0447b99f137ba47c72f8cfae67853f2f6cb9a8fad438142a
+SHA1:
+  metadata.gz: 5fed8d85358aba0b5235c0d7a67829830e916fdd
+  data.tar.gz: dc77a91cebad89157204954bf70484bc7dbea222
 SHA512:
-  metadata.gz: 26b622fe5010f2063b8a340e654adea5d3602d03a4cb12f0d160b2a5df452b60b003b3450ac5c2f235044baf3214608a249161aefbb98c0ad24ae65fed745036
-  data.tar.gz: e358e65701416c054066fbeec93c7e0ddc6f1e53f500091f89432b87db44415caab80d5993621e2ab5e0a149458597a692b409eb709146c91f8fe29498f02681
+  metadata.gz: aedfb223a5019cb25983ac80c5d79eea97264fee32c4d9f0b66cc5a013878cc7e7b6394c248700d7e67ecfb7ea6543ec7cf25cc569e46dbfc80d43899da3ee2e
+  data.tar.gz: 3c81c5e91bbdaef83e4a1721b004d906e46687ca873db2b3a747f940a6a4ccc9ad09063e432a98ca094b9cf5aeb5bb7f92feb0cc11354c6b563f021dc7eb461a

data/lib/find_changed_files.rb

@@ -1,8 +1,11 @@
 class FindChangedFiles
+  class GitDiffError < StandardError; end
+
   attr_reader :args
 
   GIT_DIFF_COMMAND = 'git diff'.freeze
   GIT_DIFF_OPTIONS = '--name-only'.freeze
+  REDIRECT_STDERR_TO_STDOUT = '2>&1'.freeze
 
   def initialize(args)
     @args = args
@@ -10,9 +13,13 @@ class FindChangedFiles
 
   def call
     changed_files = differed_files
-    changed_files += untracked_files if simple_diff?
 
-    changed_files.split("\n")
+    if simple_diff?
+      changed_files += untracked_files
+      changed_files += staged_files
+    end
+
+    changed_files
   end
 
   private
@@ -26,10 +33,20 @@ class FindChangedFiles
   end
 
   def differed_files
-    `#{GIT_DIFF_COMMAND} #{stringified_args} #{GIT_DIFF_OPTIONS}`
+    @differed_files ||= begin
+      diff_output = `#{GIT_DIFF_COMMAND} #{stringified_args} #{GIT_DIFF_OPTIONS} #{REDIRECT_STDERR_TO_STDOUT}`
+
+      raise GitDiffError.new("Bad git diff arguments; #{stringified_args}") unless $?.success?
+
+      diff_output.split("\n")
+    end
   end
 
   def untracked_files
-    `git ls-files . --exclude-standard --others`
+    `git ls-files . --exclude-standard --others`.split("\n")
+  end
+
+  def staged_files
+    `#{GIT_DIFF_COMMAND} --staged #{GIT_DIFF_OPTIONS}`.split("\n")
   end
-end
+end

data/lib/find_matching_specs.rb

@@ -1,7 +1,8 @@
 class FindMatchingSpecs
   attr_reader :directory, :files
 
-  RUBY_FILE_EXTENSION = '.rb'
+  RUBY_FILE_EXTENSION = '.rb'.freeze
+  SPEC_PREFIX_AND_EXTENSION = '_spec.rb'.freeze
 
   def initialize(files)
     @files = files
@@ -18,18 +19,26 @@ class FindMatchingSpecs
   private
 
   def spec_file_listing
-    @spec_file_listing ||= Dir.glob("./spec/**/*")
+    @spec_file_listing ||= Dir.glob("**/spec/**/*#{SPEC_PREFIX_AND_EXTENSION}")
   end
 
   def ruby_file?(filename)
     filename.end_with?(RUBY_FILE_EXTENSION)
   end
 
+  def spec_file?(filename)
+    filename.end_with?(SPEC_PREFIX_AND_EXTENSION)
+  end
+
   def specs_for(filename)
-    file = filename.split(RUBY_FILE_EXTENSION).first
+    return [filename] if spec_file?(filename)
 
     spec_file_listing.select do |spec_file|
-      spec_file.match(/#{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
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grspec
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Jordane Lew
@@ -28,6 +28,8 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/yumoose/grspec
+  changelog_uri: https://github.com/yumoose/grspec/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://github.com/yumoose/grspec/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -44,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A simple spec runner for differed files