vagrant-rspec-ci 0.0.1 → 0.0.2

data/README.md

@@ -62,8 +62,14 @@ your Vagrantfile:
 
 ## Change Log
 
-### 0.0.1 (2013-04-09)
+### 0.0.2 (2013-04-10)
+* Try to use rspec from vagrant gemset if possible
 
+### 0.0.1 (2013-04-09)
+* Integrated with ci_reporter
+* Added directories as search paths, with defaults
+* Added globbing for test files
+* Removed internal testing support
 * Forked from v0.1.2 of vagrant-test
 
 ## License

data/lib/vagrant-rspec-ci/command.rb

@@ -22,8 +22,10 @@ module VagrantRspecCI
           tests.each do |testfile|
             vm.ui.info("Running rspec test: #{testfile}")
             cmd = "#{cmd} #{testfile}"
+            env = prep_env(vm)
             @logger.debug("Command: #{cmd}")
-            system({ "CI_REPORTS" => vm.config.rspec.reports_dir } , cmd)
+            @logger.debug("Environment: #{env.inspect()}")
+            system(env, cmd)
             result = $?
             # rspec exits 0 if all passed, 1 if some failed - and system gives nil if there was a problem starting the process
             if result.nil? then
@@ -46,6 +48,17 @@ module VagrantRspecCI
     end
 
     private
+
+    def prep_env(vm) 
+      env = {}
+      env["CI_REPORTS"] = vm.config.rspec.reports_dir
+
+      # Needed so vagrant-gemmed bins (like rspec) can find ruby_noexec_wrapper
+      env["PATH"] = ::Gem.bindir + ':' + ENV["PATH"]
+
+      env
+    end
+
     def expand_test_list (rspec_config) 
       tests = rspec_config.tests.map { |filespec|
         rspec_config.dirs.find_all { |dir| File.directory?(dir) }.map { |dir|          

data/lib/vagrant-rspec-ci/config.rb

@@ -18,7 +18,12 @@ module VagrantRspecCI
     end
 
     def rspec_bin_path
-      @rpsec_bin_path || DEFAULT_RSPEC_BIN_PATH
+      if @rpsec_bin_path then
+        return @rpsec_bin_path
+      else
+        guess = File.join(::Gem.bindir, 'rspec')
+        return File.exists?(guess) ? guess : DEFAULT_RSPEC_BIN_PATH
+      end
     end
 
     def reports_dir

data/lib/vagrant-rspec-ci.rb

@@ -12,7 +12,7 @@ require "pry-debugger"
 module VagrantRspecCI
 
   NAME            = "vagrant-rspec-ci"
-  VERSION         = "0.0.1"
+  VERSION         = "0.0.2"
   AUTHOR          = "Clinton Wolfe"
   AUTHOR_EMAIL    = "clintoncwolfe [at] gmail [dot] com"
   DESCRIPTION     = "vagrant-rspec-ci is a Vagrant plugin for running tests against your VMs, derived from vagrant-test"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rspec-ci
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: