busser-rspec 0.4.0 → 0.5.0

data/lib/busser/rspec/runner.rb

@@ -17,16 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'rake'
 require 'bundler/setup'
-require 'rspec/core/rake_task'
-require 'rbconfig'
+require 'rspec/core'
 
-base_path = File.expand_path(ARGV.shift)
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_path = RbConfig::CONFIG['bindir'] + '/rspec'
-  t.ruby_opts = [ "-I#{base_path}" ]
-  t.pattern = "#{base_path}/**/*_spec.rb"
-end
-Rake::Task["spec"].invoke
+exit RSpec::Core::Runner.run(ARGV)

data/lib/busser/rspec/version.rb

@@ -21,6 +21,6 @@ module Busser
   module Rspec
 
     # Version string for the Rspec Busser runner plugin
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/lib/busser/runner_plugin/rspec.rb

@@ -27,29 +27,28 @@ class Busser::RunnerPlugin::Rspec < Busser::RunnerPlugin::Base
   postinstall do
     install_gem("rspec", "<= 2.13.1")
     install_gem("bundler")
+  end
 
+  def test
     rspec_path = suite_path('rspec').to_s
-    setup_file = File.join(rspec_path, "setup-recipe.rb")
 
-    if File.exists?(setup_file)
-      chef_apply do
+    chef_apply do
+      setup_file = File.join(rspec_path, "setup-recipe.rb")
+
+      if File.exists?(setup_file)
         eval(IO.read(setup_file))
       end
-    end
-  end
 
-
-  def test
-    rspec_path = suite_path('rspec').to_s
-    if File.exists?(File.join(rspec_path, "Gemfile"))
-      chef_apply do
-        execute "bundle install" do
-          environment(:PATH => Gem.binpath)
-          cwd rspec_path
-        end
+      execute "bundle install" do
+        environment("PATH" => Gem.bindir)
+        cwd rspec_path
+        only_if { File.exists?(File.join(rspec_path, "Gemfile")) }
       end
     end
-    runner = File.join(File.dirname(__FILE__), %w{.. rspec runner.rb})
-    run_ruby_script!("#{runner} #{suite_path('rspec').to_s}")
+
+    Dir.chdir(rspec_path) do
+      runner = File.expand_path(File.join(File.dirname(__FILE__), "..", "rspec", "runner.rb"))
+      run_ruby_script!("#{runner} -I #{rspec_path} -I #{rspec_path}/lib #{rspec_path}")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: busser-rspec
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -76663644287754471
+      hash: -3544285135490086574
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -76663644287754471
+      hash: -3544285135490086574
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25