cobratest 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ff70bef30e32aeb2861e2ed2418efd28c8fd884
-  data.tar.gz: dfaf1f67eb5ad013669c2be46ea42ae139b06957
+  metadata.gz: 98315772b10093ce2a85ec8ba59f2574202e2aab
+  data.tar.gz: 1fd03ebe1f3e34155f7561d9d92ceefba7098e2e
 SHA512:
-  metadata.gz: 984c0b3d3c4c794e22152532f508850222b58c2781c784b8a3075a604f66eac0882792ade3cb538f030b3089ea1700dd503bd2b9c794699d124a99c14f13aa61
-  data.tar.gz: 76227aec01e1ef88b6a70024051051bd12cf183601227aa310d8488ca74f8fa94f99ab2a803dad9c02d3276b0f399cfe32b0478e210d360f3cb45b07fc183073
+  metadata.gz: 8c9c628f0dd3260bf5550b154b8912aa495dbf3beb6167edd98cfe1f1d1d64a78afec835fdee4a5719137dbcebe95d3ee4b0482a36d6df77bf50295f04e5bab2
+  data.tar.gz: 6d4161308e0ed7278ae531709d8c91edb21d9d46d28c9fe11aa3d44102b58093f953689cf08ebf912736f282d07946bb748a0a45cf931930f2cf59e10ca37a5b

data/README.md

@@ -24,57 +24,63 @@ Or install it yourself as:
 
     Options are...
         -h, -H, --help                   Display this help message.
-
         -r, --results                    DEFAULT Display the directories of the components in need of running tests
+        -t, --test-runner RUNNER         Choose a test runner
         -v, --verbose                    Verbose output of all parts of the calculation
+        -s, --since BRANCH               Specify BRANCH target to calculate against
 
 ## Example
 
 There are sample #cbra folder structures in `spec/examples`. Here is an example run when changing a file in component `C`:
 
-    ± |master ✗| → bin/cobratest ~/workspace/cobratest/spec/examples/letters/A
-    /Users/stephan/workspace/cobratest/spec/examples/letters/B/test.sh
-    /Users/stephan/workspace/cobratest/spec/examples/letters/C/test.sh
-    /Users/stephan/workspace/cobratest/spec/examples/letters/A/test.sh
+    $ bin/cobratest ./cobratest/spec/examples/letters/A
+    ./cobratest/spec/examples/letters/B/test.sh
+    ./cobratest/spec/examples/letters/C/test.sh
+    ./cobratest/spec/examples/letters/A/test.sh
 
 This output can be used to run the necessary tests like so:
 
-    bin/cobratest ~/workspace/cobratest/spec/examples/letters/A | xargs -n1 /bin/bash
+    bin/cobratest ./cobratest/spec/examples/letters/A | xargs -n1 /bin/bash
+
+You can choose a different test runner like so:
+
+    $ bin/cobratest --test-runner 'myrunner --option 1' ./cobratest/spec/examples/letters/A
+    ./cobratest/spec/examples/letters/B/myrunner --option 1
+    ./cobratest/spec/examples/letters/C/myrunner --option 1
+    ./cobratest/spec/examples/letters/A/myrunner --option 1
 
 In verbose mode one can check the correctness of cobratest's calculation:
 
-    ± |master ✗| → bin/cobratest -v ~/workspace/cobra/cobratest/spec/examples/letters/A
+    $ bin/cobratest -v ./cobra/cobratest/spec/examples/letters/A
     All components
-    B    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/B
-    C    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/C
-    D    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/D
-    E1   /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/E1
-    E2   /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/E2
-    F    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/F
-    A    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/A
+    B    ./cobra/cobratest/spec/examples/letters/B
+    C    ./cobra/cobratest/spec/examples/letters/C
+    D    ./cobra/cobratest/spec/examples/letters/D
+    E1   ./cobra/cobratest/spec/examples/letters/E1
+    E2   ./cobra/cobratest/spec/examples/letters/E2
+    F    ./cobra/cobratest/spec/examples/letters/F
+    A    ./cobra/cobratest/spec/examples/letters/A
 
     Changes since last commit
-    /Users/stephan/workspace/cobra/cobratest/README.md
-    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/C/Gemfile
+    ./cobra/cobratest/README.md
+    ./cobra/cobratest/spec/examples/letters/C/Gemfile
 
     Directly affected components
