Merge branch 'main' into release-please--branches--main--components--…

…busser-bats

Gemfile

@@ -17,9 +17,6 @@ end
 group :development do
   gem "countloc"
   gem "simplecov"
-
-#   gem "finstyle",  "1.2.0"
-  gem "cane",      "2.6.2"
 end
 
 group :chefstyle do

Rakefile

@@ -2,27 +2,24 @@ require "bundler/gem_tasks"
 require "open-uri"
 
 namespace :bats do
-
   version = ENV.fetch("BATS_VERSION", "v0.4.0")
   url = "https://github.com/sstephenson/bats/archive/#{version}.tar.gz"
   tarball = "tmp/bats-#{version}.tar.gz"
   vendor = "vendor/bats"
 
   desc "Vendors bats #{version} source code into gem codebase"
-  task :vendor => "#{vendor}/VERSION.txt"
+  task vendor: "#{vendor}/VERSION.txt"
 
   directory File.dirname(tarball)
   directory vendor
 
   file tarball => File.dirname(tarball) do |t|
-    begin
-      src = open(url).binmode
-      dst = open(t.name, "wb")
-      IO.copy_stream(src, dst)
-    ensure
-      src.close
-      dst.close
-    end
+    src = open(url).binmode
+    dst = open(t.name, "wb")
+    IO.copy_stream(src, dst)
+  ensure
+    src.close
+    dst.close
   end
 
   file "#{vendor}/VERSION.txt" => [vendor, tarball] do |t|
@@ -44,7 +41,7 @@ Cucumber::Rake::Task.new(:features) do |t|
 end
 
 desc "Run all test suites"
-task :test => [:features]
+task test: [:features]
 
 desc "Display LOC stats"
 task :stats do
@@ -54,7 +51,4 @@ task :stats do
   sh "countloc -r features"
 end
 
-desc "Run all quality tasks"
-# task :quality => [:cane, :style, :stats]
-
-task :default => [:test, :quality]
+task default: %i{test quality}

busser-bats.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "busser/bats/version"
 require "English"