grspec 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4abdcf7f8708b6c96caa5d31a34921ae17a9477eca30a5b690eaf7bcc5a83d60
-  data.tar.gz: c413562adce5015317e3baf2cbce2b54a2b9a4d03ff31f5e59865ed33f56d219
+  metadata.gz: cc337747d9c3b2075d13056a58f61dc3c8bcf14b82aa6ebd37479c0c8f5de31e
+  data.tar.gz: 1a52c3b2e2697eb8e930d418e6360f5aeb640527befa8ebd42eef3b72da18828
 SHA512:
-  metadata.gz: 230116a9de943ff6081a22cdd188e6cf3b1b897f1a460a4e673785c22c46a1b4f4b041bde0aeb3a7880aa55fcb3df25e3e9da258b2d44fec4ae4d7f0326b7d01
-  data.tar.gz: 2ac42186c768e92bfb4334068968b248197dabc7ee864e2f395ed57780feb44cf0cd11818dd4f8f5853fe7f4fe7411a5d67805748cab721e6bdfb1ed8d3612d7
+  metadata.gz: ef68c66b44a274b4435d119f1e4e75c77f36bc3e19f519a0268043565267c08296f77450675350754c1f906469dc3ddb258d4bd7413e263357877e8e5fe3ca67
+  data.tar.gz: b2cd5ee27d70a7d3b255d78f915cae0a7f5620b22a5e81b3d615bda6046fe1ed8e6879b8dd276a1b8479021a1dfd8ea693d8628fc29167fda8dc09dc6cece131

data/bin/grspec

@@ -1,35 +1,12 @@
 #!/usr/bin/env ruby
-require 'active_support/core_ext/array/access'
+require_relative '../lib/arg_parser'
+require_relative '../lib/grspec'
 
-require 'find_changed_files'
-require 'find_matching_specs'
-require 'spec_runner'
+options = ArgParser.parse(ARGV)
+base_ref, diff_ref = ARGV[0..1]
 
-def display_listing(header, listing)
-  puts
-  puts header
-  puts listing
-end
-
-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)
-
-  matching_specs = FindMatchingSpecs.new(changed_files).call
-
-  if matching_specs.any?
-    display_listing('Matching specs:', matching_specs)
-
-    SpecRunner.run(matching_specs)
-  else
-    puts "No matching specs found"
-  end
-else
-  puts "No changed files found"
-end
+Grspec.new(
+  base_ref: base_ref,
+  diff_ref: diff_ref,
+  options: options
+).run

data/lib/arg_parser.rb

@@ -0,0 +1,29 @@
+require 'ostruct'
+require 'optparse'
+
+class ArgParser
+  def self.parse(options)
+    args = OpenStruct.new
+
+    opt_parser = OptionParser.new do |opts|
+      opts.banner = "Usage: grspec [git ref] [git ref] [options]"
+
+      opts.on("-rSPEC_REGEX", "--regex=SPEC_REGEX", Regexp, "Regex to filter specs") do |regex|
+        args.spec_regex = regex
+      end
+
+      opts.on("-d", "--dry", "Performs a dry run for a listing that would be passed through to RSpec") do
+        args.dry_run = true
+      end
+
+      opts.on("-h", "--help", "Prints this help") do
+        puts opts
+        exit
+      end
+    end
+
+    opt_parser.parse!(options)
+
+    args
+  end
+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_changed_files.rb

@@ -1,6 +1,4 @@
 class FindChangedFiles
-  require 'active_support/core_ext/object/blank'
-
   require_relative 'find_changed_files/simple_diff'
   require_relative 'find_changed_files/since_ref'
   require_relative 'find_changed_files/between_refs'
@@ -37,14 +35,14 @@ class FindChangedFiles
   private
 
   def simple_diff?
-    base_ref.blank? && diff_ref.blank?
+    !base_ref && !diff_ref
   end
 
   def since_ref?
-    base_ref.present? && diff_ref.blank?
+    base_ref && !diff_ref
   end
 
   def between_refs?
