Updating chef-winrm-fs

Signed-off-by: John McCrae <[email protected]>
chef · Feb 4, 2025 · 5cbc050 · 5cbc050
1 parent 31e9c17
commit 5cbc050
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rb-readline'
+
+if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
+    gem "chef-winrm", git: "https://github.com/chef/chef-winrm.git", branch: "jfm/chef-winrm-update"
+end
diff --git a/chef-winrm-fs.gemspec b/chef-winrm-fs.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables = ['rwinrmcp']
   s.required_ruby_version = '>= 3.0'
-  s.add_runtime_dependency 'chef-winrm', '>= 2.3.10'
+  # s.add_runtime_dependency 'chef-winrm', '>= 2.3.10'
   s.add_runtime_dependency 'erubi', '>= 1.7'
   s.add_runtime_dependency 'logging', ['>= 1.6.1', '< 3.0']
   s.add_runtime_dependency 'rubyzip', '~> 2.0'

diff --git a/lib/chef-winrm-fs/core/file_transporter.rb b/lib/chef-winrm-fs/core/file_transporter.rb
@@ -23,8 +23,8 @@
 require 'securerandom' unless defined?(SecureRandom)
 require 'stringio' unless defined?(StringIO)
 
-require 'winrm/exceptions'
-require 'winrm-fs/core/tmp_zip'
+require 'chef-winrm/exceptions'
+require 'chef-winrm-fs/core/tmp_zip'
 
 module WinRM
   module FS

diff --git a/lib/chef-winrm-fs/file_manager.rb b/lib/chef-winrm-fs/file_manager.rb
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'winrm' unless defined?(WinRM::Connection)
+require 'chef-winrm' unless defined?(WinRM::Connection)
 require_relative 'scripts/scripts'
 require_relative 'core/file_transporter'
 

diff --git a/spec/integration/tmp_zip_spec.rb b/spec/integration/tmp_zip_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../lib/winrm-fs/core/tmp_zip'
+require_relative '../../lib/chef-winrm-fs/core/tmp_zip'
 
 describe WinRM::FS::Core::TmpZip do
   let(:winrm_fs_dir) { File.expand_path('../../lib/winrm-fs', File.dirname(__FILE__)) }

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,7 +2,7 @@
 
 require 'rubygems' unless defined?(Gem)
 require 'bundler/setup'
-require 'winrm-fs'
+require 'chef-winrm-fs'
 require 'json' unless defined?(JSON)
 require_relative 'matchers'
 

diff --git a/spec/unit/tmp_zip_spec.rb b/spec/unit/tmp_zip_spec.rb
@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'winrm-fs/core/tmp_zip'
+require 'chef-winrm-fs/core/tmp_zip'
 
 describe WinRM::FS::Core::TmpZip do
   let(:src_dir) do