busser-rspec 0.7.0 → 0.7.1

data/README.md

@@ -1,27 +1,28 @@
-# <a name="title"></a> Busser::RunnerPlugin::Rspec
+# Busser::RunnerPlugin::Rspec
 
 A Busser runner plugin for Rspec
 
-## <a name="installation"></a> Installation and Setup
+## Installation and Setup
 
-Please read the Busser [plugin usage][plugin_usage] page for more details.
+Please read the Busser [plugin usage](plugin_usage) page for more details.
 
-## <a name="usage"></a> Usage
+## Usage
 
 Please put test files into [COOKBOOK]/test/integration/[SUITES]/rspec/
 
-```cookbook
-`-- test
-    `-- integration
+```
+-- [COOKBOOK]
+  `-- test
+     `-- integration
         `-- default
-            `-- rspec
-                `-- spec_helper.rb
+           `-- rspec
+              `-- spec_helper.rb
 ```
 
-## <a name="development"></a> Development
+## Development
 
-* Source hosted at [GitHub][repo]
-* Report issues/questions/feature requests on [GitHub Issues][issues]
+* Source hosted at [GitHub](https://github.com/opscode/busser-rspec)
+* Report issues/questions/feature requests on [GitHub Issues](issues)
 
 Pull requests are very welcome! Make sure your patches are well tested.
 Ideally create a topic branch for every separate change you make. For
@@ -33,12 +34,13 @@ example:
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## <a name="authors"></a> Authors
+## Authors
+
+Created and maintained by Adam Jacob (adam@opscode.com)
 
-Created and maintained by [Adam Jacob][author] (<adam@opscode.com>)
-Based on busser-serverspec, created and maintained by [HIGUCHI Daisuke][author] (<d-higuchi@creationline.com>)
+Based on [busser-serverspec](https://github.com/cl-lab-k/busser-serverspec), created and maintained by HIGUCHI Daisuke (d-higuchi@creationline.com)
 
-## <a name="license"></a> License
+## License
 
-Apache 2.0 (see [LICENSE][license])
+Apache 2.0 (see [LICENSE](license))
 

data/busser-rspec.gemspec

@@ -20,6 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'busser'
 
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'chef'
+
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'aruba'

data/features/plugin_install_command.feature

@@ -5,7 +5,9 @@ Feature: Plugin install command
 
   Background:
     Given a test BUSSER_ROOT directory named "busser-rspec-install"
+    And a sandboxed GEM_HOME directory named "busser-rspec-gem-home"
 
   Scenario: Running the postinstall generator
     When I run `busser plugin install busser-rspec --force-postinstall`
-    Then the exit status should be 0
+    Then a gem named "rspec" is installed
+    And the exit status should be 0

data/features/test_command.feature

@@ -5,27 +5,37 @@ Feature: Test command
 
   Background:
     Given a test BUSSER_ROOT directory named "busser-rspec-test"
+    And a sandboxed GEM_HOME directory named "busser-rspec-gem-home"
     When I successfully run `busser plugin install busser-rspec --force-postinstall`
     Given a suite directory named "rspec"
 
   Scenario: A passing test suite
-    Given a file in suite "rspec" named "<YOUR_FILE>" with:
+    Given a file in suite "rspec" named "default_spec.rb" with:
     """
-    TEST FILE CONTENT
-
-    A good test might be a simple passing statement
+    describe 'default' do
+      it 'succeed' do
+      end
+    end
     """
     When I run `busser test rspec`
-    Then I should verify some output for the rspec plugin
+    Then the output should contain:
+    """
+    1 example, 0 failures
+    """
     And the exit status should be 0
 
   Scenario: A failing test suite
-    Given a file in suite "rspec" named "<YOUR_FILE>" with:
+    Given a file in suite "rspec" named "default_spec.rb" with:
     """
-    TEST FILE CONTENT
-
-    A good test might be a failing test case, raised exception, etc.
+    describe 'default' do
+      it 'fail' do
+        raise
+      end
+    end
     """
     When I run `busser test rspec`
-    Then I should verify some output for the rspec plugin
+    Then the output should contain:
+    """
+    1 example, 1 failure
+    """
     And the exit status should not be 0

data/lib/busser/rspec/version.rb

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

data/lib/busser/runner_plugin/rspec.rb

@@ -25,28 +25,30 @@ require 'rubygems'
 #
 class Busser::RunnerPlugin::Rspec < Busser::RunnerPlugin::Base
   postinstall do
-    install_gem("rspec", "<= 2.13.1")
+    install_gem("rspec")
     install_gem("bundler")
   end
 
   def test
     rspec_path = suite_path('rspec').to_s
 
-    chef_apply do
-      setup_file = File.join(rspec_path, "setup-recipe.rb")
+    setup_file = File.join(rspec_path, "setup-recipe.rb")
 
+    Dir.chdir(rspec_path) do
       if File.exists?(setup_file)
-        eval(IO.read(setup_file))
+        if !File.exists?("/opt/chef/bin/chef-apply")
+          raise "You have a chef setup file at #{setup_file}, but /opt/chef/bin/chef-apply does not if exist"
+        end
+        run("/opt/chef/bin/chef-apply #{setup_file}")
       end
 
-      execute "bundle install --local || bundle install" do
-        environment("PATH" => "#{ENV['PATH']}:#{Gem.bindir}")
-        cwd rspec_path
-        only_if { File.exists?(File.join(rspec_path, "Gemfile")) }
+      if File.exists?(File.join(rspec_path, "Gemfile"))
+        # Bundle install local completes quickly if the gems are already found locally
+        # it fails if it needs to talk to the internet. The || below is the fallback
+        # to the internet-enabled version. It's a speed optimization.
+        run("env PATH=#{ENV['PATH']}:#{Gem.bindir} bundle install --local || bundle install")
       end
-    end
 
-    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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: busser-rspec
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: busser
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3777970935078636489
+      hash: -1620810802609636202
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -171,10 +203,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3777970935078636489
+      hash: -1620810802609636202
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Busser runner plugin for RSpec