grspec 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5fed8d85358aba0b5235c0d7a67829830e916fdd
-  data.tar.gz: dc77a91cebad89157204954bf70484bc7dbea222
+SHA256:
+  metadata.gz: 4abdcf7f8708b6c96caa5d31a34921ae17a9477eca30a5b690eaf7bcc5a83d60
+  data.tar.gz: c413562adce5015317e3baf2cbce2b54a2b9a4d03ff31f5e59865ed33f56d219
 SHA512:
-  metadata.gz: aedfb223a5019cb25983ac80c5d79eea97264fee32c4d9f0b66cc5a013878cc7e7b6394c248700d7e67ecfb7ea6543ec7cf25cc569e46dbfc80d43899da3ee2e
-  data.tar.gz: 3c81c5e91bbdaef83e4a1721b004d906e46687ca873db2b3a747f940a6a4ccc9ad09063e432a98ca094b9cf5aeb5bb7f92feb0cc11354c6b563f021dc7eb461a
+  metadata.gz: 230116a9de943ff6081a22cdd188e6cf3b1b897f1a460a4e673785c22c46a1b4f4b041bde0aeb3a7880aa55fcb3df25e3e9da258b2d44fec4ae4d7f0326b7d01
+  data.tar.gz: 2ac42186c768e92bfb4334068968b248197dabc7ee864e2f395ed57780feb44cf0cd11818dd4f8f5853fe7f4fe7411a5d67805748cab721e6bdfb1ed8d3612d7

data/bin/grspec

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'active_support/core_ext/array/access'
 
 require 'find_changed_files'
 require 'find_matching_specs'
@@ -10,8 +11,12 @@ def display_listing(header, listing)
   puts listing
 end
 
-git_diff_args = ARGV.join(' ')
-changed_files = FindChangedFiles.new(ARGV).call
+git_diff_args = ARGV.first(2)
+
+changed_files = FindChangedFiles.new(
+  base_ref: git_diff_args.first,
+  diff_ref: git_diff_args.second
+).call
 
 if changed_files.any?
   display_listing('Changed files:', changed_files)

data/lib/find_changed_files/between_refs.rb

@@ -0,0 +1,34 @@
+class FindChangedFiles::BetweenRefs < FindChangedFiles
+  attr_reader :base_ref, :diff_ref
+
+  GIT_MERGE_BASE_COMMAND = 'git merge-base'.freeze
+
+  def initialize(base_ref:, diff_ref:)
+    @base_ref = base_ref
+    @diff_ref = diff_ref
+  end
+
+  def call
+    differed_files(merge_base_ref, diff_ref)
+  end
+
+  private
+
+  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?
+
+    merge_base.strip
+  end
+
+  def differed_files(from_ref, to_ref)
+    @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?
+
+      diff_output.split("\n")
+    end
+  end
+end

data/lib/find_changed_files/simple_diff.rb

@@ -0,0 +1,21 @@
+class FindChangedFiles::SimpleDiff < FindChangedFiles
+  def call
+    differed_files +
+    untracked_files +
+    staged_files
+  end
+
+  private
+
+  def differed_files
+    `#{GIT_DIFF_COMMAND} #{GIT_DIFF_OPTIONS} #{REDIRECT_STDERR_TO_STDOUT}`.split("\n")
+  end
+
+  def untracked_files
+    `git ls-files . --exclude-standard --others`.split("\n")
+  end
+
+  def staged_files
+    `#{GIT_DIFF_COMMAND} --staged #{GIT_DIFF_OPTIONS}`.split("\n")
+  end
+end

data/lib/find_changed_files/since_ref.rb

@@ -0,0 +1,27 @@
+class FindChangedFiles::SinceRef < FindChangedFiles
+  attr_reader :base_ref
+
+  CURRENT_REF = 'HEAD'
+
+  def initialize(base_ref:)
+    @base_ref = base_ref
+  end
+
+  def call
+    changed_files_between_commits +
+      changed_files_in_diff
+  end
+
+  private
+
+  def changed_files_in_diff
+    SimpleDiff.new.call
+  end
+
+  def changed_files_between_commits
+    BetweenRefs.new(
+      base_ref: base_ref,
+      diff_ref: CURRENT_REF
+    ).call
+  end
+end

data/lib/find_changed_files.rb

@@ -1,52 +1,50 @@
 class FindChangedFiles
-  class GitDiffError < StandardError; end
+  require 'active_support/core_ext/object/blank'
 
-  attr_reader :args
+  require_relative 'find_changed_files/simple_diff'
+  require_relative 'find_changed_files/since_ref'
+  require_relative 'find_changed_files/between_refs'
+
+  attr_reader :base_ref, :diff_ref
 
   GIT_DIFF_COMMAND = 'git diff'.freeze
   GIT_DIFF_OPTIONS = '--name-only'.freeze
+
   REDIRECT_STDERR_TO_STDOUT = '2>&1'.freeze
 
-  def initialize(args)
-    @args = args
+  def initialize(base_ref: nil, diff_ref: nil)
+    @base_ref = base_ref
+    @diff_ref = diff_ref
   end
 
   def call
-    changed_files = differed_files
-
     if simple_diff?
-      changed_files += untracked_files
-      changed_files += staged_files
+      SimpleDiff.new.call
+    elsif since_ref?
+      SinceRef.new(
+        base_ref: base_ref
+      ).call
+    elsif between_refs?
+      BetweenRefs.new(
+        base_ref: base_ref,
+        diff_ref: diff_ref
+      ).call
+    else
+      raise ArgumentError.new('A base ref must be supplied with a diff ref')
     end
-
-    changed_files
   end
 
   private
 
   def simple_diff?
-    args.none?
-  end
-
-  def stringified_args
-    args.join(' ')
-  end
-
-  def differed_files
-    @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
+    base_ref.blank? && diff_ref.blank?
   end
 
-  def untracked_files
-    `git ls-files . --exclude-standard --others`.split("\n")
+  def since_ref?
+    base_ref.present? && diff_ref.blank?
   end
 
-  def staged_files
-    `#{GIT_DIFF_COMMAND} --staged #{GIT_DIFF_OPTIONS}`.split("\n")
+  def between_refs?
+    base_ref.present? && diff_ref.present?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grspec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jordane Lew
@@ -21,6 +21,9 @@ extra_rdoc_files: []
 files:
 - bin/grspec
 - lib/find_changed_files.rb
+- lib/find_changed_files/between_refs.rb
+- lib/find_changed_files/simple_diff.rb
+- lib/find_changed_files/since_ref.rb
 - lib/find_matching_specs.rb
 - lib/spec_runner.rb
 homepage: https://rubygems.org/gems/grspec
@@ -46,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A simple spec runner for differed files