test_changes 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d706999477bb9b59090625e9fe646702fc744ce7
-  data.tar.gz: c892a055438367a3b58936fdd33d0354bf821d18
+  metadata.gz: 2df6a30cc05c9b8f553a8669986694b2572ca420
+  data.tar.gz: 71c96602d2c338981e6afe322da2431165fb7ff6
 SHA512:
-  metadata.gz: 78a39c46163217fea3b393a96655d20cdb7a6066dfec21711e57e048529acce0ef6be15a2ce0a9f570a7e05f4075716b63c74db948799a751a465cfcb5a77bc7
-  data.tar.gz: 1822de2d1711f7fd48582b560df865e6eb18ee0c3055eaf6bc94a5196ae1b59d0178f8b44e4e26278991e5312805add64c0ad8f5f6746d3aa3bdc51a5de2a892
+  metadata.gz: 0743c92860832fca6d404bbae31c5b0faedb52df44616190052652eb3c410eabadab8c19236be295cc1a03ae070cac040b9c1ccc7e43f0c0d1a861be7a86f942
+  data.tar.gz: 701f39dd0669df793fc6d292f20cc88c2cfd161a12f10fbc0a0eea22a540727f0ca7a9a2051103538d90adc4c0ea567e3bbcf5086658507fbeb2d73c6503ec38

data/.rubocop.yml

@@ -12,3 +12,7 @@ StringLiterals:
 
 Style/AlignParameters:
   Enabled: false
+
+Style/FileName:
+  Exclude:
+  - exe/*

data/{.test_changes.yaml → .test-changes.yml}

@@ -1,7 +1,5 @@
----
-test_tool_command: rspec
-finding_patterns:
+rspec:
   ^lib/(.+)\.rb: spec/\1_spec.rb
   ^spec/(.+)_spec.rb: spec/\1_spec.rb
-
-verbose: true
+rubocop:
+  ^(.+)\.rb: \1.rb

data/.travis.yml

@@ -1,4 +1,6 @@
-script: bundle exec rspec
+script:
+- bundle exec rspec
+- bundle exec rubocop
 rvm:
   - 2.0.0
 cache: bundler

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## master
 
+## 0.2.0
+
+### Breaking changes
+
+* Command line API changed. See README and `test-changes -h` for more information. #4
+* Config file renamed to `test-changes.yml`. #4
+* Config file format changed. See README for more info. #4
+
+### New features
+
+* You can now put multiple runners in the config file. #8
+
 ## 0.1.1
 
 * Infer configuration automatically (#2 @rstacruz).

data/README.md

@@ -2,6 +2,8 @@
 
 Test files that have changed since a given commit.
 
+[![Status](https://travis-ci.org/gsmendoza/test_changes.svg?branch=master)](https://travis-ci.org/gsmendoza/test_changes "See test builds")
+
 ## Requirements
 
 * [Git](https://git-scm.com)
@@ -24,51 +26,49 @@ Or install it yourself as:
 
 ## Configuration
 
-Add a `.test_changes.yaml` configuration file to your repo. Example:
+Add a `.test-changes.yml` configuration file to your repo. Example:
 
 ```yaml
 ---
-test_tool_command: rspec
-
-finding_patterns:
+rspec:
   ^lib/(.+)\.rb: spec/\1_spec.rb
   ^spec/(.+)_spec.rb: spec/\1_spec.rb
-
-verbose: true
+rubocop:
+  ^(.+)\.rb: \1.rb
 ```
 
 The options
 
-* `test_tool_command` - The command for running the tests.
-  Example: `rspec`, `zeus rspec`.
+* The keys - The commands for running the tests.
+  Example: `rspec`, `zeus rspec`, `rubocop`.
 
-* `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:
+* The values - The 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
-    finding_patterns:
+    rspec:
       ^lib/test_changes\.rb:
       - spec/test_changes_spec.rb
       - spec/test_changes/client_spec.rb
     ```
 
-* `verbose` - Set the verbose level of output.
-
 ## Usage
 
-`test_changes [test_tool_arguments] [commit]`
+`test-changes -c [commit] -- [test_tool_arguments]`
 
 * `test_tool_arguments` - Arguments that can be passed to the test tool.
 
 * `commit` - Test change from this commit. Defaults to HEAD.
 
+See `test-changes -h` for more options.
+
 Examples:
 
 ```
-test_changes
-test_changes master
-test_changes --format=documentation HEAD^
+test-changes
+test-changes -c master
+test-changes -c HEAD^ -- --format=documentation
 ```
 
 ## Known to work on

data/exe/test-changes

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'test_changes/argv_wrapper'
+require 'test_changes/client'
+require 'test_changes/find_runner_service'
+
+argv_wrapper = TestChanges::ARGVWrapper.new(ARGV)
+runner = TestChanges::FindRunnerService.new(argv_wrapper).call
+
+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?)
+
+client.call

data/lib/test_changes.rb

@@ -1,5 +1,7 @@
 require "test_changes/version"
 
 module TestChanges
-  # Your code goes here...
+  SUMMARY = 'Test Changes'.freeze
+  DESCRIPTION =
+    'Run only the tests affected by files changed since a given commit.'.freeze
 end

data/lib/test_changes/argv_wrapper.rb

@@ -1,19 +1,50 @@
+require 'slop'
+require 'test_changes'
+
 module TestChanges
   class ARGVWrapper
+    attr_reader :argv
+
     def initialize(argv)
       @argv = argv
     end
 
     def commit
-      argv.last || 'HEAD'
+      slop_options[:commit]
     end
 
-    def test_tool_call_options
-      argv[0, argv.size - 1] || []
+    def runner_call_options
+      runner_call_options_delimiter_index = argv.index('--')
+
+      if runner_call_options_delimiter_index
+        argv.slice(runner_call_options_delimiter_index + 1, argv.size)
+      else
+        []
+      end
+    end
+
+    def runner_name
+      slop_options[:runner]
+    end
+
+    def verbose?
+      !slop_options.quiet?
     end
 
     private
 
-    attr_reader :argv
+    def slop_options
+      Slop.parse(argv, help: true, strict: true, banner: banner) do
+        on 'c', 'commit=', 'Git commit. Default: HEAD.', default: 'HEAD'
+        on 'q', 'quiet', 'Do not print output. Default: false.', default: false
+
+        on 'r', 'runner=',
+          'The test tool to run. Default: the first runner of the config file.'
+      end
+    end
+
+    def banner
+      "Usage: test-changes [options] -- [test tool arguments]"
+    end
   end
 end

data/lib/test_changes/client.rb

@@ -3,10 +3,10 @@ require 'test_changes/finding_pattern'
 module TestChanges
   class Client
     def initialize(options)
-      @test_tool_command = options[:test_tool_command]
+      @runner_name = options[:runner_name]
       @finding_patterns = options[:finding_patterns]
       @commit = options[:commit]
-      @test_tool_call_options = options[:test_tool_call_options]
+      @runner_call_options = options[:runner_call_options]
       @verbose = options[:verbose]
     end
 
@@ -30,8 +30,8 @@ module TestChanges
 
     attr_reader :commit,
       :finding_patterns,
-      :test_tool_command,
-      :test_tool_call_options,
+      :runner_name,
+      :runner_call_options,
       :verbose
 
     def log(header, message)
@@ -52,8 +52,8 @@ module TestChanges
 
     def test_tool_call
       @test_tool_call ||= [
-        test_tool_command,
-        test_tool_call_options,
+        runner_name,
+        runner_call_options,
         existing_matches
       ].flatten.compact.join(' ')
     end

data/lib/test_changes/config.rb

@@ -11,16 +11,12 @@ module TestChanges
       File.exist?(@config_path)
     end
 
-    def finding_patterns
-      FindingPattern.build config['finding_patterns']
-    end
-
-    def test_tool_command
-      config['test_tool_command']
-    end
-
-    def verbose
-      config['verbose']
+    def runners
+      config.map do |runner_name, finding_pattern_maps|
+        Runner.new(
+          name: runner_name,
+          finding_patterns: FindingPattern.build(finding_pattern_maps))
+      end
     end
 
     private

data/lib/test_changes/config_setup_service.rb

@@ -1,9 +1,11 @@
+require 'test_changes/config'
 require 'test_changes/inferred_config'
 
 module TestChanges
   module ConfigSetupService
     def self.call
-      config = Config.new('.test_changes.yaml')
+      config_file_name = '.test-changes.yml'
+      config = Config.new(config_file_name)
 
       return config if config.exists?
 
@@ -13,31 +15,31 @@ module TestChanges
         return use_testunit_rails('bundle exec ruby -Itest') if File.directory?('./test')
       end
 
-      fail TestChanges::Error, "No .test_changes.yaml found"
+      fail TestChanges::Error, "No #{config_file_name} found"
     end
 
     private
 
     def self.use_rspec_rails(bin)
-      InferredConfig.new(
-        test_tool_command: bin,
+      runner = Runner.new(
+        name: bin,
         project_type_name: 'rspec_rails',
-        finding_patterns_map: {
+        finding_patterns: FindingPattern.build(
           '^app/(models)/(.+).rb' => 'spec/\1/\2_spec.rb',
-          '^app/(controller|helper|view)s/(.+).rb' => 'spec/controllers/\2_\1_spec.rb'
-        }
-      )
+          '^app/(controller|helper|view)s/(.+).rb' => 'spec/controllers/\2_\1_spec.rb'))
+
+      InferredConfig.new([runner])
     end
 
     def self.use_testunit_rails(bin)
-      InferredConfig.new(
-        test_tool_command: bin,
+      runner = Runner.new(
+        name: bin,
         project_type_name: 'testunit_rails',
-        finding_patterns_map: {
+        finding_patterns: FindingPattern.build(
           '^app/(models)/(.+).rb' => 'test/\1/\2_test.rb',
-          '^app/(controller|helper|view)s/(.+).rb' => 'test/controllers/\2_\1_test.rb'
-        }
-      )
+          '^app/(controller|helper|view)s/(.+).rb' => 'test/controllers/\2_\1_test.rb'))
+
+      InferredConfig.new([runner])
     end
   end
 end

data/lib/test_changes/find_runner_service.rb

@@ -0,0 +1,23 @@
+require 'test_changes/config_setup_service'
+require 'test_changes/runner'
+
+module TestChanges
+  class FindRunnerService
+    def initialize(argv_wrapper)
+      @config = ConfigSetupService.call
+      @argv_wrapper = argv_wrapper
+    end
+
+    def call
+      return config.runners.first unless argv_wrapper.runner_name
+
+      config.runners.find do |runner|
+        runner.name == argv_wrapper.runner_name
+      end
+    end
+
+    private
+
+    attr_reader :config, :argv_wrapper
+  end
+end

data/lib/test_changes/inferred_config.rb

@@ -1,25 +1,5 @@
 require 'test_changes/error'
 
 module TestChanges
-  class InferredConfig
-    attr_reader :finding_patterns_map
-    attr_reader :test_tool_command
-    attr_reader :project_type_name
-
-    def initialize(test_tool_command: nil,
-      project_type_name: nil, finding_patterns_map: nil)
-
-      @test_tool_command = test_tool_command
-      @project_type_name = project_type_name
-      @finding_patterns_map = finding_patterns_map
-    end
-
-    def finding_patterns
-      FindingPattern.build finding_patterns_map
-    end
-
-    def verbose
-      true
-    end
-  end
+  InferredConfig = Struct.new(:runners)
 end

data/lib/test_changes/runner.rb

@@ -0,0 +1,13 @@
+require 'test_changes/config_setup_service'
+
+module TestChanges
+  class Runner
+    def initialize(name: nil, finding_patterns: nil, project_type_name: nil)
+      @name = name
+      @finding_patterns = finding_patterns
+      @project_type_name = project_type_name
+    end
+
+    attr_reader :name, :finding_patterns, :project_type_name
+  end
+end

data/lib/test_changes/version.rb

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

data/test_changes.gemspec

@@ -1,6 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'test_changes'
 require 'test_changes/version'
 
 Gem::Specification.new do |spec|
@@ -9,10 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["George Mendoza"]
   spec.email         = ["gsmendoza@gmail.com"]
 
-  spec.summary       = %(Test Changes)
-
-  spec.description =
-    %(Run only the tests affected by files changed since a given commit.)
+  spec.summary       = TestChanges::SUMMARY
+  spec.description   = TestChanges::DESCRIPTION
 
   spec.homepage      = "https://github.com/gsmendoza/test_changes"
   spec.license       = "MIT"
@@ -25,7 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "pry"
+  spec.add_dependency "slop", '~> 3.4.0'
+
+  spec.add_development_dependency "pry", '~> 0.10.1'
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop"
 end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: test_changes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - George Mendoza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-29 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'
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,11 +66,25 @@ dependencies:
     - - ">="
       - !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.
 email:
 - gsmendoza@gmail.com
 executables:
-- test_changes
+- test-changes
 extensions: []
 extra_rdoc_files: []
 files:
@@ -64,7 +92,7 @@ files:
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".test_changes.yaml"
+- ".test-changes.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -74,15 +102,17 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- exe/test_changes
+- exe/test-changes
 - lib/test_changes.rb
 - lib/test_changes/argv_wrapper.rb
 - lib/test_changes/client.rb
 - lib/test_changes/config.rb
 - lib/test_changes/config_setup_service.rb
 - lib/test_changes/error.rb
+- lib/test_changes/find_runner_service.rb
 - lib/test_changes/finding_pattern.rb
 - lib/test_changes/inferred_config.rb
+- lib/test_changes/runner.rb
 - lib/test_changes/version.rb
 - test_changes.gemspec
 homepage: https://github.com/gsmendoza/test_changes

data/exe/test_changes

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'test_changes/argv_wrapper'
-require 'test_changes/client'
-require 'test_changes/config'
-require 'test_changes/inferred_config'
-require 'test_changes/config_setup_service'
-
-argv_wrapper = TestChanges::ARGVWrapper.new(ARGV)
-
-config = TestChanges::ConfigSetupService.call
-
-client = TestChanges::Client.new(
-  test_tool_command: config.test_tool_command,
-  finding_patterns: config.finding_patterns,
-  commit: argv_wrapper.commit,
-  test_tool_call_options: argv_wrapper.test_tool_call_options,
-  verbose: config.verbose)
-
-client.call