Merge branch 'main' of github.com:inspec/train into CHEF-7409-update-…

…train-dev-doc
inspec · Aug 30, 2024 · 89cfb84 · 89cfb84
2 parents f8c4398 + 49f1c07
commit 89cfb84
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 11 deletions.
diff --git a/.expeditor/buildkite/coverage.sh b/.expeditor/buildkite/coverage.sh
@@ -31,9 +31,9 @@ RAKE_EXIT=$?
 
 if [ -n "${CI_ENABLE_COVERAGE:-}" ]; then
   echo "--- installing sonarscanner"
-  export SONAR_SCANNER_VERSION=4.7.0.2747
-  export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux
-  curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip
+  export SONAR_SCANNER_VERSION=6.1.0.4477
+  export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64
+  curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux-x64.zip
   unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
   export PATH=$SONAR_SCANNER_HOME/bin:$PATH
   export SONAR_SCANNER_OPTS="-server"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,41 @@
-<!-- latest_release -->
+<!-- latest_release 3.12.8 -->
+## [v3.12.8](https://github.com/inspec/train/tree/v3.12.8) (2024-08-30)
+
+#### Merged Pull Requests
+- Update chefstyle requirement from 2.1.1 to 2.2.3 [#756](https://github.com/inspec/train/pull/756) ([dependabot[bot]](https://github.com/dependabot[bot]))
 <!-- latest_release -->
 
+<!-- release_rollup since=3.12.7 -->
+### Changes not yet released to rubygems.org
+
+#### Merged Pull Requests
+- Update chefstyle requirement from 2.1.1 to 2.2.3 [#756](https://github.com/inspec/train/pull/756) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 3.12.8 -->
 <!-- release_rollup -->
-<!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v3.12.7](https://github.com/inspec/train/tree/v3.12.7) (2024-08-22)
+
+#### Merged Pull Requests
+- Version pinned for active support gem [#784](https://github.com/inspec/train/pull/784) ([Nik08](https://github.com/Nik08))
+<!-- latest_stable_release -->
+
+## [v3.12.6](https://github.com/inspec/train/tree/v3.12.6) (2024-07-17)
+
+#### Merged Pull Requests
+- Revert &quot;CHEF-13189: Remove ruby 3.0 support&quot; [#783](https://github.com/inspec/train/pull/783) ([Vasu1105](https://github.com/Vasu1105))
+
+## [v3.12.5](https://github.com/inspec/train/tree/v3.12.5) (2024-07-02)
+
+#### Merged Pull Requests
+- CHEF-13189: Remove ruby 3.0 support [#781](https://github.com/inspec/train/pull/781) ([Vasu1105](https://github.com/Vasu1105))
+- Close SSH channels on close event [#780](https://github.com/inspec/train/pull/780) ([thheinen](https://github.com/thheinen))
+
 ## [v3.12.3](https://github.com/inspec/train/tree/v3.12.3) (2024-04-16)
 
 #### Merged Pull Requests
 - Add missing require for OpenStruct library [#775](https://github.com/inspec/train/pull/775) ([Vasu1105](https://github.com/Vasu1105))
 - Turn off vendor cache [#774](https://github.com/inspec/train/pull/774) ([Vasu1105](https://github.com/Vasu1105))
 - gem: pin down googleauth gem to below 1.9 [#773](https://github.com/inspec/train/pull/773) ([ahasunos](https://github.com/ahasunos))
-<!-- latest_stable_release -->
 
 ## [v3.12.0](https://github.com/inspec/train/tree/v3.12.0) (2024-03-28)
 

diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ gemspec name: "train"
 group :test do
   gem "minitest", "~> 5.8"
   gem "rake", "~> 13.0"
-  gem "chefstyle", "2.1.1"
+  gem "chefstyle", "2.2.3"
   gem "concurrent-ruby", "~> 1.0"
   gem "pry-byebug"
   gem "m"

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.12.3
+3.12.8
diff --git a/lib/train/transports/ssh_connection.rb b/lib/train/transports/ssh_connection.rb
@@ -364,9 +364,14 @@ def execute_on_channel(cmd, opts)
           channel.on_request("exit-signal") do |_, data|
             exit_status = data.read_long
           end
+
+          channel.on_close do
+            session.channels.each { |_, session_channel| session_channel.close }
+          end
         end
       end
-      session.loop
+
+      session.loop { session.busy? }
 
       if timeout && timeoutable?(cmd) && exit_status == GNU_TIMEOUT_EXIT_STATUS
         logger.debug("train ssh command '#{cmd}' reached requested timeout (#{timeout}s)")

diff --git a/lib/train/version.rb b/lib/train/version.rb
@@ -2,5 +2,5 @@
 # Author:: Dominik Richter (<[email protected]>)
 
 module Train
-  VERSION = "3.12.3".freeze
+  VERSION = "3.12.8".freeze
 end
diff --git a/test/unit/transports/ssh_connection_test.rb b/test/unit/transports/ssh_connection_test.rb
@@ -28,6 +28,8 @@ def mock_inbound_data(data)
   def on_extended_data; end
 
   def on_request(any); end
+
+  def on_close(&block); end
 end
 
 describe "ssh connection" do

diff --git a/train.gemspec b/train.gemspec
@@ -30,8 +30,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "train-core", "= #{Train::VERSION}"
   spec.add_dependency "train-winrm", "~> 0.2"
 
+  if Gem.ruby_version >= Gem::Version.new("3.1.0")
+    spec.add_dependency "activesupport", ">= 6.0.3.1"
+  else
+    spec.add_dependency "activesupport", ">= 6.0.3.1", "< 7.2.0"
+  end
+
   # azure, docker, gcp dependencies
-  spec.add_dependency "activesupport", ">= 6.0.3.1"
   spec.add_dependency "inifile", "~> 3.0"
   spec.add_dependency "azure_graph_rbac", "~> 0.16"
   spec.add_dependency "azure_mgmt_key_vault", "~> 0.17"