Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'ruby-head']
ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'ruby-head']
continue-on-error: ${{ matrix.ruby-version == 'ruby-head' }}
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in mygem.gemspec
gemspec

gem "net-ssh", ">= 7.3.1"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the gem version be specified in net-scp.gemspec instead?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine, in gem spec it would me a backward incompat change. Users can still use with older net-ssh for example if they are on ruby not supported by later net-ssh, just frozen string literals will not fully work for them.

gem "logger" # no longer a default gem in Ruby 4.0+

# TODO: add to gemspec
gem "bundler", ">= 1.11"
gem "rake", ">= 12.0"
gem "rdoc"

gem 'byebug', group: %i[development test] if !Gem.win_platform? && RUBY_ENGINE == "ruby"

Expand Down
29 changes: 17 additions & 12 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
require "rubygems"
require "rake"
require "rake/clean"
require "rdoc/task"
begin
require "rdoc/task"
rescue LoadError
end
require "bundler/gem_tasks"

desc "When releasing make sure NET_SSH_BUILDGEM_SIGNED is set"
Expand Down Expand Up @@ -67,17 +70,19 @@ Rake::TestTask.new do |t|
end

extra_files = %w[LICENSE.txt THANKS.txt CHANGES.txt ]
RDoc::Task.new do |rdoc|
rdoc.rdoc_dir = "rdoc"
rdoc.title = "#{name} #{version}"
rdoc.generator = 'hanna' # gem install hanna-nouveau
rdoc.main = 'README.md'
rdoc.rdoc_files.include("README*")
rdoc.rdoc_files.include("bin/*.rb")
rdoc.rdoc_files.include("lib/**/*.rb")
extra_files.each { |file|
rdoc.rdoc_files.include(file) if File.exist?(file)
}
if defined?(RDoc::Task)
RDoc::Task.new do |rdoc|
rdoc.rdoc_dir = "rdoc"
rdoc.title = "#{name} #{version}"
rdoc.generator = 'hanna' # gem install hanna-nouveau
rdoc.main = 'README.md'
rdoc.rdoc_files.include("README*")
rdoc.rdoc_files.include("bin/*.rb")
rdoc.rdoc_files.include("lib/**/*.rb")
extra_files.each { |file|
rdoc.rdoc_files.include(file) if File.exist?(file)
}
end
end

def change_version(&block)
Expand Down
2 changes: 1 addition & 1 deletion lib/net/scp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ def start_command(mode, local, remote, options={}, &callback)
channel[:buffer ] = Net::SSH::Buffer.new
channel[:state ] = "#{mode}_start"
channel[:stack ] = []
channel[:error_string] = ''
channel[:error_string] = +''

channel.on_close do
# If we got an exit-status and it is not 0, something went wrong
Expand Down
Loading