-    C    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/C
+    C    ./cobra/cobratest/spec/examples/letters/C
 
     Transitively affected components
-    B    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/B
-    C    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/C
-    A    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/A
+    B    ./cobra/cobratest/spec/examples/letters/B
+    C    ./cobra/cobratest/spec/examples/letters/C
+    A    ./cobra/cobratest/spec/examples/letters/A
 
     Test scripts to run
-    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/B/test.sh
-    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/C/test.sh
-    /Users/stephan/workspace/cobra/cobratest/spec/examples/letters/A/test.sh
+    ./cobra/cobratest/spec/examples/letters/B/test.sh
+    ./cobra/cobratest/spec/examples/letters/C/test.sh
+    ./cobra/cobratest/spec/examples/letters/A/test.sh
 
 ## Todos
-* make algorithm work for structures where a gem is in a sub folder of another gem (only the inner gem should be diectly affected)
+* make algorithm work for structures where a gem is in a sub folder of another gem (only the inner gem should be directly affected)
 * allow for other test runners to be specified
-* optionally check for changes since origin/master
-* optionally allow branch to compare against to be specified
 
 ## License
 

data/bin/cobratest

@@ -1,47 +1,49 @@
 #!/usr/bin/ruby
 
 require_relative "../lib/cobratest"
+require "optparse"
 
-def help_text
-  <<-USAGE
-cobratest [OPTION] [application path]
+options = {
+  display: "results",
+  path: nil
+}
 
-Test runner employing the structure of Component-based Ruby/Rails apps to optimize what needs to run.
+instructions = OptionParser.new do |opts|
+  opts.banner = "cobratest [OPTION] [application path]\n\n"
+  opts.separator "Test runner employing the structure of Component-based Ruby/Rails apps to optimize what needs to run.\n\n"
+  opts.separator "Options are...\n"
 
-Options are...
-    -h, -H, --help                   Display this help message.
+  opts.on("-h", "-H", "--help", "Display this help message.") do
+    puts opts
+    exit
+  end
 
-    -r, --results                    DEFAULT Display the directories of the components in need of running tests
-    -v, --verbose                    Verbose output of all parts of the calculation
-  USAGE
-end
+  opts.on("-r", "--results", "DEFAULT Display the directories of the components in need of running tests") do
+    options[:display] = "results"
+  end
 
-option = "-r"
-path = nil
-
-case ARGV.size
-  when 0
-  when 1
-    if ARGV[0].start_with? "-"
-      option = ARGV[0]
-    else
-      path = ARGV[0]
-    end
-  when 2
-    option = ARGV[0]
-    path = ARGV[1]
-  else
-    puts "Incorrect invocation. Please see help:\n\n"
-    puts help_text
-    exit 1
+  opts.on("-t", "--test-runner RUNNER", "Choose a test runner") do |runner|
+    options[:runner] = runner
+  end
+
+  opts.on("-v", "--verbose", "Verbose output of all parts of the calculation") do
+    options[:display] = "verbose"
+  end
+
+  opts.on("-s", "--since BRANCH", "Specify BRANCH target to calculate against") do |branch|
+    options[:since] = branch
+  end
 end
 
-if option
-  if %w(--help -h -H).include? option
-    puts help_text
-  elsif %w(-r --results).include? option
-    Cbratest::Runner.new(false).run path
-  elsif %w(-v --verbose).include? option
-    Cbratest::Runner.new(true).run path
+begin
+  instructions.parse!
+  if ARGV.size >= 1
+    Cbratest::Runner.new(options).run ARGV[0]
+  else
+    raise OptionParser::MissingArgument.new("Must specify the application path")
   end
+rescue OptionParser::InvalidOption, OptionParser::MissingArgument => error
+  puts error
+  puts instructions
+  exit
 end

data/cobratest.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'cobratest'
-  spec.version       = '0.1.2'
+  spec.version       = '0.1.3'
   spec.authors       = ['Stephan Hagemann']
   spec.email         = ['stephan.hagemann@gmail.com']
   spec.summary       = %q{A test selector for your component-based Rails application}
@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'bundler', '~> 1.13'
 
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
 end

data/lib/cobratest.rb

