busser-cucumber 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b172d782d8d9975e5b40490356f97babeb5cd3b0
+  data.tar.gz: eb1102f37f218ad74e8f0b048e29d9e527e02dee
+SHA512:
+  metadata.gz: 8653a46de5ed5802c2ec0aa3bb39ea8baf402d37ac17474bf8796d72d6ff9df529c59473316b1cd56f744f4e047dd806f6f6e66cbcc72822e5eddf4943c3ebaa
+  data.tar.gz: 2e39d7339aedae7f19c00faadd59db6429a5ccb281d6ae65eecd63148b2b88a7bd3232e7c5589dc70b6be18a748942baa40cdcf3cf20ef97b5a36d6843647440

data/.travis.yml

@@ -1,11 +1,6 @@
 language: ruby
 
 rvm:
+- 2.1.1
 - 2.0.0
 - 1.9.3
-- 1.9.2
-- ruby-head
-
-matrix:
-  allow_failures:
-  - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,11 @@
-## 0.1.0 / 2013-10-11
+Busser-Cucumber Gem CHANGELOG
+=============================
 
-* Initial release
+v0.2.0 (2014-10-08)
+-------------------
+- Add support for included `Gemfile`s
+- Add support for included `setup-recipe.rb` Chef recipes
+
+v0.1.0 (2013-10-11)
+-------------------
+- Initial release

data/Gemfile

@@ -1,5 +1,5 @@
+# Encoding: UTF-8
+
 source 'https://rubygems.org'
 
 gemspec
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/LICENSE.txt

@@ -1,6 +1,6 @@
 Author:: Jonathan Hartman (<j@p4nt5.com>)
 
-Copyright (c) 2013 Jonathan Hartman
+Copyright (c) 2013-2014 Jonathan Hartman
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,17 +1,29 @@
-[![Gem Version](https://badge.fury.io/rb/busser-cucumber.png)](http://badge.fury.io/rb/busser-cucumber) [![Dependency Status](https://gemnasium.com/RoboticCheese/busser-cucumber.png)](https://gemnasium.com/RoboticCheese/busser-cucumber) [![Build Status](https://travis-ci.org/RoboticCheese/busser-cucumber.png?branch=master)](https://travis-ci.org/RoboticCheese/busser-cucumber) [![Code Climate](https://codeclimate.com/github/RoboticCheese/busser-cucumber.png)](https://codeclimate.com/github/RoboticCheese/busser-cucumber)
+Busser-Cucumber
+===============
+
+[![Gem Version](https://badge.fury.io/rb/busser-cucumber.png)][fury]
+[![Build Status](https://img.shields.io/travis/test-kitchen/busser-cucumber.svg)][travis]
+[![Code Climate](https://img.shields.io/codeclimate/github/test-kitchen/busser-cucumber.svg)][codeclimate]
+[![Dependency Status](https://img.shields.io/gemnasium/test-kitchen/busser-cucumber.svg)][gemnasium]
+
+[fury]: http://badge.fury.io/rb/busser-cucumber
+[travis]: https://travis-ci.org/test-kitchen/busser-cucumber
+[codeclimate]: https://codeclimate.com/github/test-kitchen/busser-cucumber
+[gemnasium]: https://gemnasium.com/test-kitchen/busser-cucumber
 
-# Busser::Cucumber
 
 A Busser runner plugin for Cucumber.
 
-## Installation
+Installation
+------------
 
-See the [Busser](https://github.com/fnichol/busser) and
-[Test Kitchen](https://github.com/opscode/test-kitchen) pages for more details.
+See the [Busser](https://github.com/test-kitchen/busser) and
+[Test Kitchen](https://github.com/test-kitchen/test-kitchen) pages for more details.
 
-## Usage
+Usage
+-----
 
-Place test files in [COOKBOOK]/test/integration/[SUITE]/cucumber/
+Place test files in `[COOKBOOK]/test/integration/[SUITE]/cucumber/`
 
     cookbook
         -- test
@@ -19,23 +31,41 @@ Place test files in [COOKBOOK]/test/integration/[SUITE]/cucumber/
                 -- default
                     -- cucumber
 
-## Contributing
+When Test Kitchen runs Busser, it will automatically install this plugin on
+your server under test.
+
+In some cases, your tests may require some additional setup. This plugin will
+run any `Gemfile` or `setup-recipe.rb` Chef recipe included in the test file
+directory. For example, if you need the `aruba` and `rest-client` gems for some
+tests, place a file in `[COOKBOOK]/test/integration/[SUITE]/cucumber/Gemfile`:
+
+    source 'https://rubygems.org'
+
+    gem 'cucumber'
+    gem 'aruba'
+    gem 'rest_client'
+
+Contributing
+------------
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. Ensure any changes are tested and all tests pass (`rake`)
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request
 
-## Authors
+Authors
+-------
 
 - Author:: Jonathan Hartman (<j@p4nt5.com>)
 
 Based mostly on work by [Adam Jacob](https://github.com/adamhjk) on
-[busser-rspec](https://github.com/adamhjk/busser-rspec), in turn based on work
-done by [Daisuke Higuchi](https://github.com/cl-lab-k) on
-[busser-serverspec](https://github.com/cl-lab-k/busser-serverspec).
+[busser-rspec](https://github.com/test-kitchen/busser-rspec), in turn based on
+work done by [Daisuke Higuchi](https://github.com/cl-lab-k) on
+[busser-serverspec](https://github.com/test-kitchen/busser-serverspec).
 
-## License
+License
+-------
 
 Apache 2.0 (see [LICENSE](license.txt)).

data/Rakefile

@@ -1,4 +1,6 @@
-require 'bundler/gem_tasks'
+# Encoding: UTF-8
+
+require 'bundler/setup'
 require 'cane/rake_task'
 require 'rubocop/rake_task'
 require 'cucumber/rake/task'
@@ -11,10 +13,8 @@ task :loc do
   Kernel.system 'countloc -r .'
 end
 
-Rubocop::RakeTask.new
+RuboCop::RakeTask.new
 
 Cucumber::Rake::Task.new
 
 task 'default' => [:cane, :loc, :rubocop, :cucumber]
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/busser-cucumber.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# Encoding: UTF-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'busser/cucumber/version'
@@ -7,26 +8,25 @@ Gem::Specification.new do |spec|
   spec.name          = 'busser-cucumber'
   spec.version       = Busser::Cucumber::VERSION
   spec.authors       = ['Jonathan Hartman']
-  spec.email         = ['j@p4nt5.com']
-  spec.description   = %q{A Busser plugin for Cucumber}
+  spec.email         = %w(j@p4nt5.com)
+  spec.description   = 'A Busser plugin for Cucumber'
   spec.summary       = spec.description
-  spec.homepage      = 'https://github.com/RoboticCheese/busser-cucumber'
+  spec.homepage      = 'https://github.com/test-kitchen/busser-cucumber'
   spec.license       = 'Apache 2.0'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = []
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.require_paths = %w(lib)
 
   spec.add_dependency 'busser'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'cane'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'countloc'
   spec.add_development_dependency 'aruba'
   spec.add_development_dependency 'cucumber'
+  spec.add_development_dependency 'rspec'
 end
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/features/plugin_install_command.feature

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

data/features/support/env.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# Encoding: UTF-8
 
 require 'aruba/cucumber'
 require 'busser/cucumber'

data/features/test_command.feature

@@ -5,27 +5,80 @@ Feature: Test command
 
   Background:
     Given a test BUSSER_ROOT directory named "busser-cucumber-test"
+    And a sandboxed GEM_HOME directory named "busser-cucumber-gem-home"
+    And a suite directory named "cucumber"
     When I successfully run `busser plugin install busser-cucumber --force-postinstall`
-    Given a suite directory named "cucumber"
 
   Scenario: A passing test suite
-    Given a file in suite "cucumber" named "<YOUR_FILE>" with:
+    Given a file in suite "cucumber" named "something.feature" with:
     """
-    TEST FILE CONTENT
+    Feature: Something
+      In order to do things
+      As a user
+      I want to do something
 
-    A good test might be a simple passing statement
+      Scenario: Do something
+        Given 2
+        When I add 2
+        Then I get 4
+    """
+    And a file in suite "cucumber" named "step_definitions/steps.rb" with:
+    """
+    require 'rspec'
+
+    Given(/^([0-9]+)$/) do |num|
+      @num = num.to_i
+    end
+
+    When(/^I add ([0-9]+)$/) do |num|
+      @num += num.to_i
+    end
+
+    Then(/^I get ([0-9]+)$/) do |num|
+      expect(@num).to eq(num.to_i)
+    end
     """
     When I run `busser test cucumber`
-    Then I should verify some output for the cucumber plugin
+    Then the output should contain:
+    """
+    1 scenario (1 passed)
+    3 steps (3 passed)
+    """
     And the exit status should be 0
 
   Scenario: A failing test suite
-    Given a file in suite "cucumber" named "<YOUR_FILE>" with:
+    Given a file in suite "cucumber" named "something.feature" with:
     """
-    TEST FILE CONTENT
+    Feature: Something
+      In order to do things
+      As a user
+      I want to do something
 
-    A good test might be a failing test case, raised exception, etc.
+      Scenario: Do something
+        Given 2
+        When I add 2
+        Then I get 5
+    """
+    And a file in suite "cucumber" named "step_definitions/steps.rb" with:
+    """
+    require 'rspec'
+
+    Given(/^([0-9]+)$/) do |num|
+      @num = num.to_i
+    end
+
+    When(/^I add ([0-9]+)$/) do |num|
+      @num += num.to_i
+    end
+
+    Then(/^I get ([0-9]+)$/) do |num|
+      expect(@num).to eq(num.to_i)
+    end
     """
     When I run `busser test cucumber`
-    Then I should verify some output for the cucumber plugin
+    Then the output should contain:
+    """
+    1 scenario (1 failed)
+    3 steps (1 failed, 2 passed)
+    """
     And the exit status should not be 0

data/lib/busser/cucumber/runner.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
+# Encoding: UTF-8
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
-# Copyright (C) 2013, Jonathan Hartman
+# Copyright (C) 2013-2014, Jonathan Hartman
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'bundler/setup'
 require 'cucumber/cli/main'
 
 exit Cucumber::Cli::Main.new(ARGV.dup).execute!
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/lib/busser/cucumber/version.rb

@@ -1,8 +1,8 @@
-# -*- encoding: utf-8 -*-
+# Encoding: UTF-8
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
-# Copyright (C) 2013, Jonathan Hartman
+# Copyright (C) 2013-2014, Jonathan Hartman
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,10 +20,7 @@ module Busser
   # A Busser runner for Cucumber
   #
   # @author Jonathan Hartman <j@p4nt5.com>
-  #
   module Cucumber
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/lib/busser/runner_plugin/cucumber.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
+# Encoding: UTF-8
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
-# Copyright (C) 2013, Jonathan Hartman
+# Copyright (C) 2013-2014, Jonathan Hartman
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,22 +19,61 @@
 
 require 'busser/runner_plugin'
 
-# A Busser runner for Cucumber
-#
-# @author Jonathan Hartman <j@p4nt5.com>
-#
-class Busser::RunnerPlugin::Cucumber < Busser::RunnerPlugin::Base
-  postinstall do
-    install_gem 'cucumber'
-  end
+module Busser
+  module RunnerPlugin
+    # A Busser runner for Cucumber
+    #
+    # @author Jonathan Hartman <j@p4nt5.com>
+    #
+    class Cucumber < Busser::RunnerPlugin::Base
+      postinstall do
+        install_gem('cucumber')
+        install_gem('bundler')
+      end
+
+      def test
+        Dir.chdir(cuke_path) do
+          bundle_install
+          chef_apply
+          run_ruby_script!("#{runner} #{cuke_path}")
+        end
+      end
+
+      private
 
-  def test
-    runner = File.expand_path(File.join(File.dirname(__FILE__),
-                                        '..',
-                                        'cucumber',
-                                        'runner.rb'))
-    run_ruby_script!("#{runner} #{suite_path('cucumber').to_s}")
+      def chef_apply
+        return nil unless File.exist?(setup_file)
+        unless File.exist?('/opt/chef/bin/chef-apply')
+          fail("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
+
+      def bundle_install
+        return nil unless File.exist?(File.join(cuke_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("PATH=#{ENV['PATH']}:#{Gem.bindir}; " \
+            'bundle install --local || bundle install')
+      end
+
+      def runner
+        File.expand_path(File.join(File.dirname(__FILE__),
+                                   '..',
+                                   'cucumber',
+                                   'runner.rb'))
+      end
+
+      def setup_file
+        File.join(cuke_path, 'setup-recipe.rb')
+      end
+
+      def cuke_path
+        suite_path('cucumber').to_s
+      end
+    end
   end
 end
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

metadata

@@ -1,142 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: busser-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: busser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   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
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: cane
   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: rubocop
   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: countloc
   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: aruba
   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: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    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'
 description: A Busser plugin for Cucumber
@@ -146,8 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -161,30 +158,29 @@ files:
 - lib/busser/cucumber/runner.rb
 - lib/busser/cucumber/version.rb
 - lib/busser/runner_plugin/cucumber.rb
-homepage: https://github.com/RoboticCheese/busser-cucumber
+homepage: https://github.com/test-kitchen/busser-cucumber
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Busser plugin for Cucumber
 test_files:
 - features/plugin_install_command.feature