busser 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 30f4595bebbc27b98f099d0e238e426fea215e25
-  data.tar.gz: 651088d9f4151726593bcceb028f109c9493e225
+SHA256:
+  metadata.gz: 461cec059616e39a6f7f86d6c7bf2478e36116fab040dc2b9076dc09641963c7
+  data.tar.gz: 2a21f5a58dc7a107b6af55e86a267143f3d9d5212b8590b3d0996ac182625074
 SHA512:
-  metadata.gz: a0a98ba07cfdc996db7457857002286f4cce1a3475554acf02b93236deb389d56362f443d7ca44e7c063e0b64941c8c5570c18482001ab2c19db34706a6411f2
-  data.tar.gz: 1f430ccc80672473ac4c48b0ee17e194e8a6f2297e5af94aee7a154edc03c7eb8d77c0756f5bb9c5edf7576bdcb530f0716f19f76b676b8e7e67c9f74797c6ab
+  metadata.gz: d2f10dfebb25a155b78f91a0d9b06d7f06fe5bf33174c48ee5078543d271a44f1cdb040ca8ed54ce26c9b3210b5264c5e7e89406b6669f8a1e9126bec1063979
+  data.tar.gz: b29b1a3e4a4392dd74a6a4f0e2d3475b267bdd253b3d745da2687b44621777ae95c34beef7db82102a48dcdac6f1de22e1e7ef0ee6fa27e7e54d913ad3be2cda

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 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

data/README.md

@@ -1,15 +1,18 @@
 # Busser
 
-[![Gem Version](https://badge.fury.io/rb/busser.png)](http://badge.fury.io/rb/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)
-[![Dependency Status](https://gemnasium.com/test-kitchen/busser.svg)](https://gemnasium.com/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

@@ -10,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"

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,8 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor', '<= 0.19.0'
 
-  spec.add_development_dependency 'aruba'
-  spec.add_development_dependency "bundler", "~> 1.3"
+  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'

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/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/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')
@@ -111,7 +111,7 @@ Then(/^a bat busser binstub file should contain:$/) do |partial_content|
 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]
     expect(file_perms).to eq(perms)

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'
 

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/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Busser
-  VERSION = "0.7.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: busser
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Fletcher Nichol
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -28,30 +28,30 @@ dependencies:
   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'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- appveyor.yml
 - bin/busser
 - busser.gemspec
 - features/deserialize_command.feature
@@ -225,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
@@ -240,9 +241,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Busser - Runs tests for projects in Test Kitchen
 test_files: