vagrant-rspec-ci 1.1.0 → 1.1.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -104,7 +104,7 @@ module VagrantPlugins
104
104
 
105
105
  cmd = ""
106
106
  cmd << rspec_path
107
- cmd << (use_cir ? " --require " + ci_hook_path + " --format CI::Reporter::RSpec" : "")
107
+ cmd << (use_cir ? " --require " + ci_hook_path + " --format CI::Reporter::RSpecFormatter" : "")
108
108
  cmd << (use_cir && vm.config.rspec.suppress_ci_stdout ? " -o /dev/null " : "")
109
109
  cmd << vm.config.rspec.dirs.map{ |d| " -I #{d}" }.join('')
110
110
 
@@ -28,11 +28,15 @@ module VagrantPlugins
28
28
  @tests = DEFAULT_TESTS if @tests == UNSET_VALUE
29
29
 
30
30
  if @rspec_bin_path == UNSET_VALUE then
31
- guess = ::Gem.bin_path 'rspec', 'rspec'
31
+ guess = guess_rspec_bin_path
32
32
  @rspec_bin_path = File.exists?(guess) ? guess : DEFAULT_RSPEC_BIN_PATH
33
33
  end
34
34
  end
35
35
 
36
+ def guess_rspec_bin_path
37
+ rspec_version = ::Gem::Specification::find_by_name('rspec').version
38
+ ::Gem.bin_path rspec_version >= Gem::Version.new('2.0.0.a2') ? 'rspec-core' : 'rspec', 'rspec'
39
+ end
36
40
 
37
41
  # TODO check args to this
38
42
  def validate(machine)
@@ -1,8 +1,9 @@
1
1
  module VagrantPlugins
2
2
  module VagrantRspecCI
3
3
  class Plugin < Vagrant.plugin("2")
4
- name "Run rspec tests against a VM, with jUnit output"
5
-
4
+ name 'vagrant-rspec-ci'
5
+ description "Run rspec tests against a VM, with jUnit output"
6
+
6
7
  command "rspec" do
7
8
  require_relative "command"
8
9
  VagrantPlugins::VagrantRspecCI::Command
@@ -2,7 +2,7 @@ module VagrantPlugins
2
2
  module VagrantRspecCI
3
3
 
4
4
  NAME = "vagrant-rspec-ci"
5
- VERSION = "1.1.0"
5
+ VERSION = "1.1.1"
6
6
  AUTHOR = "Clinton Wolfe"
7
7
  AUTHOR_EMAIL = "clintoncwolfe [at] gmail [dot] com"
8
8
  DESCRIPTION = "vagrant-rspec-ci is a Vagrant 1.2.x plugin for running tests against your VMs, derived from vagrant-test"
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: vagrant-rspec-ci
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.1.0
5
+ version: 1.1.1
6
6
  platform: ruby
7
7
  authors:
8
8
  - Clinton Wolfe
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2014-11-27 00:00:00 Z
13
+ date: 2016-03-28 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rspec
@@ -57,7 +57,7 @@ dependencies:
57
57
  type: :runtime
58
58
  version_requirements: *id004
59
59
  - !ruby/object:Gem::Dependency
60
- name: ci_reporter
60
+ name: ci_reporter_rspec
61
61
  prerelease: false
62
62
  requirement: &id005 !ruby/object:Gem::Requirement
63
63
  none: false