geordi 0.12.2 → 0.12.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/geordi/cuc.rb +11 -3
  2. data/lib/geordi/version.rb +1 -1
  3. metadata +4 -4
data/lib/geordi/cuc.rb CHANGED
@@ -38,8 +38,7 @@ module Geordi
38
38
  def parallel_execution_command
39
39
  puts "Using parallel_tests ...\n\n"
40
40
  self.argv = argv - command_line_features
41
- version = File.exists?('Gemfile.lock') && File.open('Gemfile.lock').read.scan(/parallel_tests \([^\d\.]*([\d\.]+)\)/).flatten.first
42
- gem 'parallel_tests', version if version
41
+ gem 'parallel_tests', parallel_tests_version
43
42
  require 'parallel_tests'
44
43
  type_arg = Gem::Version.new(::ParallelTests::VERSION) > Gem::Version.new('0.7.0') ? 'cucumber' : 'features'
45
44
  parallel_tests_args = "-t #{type_arg} #{command_line_features.join(' ')}"
@@ -125,9 +124,18 @@ module Geordi
125
124
 
126
125
  # Check if parallel_tests is available
127
126
  def parallel_tests_available?
128
- @parallel_tests_available ||= File.exists?('Gemfile') && File.open('Gemfile').read.scan(/parallel_tests/).any?
127
+ not parallel_tests_version.nil?
129
128
  end
130
129
 
130
+ # get the current parallel test version used in Gemfile.lock (nil if not available)
131
+ def parallel_tests_version
132
+ @parallel_tests_version ||= begin
133
+ parallel_tests = `bundle list`.split("\n").detect{ |x| x =~ /parallel_tests/ }
134
+ if parallel_tests
135
+ parallel_tests.scan( /\((.+?)\)/ ).flatten.first
136
+ end
137
+ end
138
+ end
131
139
 
132
140
  def use_parallel_tests?
133
141
  parallel_tests_available? && features_can_run_with_parallel_tests?(features_to_run) && features_to_run.size != 1
@@ -1,3 +1,3 @@
1
1
  module Geordi
2
- VERSION = '0.12.2'
2
+ VERSION = '0.12.3'
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: geordi
3
3
  version: !ruby/object:Gem::Version
4
- hash: 43
4
+ hash: 41
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 12
9
- - 2
10
- version: 0.12.2
9
+ - 3
10
+ version: 0.12.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-04-25 00:00:00 +02:00
18
+ date: 2012-04-26 00:00:00 +02:00
19
19
  default_executable:
20
20
  dependencies: []
21
21