busser 0.6.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b72fd59135ca003d371dd87f7424b419b1c6b4c
-  data.tar.gz: b54e624af6811629926648fb49b9506e8c3b4def
+SHA256:
+  metadata.gz: 461cec059616e39a6f7f86d6c7bf2478e36116fab040dc2b9076dc09641963c7
+  data.tar.gz: 2a21f5a58dc7a107b6af55e86a267143f3d9d5212b8590b3d0996ac182625074
 SHA512:
-  metadata.gz: e884518990da3a8a31c6076e2f9cbd386b5ef3aa940e70c8d346010f425418ec14cd5372e92aa0e8fb32ba50356b6188ce473b37bd18f9f9cb476525b9eab666
-  data.tar.gz: a806bd91b9f165c6588c54b5ae69a6ba9972be466fa5b5ad3327355697f5e08310c002c33662a032fe98300e3dd612bc0118c9620f3ce7468a37896b2f357384
+  metadata.gz: d2f10dfebb25a155b78f91a0d9b06d7f06fe5bf33174c48ee5078543d271a44f1cdb040ca8ed54ce26c9b3210b5264c5e7e89406b6669f8a1e9126bec1063979
+  data.tar.gz: b29b1a3e4a4392dd74a6a4f0e2d3475b267bdd253b3d745da2687b44621777ae95c34beef7db82102a48dcdac6f1de22e1e7ef0ee6fa27e7e54d913ad3be2cda

data/.simplecov

@@ -1,4 +1,4 @@
-SimpleCov.adapters.define 'gem' do
+SimpleCov.profiles.define 'gem' do
   command_name 'Specs'
 
   add_filter '.gem/'

data/.travis.yml

@@ -1,28 +1,52 @@
 language: ruby
 
 rvm:
-- 2.0.0
-- 1.9.3
-- 1.9.2
-- ruby-head
+  - 2.2
+  - 2.1
+  - 2.0.0
+  - 1.9.3
+  - ruby-head
 
 env:
-  - RUBYGEMS_VERSION=2.0.3 CHEF_VERSION=11.8.0
-  - RUBYGEMS_VERSION=2.0.3 CHEF_VERSION=10.28.2
-  - RUBYGEMS_VERSION=1.8.25 CHEF_VERSION=11.8.0
-  - RUBYGEMS_VERSION=1.8.25 CHEF_VERSION=10.28.2
+  - RUBYGEMS_VERSION=
+  - RUBYGEMS_VERSION=2.4.5
+  - RUBYGEMS_VERSION=2.2.2
+  - RUBYGEMS_VERSION=2.1.11
+  - RUBYGEMS_VERSION=2.0.14
+  - RUBYGEMS_VERSION=1.8.29
 
 before_install:
-  - gem update --system $RUBYGEMS_VERSION
+  - if [ -n "$RUBYGEMS_VERSION" ]; then gem update --system $RUBYGEMS_VERSION; fi
   - gem --version
 
 bundler_args: --without guard
 
+sudo: false
+
 matrix:
-  exclude:
-  - rvm: 2.0.0
-    env: RUBYGEMS_VERSION=1.8.25 CHEF_VERSION=10.28.2
-  - rvm: 2.0.0
-    env: RUBYGEMS_VERSION=1.8.25 CHEF_VERSION=11.8.0
   allow_failures:
