test_changes 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df6a30cc05c9b8f553a8669986694b2572ca420
-  data.tar.gz: 71c96602d2c338981e6afe322da2431165fb7ff6
+  metadata.gz: 8cc70f46a0ecc0eb63dbf411fdca42a39d0ec58d
+  data.tar.gz: c39900feb27bf873361bcb9d2cdbb9722751a0d1
 SHA512:
-  metadata.gz: 0743c92860832fca6d404bbae31c5b0faedb52df44616190052652eb3c410eabadab8c19236be295cc1a03ae070cac040b9c1ccc7e43f0c0d1a861be7a86f942
-  data.tar.gz: 701f39dd0669df793fc6d292f20cc88c2cfd161a12f10fbc0a0eea22a540727f0ca7a9a2051103538d90adc4c0ea567e3bbcf5086658507fbeb2d73c6503ec38
+  metadata.gz: 0e125f2b5f8126a7bb443b5adaacb4de1b99c46172210bfb2ae6cbd82a8dd0fdb2dddc6ad7798363106738f28aec89eada6b304e2de79b16fabdee8df6dffddb
+  data.tar.gz: ebb3652470a3a377e88b11f1cbd45dfc0f4295eb2875ab9676e1297735c2bcb94e5f85398ab86165490f4898260a738640afe23873becfe45d690ec6d90c8c6f

data/.test-changes.yml

@@ -1,5 +1,9 @@
 rspec:
-  ^lib/(.+)\.rb: spec/\1_spec.rb
-  ^spec/(.+)_spec.rb: spec/\1_spec.rb
+  finding_patterns:
+    ^lib/(.+)\.rb: spec/\1_spec.rb
+    ^spec/(.+)_spec.rb: spec/\1_spec.rb
+  exclude:
+    - spec/fixtures/**/*
 rubocop:
-  ^(.+)\.rb: \1.rb
+  finding_patterns:
+    ^(.+)\.rb: \1.rb

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## master
 
+## 0.3.0
+
+### Breaking changes
+
+* Reintroduced finding_patterns option in config file. See README for more info.
+
+### New features
+
+* You can now list files that should be excluded when running a command.
+* You can now specify glob patterns as substitution patterns.
+
 ## 0.2.0
 
 ### Breaking changes

data/README.md

@@ -31,28 +31,36 @@ Add a `.test-changes.yml` configuration file to your repo. Example:
 ```yaml
 ---
 rspec:
-  ^lib/(.+)\.rb: spec/\1_spec.rb
-  ^spec/(.+)_spec.rb: spec/\1_spec.rb
+  finding_patterns:
+    ^lib/(.+)\.rb: spec/\1_spec.rb
+    ^spec/(.+)_spec.rb: spec/\1_spec.rb
+  exclude:
+    - spec/fixtures/**/*
 rubocop:
-  ^(.+)\.rb: \1.rb
+  finding_patterns:
+    ^(.+)\.rb: \1.rb
 ```
 
-The options
+At the root of the file, we have the commands for running the tests. Examples: `rspec`, `zeus rspec`, `rubocop`.
 
-* The keys - The commands for running the tests.
-  Example: `rspec`, `zeus rspec`, `rubocop`.
+These are the options under each command:
 
-* The values - The finding patterns. If the name of a changed file matches
+* `finding_patterns` - If the name of a changed file matches
   the regular expression, `test_changes` will test the file's matching tests.
   Can accept an array of tests:
 
     ```yaml
     rspec:
-      ^lib/test_changes\.rb:
-      - spec/test_changes_spec.rb
-      - spec/test_changes/client_spec.rb
+      finding_patterns:
+        ^lib/test_changes\.rb:
+        - spec/test_changes_spec.rb
+        - spec/test_changes/*_spec.rb
     ```
 
+    The values can also be glob patterns.
+
+* `exclude` - Patterns of files that should be excluded from the run.
+
 ## Usage
 
 `test-changes -c [commit] -- [test_tool_arguments]`
