Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions lib/bolt/transport/winrm/connection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,20 @@ def upload_file_winrm(source, destination)
raise Bolt::Node::FileError.new(e.message, 'WRITE_ERROR')
end

def upload_file_smb(source, destination)
def require_ruby_smb
# lazy-load expensive gem code
# In BinData 2.5.0+, the below commit makes things VERY noisy when loading RubySMB, so
# we temporarily disable warnings while we load it. If this ever gets fixed, get rid
# of this function and restore the plain 'require' where this function is called.
# https://github.com/dmendel/bindata/commit/2c8588a1ae5959080fffa429e07027f2ff20161c
prev = $VERBOSE
$VERBOSE = nil
require 'ruby_smb'
$VERBOSE = prev
end

def upload_file_smb(source, destination)
require_ruby_smb

win_dest = destination.tr('/', '\\')
if (md = win_dest.match(/^([a-z]):\\(.*)/i))
Expand Down Expand Up @@ -215,8 +226,7 @@ def download_file_winrm(source, destination, download)
end

def download_file_smb(source, destination)
# lazy-load expensive gem code
require 'ruby_smb'
require_ruby_smb

win_source = source.tr('/', '\\')
if (md = win_source.match(/^([a-z]):\\(.*)/i))
Expand Down
15 changes: 7 additions & 8 deletions openbolt.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,13 @@ Gem::Specification.new do |spec|
spec.add_dependency "CFPropertyList", ">= 2.2"
spec.add_dependency "concurrent-ruby", "~> 1.0"
spec.add_dependency "ffi", ">= 1.9.25", "< 2.0.0"
spec.add_dependency "fiddle", ">= 1.0", "< 2.0"
spec.add_dependency "hiera-eyaml", ">= 3.0.0", "< 5.0.0"
spec.add_dependency "json", "~> 2.12"
spec.add_dependency "jwt", "~> 2.2"
spec.add_dependency "logging", "~> 2.2"
spec.add_dependency "minitar", ">= 0.6", "< 2.0"
spec.add_dependency "net-ftp", ">= 0.3", "< 0.4"
spec.add_dependency "net-scp", ">= 1.2", "< 5.0"
spec.add_dependency "net-ssh", ">= 4.0", "< 8.0"
spec.add_dependency "net-ssh-krb", "~> 0.5"
Expand All @@ -61,20 +64,16 @@ Gem::Specification.new do |spec|
spec.add_dependency "puppet-resource_api", ">= 1.8.1"
spec.add_dependency "r10k", ">= 3.10", "< 6"
spec.add_dependency "ruby_smb", "~> 1.0"
spec.add_dependency "terminal-table", "~> 3.0"
spec.add_dependency "terminal-table", "~> 4.0"
spec.add_dependency "winrm", "~> 2.0"
spec.add_dependency "winrm-fs", "~> 1.3"
if Gem.win_platform?
spec.add_dependency "win32ole", ">= 1.9"
end

spec.add_development_dependency "bundler", ">= 1.14"
spec.add_development_dependency "octokit", ">= 4.0", "< 9"
spec.add_development_dependency "rake", ">= 12.0", "< 14"
spec.add_development_dependency "rspec", ">= 3.0", "< 4"
spec.add_development_dependency 'voxpupuli-rubocop', '~> 5.0.0'

platform = RUBY_PLATFORM
if platform =~ /mingw|mswin/
spec.add_dependency "minitar", "~> 0.9"
else
spec.add_dependency "minitar", ">= 0.6", "< 2.0"
end
end
6 changes: 6 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
require 'puppet_pal'
# HACK: must be loaded prior to spec libs that implement stub to prevent
# RubySMB::Dcerpc::Request from shadowing 'stub' through BinData::DSLMixin::DSLFieldValidator
# In BinData 2.5.0+, the below commit makes things VERY noisy when loading RubySMB, so
# we temporarily disable warnings while we load it.
# https://github.com/dmendel/bindata/commit/2c8588a1ae5959080fffa429e07027f2ff20161c
prev = $VERBOSE
$VERBOSE = nil
require 'ruby_smb'
$VERBOSE = prev

ENV['RACK_ENV'] = 'test'
$LOAD_PATH.unshift File.join(__dir__, 'lib')
Expand Down
Loading