-  - rvm: ruby-head
+    - rvm: ruby-head
+  exclude:
+    - rvm: 2.2
+      env: RUBYGEMS_VERSION=2.2.2
+    - rvm: 2.2
+      env: RUBYGEMS_VERSION=2.1.11
+    - rvm: 2.2
+      env: RUBYGEMS_VERSION=2.0.14
+    - rvm: 2.2
+      env: RUBYGEMS_VERSION=1.8.29
+    - rvm: 2.1
+      env: RUBYGEMS_VERSION=1.8.29
+    - rvm: 2.0.0
+      env: RUBYGEMS_VERSION=1.8.29
+    - rvm: ruby-head
+      env: RUBYGEMS_VERSION=2.2.2
+    - rvm: ruby-head
+      env: RUBYGEMS_VERSION=2.1.11
+    - rvm: ruby-head
+      env: RUBYGEMS_VERSION=2.0.14
+    - rvm: ruby-head
+      env: RUBYGEMS_VERSION=1.8.29
+
+notifications:
+  irc: "chat.freenode.net#kitchenci"

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+## 0.8.0 / 2020-08-20
+
+- Add http_proxy support to `busser plugin install`
+- Use a SPDX compliant license string in the gemspec
+- Remove the pin to bundler 1.x in the development gems
+- Misc readme updates
+- Add testing with Appveyor
+- Pin the Aruba dev dep to prevent API churn
+
+## 0.7.1 / 2015-04-20
+
+### Bug fixes
+
+* Pull request [#23][]: Dir.glob does not accept `/` but on windows hosts uses `/` when joining path segments - expanding the path corrects this. ([@tyler-ball][])
+
+## 0.7.0 / 2015-03-19
+
+### Bug fixes
+
+* Pull request [#20][], issue [#17][]: Better detection of failed forked subprocess in `#run_ruby_script!` & `#run!`. ([@fnichol][], [@tyler-ball][], [@tknerr][])
+
+### New features
+
+* Add optional `--type bat` flag to `busser setup` to support Windows platforms. ([@fnichol][])
+
+### Improvements
+
+* Simplify busser binstub for more conservative bourne shell support. ([@fnichol][])
+* Pull request [#15][]: Fix spelling in `busser test`. ([@obazoud][])
+
+
+## 0.6.2 / 2014-03-23
+
+### Bug fixes
+
+* Pull request [#8][]: Invoke prepare.sh scripts with /bin/sh for platforms without bash. ([@fnichol][])
+
+
 ## 0.6.1 / 2014-03-23
 
 ### Bug fixes
@@ -99,7 +137,15 @@
 [#5]: https://github.com/test-kitchen/busser/issues/5
 [#6]: https://github.com/test-kitchen/busser/issues/6
 [#7]: https://github.com/test-kitchen/busser/issues/7
+[#8]: https://github.com/test-kitchen/busser/issues/8
+[#15]: https://github.com/test-kitchen/busser/issues/15
+[#17]: https://github.com/test-kitchen/busser/issues/17
+[#20]: https://github.com/test-kitchen/busser/issues/20
+[#23]: https://github.com/test-kitchen/busser/issues/23
 [@fnichol]: https://github.com/fnichol
 [@jtimberman]: https://github.com/jtimberman
 [@neuhalje]: https://github.com/neuhalje
-[@sawanoboly]: https://github.com/sawanoboly
+[@obazoud]: https://github.com/obazoud
+[@sawanoboly]: https://github.com/sawanoboly
+[@tknerr]: https://github.com/tknerr
+[@tyler-ball]: https://github.com/tyler-ball

data/Gemfile

@@ -3,15 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :guard do
-  gem 'rb-inotify', :require => false
-  gem 'rb-fsevent', :require => false
-  gem 'rb-fchange', :require => false
   gem 'guard-minitest'
   gem 'guard-cucumber'
   gem 'guard-cane'
 end
-
-group :test do
-  # allow CI to override the version of Chef for matrix testing
-  gem 'chef', (ENV['CHEF_VERSION'] || '>= 0.10.10')
-end

data/README.md

@@ -1,13 +1,18 @@
 # Busser
 
-[![Build Status](https://travis-ci.org/test-kitchen/busser.png?branch=master)](https://travis-ci.org/test-kitchen/busser)
-[![Code Climate](https://codeclimate.com/github/test-kitchen/busser.png)](https://codeclimate.com/github/test-kitchen/busser)
+[![Gem Version](https://badge.fury.io/rb/busser.svg)](http://badge.fury.io/rb/busser)
+[![Build Status](https://travis-ci.org/test-kitchen/busser.svg?branch=master)](https://travis-ci.org/test-kitchen/busser)
+[![Code Climate](https://codeclimate.com/github/test-kitchen/busser.svg)](https://codeclimate.com/github/test-kitchen/busser)
 
 Busser is a test setup and execution framework designed to
 work on remote nodes whose system dependencies cannot be relied upon, except
 for an Omnibus installation of Chef. It uses a plugin architecture to add
 support for different testing strategies such minitest, cucumber, bash, etc.
 
+## Status
+
+This software project is no longer under active development as it has no active maintainers. The software may continue to work for some or all use cases, but issues filed in GitHub will most likely not be triaged. If a new maintainer is interested in working on this project please come chat with us in #test-kitchen on Chef Community Slack.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -2,7 +2,6 @@ require "bundler/gem_tasks"
 require 'rake/testtask'
 require 'cucumber/rake/task'
 require 'cane/rake_task'
-require 'tailor/rake_task'
 
 Rake::TestTask.new(:unit) do |t|
   t.libs.push "lib"
@@ -11,7 +10,7 @@ Rake::TestTask.new(:unit) do |t|
 end
 
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = ['features', '-x', '--format progress']
+  t.cucumber_opts = ['features', '-x', '--format progress', '--no-color', '-b']
 end
 
 desc "Run all test suites"
@@ -22,8 +21,6 @@ Cane::RakeTask.new do |cane|
   cane.canefile = './.cane'
 end
 
-Tailor::RakeTask.new
-
 desc "Display LOC stats"
 task :stats do
   puts "\n## Production Code Stats"
@@ -33,6 +30,6 @@ task :stats do
 end
 
 desc "Run all quality tasks"
-task :quality => [:cane, :tailor, :stats]
+task :quality => [:cane, :stats]
 
 task :default => [:test, :quality]

data/appveyor.yml

@@ -0,0 +1,36 @@
+version: "master-{build}"
+
+os: Windows Server 2012 R2
+platform:
+  - x64
+
+environment:
+  matrix:
+    - ruby_version: "200-x64"
+    - ruby_version: "21"
+
+clone_folder: c:\projects\busser
+clone_depth: 1
+skip_tags: true
+branches:
+  only:
+    - master
+
+install:
+  - systeminfo
+  - winrm quickconfig -q
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - echo %PATH%
+  - ruby --version
+  - gem install bundler --quiet --no-ri --no-rdoc || gem install bundler --quiet --no-ri --no-rdoc || gem install bundler --quiet --no-ri --no-rdoc
+  - gem install rubygems-pkg/rubygems-update-2.4.6.gem
+  - update_rubygems
+  - gem --version
+  - bundler --version
+
+build_script:
+  - bundle install || bundle install || bundle install
+
+test_script:
+  - SET SPEC_OPTS=--format progress
+  - bundle exec rake

data/bin/busser

@@ -2,7 +2,7 @@
 # -*- encoding: utf-8 -*-
 
 $:.unshift File.join(File.dirname(__FILE__), %w{.. lib})
-require 'rubygems'
+require 'rubygems' unless defined?(Gem)
 require 'busser/cli'
 
 Busser::CLI.start

data/busser.gemspec

@@ -22,17 +22,13 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor', '<= 0.19.0'
 
-  spec.add_development_dependency "chef"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'aruba', "0.7.4"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency 'cane'
+  spec.add_development_dependency 'countloc'
+  spec.add_development_dependency 'fakefs'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'fakefs'
-  spec.add_development_dependency 'aruba'
-
-  spec.add_development_dependency 'cane'
-  spec.add_development_dependency 'tailor'
+  spec.add_development_dependency "rake"
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'countloc'
 end

data/features/setup_command.feature

@@ -7,11 +7,28 @@ Feature: Setup command
     Given a test BUSSER_ROOT directory named "busser-setup"
     And I delete the BUSSER_ROOT directory
 
-  Scenario: Busser home is set up
-    Given I run `busser setup`
+  Scenario: Busser home is set up with bourne binstub
+    Given I run `busser setup --type bourne`
     Then the BUSSER_ROOT directory should exist
     And a busser binstub file should contain:
     """
     This file was generated by Busser.
     """
+    And a busser binstub file should contain:
+    """
+    export BUSSER_ROOT
+    """
+    And the exit status should be 0
+
+  Scenario: Busser home is set up with bat binstub
+    Given I run `busser setup --type bat`
+    Then the BUSSER_ROOT directory should exist
+    And a bat busser binstub file should contain:
+    """
+    REM This file was generated by Busser.
+    """
+    And a bat busser binstub file should contain:
+    """
+    SET "BUSSER_EXIT_STATUS=%ERRORLEVEL%"
+    """
     And the exit status should be 0

data/features/support/env.rb

@@ -1,9 +1,10 @@
-require 'simplecov'
 require 'aruba/cucumber'
-
 require 'busser/cucumber'
 
-SimpleCov.command_name "features"
+if ENV["COVERAGE"]
+  require 'simplecov'
+  SimpleCov.command_name "features"
+end
 
 Before do
   @aruba_timeout_seconds = 20

data/lib/busser.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'pathname'
+require 'pathname' unless defined?(Pathname)
 
 require 'busser/version'
 

data/lib/busser/cli.rb

@@ -37,6 +37,7 @@ module Busser
 
     register Busser::Command::Setup, "setup",
       "setup", "Creates a Busser home"
+    tasks["setup"].options = Busser::Command::Setup.class_options
 
     register Busser::Command::Plugin, "plugin",
       "plugin SUBCOMMAND", "Plugin subcommands"

data/lib/busser/command/deserialize.rb

@@ -16,8 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'base64'
-require 'digest'
+require 'base64' unless defined?(Base64)
+require 'digest' unless defined?(Digest)
 
 require 'busser/thor'
 

data/lib/busser/command/plugin_install.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'openssl'
+require 'openssl' unless defined?(OpenSSL)
 
 require 'busser/rubygems'
 require 'busser/thor'
@@ -38,7 +38,15 @@ module Busser
       class_option :force_postinstall, :type => :boolean, :default => false,
         :desc => "Run the plugin's postinstall if it is already installed"
 
+      class_option :verbose, :type => :boolean, :default => false,
+        :desc => "Set a more verbose output"
+
       def install_all
+        if options[:verbose]
+          Gem.configuration.verbose = 2 if options[:verbose]
+          info("Using http_proxy=#{rbg_options[:http_proxy].inspect}")
+        end
+
         silence_gem_ui do
           plugins.each { |plugin| install(plugin) }
         end

data/lib/busser/command/setup.rb

@@ -29,6 +29,10 @@ module Busser
     #
     class Setup < Busser::Thor::BaseGroup
 
+      class_option :type,
+        :desc => "Type of binstub file to create (bourne or bat)",
+        :default => "bourne"
+
       def perform
         banner "Setting up Busser"
         create_busser_root
@@ -43,9 +47,58 @@ module Busser
       end
 
       def generate_busser_binstub
+        info "Creating busser binstub"
+
+        if options[:type] == "bat"
+          generate_busser_binstub_for_bat
+        else
+          generate_busser_binstub_for_bourne
+        end
+      end
+
+      def generate_busser_binstub_for_bat
+        binstub = root_path + "bin/busser.bat"
+        busser_root = root_path.to_s.gsub("/", "\\")
+
+        File.unlink(binstub) if File.exists?(binstub)
+        create_file(binstub, :verbose => false) do
+          <<-BUSSER_BINSTUB.gsub(/^ {12}/, '')
+            @ECHO OFF
+            REM This file was generated by Busser.
+            REM
+            REM The application 'busser' is installed as part of a gem, and
+            REM this file is here to facilitate running it.
+
+            REM Make sure any variables we set exist only for this batch file
+            SETLOCAL
+
+            REM Set Busser Root Path
+            SET "BUSSER_ROOT=#{busser_root}"
+
+            REM Export gem paths so that we use the isolated gems.
+            SET "GEM_HOME=#{gem_home}"
+            SET "GEM_PATH=#{gem_path}"
+            SET "GEM_CACHE=#{gem_home}\\cache"
+
+            REM Unset RUBYOPT, we don't want this bleeding into our runtime.
+            SET RUBYOPT=
+            SET GEMRC=
+
+            REM Call the actual Busser bin with our arguments
+            "#{ruby_bin}" "#{gem_bindir}\\busser" %*
+
+            REM Store the exit status so we can re-use it later
+            SET "BUSSER_EXIT_STATUS=%ERRORLEVEL%"
+
+            REM Exit with the proper exit status from Busser
+            exit /b %BUSSER_EXIT_STATUS%
+          BUSSER_BINSTUB
+        end
+      end
+
+      def generate_busser_binstub_for_bourne
         binstub = root_path + "bin/busser"
 
-        info "Creating busser binstub"
         File.unlink(binstub) if File.exists?(binstub)
         create_file(binstub, :verbose => false) do
           <<-BUSSER_BINSTUB.gsub(/^ {12}/, '')
@@ -56,14 +109,7 @@ module Busser
             # The application 'busser' is installed as part of a gem, and
             # this file is here to facilitate running it.
             #
-            if [ -n "$DEBUG" ] ; then set -x ; fi
-
-            # Get the directory where this ruby is. This will also resolve
-            # any symlinks in the directory/script, so it will be the fully
-            # resolved path.
-            SOURCE="#{ruby_bin}"
-            while [ -h "$SOURCE" ] ; do SOURCE="`readlink "$SOURCE"`"; done
-            DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)"
+            if test -n "$DEBUG"; then set -x; fi
 
             # Set Busser Root path
             BUSSER_ROOT="#{root_path}"
@@ -71,40 +117,44 @@ module Busser
             export BUSSER_ROOT
 
             # Export gem paths so that we use the isolated gems.
-            GEM_HOME="#{gem_home}"
-            GEM_PATH="#{gem_path}"
-            GEM_CACHE="#{gem_home}/cache"
-
-            export GEM_HOME GEM_PATH GEM_CACHE
+            GEM_HOME="#{gem_home}"; export GEM_HOME
+            GEM_PATH="#{gem_path}"; export GEM_PATH
+            GEM_CACHE="#{gem_home}/cache"; export GEM_CACHE
 
             # Unset RUBYOPT, we don't want this bleeding into our runtime.
             unset RUBYOPT GEMRC
 
             # Call the actual Busser bin with our arguments
-            exec "${DIR}/ruby" "#{gem_bindir}/busser" "$@"
+            exec "#{ruby_bin}" "#{gem_bindir}/busser" "$@"
           BUSSER_BINSTUB
         end
         chmod(binstub, 0755, :verbose => false)
       end
 
       def ruby_bin
-        if bindir = RbConfig::CONFIG["bindir"]
+        result = if bindir = RbConfig::CONFIG["bindir"]
           File.join(bindir, "ruby")
         else
           "ruby"
         end
+        result = result.gsub("/", "\\").concat(".exe") if bat?
+        result
       end
 
       def gem_home
-        Gem.paths.home
+        Gem.paths.home.dup.tap { |p| p.gsub!("/", "\\") if bat? }
       end
 
       def gem_path
-        Gem.paths.path.join(":")
+        Gem.paths.path.join(":").dup.tap { |p| p.gsub!("/", "\\") if bat? }
       end
 
       def gem_bindir
-        Gem.bindir
+        Gem.bindir.dup.tap { |p| p.gsub!("/", "\\") if bat? }
+      end
+
+      def bat?
+        options[:type] == "bat"
       end
     end
   end

data/lib/busser/command/test.rb

@@ -60,7 +60,7 @@ module Busser
 
         if prepare_sh_script.exist?
           banner "Preparing #{runner} suite with #{prepare_sh_script}"
-          run!("bash #{prepare_sh_script}")
+          run!("/bin/sh #{prepare_sh_script}")
         end
       end
 
@@ -70,7 +70,7 @@ module Busser
         if prepare_recipe.exist?
           warn "Apologies, but Busser no longer supports the" +
             " prepare_recipe.rb file. Please use prepare.sh and optionally" +
-            " shell out to chef-apply in an Omnibus installtion."
+            " shell out to chef-apply in an Omnibus installation."
         end
       end
     end

data/lib/busser/cucumber.rb

@@ -6,8 +6,8 @@ end
 
 require 'busser/cucumber/hooks'
 
-require 'tmpdir'
-require 'pathname'
+require 'tmpdir' unless defined?(Dir.mktmpdir)
+require 'pathname' unless defined?(Pathname)
 
 Given(/^a BUSSER_ROOT of "(.*?)"$/) do |busser_root|
   backup_envvar('BUSSER_ROOT')
@@ -66,7 +66,7 @@ end
 
 Then(/^the suite file "(.*?)" should contain exactly:$/) do |file, content|
   file_name = File.join(ENV['BUSSER_ROOT'], "suites", file)
-  check_exact_file_content(file_name, content)
+  check_file_content(file_name, content)
 end
 
 Then(/^the vendor directory named "(.*?)" should exist$/) do |name|
@@ -102,14 +102,19 @@ end
 
 Then(/^a busser binstub file should contain:$/) do |partial_content|
   file = File.join(ENV['BUSSER_ROOT'], %w{bin busser})
-  check_file_content(file, partial_content, true)
+  check_file_content(file, Regexp.new(Regexp.escape(partial_content)), true)
+end
+
+Then(/^a bat busser binstub file should contain:$/) do |partial_content|
+  file = File.join(ENV['BUSSER_ROOT'], %w{bin busser.bat})
+  check_file_content(file, Regexp.new(Regexp.escape(partial_content)), true)
 end
 
 Then(/^the file "(.*?)" should have permissions "(.*?)"$/) do |file, perms|
-  in_current_dir do
+  in_current_directory do
     file_perms = sprintf("%o", File.stat(file).mode)
     file_perms = file_perms[2, 4]
-    file_perms.should eq(perms)
+    expect(file_perms).to eq(perms)
   end
 end
 

data/lib/busser/helpers.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'pathname'
+require 'pathname' unless defined?(Pathname)
 
 require 'busser/rubygems'
 
@@ -33,13 +33,13 @@ module Busser
     def suite_path(name = nil)
       path = root_path + "suites"
       path += name if name
-      path
+      path.expand_path
     end
 
     def vendor_path(product = nil)
       path = root_path + "vendor"
       path += product if product
-      path
+      path.expand_path
     end
 
     def root_path

data/lib/busser/rubygems.rb

@@ -29,56 +29,38 @@ module Busser
     module_function
 
     def gem_installed?(name, version)
-      installed = Array(Gem::Specification.find_all_by_name(name, version))
-      version = latest_gem_version(name) if version.nil?
-
-      if version.nil?
-        ! installed.empty?
-      else
-        installed.find { |spec| spec.version.to_s == version }
-      end
+      version = Gem::Requirement.default unless version
+      ! Gem::Dependency.new(name, version).matching_specs.empty?
     end
 
     def install_gem(gem, version)
-      install_arg = gem =~ /\.gem$/ ? gem : new_dep(gem, version)
-      spec = dep_installer.install(install_arg).find { |s| s.name == gem }
-      Gem.clear_paths
-      spec
-    end
+      version = Gem::Requirement.default unless version
 
-    def latest_gem_version(name)
-      available_gems = dep_installer.find_gems_with_sources(new_dep(name))
+      inst = Gem::DependencyInstaller.new(rbg_options)
+      specs = inst.install(gem, Gem::Requirement.create(version))
 
-      spec, source = if available_gems.respond_to?(:last)
-        # DependencyInstaller sorts the results such that the last one is
-        # always the one it considers best.
-        spec_with_source = available_gems.last
-        spec_with_source && spec_with_source
-      else
-        # Rubygems 2.0 returns a Gem::Available set, which is a
-        # collection of AvailableSet::Tuple structs
-        available_gems.pick_best!
-        best_gem = available_gems.set.first
-        best_gem && [best_gem.spec, best_gem.source]
-      end
+      Gem.clear_paths
+      specs.find { |s| s.name == gem }
+    end
 
-      spec && spec.version && spec.version.to_s
+    def rbg_options
+      @rbg_options ||= Gem::DependencyInstaller::DEFAULT_OPTIONS.merge(
+        :suggest_alternate => false,
+        :version => Gem::Requirement.default,
+        :without_groups => [],
+        :minimal_deps => true,
+        :http_proxy => ENV.fetch("http_proxy", ENV.fetch("HTTP_PROXY", nil))
+      )
     end
 
     def silence_gem_ui
       interaction = Gem::DefaultUserInteraction.ui
-      Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
+      if !Gem.configuration.really_verbose
+        Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
+      end
       yield
     ensure
       Gem::DefaultUserInteraction.ui = interaction
     end
-
-    def dep_installer
-      Gem::DependencyInstaller.new
-    end
-
-    def new_dep(name, version = nil)
-      Gem::Dependency.new(name, version)
-    end
   end
 end

data/lib/busser/thor.rb

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'thor'
+require 'thor' unless defined?(Thor)
 
 require 'busser/helpers'
 require 'busser/ui'

data/lib/busser/ui.rb

@@ -40,36 +40,56 @@ module Busser
       say(">>>>>> #{msg}")
     end
 
-    def run!(cmd)
-      run(cmd, :capture => false, :verbose => false)
+    def fatal(msg)
+      error("!!!!!! #{msg}")
+    end
 
-      if status.success?
-        true
-      else
-        code = status.exitstatus
-        die "Command [#{cmd}] exit code was #{code}", code
+    def run!(cmd, config = {})
+      config = { :capture => false, :verbose => false }.merge(config)
+
+      handle_command("Command", cmd) do
+        run(cmd, config)
       end
     end
 
     def run_ruby_script!(cmd, config = {})
       config = { :capture => false, :verbose => false }.merge(config)
-      run_ruby_script(cmd, config)
 
-      if status.success?
-        true
-      else
-        code = status.exitstatus
-        die "Ruby Script [#{cmd}] exit code was #{code}", code
+      handle_command("Ruby Script", cmd) do
+        run_ruby_script(cmd, config)
       end
     end
 
     def die(msg, exitstatus = 1)
-      $stderr.puts(msg)
+      fatal(msg)
       exit(exitstatus)
     end
 
     def status
       $?
     end
+
+    def handle_command(type, cmd)
+      begin
+        yield
+      rescue => e
+        fatal(
+          "#{type} [#{cmd}] raised an exception: #{e.message}\n" +
+          e.backtrace.join("\n"))
+        raise
+      end
+
+      if status.nil?
+        die(
+          "#{type} [#{cmd}] did not return a valid status. " \
+          "This instance could be starved for RAM or may have swap disabled."
+        )
+      elsif status.success?
+        true
+      else
+        code = status.exitstatus
+        die("#{type} [#{cmd}] exit code was #{code}", code)
+      end
+    end
   end
 end

data/lib/busser/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Busser
-  VERSION = "0.6.1"
+  VERSION = "0.8.0"
 end

data/spec/busser/helpers_spec.rb

@@ -15,11 +15,11 @@ describe Busser::Helpers do
     describe "with a default root path" do
 
       it "returns a base path if no suite name is given" do
-        suite_path.to_s.must_equal "/opt/busser/suites"
+        suite_path.to_s.must_match %r{/opt/busser/suites$}
       end
 
       it "returns a suite path given a suite name" do
-        suite_path("fuzzy").to_s.must_equal "/opt/busser/suites/fuzzy"
+        suite_path("fuzzy").to_s.must_match %r{/opt/busser/suites/fuzzy$}
       end
     end
 
@@ -30,12 +30,12 @@ describe Busser::Helpers do
 
       it "returns a base path if no suite name is given" do
         ENV['BUSSER_ROOT'] = "/path/to/busser"
-        suite_path.to_s.must_equal "/path/to/busser/suites"
+        suite_path.to_s.must_match %r{/path/to/busser/suites$}
       end
 
       it "returns a suite path given a suite name" do
         ENV['BUSSER_ROOT'] = "/path/to/busser"
-        suite_path("fuzzy").to_s.must_equal "/path/to/busser/suites/fuzzy"
+        suite_path("fuzzy").to_s.must_match %r{/path/to/busser/suites/fuzzy$}
       end
     end
   end
@@ -49,11 +49,11 @@ describe Busser::Helpers do
     describe "with a default root path" do
 
       it "returns a base path if no product name is given" do
-        vendor_path.to_s.must_equal "/opt/busser/vendor"
+        vendor_path.to_s.must_match %r{/opt/busser/vendor$}
       end
 
       it "returns a vendor path given a product name" do
-        vendor_path("supreme").to_s.must_equal "/opt/busser/vendor/supreme"
+        vendor_path("supreme").to_s.must_match %r{/opt/busser/vendor/supreme$}
       end
     end
 
@@ -64,12 +64,13 @@ describe Busser::Helpers do
 
       it "returns a base path if no product name is given" do
         ENV['BUSSER_ROOT'] = "/path/to/busser"
-        vendor_path.to_s.must_equal "/path/to/busser/vendor"
+        vendor_path.to_s.must_match %r{/path/to/busser/vendor$}
       end
 
       it "returns a suite path given a product name" do
         ENV['BUSSER_ROOT'] = "/path/to/busser"
-        vendor_path("maximal").to_s.must_equal "/path/to/busser/vendor/maximal"
+        vendor_path("maximal").to_s.must_match \
+          %r{/path/to/busser/vendor/maximal$}
       end
     end
   end

data/spec/busser/ui_spec.rb

@@ -14,6 +14,10 @@ class SneakyUI
      msg
   end
 
+  def error(msg)
+    $stderr.puts msg
+  end
+
   def run(cmd, opts)
     @run_args = [cmd, opts]
   end
@@ -33,7 +37,7 @@ class SneakyUI
 
   # these methods are technically private, so we'll avoid straight send
   # calls in the specs
-  %w{banner info warn die run! run_ruby_script!}.each do |meth|
+  %w{banner info warn fatal die run! run_ruby_script!}.each do |meth|
     define_method("invoke_#{meth}") { |*args| send(meth, *args) }
   end
 end
@@ -72,9 +76,13 @@ describe Busser::UI do
     ui.invoke_warn("grinder").must_equal ">>>>>> grinder"
   end
 
+  it "#fatal should display a formatted message on stderr" do
+    capture_stderr { ui.invoke_fatal("grinder") }.must_equal "!!!!!! grinder\n"
+  end
+
   describe "#die" do
     it "prints a message to stderr" do
-      capture_stderr { ui.invoke_die("noes") }.must_equal "noes\n"
+      capture_stderr { ui.invoke_die("noes") }.must_equal "!!!!!! noes\n"
     end
 
     it "calls exit with 1 by default" do
@@ -105,6 +113,14 @@ describe Busser::UI do
       ui.invoke_run!("great-stuff").must_equal true
     end
 
+    it "re-raises any exceptions from the underlying fork/exec" do
+      ui.stubs(:run).raises(Errno::ENOMEM)
+
+      capture_stderr {
+        proc { ui.invoke_run!("failwhale") }.must_raise Errno::ENOMEM
+      }.must_match /raised an exception/
+    end
+
     it "terminates the program if the command failed" do
       ui.status = FakeStatus.new(false)
       capture_stderr { ui.invoke_run!("failwhale") }
@@ -119,6 +135,14 @@ describe Busser::UI do
         ui.invoke_run!("failwhale").must_equal 24
       end
     end
+
+    it "terminates the program if status is nil" do
+      ui.status = nil
+      capture_stderr { ui.invoke_run!("failwhale") }.
+        must_match /did not return a valid status/
+
+      ui.died?.must_equal true
+    end
   end
 
   describe "#run_ruby_script!" do
@@ -145,6 +169,14 @@ describe Busser::UI do
       ui.invoke_run_ruby_script!("thewin.rb").must_equal true
     end
 
+    it "re-raises any exceptions from the underlying fork/exec" do
+      ui.stubs(:run_ruby_script).raises(Errno::ENOMEM)
+
+      capture_stderr {
+        proc { ui.invoke_run_ruby_script!("nope.rb") }.must_raise Errno::ENOMEM
+      }.must_match /raised an exception/
+    end
+
     it "terminates the program if the script failed" do
       ui.status = FakeStatus.new(false)
       capture_stderr { ui.invoke_run_ruby_script!("nope.rb") }
@@ -159,6 +191,14 @@ describe Busser::UI do
         ui.invoke_run_ruby_script!("nadda.rb").must_equal 97
       end
     end
+
+    it "terminates the program if status is nil" do
+      ui.status = nil
+      capture_stderr { ui.invoke_run_ruby_script!("nope.rb") }.
+        must_match /did not return a valid status/
+
+      ui.died?.must_equal true
+    end
   end
 
   def capture_stderr

data/spec/spec_helper.rb

@@ -16,9 +16,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'simplecov'
 require 'fakefs/safe'
 require 'minitest/autorun'
 require 'mocha/setup'
 
-SimpleCov.command_name "unit"
+if ENV["COVERAGE"]
+  require 'simplecov'
+  SimpleCov.command_name "unit"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: busser
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Fletcher Nichol
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,35 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.19.0
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tailor
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -164,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: countloc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Busser - Runs tests for projects in Test Kitchen
 email:
 - fnichol@nichol.ca
@@ -189,7 +161,6 @@ files:
 - ".cane"
 - ".gitignore"
 - ".simplecov"
-- ".tailor"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -197,6 +168,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/busser
 - busser.gemspec
 - features/deserialize_command.feature
@@ -254,7 +226,7 @@ homepage: https://github.com/test-kitchen/busser
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -269,9 +241,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Busser - Runs tests for projects in Test Kitchen
 test_files:

data/.tailor

@@ -1,4 +0,0 @@
-Tailor.config do |config|
-  config.formatters "text"
-  config.file_set 'lib/**/*.rb'
-end