grspec 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37e98f517772ef358da9d9eb36f553d571ae17204eeb7c47dfd45bbc2f9868ac
-  data.tar.gz: 5e14f29212bc6a384418ef5f2aa16429a10b166b2a6a4f2c744a79227871dd90
+  metadata.gz: 16610e47bcb0c299bbff11a44ff15b8467014fc9f29047b661db9f9234fdfb5f
+  data.tar.gz: a0eb0ce7a49c84384d916dd259c2af74b1e7afd2d7b82f89a846f3e9bca47fce
 SHA512:
-  metadata.gz: f50f800264cc862c3f666ef47441e0fb051d99d31bf35ea41f62395378bb6727140b3dc89b7034f44f20ae0445f3bb700ff1374007362d6990962d6a3b1f9b16
-  data.tar.gz: b221ca121a365098c6edfc1e26e80e77049453636f9413752c3529fe954ee330272916fc3ebad3bb06abe60eed8120467d0fa130c8e17042827aa128b5d1eb57
+  metadata.gz: 19f518d2092c2a7282183aef5e8d6698944c3b0ec1540b7704b271543a7f2daca8d38f547165d1f37cb7a54dd188117e8cf504bf3788133a996a1bbe3e9b7c8f
+  data.tar.gz: 47cf4410ebdebb27d3211640d160790c7ee12cb601f87c55c415d8ca87a537810bfa92f7106241379c20fd48bca44fd4e19ad22d87a04d65e10b3362b1a5bb75

data/bin/grspec

@@ -1,36 +1,12 @@
 #!/usr/bin/env ruby
+require_relative '../lib/arg_parser'
+require_relative '../lib/grspec'
 
-require 'active_support/core_ext/array/access'
+options = ArgParser.parse(ARGV)
+base_ref, diff_ref = ARGV.first(2)
 
-require_relative '../lib/find_changed_files'
-require_relative '../lib/find_matching_specs'
-require_relative '../lib/spec_runner'
-
-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.map {|matching_spec| matching_spec.join(' -> ') })
-
-    SpecRunner.run(matching_specs.map(&:second).uniq)
-  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_matching_specs.rb

@@ -13,7 +13,7 @@ class FindMatchingSpecs
     ruby_files = files.select { |filename| ruby_file?(filename) }
     spec_files = ruby_files.map { |filename| specs_for(filename) }
 
-    spec_files.compact.uniq
+    spec_files.uniq
   end
 
   private
@@ -41,6 +41,6 @@ class FindMatchingSpecs
       file_for_spec == filename
     end
 
-    [filename, spec_match] unless spec_match.nil?
+    [filename, spec_match]
   end
-end
+end

data/lib/grspec.rb

@@ -0,0 +1,88 @@
+require 'active_support/core_ext/array/access'
+
+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 matching_specs.any?
+      display_listing(
+        'Matching specs:',
+        matching_specs.map { |matching_spec| matching_spec.join(' -> ') }
+      )
+
+      if dry_run?
+        puts matching_specs.map(&:second).uniq
+      else
+        SpecRunner.run(matching_specs.map(&:second).uniq)
+      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 matching_specs
+    @matching_specs ||= file_spec_pairs - mismatching_files
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grspec
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jordane Lew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-11 00:00:00.000000000 Z
+date: 2018-02-20 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
@@ -20,11 +20,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: