net-ssh 4.0.0.alpha2 → 4.0.0.alpha3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3b154ee668530e852d2d49b1abd6adabafb36548
4
- data.tar.gz: 3575089fbf97251dcf4b5da9f58e4c80756f2c61
3
+ metadata.gz: 87c438b3e9f663090d5c58e901dbb7fd0ac5d2b1
4
+ data.tar.gz: b5131b9da9d74e7db8294d621a140d9f3f26d8f3
5
5
  SHA512:
6
- metadata.gz: 6f36037cc7802c102385c28ce1ae52a59fb8b3604288ad0a5724465ed02536e009ade110fb76ce3cf40a96204556d757a3f53ff005abb535ed9452b607f66306
7
- data.tar.gz: 90a90d798b557773ab1cd0398ab6b32128bec55c89feeea5a4cc80a39d2310cdb9f02cbe16cf9fbb7b3924ac9339edba5d96d442aa4f882f9fa81d28106b4ee2
6
+ metadata.gz: a750f4dee5bd82f5678877da2585fe01784a4c340ee188e9b9f7048b3b3342630149c68d67d7069990e8a818f940bf03e5f7238b902b76b67044a13db05b13ed
7
+ data.tar.gz: 5c089f3172efd1ca45d4c62101bc623c8e630245dea0c85cb11cc4ce1815f3b618cda431aa89187dec5ddf826a101747dca7114e86585427b4528ae258a2410b
Binary file
data.tar.gz.sig CHANGED
Binary file
@@ -6,16 +6,16 @@ rvm:
6
6
  - 2.2
7
7
  - 2.3.0
8
8
  - jruby-head
9
- - jruby-19mode
10
- - rbx-2
11
- - rbx-3
9
+ - rbx-3.20
12
10
  - ruby-head
13
11
 
14
12
  matrix:
15
13
  allow_failures:
16
14
  - rvm: ruby-head
17
- - rvm: rbx-3
15
+ - rvm: rbx-3.20
18
16
 
19
- install: bundle install
17
+ install:
18
+ - gem install bundler -v "= 1.11.2"
19
+ - bundle _1.11.2_ install
20
20
 
21
21
  script: rake test
@@ -1,3 +1,7 @@
1
+ === 4.0.0.alpha3
2
+
3
+ * added max_select_wait_time [Eugene Kenny]
4
+
1
5
  === 4.0.0.alpha2
2
6
 
3
7
  * when transport closes we're cleaning up channels [Miklos Fazekas]
@@ -88,6 +88,8 @@ Lastly, if you want to run the tests or use any of the Rake tasks, you'll need M
88
88
 
89
89
  * gem install net-ssh (might need sudo privileges)
90
90
 
91
+ NOTE: If you are running on jruby on windows you need to install jruby-pageant manually (gemspec doesn't allow for platform specific dependencies).
92
+
91
93
  However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signature[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once):
92
94
 
93
95
  # Add the public key as a trusted certificate
@@ -121,9 +123,7 @@ To run integration tests see test/integration/README.txt
121
123
 
122
124
  === BUILDING GEM
123
125
 
124
- Since building the gem requires the private key if you want to build a .gem locally please use the NET_SSH_BUILDGEM_UNSIGNED=1 envirnoment variable:
125
-
126
- rake build NET_SSH_BUILDGEM_UNSIGNED=1
126
+ rake build
127
127
 
128
128
  == LICENSE:
129
129
 
data/Rakefile CHANGED
@@ -12,12 +12,21 @@ require "bundler/gem_tasks"
12
12
 
13
13
  require "rdoc/task"
14
14
 
15
+
16
+ desc "When releasing make sure NET_SSH_BUILDGEM_SIGNED is set"
17
+ task :check_NET_SSH_BUILDGEM_SIGNED do
18
+ raise "NET_SSH_BUILDGEM_SIGNED should be set to release" unless ENV['NET_SSH_BUILDGEM_SIGNED']
19
+ end
20
+
21
+ Rake::Task[:release].enhance [:check_NET_SSH_BUILDGEM_SIGNED]
22
+ Rake::Task[:release].prerequisites.unshift(:check_NET_SSH_BUILDGEM_SIGNED)
23
+
24
+
15
25
  task :default => ["build"]
16
26
  CLEAN.include [ 'pkg', 'rdoc' ]
17
27
  name = "net-ssh"
18
28
 
19
- $:.unshift File.join(File.dirname(__FILE__), 'lib')
20
- require "net/ssh"
29
+ require_relative "lib/net/ssh/version"
21
30
  version = Net::SSH::Version::CURRENT
22
31
 
23
32
  extra_files = %w[LICENSE.txt THANKS.txt CHANGES.txt ]
@@ -64,4 +73,7 @@ require 'rake/testtask'
64
73
  Rake::TestTask.new do |t|
65
74
  t.libs = ["lib", "test"]
66
75
  t.libs << "test/integration" if ENV['NET_SSH_RUN_INTEGRATION_TESTS']
76
+ test_files = FileList['test/**/test_*.rb']
77
+ test_files -= FileList['test/integration/**/test_*.rb'] unless ENV['NET_SSH_RUN_INTEGRATION_TESTS']
78
+ t.test_files = test_files
67
79
  end
@@ -462,6 +462,13 @@ module Net; module SSH; module Connection
462
462
  end
463
463
  end
464
464
 
465
+ # If the #preprocess and #postprocess callbacks for this session need to run
466
+ # periodically, this method returns the maximum number of seconds which may
467
+ # pass between callbacks.
468
+ def max_select_wait_time
469
+ @keepalive.interval if @keepalive.enabled?
470
+ end
471
+
465
472
 
466
473
  private
467
474
 
@@ -622,11 +629,7 @@ module Net; module SSH; module Connection
622
629
  end
623
630
 
624
631
  def io_select_wait(wait)
625
- if @keepalive.enabled?
626
- [wait, @keepalive.interval].compact.min
627
- else
628
- wait
629
- end
632
+ [wait, max_select_wait_time].compact.min
630
633
  end
631
634
 
632
635
  MAP = Constants.constants.inject({}) do |memo, name|
@@ -7,11 +7,12 @@ module Net; module SSH
7
7
 
8
8
  # Represents the result of a search in known hosts
9
9
  # see search_for
10
- class HostKeys < Array
10
+ class HostKeys
11
+ include Enumerable
11
12
  attr_reader :host
12
13
 
13
14
  def initialize(host_keys, host, known_hosts, options = {})
14
- super(host_keys)
15
+ @host_keys = host_keys
15
16
  @host = host
16
17
  @known_hosts = known_hosts
17
18
  @options = options
@@ -19,7 +20,15 @@ module Net; module SSH
19
20
 
20
21
  def add_host_key(key)
21
22
  @known_hosts.add(@host, key, @options)
22
- push(key)
23
+ @host_keys.push(key)
24
+ end
25
+
26
+ def each(&block)
27
+ @host_keys.each(&block)
28
+ end
29
+
30
+ def empty?
31
+ @host_keys.empty?
23
32
  end
24
33
  end
25
34
 
@@ -10,10 +10,10 @@ module Net; module SSH
10
10
  # typically include this module in your unit test class, and then build a
11
11
  # "story" of expected sends and receives:
12
12
  #
13
- # require 'test/unit'
13
+ # require 'minitest/autorun'
14
14
  # require 'net/ssh/test'
15
15
  #
16
- # class MyTest < Test::Unit::TestCase
16
+ # class MyTest < Minitest::Test
17
17
  # include Net::SSH::Test
18
18
  #
19
19
  # def test_exec_via_channel_works
@@ -55,7 +55,7 @@ module Net; module SSH
55
55
 
56
56
  # The prerelease component of this version of the Net::SSH library
57
57
  # nil allowed
58
- PRE = "alpha2"
58
+ PRE = "alpha3"
59
59
 
60
60
  # The current version of the Net::SSH library as a Version instance
61
61
  CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)
@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
7
7
  spec.authors = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
8
8
  spec.email = ["net-ssh@solutious.com"]
9
9
 
10
- unless ENV['NET_SSH_BUILDGEM_UNSIGNED']
10
+ if ENV['NET_SSH_BUILDGEM_SIGNED']
11
11
  spec.cert_chain = ["net-ssh-public_cert.pem"]
12
12
  spec.signing_key = "/mnt/gem/net-ssh-private_key.pem"
13
13
  end
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
32
32
  spec.add_runtime_dependency("rbnacl", ">= 3.1.2")
33
33
  spec.add_runtime_dependency("bcrypt_pbkdf", "= 1.0.0.alpha1") unless RUBY_PLATFORM == "java"
34
34
 
35
- spec.add_development_dependency "bundler", "~> 1.11"
35
+ spec.add_development_dependency "bundler", "~> 1.11.2"
36
36
  spec.add_development_dependency "rake", "~> 11.1"
37
37
  spec.add_development_dependency "minitest", "~> 5.0"
38
38
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: net-ssh
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0.alpha2
4
+ version: 4.0.0.alpha3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
31
31
  s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
32
32
  e2C9M1m/2odPZo8h
33
33
  -----END CERTIFICATE-----
34
- date: 2016-03-26 00:00:00.000000000 Z
34
+ date: 2016-03-30 00:00:00.000000000 Z
35
35
  dependencies:
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rbnacl-libsodium
@@ -81,14 +81,14 @@ dependencies:
81
81
  requirements:
82
82
  - - "~>"
83
83
  - !ruby/object:Gem::Version
84
- version: '1.11'
84
+ version: 1.11.2
85
85
  type: :development
86
86
  prerelease: false
87
87
  version_requirements: !ruby/object:Gem::Requirement
88
88
  requirements:
89
89
  - - "~>"
90
90
  - !ruby/object:Gem::Version
91
- version: '1.11'
91
+ version: 1.11.2
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: rake
94
94
  requirement: !ruby/object:Gem::Requirement
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
257
257
  version: 1.3.1
258
258
  requirements: []
259
259
  rubyforge_project:
260
- rubygems_version: 2.5.1
260
+ rubygems_version: 2.4.6
261
261
  signing_key:
262
262
  specification_version: 4
263
263
  summary: 'Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.'
metadata.gz.sig CHANGED
Binary file