-    base_ref.present? && diff_ref.present?
+    base_ref && diff_ref
   end
 end

data/lib/find_matching_specs.rb

@@ -11,9 +11,9 @@ 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
+    spec_files.uniq
   end
 
   private
@@ -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]
   end
-end
+end

data/lib/grspec.rb

@@ -0,0 +1,107 @@
+require_relative '../lib/find_changed_files'
+require_relative '../lib/find_matching_specs'
+require_relative '../lib/spec_runner'
+
+class Grspec
+  attr_reader :base_ref, :diff_ref, :options
+
+  def initialize(base_ref:, diff_ref:, options: OpenStruct.new)
+    @base_ref = base_ref
+    @diff_ref = diff_ref
+    @options = options
+  end
+
+  def run
+    if changed_files.empty?
+      display("No changed files found")
+      return
+    end
+
+    display_listing('Changed files:', changed_files)
+
+    display_listing(
+      'Files without specs:',
+      mismatching_files.map(&:first)
+    ) if mismatching_files.any?
+
+    if spec_matchings.any?
+      display_listing(
+        'Matching specs:',
+        spec_matchings.map { |matching_spec| matching_spec.join(' -> ') }
+      )
+
+      if non_existent_specs.any?
+        display_listing(
+          'Removed specs:',
+          non_existent_specs
+        )
+      end
+
+      if specs_to_run.any?
+        if dry_run?
+          puts specs_to_run
+        else
+          SpecRunner.run(specs_to_run)
+        end
+      end
+    else
+      display("No matching specs found")
+    end
+  end
+
+  private
+
+  def dry_run?
+    options.dry_run
+  end
+
+  def changed_files
+    @changed_files ||= FindChangedFiles.new(
+      base_ref: base_ref,
+      diff_ref: diff_ref
+    ).call
+  end
+
+  def file_spec_pairs
+    @file_spec_pairs ||= FindMatchingSpecs.new(changed_files).call
+  end
+
+  def mismatching_files
+    @mismatching_files ||= file_spec_pairs.select { |_, spec| spec.nil? }
+  end
+
+  def spec_matchings
+    @spec_matchings ||= file_spec_pairs - mismatching_files
+  end
+
+  def matching_specs
+    @matching_specs ||= spec_matchings.map { |match| match[1] }.uniq
+  end
+
+  def non_existent_specs
+    @non_existent_specs ||= matching_specs.reject { |spec_file| File.file?(spec_file) }
+  end
+
+  def specs_to_run
+    @specs_to_run ||= matching_specs - non_existent_specs
+  end
+
+  def display_output?
+    !dry_run?
+  end
+
+  def display(string)
+    return unless display_output?
+
+    puts
+    puts string
+  end
+
+  def display_listing(header, listing)
+    return unless display_output?
+
+    puts
+    puts header
+    puts listing
+  end
+end

data/lib/spec_runner.rb

@@ -1,7 +1,7 @@
 class SpecRunner
   RSPEC_COMMAND = 'rspec'.freeze
 
-  def self.run(matching_specs)
-    exec "#{RSPEC_COMMAND} #{matching_specs.join(' ')}" if matching_specs.any?
+  def self.run(specs)
+    system "#{RSPEC_COMMAND} #{specs.join(' ')}" if specs.any?
   end
 end

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: grspec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jordane Lew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies: []
-description: GRSpec is a tiny gem that can quickly and easily run specs for files
-  that git has detected changes for, allowing for quick and easy regression checking
-  without full-on test runs before committing and overloading build nodes.
+description: GRSpec is a tool for quickly and easily running specs for files that
+  git has detected changes for, allowing for efficient regression checks.
 email: jordane.lew@gmail.com
 executables:
 - grspec
@@ -20,11 +19,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/grspec
+- lib/arg_parser.rb
 - 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/grspec.rb
 - lib/spec_runner.rb
 homepage: https://rubygems.org/gems/grspec
 licenses:
@@ -48,9 +49,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: A simple spec runner for differed files
+summary: A simple spec runner for diff'd files
 test_files: []