@@ -68,7 +76,7 @@ Examples:
 ```
 test-changes
 test-changes -c master
-test-changes -c HEAD^ -- --format=documentation
+test-changes -r rspec -c HEAD^ -- --format=documentation
 ```
 
 ## Known to work on
@@ -78,7 +86,7 @@ test-changes -c HEAD^ -- --format=documentation
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bundle install` to install dependencies. Then, run `bundle console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/exe/test-changes

@@ -2,16 +2,17 @@
 
 require 'test_changes/argv_wrapper'
 require 'test_changes/client'
+require 'test_changes/config_setup_service'
 require 'test_changes/find_runner_service'
 
 argv_wrapper = TestChanges::ARGVWrapper.new(ARGV)
-runner = TestChanges::FindRunnerService.new(argv_wrapper).call
+config = TestChanges::ConfigSetupService.call
+
+find_runner_service =
+  TestChanges::FindRunnerService.new(argv_wrapper: argv_wrapper, config: config)
 
 client = TestChanges::Client.new(
-  runner_name: runner.name,
-  finding_patterns: runner.finding_patterns,
-  commit: argv_wrapper.commit,
-  runner_call_options: argv_wrapper.runner_call_options,
-  verbose: argv_wrapper.verbose?)
+  argv_wrapper: argv_wrapper,
+  runner: find_runner_service.call)
 
 client.call

data/lib/test_changes/client.rb

@@ -3,39 +3,36 @@ require 'test_changes/finding_pattern'
 module TestChanges
   class Client
     def initialize(options)
-      @runner_name = options[:runner_name]
-      @finding_patterns = options[:finding_patterns]
-      @commit = options[:commit]
-      @runner_call_options = options[:runner_call_options]
-      @verbose = options[:verbose]
+      @argv_wrapper = options[:argv_wrapper]
+      @runner = options[:runner]
     end
 
     # rubocop:disable Metrics/AbcSize
     def call
-      log "paths_changed_since_commit #{commit}:",
+      log "Paths changed since commit #{argv_wrapper.commit}:",
         paths_changed_since_commit.inspect
 
-      log "matches:", matches.inspect
+      log "Matches:", matches.inspect
 
-      log "existing_matches:", existing_matches.inspect
+      log "Existing matches:", existing_matches.inspect
 
       return if existing_matches.empty?
 
-      log "test_tool_call:", test_tool_call
+      log "Non-excluded matches:", included_matches.inspect
+
+      return if included_matches.empty?
+
+      log "Test tool call:", test_tool_call
       system(test_tool_call)
     end
     # rubocop:enable Metrics/AbcSize
 
     private
 
-    attr_reader :commit,
-      :finding_patterns,
-      :runner_name,
-      :runner_call_options,
-      :verbose
+    attr_reader :argv_wrapper, :runner
 
     def log(header, message)
-      return unless verbose?
+      return unless argv_wrapper.verbose?
 
       puts "\n#{header}"
       puts message
@@ -47,17 +44,21 @@ module TestChanges
 
     def paths_changed_since_commit
       @paths_changed_since_commit ||=
-        `git diff --name-only --diff-filter=AMR #{commit}`.split("\n")
+        `git diff --name-only --diff-filter=AMR #{argv_wrapper.commit}`.split("\n")
     end
 
     def test_tool_call
       @test_tool_call ||= [
-        runner_name,
-        runner_call_options,
-        existing_matches
+        runner.name,
+        argv_wrapper.runner_call_options,
+        included_matches
       ].flatten.compact.join(' ')
     end
 
+    def included_matches
+      runner.ignore_excluded_files_service.call(existing_matches)
+    end
+
     def existing_matches
       @existing_matches ||= matches.select { |match| File.exist?(match) }
     end
@@ -68,7 +69,7 @@ module TestChanges
       paths = paths_changed_since_commit
 
       @matches =
-        paths.product(finding_patterns).map do |path, finding_pattern|
+        paths.product(runner.finding_patterns).map do |path, finding_pattern|
           finding_pattern.matching_paths(path)
         end
 

data/lib/test_changes/config.rb

@@ -1,4 +1,5 @@
 require 'test_changes/finding_pattern'
