net-ssh 4.0.0 → 4.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ca3b9e413b9e081ec60080e8a7f076fdea0326e
-  data.tar.gz: 37e873e6a678e995281ffacdc8941a8a1c6edf99
+  metadata.gz: 2a85d8ffe356b4c518f3b9f03e5db8e988d305c8
+  data.tar.gz: 814f1bd93b849e89d6210d84ec53a4eafa617a91
 SHA512:
-  metadata.gz: 775e2a31a2aa12784784a85eccbfe4fb8153dcf992dacc1e3d89ad859dc9f6bc6fb11fe55582a86d4d4a6c7c834d3b7e11df43acf1d5fcc03c8bb7281a95a34e
-  data.tar.gz: 4f5cf221ac378298931376187780566306f7310a6a1eccc972cb2d7ced4e4b875e5605a88b6aca29974253c65dd80f93b9b983713af564c1d0e2affb3e0b6291
+  metadata.gz: 59055d104360f2ddb71cb09747dc4a0cc3df52714d97b966cce35e13cc731d913114f873c6ccc3a937c2ecb2bce2ed84850bcbfe5a9e5f554ada3f725eb47c15
+  data.tar.gz: 0f7d6af33dfe71f9d34a06d2a7eddbd3350cf135bb9da9e13e494c1c1284db46a4f226bbfbed5d8c608ab4eb963bd4dfeb3099a167a5b58d8b7dae3cdd519521

checksums.yaml.gz.sig

@@ -1,4 +1,3 @@
-��+Ͱ����С%��"��m�E�b��@��g
A�����3�����O����.$���Gm���x��
-�[�W��-���#D�N��emJ\f
-
-�8��vi�Ww�T�|�m�o1˧?��a&4M
+�2��Ik�z�Q6�:�6tvx��e�*^�� �18�x��K犐��9�#�Uv�\`'̫=����a�W;8�Us�9>lb��W��_V�����~�8)]Pcif�\�(�͑0b��<�:c~?,���P�=�%������w���n��Y���
+>����䯯郂�g�F+��ƽ���������p�N��
+����g�j

data/.travis.yml

@@ -32,15 +32,15 @@ matrix:
 install:
   - export JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false'
   - sudo pip install ansible
-  - gem install bundler -v "= 1.11.2"
-  - bundle _1.11.2_ install
-  - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.11.2_ install
+  - gem install bundler -v "= 1.13.7"
+  - bundle _1.13.7_ install
+  - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.13.7_ install
   - sudo ansible-galaxy install rvm_io.ruby
   - sudo chown -R travis:travis /home/travis/.ansible
   - ansible-playbook ./test/integration/playbook.yml -i "localhost," --become -c local -e 'no_rvm=true' -e 'myuser=travis' -e 'mygroup=travis' -e 'homedir=/home/travis'
 
 script:
-  - bundle _1.11.2_ exec rake test
-  - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.11.2_ exec rake test
-  - bundle _1.11.2_ exec rake test_test
-  - bundle _1.11.2_ exec rubocop
+  - bundle _1.13.7_ exec rake test
+  - BUNDLE_GEMFILE=./Gemfile.norbnacl bundle _1.13.7_ exec rake test
+  - bundle _1.13.7_ exec rake test_test
+  - bundle _1.13.7_ exec rubocop

data/CHANGES.txt

@@ -1,3 +1,10 @@
+=== 4.0.1.rc1
+
+ * support of rbnacl 4.0 and better error message [#479]
+ * support include in config files [Kimura Masayuki, #475]
+ * fixed issue with ruby 2.2 or older on windows [#472]
+
+=== 4.0.0
 === 4.0.0.rc3
 
  * parse `+` character in config files [Christoph Lupprich, #470, #314]

data/Gemfile

@@ -7,6 +7,10 @@ if !Gem.win_platform? && RUBY_ENGINE == "mri"
   gem 'byebug', group: [:development, :test]
 end
 
+if (Gem::Version.new(RUBY_VERSION) <=> Gem::Version.new("2.2.6")) < 0
+  gem 'rbnacl', '< 4.0'
+end
+
 if ENV["CI"]
   gem 'codecov', require: false, group: :test
   gem 'simplecov', require: false, group: :test

data/Gemfile.norbnacl.lock

@@ -1,29 +1,29 @@
 PATH
   remote: .
   specs:
-    net-ssh (4.0.0.rc1)
+    net-ssh (4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.2.0)
+    ast (2.3.0)
     metaclass (0.0.4)
-    minitest (5.8.4)
-    mocha (1.1.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    parser (2.3.1.0)
+    parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)
     rainbow (2.1.0)
-    rake (11.1.2)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+    rake (12.0.0)
+    rubocop (0.46.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.0)
-    unicode-display_width (1.0.5)
+    ruby-progressbar (1.8.1)
+    unicode-display_width (1.1.2)
 
 PLATFORMS
   ruby
@@ -31,11 +31,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.11)
-  minitest (~> 5.0)
-  mocha (>= 1.1.0)
+  minitest (~> 5.10)
+  mocha (>= 1.2.1)
   net-ssh!
-  rake (~> 11.1)
-  rubocop (~> 0.39.0)
+  rake (~> 12.0)
+  rubocop (~> 0.46.0)
 
 BUNDLED WITH
    1.13.6

data/appveyor.yml

@@ -7,6 +7,7 @@ environment:
     - ruby_version: "jruby-9.1.2.0"
     - ruby_version: "23"
     - ruby_version: "23-x64"
+    - ruby_version: "22-x64"
 
 #init:
 #  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
@@ -21,14 +22,14 @@ platform:
 install:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - if "%ruby_version%" == "jruby-9.1.2.0" ( cinst javaruntime -i )
-  - if "%ruby_version%" == "jruby-9.1.2.0" ( cinst jruby --version 9.1.2.0 -i )
+  - if "%ruby_version%" == "jruby-9.1.2.0" ( cinst jruby --version 9.1.2.0 -i --allow-empty-checksums )
   - if "%ruby_version%" == "jruby-9.1.2.0" ( SET "PATH=C:\jruby-9.1.2.0\bin\;%PATH%" )
   - ruby --version
   - gem install bundler --no-document -v 1.13.5
   - SET BUNDLE_GEMFILE=Gemfile.norbnacl
   - bundle _1.13.5_ install --retry=3
   - cinst freesshd
-  - cinst putty
+  - cinst putty --allow-empty-checksums
   - ps: |
           if ($env:Processor_Architecture -eq "x86")
           {

data/lib/net/ssh/authentication/ed25519.rb

@@ -1,6 +1,5 @@
-gem 'rbnacl-libsodium', '>= 1.0.10'
-gem 'rbnacl', '>= 3.2.0', '< 4.0'
-gem 'bcrypt_pbkdf', '~> 1.0.0' unless RUBY_PLATFORM == "java"
+gem 'rbnacl', '>= 3.2.0', '< 5.0'
+gem 'bcrypt_pbkdf', '~> 1.0' unless RUBY_PLATFORM == "java"
 
 require 'rbnacl/libsodium'
 require 'rbnacl'

data/lib/net/ssh/authentication/ed25519_loader.rb

@@ -1,7 +1,7 @@
 module Net; module SSH; module Authentication
 
 # Loads ED25519 support which requires optinal dependecies like
-# rbnacl-libsodium, rbnacl, bcrypt_pbkdf
+# rbnacl, bcrypt_pbkdf
 module ED25519Loader
 
 begin
@@ -14,8 +14,18 @@ rescue LoadError => e
 end
 
 def self.raiseUnlessLoaded(message)
-  raise NotImplementedError, "#{message} -- see #{ERROR}" unless LOADED
+  description = dependenciesRequiredForED25519 if ERROR.is_a?(Gem::LoadError)
+  description << "#{ERROR.class} : \"#{ERROR.message}\"\n" if ERROR
+  raise NotImplementedError, "#{message}\n#{description}" unless LOADED
 end
 
+def self.dependenciesRequiredForED25519
+  result = "net-ssh requires the following gems for ed25519 support:\n"
+  result << " * rbnacl (>= 3.2, < 5.0)\n"
+  result << " * rbnacl-libsodium, if your system doesn't have libsodium installed.\n"
+  result << " * bcrypt_pbkdf (>= 1.0, < 2.0)\n" unless RUBY_PLATFORM == "java"
+  result << "See https://github.com/net-ssh/net-ssh/issues/478 for more information\n"
 end
-end; end; end
+
+end
+end; end; end

data/lib/net/ssh/authentication/pageant.rb

@@ -98,8 +98,8 @@ module Net; module SSH; module Authentication
 
       # args: hFile, (ignored), flProtect, dwMaximumSizeHigh,
       #           dwMaximumSizeLow, lpName
-      extern "HANDLE CreateFileMapping#{SUFFIX}(HANDLE, void *, DWORD, ' +
-        'DWORD, DWORD, LPCTSTR)"
+      extern "HANDLE CreateFileMapping#{SUFFIX}(HANDLE, void *, DWORD, " +
+        "DWORD, DWORD, LPCTSTR)"
 
       # args: hFileMappingObject, dwDesiredAccess, dwFileOffsetHigh,
       #           dwfileOffsetLow, dwNumberOfBytesToMap
@@ -112,8 +112,8 @@ module Net; module SSH; module Authentication
       extern 'BOOL CloseHandle(HANDLE)'
 
       # args: hWnd, Msg, wParam, lParam, fuFlags, uTimeout, lpdwResult
-      extern "LRESULT SendMessageTimeout#{SUFFIX}(HWND, UINT, WPARAM, LPARAM, ' +
-        'UINT, UINT, PDWORD_PTR)"
+      extern "LRESULT SendMessageTimeout#{SUFFIX}(HWND, UINT, WPARAM, LPARAM, " +
+        "UINT, UINT, PDWORD_PTR)"
 
       # args: none
       extern 'DWORD GetLastError()'

data/lib/net/ssh/config.rb

@@ -73,10 +73,11 @@ module Net; module SSH
       # options.)
       def load(path, host, settings={})
         file = File.expand_path(path)
+        base_dir = File.dirname(file)
         return settings unless File.readable?(file)
 
         globals = {}
-        matched_host = nil
+        host_matched = false
         seen_host = false
         IO.foreach(file) do |line|
           next if line =~ /^\s*(?:#.*)?$/
@@ -107,25 +108,35 @@ module Net; module SSH
 
             # Check for negative patterns first. If the host matches, that overrules any other positive match.
             # The host substring code is used to strip out the starting "!" so the regexp will be correct.
-            negative_match = negative_hosts.select { |h| host =~ pattern2regex(h[1..-1]) }.first
+            negative_matched = negative_hosts.any? { |h| host =~ pattern2regex(h[1..-1]) }
 
-            if negative_match
-              matched_host = nil
+            if negative_matched
+              host_matched = false
             else
-              matched_host = positive_hosts.select { |h| host =~ pattern2regex(h) }.first
+              host_matched = positive_hosts.any? { |h| host =~ pattern2regex(h) }
             end
 
             seen_host = true
             settings[key] = host
           elsif !seen_host
-            if key == 'identityfile'
+            case key
+            when 'identityfile'
               (globals[key] ||= []) << value
+            when 'include'
+              included_file_paths(base_dir, value).each do |file_path|
+                globals = load(file_path, host, globals)
+              end
             else
               globals[key] = value unless settings.key?(key)
             end
-          elsif !matched_host.nil?
-            if key == 'identityfile'
+          elsif host_matched
+            case key
+            when 'identityfile'
               (settings[key] ||= []) << value
+            when 'include'
+              included_file_paths(base_dir, value).each do |file_path|
+                settings = load(file_path, host, settings)
+              end
             else
               settings[key] = value unless settings.key?(key)
             end
@@ -214,7 +225,7 @@ module Net; module SSH
               require 'net/ssh/proxy/command'
               hash[:proxy] = Net::SSH::Proxy::Command.new(value)
             end
-	        when 'pubkeyauthentication'
+          when 'pubkeyauthentication'
             if value
               (hash[:auth_methods] << 'publickey').uniq!
             else
@@ -288,6 +299,13 @@ module Net; module SSH
           end
           hash
         end
+
+        def included_file_paths(base_dir, config_path)
+          paths = Dir.glob(File.expand_path(config_path)).select { |f| File.file?(f) }
+          paths += Dir.glob(File.join(base_dir, config_path)).select { |f| File.file?(f) }
+          paths.uniq
+        end
+
     end
   end
 

data/lib/net/ssh/version.rb

@@ -51,11 +51,11 @@ module Net; module SSH
     MINOR = 0
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 0
+    TINY  = 1
 
     # The prerelease component of this version of the Net::SSH library
     # nil allowed
-    PRE   = nil
+    PRE   = "rc1"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

data/net-ssh.gemspec

@@ -29,9 +29,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   unless ENV['NET_SSH_NO_RBNACL']
-    spec.add_development_dependency("rbnacl-libsodium", "~> 1.0.10")
-    spec.add_development_dependency("rbnacl", "~> 3.4.0")
-    spec.add_development_dependency("bcrypt_pbkdf", "~> 1.0.0") unless RUBY_PLATFORM == "java"
+    spec.add_development_dependency("rbnacl-libsodium", "~> 1.0.11")
+    spec.add_development_dependency("rbnacl", ['>= 3.2.0','< 5.0'])
+    spec.add_development_dependency("bcrypt_pbkdf", "~> 1.0") unless RUBY_PLATFORM == "java"
   end
 
   spec.add_development_dependency "bundler", "~> 1.11"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1.rc1
 platform: ruby
 authors:
 - Jamis Buck
@@ -32,14 +32,14 @@ cert_chain:
   L4d54WIy4HkZCqQXoTSiK5HZMIdXkPk3F1bZdJ8Dy1sMRru0rUkkM5mW7TQ75mfW
   Zp0QrZyNZhtitrXFbZneGRrIA/8G2Krft5Ly/A==
   -----END CERTIFICATE-----
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.0.11
   name: rbnacl-libsodium
   prerelease: false
   type: :development
@@ -47,21 +47,27 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   name: rbnacl
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -259,9 +265,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.6.8