@@ -8,8 +8,10 @@ module Cbratest
   require_relative "cobratest/tests_to_run_selector"
 
   class Runner
-    def initialize(verbose_output)
-      @verbose_output = verbose_output
+    def initialize(opts)
+      @verbose_output = opts[:display] == "verbose"
+      @since = opts[:since] || "current branch"
+      @test_runner = opts[:runner] || "test.sh"
     end
 
     def run(root_path)
@@ -21,13 +23,15 @@ module Cbratest
       components = cobra_deps << app.to_s
       outputs component_out(components.to_a)
 
-
-      outputs "\nChanges since last commit"
+      outputs "\nChanges since last commit on #{@since}"
       root_dir = `cd "#{path}" && git rev-parse --show-toplevel`.chomp
-      changes = `cd "#{root_dir}" && git status -s -u`.split("\n").map { |file| File.join(root_dir, file.sub(/^.../, "")) }
+      if @since != "current branch"
+        changes = `cd "#{root_dir}" && git diff --name-only #{@since}`.split("\n").map { |file| File.join(root_dir, file) }
+      else
+        changes = `cd "#{root_dir}" && git status -s -u`.split("\n").map { |file| File.join(root_dir, file.sub(/^.../, "")) }
+      end
       outputs changes
 
-
       outputs "\nDirectly affected components"
       affected = AffectedComponentFinder.new.find(components, changes)
       outputs affected_out(affected)
@@ -37,7 +41,7 @@ module Cbratest
       outputs affected_out(all_affected)
 
       outputs "\nTest scripts to run"
-      outputs all_in_need_of_running = TestsToRunSelector.new.list(all_affected), true
+      outputs all_in_need_of_running = TestsToRunSelector.new(@test_runner).list(all_affected), true
     end
 
     private

data/lib/cobratest/gemfile_scraper.rb

@@ -14,13 +14,6 @@ module Cbratest
       {name: name, options: {path: @root_path}}
     end
 
-    def cobra_dependencies
-      dirdep = direct_dependencies
-      transitive_cobra_dependencies.select do |dep|
-        dirdep.include?(dep[:name]) || dep[:options][:direct]
-      end
-    end
-
     def transitive_cobra_dependencies
       gem_dependencies.inject([]) do |memo, dep|
         if !!dep[:options][:path]
@@ -34,24 +27,11 @@ module Cbratest
 
     private
 
-    def raw_gemspec
-      path = File.expand_path(File.join(@root_path, "#{underscore(name)}.gemspec"))
-      File.exist?(path) ? File.read(path) : ""
-    end
-
-    def direct_dependencies
-      raw_gemspec.split("\n").inject([]) do |memo, line|
-        match = line.match(/add_(?:development_)?dependency\s+["']([^'"]+)["']/)
-        memo << match[1] if match
-        memo
-      end
-    end
-
     def gem_dependencies
       gemfile_path = File.join(@root_path, "Gemfile")
       lockfile_path = File.join(@root_path, "Gemfile.lock")
       ::Bundler::Definition.build(gemfile_path, lockfile_path, nil).dependencies.inject([]) do |memo, dep|
-        path = dep.source.path.to_s if dep.source && dep.source.is_a_path?
+        path = dep.source.path.to_s if dep.source && dep.source.path?
         if path == "."
           path = nil
         elsif path && !path.match(/#{dep.name}/)
@@ -61,13 +41,5 @@ module Cbratest
         memo
       end
     end
-
-    def underscore(string)
-      string.gsub(/::/, '/').
-          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-          gsub(/([a-z\d])([A-Z])/, '\1_\2').
-          tr("-", "_").
-          downcase
-    end
   end
 end

data/lib/cobratest/tests_to_run_selector.rb

@@ -1,10 +1,16 @@
 module Cbratest
   class TestsToRunSelector
+    attr_reader :suffix
+
+    def initialize(suffix = 'test.sh')
+      @suffix = suffix
+    end
+
     def list(affected)
       affected.keys.inject([]) do |memo, key|
-        memo << File.join(key[:options][:path], "test.sh") if affected[key]
+        memo << File.join(key[:options][:path], suffix) if affected[key]
         memo
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobratest
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Stephan Hagemann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,16 +28,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A test selector for your component-based Rails application