+require 'test_changes/runner'
 require 'yaml'
 
 module TestChanges
@@ -12,10 +13,13 @@ module TestChanges
     end
 
     def runners
-      config.map do |runner_name, finding_pattern_maps|
+      config.map do |runner_name, options|
+        finding_pattern_maps = options['finding_patterns']
+
         Runner.new(
           name: runner_name,
-          finding_patterns: FindingPattern.build(finding_pattern_maps))
+          finding_patterns: FindingPattern.build(finding_pattern_maps),
+          exclusion_patterns: options['exclude'])
       end
     end
 

data/lib/test_changes/find_runner_service.rb

@@ -1,11 +1,10 @@
-require 'test_changes/config_setup_service'
 require 'test_changes/runner'
 
 module TestChanges
   class FindRunnerService
-    def initialize(argv_wrapper)
-      @config = ConfigSetupService.call
+    def initialize(argv_wrapper: nil, config: nil)
       @argv_wrapper = argv_wrapper
+      @config = config
     end
 
     def call

data/lib/test_changes/finding_pattern.rb

@@ -8,11 +8,14 @@ module TestChanges
     end
 
     def matching_paths(path)
-      results = substitution_patterns.map do |substitution_pattern|
-        path.sub(matching_pattern, substitution_pattern) if matches?(path)
+      results = substitution_patterns.flat_map do |substitution_pattern|
+        if matches?(path)
+          substituted_pattern = path.sub(matching_pattern, substitution_pattern)
+          Pathname.glob(substituted_pattern)
+        end
       end
 
-      results.compact
+      results.compact.map(&:to_s)
     end
 
     def self.build(patterns)

data/lib/test_changes/ignore_excluded_files_service.rb

@@ -0,0 +1,17 @@
+module TestChanges
+  class IgnoreExcludedFilesService
+    attr_reader :exclusion_patterns
+
+    def initialize(exclusion_patterns = [])
+      @exclusion_patterns = exclusion_patterns
+    end
+
+    def call(paths)
+      matching_paths = exclusion_patterns.flat_map do |pattern|
+        Pathname.glob(pattern)
+      end
+
+      paths - matching_paths.map(&:to_s)
+    end
+  end
+end

data/lib/test_changes/runner.rb

@@ -1,13 +1,25 @@
+require 'test_changes/ignore_excluded_files_service'
 require 'test_changes/config_setup_service'
 
 module TestChanges
   class Runner
-    def initialize(name: nil, finding_patterns: nil, project_type_name: nil)
+    def initialize(
+      name: nil,
+      finding_patterns: nil,
+      exclusion_patterns: [],
+      project_type_name: nil)
+
       @name = name
       @finding_patterns = finding_patterns
+      @exclusion_patterns =  exclusion_patterns
       @project_type_name = project_type_name
     end
 
-    attr_reader :name, :finding_patterns, :project_type_name
+    def ignore_excluded_files_service
+      @ignore_excluded_files_service ||=
+        IgnoreExcludedFilesService.new(exclusion_patterns)
+    end
+
+    attr_reader :exclusion_patterns, :name, :finding_patterns, :project_type_name
   end
 end

data/lib/test_changes/version.rb

@@ -1,3 +1,3 @@
 module TestChanges
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: test_changes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - George Mendoza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Run only the tests affected by files changed since a given commit.
@@ -88,12 +88,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".overcommit.yml"
-- ".rspec"
-- ".rubocop.yml"
-- ".test-changes.yml"
-- ".travis.yml"
+- .gitignore
+- .overcommit.yml
+- .rspec
+- .rubocop.yml
+- .test-changes.yml
+- .travis.yml
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -111,6 +111,7 @@ files:
 - lib/test_changes/error.rb
 - lib/test_changes/find_runner_service.rb
 - lib/test_changes/finding_pattern.rb
+- lib/test_changes/ignore_excluded_files_service.rb
 - lib/test_changes/inferred_config.rb
 - lib/test_changes/runner.rb
 - lib/test_changes/version.rb
@@ -125,12 +126,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []