net-ssh 2.9.2 → 2.9.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aac9757449c9d417f334f8a5c44b9b69105c4c9b
-  data.tar.gz: eda8ba20fad936162084101482eb1f1c821b67a3
+  metadata.gz: ec0f0d0b39f574411bd29862e5a2daa9a1b3dc91
+  data.tar.gz: a168942e250f47b0667d7d565f140feb9583b9dd
 SHA512:
-  metadata.gz: fc1b60e3b51388d6b66fc38b7d4aaba56ead796820c2374a0aad1b48de094c2fb382db4159425d404f66612d8e61f0a1436b16dd90873235fcacca9b64bf3da5
-  data.tar.gz: f5dce76345e1774539a47d70c4f516e52164171d38da7569fd2f0489f34cc8599d0914115ad2108d89ca12cf667fa36a062a188508d3d136692075421d4e0307
+  metadata.gz: c1232cbcb52c0f9fbc4d3d2d8e340f9d3a64bde61cf4f579faaa189e815280cc986ee28d55ecb1d019623a6597310eda24fb88e74382e85b986a6a6390bdb645
+  data.tar.gz: d88ec6f463ada1697a50f1f71e1de20f537d17edf873f76d06034031a5b72ef8520a714ce18af7127e0c89596f81becb8662e0624399a10d7cde0cce87cdae6b

data/.travis.yml

@@ -1,10 +1,18 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
+  - jruby-head
+  - jruby-19mode
+  - 1.8.7
 
-
-install: gem install jeweler test-unit mocha
+install: gem install test-unit mocha
 
 script: rake test
 
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: 1.8.7

data/CHANGES.txt

@@ -1,3 +1,10 @@
+=== 2.9.4-beta1
+
+* Use sysread and syswrite on Windows instead of read_nonblock and write [marc-etienne]
+* Windows/peagant: use fiddle on ruby 2.2+/windows [Charlie Savage]
+* Check if ssh key is a file [kiela]
+
+=== 2.9.3
 === 2.9.2-rc3
 
 * Remove advertised algorithms that were not working (curve25519-sha256@libssh.org) [mfazekas]

data/Rakefile

@@ -8,6 +8,7 @@
 require "rubygems"
 require "rake"
 require "rake/clean"
+if RUBY_VERSION >= '1.9.0'
 require "rdoc/task"
 
 task :default => ["build"]
@@ -55,11 +56,6 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new do |t|
-  t.libs = ["lib", "test"]
-end
-
 extra_files = %w[LICENSE.txt THANKS.txt CHANGES.txt ]
 RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = "rdoc"
@@ -73,3 +69,12 @@ RDoc::Task.new do |rdoc|
     rdoc.rdoc_files.include(file) if File.exists?(file)
   }
 end
+end
+
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs = ["lib", "test"]
+  if RUBY_VERSION < '1.9.0'
+    t.ruby_opts << '-rubygems'
+  end
+end

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

@@ -188,14 +188,18 @@ module Net
         def prepare_identities_from_files
           key_files.map do |file|
             public_key_file = file + ".pub"
-            if File.readable?(public_key_file)
-              { :load_from => :pubkey_file, :file => file }
-            elsif File.readable?(file)
+            if readable_file?(public_key_file)
+              { :load_from => :pubkey_file, :file => public_key_file }
+            elsif readable_file?(file)
               { :load_from => :privkey_file, :file => file }
             end
           end.compact
         end
 
+        def readable_file?(path)
+          File.file?(path) && File.readable?(path)
+        end
+
         # Prepared identities from user key_data, preserving their order and sources.
         def prepare_identities_from_data
           key_data.map do |data|
@@ -209,7 +213,7 @@ module Net
             begin
               case identity[:load_from]
               when :pubkey_file
-                key = KeyFactory.load_public_key(identity[:file] + ".pub")
+                key = KeyFactory.load_public_key(identity[:file])
                 { :public_key => key, :from => :file, :file => identity[:file] }
               when :privkey_file
                 private_key = KeyFactory.load_private_key(identity[:file], options[:passphrase], ask_passphrase)

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

@@ -1,10 +1,20 @@
-require 'dl/import'
-
 if RUBY_VERSION < "1.9"
+  require 'dl/import'
   require 'dl/struct'
-else
+elsif RUBY_VERSION < "2.2"
+  require 'dl/import'
   require 'dl/types'
   require 'dl'
+else
+  require 'fiddle'
+  require 'fiddle/types'
+  require 'fiddle/import'
+
+  # For now map DL to Fiddler versus updating all the code below
+  module DL
+    CPtr = Fiddle::Pointer
+    RUBY_FREE = Fiddle::RUBY_FREE
+  end
 end
 
 require 'net/ssh/errors'
@@ -36,12 +46,17 @@ module Net; module SSH; module Authentication
         dlload 'advapi32'
 
         SIZEOF_DWORD = DL.sizeof('L')
-      else
+      elsif RUBY_VERSION < "2.2"
         extend DL::Importer
         dlload 'user32','kernel32', 'advapi32'
         include DL::Win32Types
 
         SIZEOF_DWORD = DL::SIZEOF_LONG
+      else
+        extend Fiddle::Importer
+        dlload 'user32','kernel32', 'advapi32'
+        include Fiddle::Win32Types
+        SIZEOF_DWORD = Fiddle::SIZEOF_LONG
       end
 
       typealias("LPCTSTR", "char *")         # From winnt.h

data/lib/net/ssh/proxy/command.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'rubygems'
 require 'net/ssh/proxy/errors'
 require 'net/ssh/ruby_compat'
 
@@ -67,12 +68,24 @@ module Net; module SSH; module Proxy
       end
       @command_line = command_line
       class << io
-        def send(data, flag)
-          write_nonblock(data)
-        end
+        if Gem.win_platform?
+          # read_nonblock and write_nonblock are not available on Windows
+          # pipe. Use sysread and syswrite as a replacement works.
+          def send(data, flag)
+            syswrite(data)
+          end
 
-        def recv(size)
-          read_nonblock(size)
+          def recv(size)
+            sysread(size)
+          end
+        else
+          def send(data, flag)
+            write_nonblock(data)
+          end
+
+          def recv(size)
+            read_nonblock(size)
+          end
         end
       end
       io

data/lib/net/ssh/transport/cipher_factory.rb

@@ -76,7 +76,6 @@ module Net; module SSH; module Transport
       cipher.padding = 0
 
       cipher.extend(Net::SSH::Transport::CTR) if (name =~ /-ctr(@openssh.org)?$/)
-
       cipher.iv      = Net::SSH::Transport::KeyExpander.expand_key(cipher.iv_len, options[:iv], options) if ossl_name != "rc4"
 
       key_len = KEY_LEN_OVERRIDE[name] || cipher.key_len

data/lib/net/ssh/transport/session.rb

@@ -63,14 +63,15 @@ module Net; module SSH; module Transport
       @options = options
 
       debug { "establishing connection to #{@host}:#{@port}" }
-      factory = options[:proxy] || TCPSocket
-      @socket = timeout(options[:timeout] || 0) {
-        case
-        when options[:proxy] then factory.open(@host, @port, options)
-        when @bind_address.nil? then factory.open(@host, @port)
-        else factory.open(@host, @port, @bind_address)
+
+      @socket = timeout(options[:timeout] || 0) do
+        if (factory = options[:proxy])
+          factory.open(@host, @port, options)
+        else
+          TCPSocket.open(@host, @port, @bind_address)
         end
-      }
+      end
+
       @socket.extend(PacketStream)
       @socket.logger = @logger
 

data/lib/net/ssh/version.rb

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

data/net-ssh.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: net-ssh 2.9.2 ruby lib
+# stub: net-ssh 2.9.3.beta1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "2.9.2"
+  s.version = "2.9.3.beta1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
   s.cert_chain = ["net-ssh-public_cert.pem"]
-  s.date = "2015-01-09"
+  s.date = "2015-01-27"
   s.description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2."
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [

data/test/authentication/test_key_manager.rb

@@ -156,7 +156,9 @@ module Authentication
 
       def stub_file_private_key(name, key, options = {})
         manager.add(name)
+        File.stubs(:file?).with(name).returns(true)
         File.stubs(:readable?).with(name).returns(true)
+        File.stubs(:file?).with(name + ".pub").returns(true)
         File.stubs(:readable?).with(name + ".pub").returns(false)
 
         case options.fetch(:passphrase, :indifferently)
@@ -179,7 +181,9 @@ module Authentication
 
       def stub_file_public_key(name, key)
         manager.add(name)
+        File.stubs(:file?).with(name).returns(true)
         File.stubs(:readable?).with(name).returns(false)
+        File.stubs(:file?).with(name + ".pub").returns(true)
         File.stubs(:readable?).with(name + ".pub").returns(true)
 
         Net::SSH::KeyFactory.expects(:load_public_key).with(name + ".pub").returns(key).at_least_once

data/test/transport/test_session.rb

@@ -315,7 +315,7 @@ module Transport
       def session(options={})
         @session ||= begin
           host = options.delete(:host) || "net.ssh.test"
-          TCPSocket.stubs(:open).with(host, options[:port] || 22).returns(socket)
+          TCPSocket.stubs(:open).with(host, options[:port] || 22, nil).returns(socket)
           Net::SSH::Transport::ServerVersion.stubs(:new).returns(server_version)
           Net::SSH::Transport::Algorithms.stubs(:new).returns(algorithms)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.3.beta1
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   MbvRpzgROzyfw1qYi4dnIyMwTtXFFcZ0a2jpxHPkcTYFK6TzvFgDLAP0Y/u9jqUQ
   eZ7/3CdSi/isZHEw
   -----END CERTIFICATE-----
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -243,9 +243,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: net-ssh
 rubygems_version: 2.2.2

metadata.gz.sig

@@ -1 +1 @@
-
�,�|�';��C�YYy1�|S��Z����{�/�x/�؂�&o�9B<ߘ�8��;@s3��w$���Rn���uԃ���ï7�AW��X�6��6d��T�Ǿ�=�.�]����×
+�����"e�k�<�wж�.)ì-0oeb�;S�k~'}M��mR��Q�|��*��,ލC�A�D�ߪ�~��k@�t��Y�O����9qa�}�
�6-!�y�8���)2�g���]��D���\��-(��F���!^���:�=���Q����A�;g�J�f00��co��l/Pi��<�DQ��u�ѡ�ze���?��zb���j�U�ъ�i虃6�݇R��,��g����cҔ�n�ζ/n���u���{���Ʒ