direct_ssh 0.1.8 → 2.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjA1OTA3N2M3NjRkNzUwMTUzYjJiYzIzMjM2NWYwMDcwYzA1M2U1Ng==
-  data.tar.gz: !binary |-
-    NGQ1OTk3YjM0MDg4ZjNlYjQyZDdjODM0MWFmYTFjMWJlMzM1ZTUzNQ==
+SHA256:
+  metadata.gz: ba1c3e2ba267144d1f487937d263c3a85e7ffb1d261a3f8d67bfe27d57fd3f98
+  data.tar.gz: 2484d5d0ba106029424be7f72d3bd571802bacedbbb868c339d03072eab8b20e
 SHA512:
-  metadata.gz: !binary |-
-    MGU2YmViMDA3NzhmZWQ1OTVkN2Y2N2U3MTEyOTdlYTEyYzI4ZmZlZjAzYTQ1
-    ZDgwNDYzNDZhYzU5MWNkM2Q3MWMzZDVmZTg1YmJlYTAyNzlmZDBhNzNlMzEy
-    OWQ5OGRhMmJmNWE4ZjkyMGVjNzI0Njk0YTVkZDQ3NjBkMGNlYmU=
-  data.tar.gz: !binary |-
-    ZDA1MmUyNjExN2M5OTBhZGI0MDJiNzIxNTEyZTllMDQ2OWI0ZDY4NWQ2M2Rm
-    ZWZhNGFiY2RhOWZkZWQ2ZjY4Mjk2ZWFiYTBjMTRhZDUwY2RhM2UzZWQ1N2Vk
-    NTQ5YjE1MDEyMGFlNjdkZmNjMDk1OTI3MzU1ZjEwZDM2NDNmMjk=
+  metadata.gz: b80618a834bdc9c1f8885c2564a6e8e43edd02c24a2fad1ec1f87fb92f1441f2f18679754e20e9a11b49f0bf9e3c1812d56e066a92a6a7dff7e90c268b748387
+  data.tar.gz: b7b938d32d68bbde55b346e61020b0f7515cc018cd5bd1786971659362e1016f517cd6dc2de36082dd81f956db91f0c98c5c5aca5ad8581634d278ea66da0578

data/bin/direct_ssh

@@ -24,8 +24,7 @@ def main(argv)
     host, user, port = parse_args(argv)
 
     DirectSsh.start(host, user, {:port => port}) { |ssh|
-        puts ssh.exec!('cat /etc/*-release')
-        puts 'Direct SSH connected successfully'
+        system "ssh #{user}@#{host} -p #{port}"
     }
 rescue ArgumentError => e
     $stderr.puts e.message

data/direct_ssh.gemspec

@@ -6,24 +6,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'direct_ssh/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "direct_ssh"
-  spec.version       = DirectSsh::VERSION
-  spec.authors       = ["Xia Xiongjun"]
-  spec.email         = ["xxjapp@gmail.com"]
-  spec.description   = %q{In order to use SSH or SCP without the need to enter password every time, this gem will create public/private ssh rsa keys if they do not exist and send public key to remote server automatically only if necessary.}
-  spec.summary       = %q{Use SSH or SCP directly without the need to enter password every time}
-  spec.homepage      = %q{https://github.com/xxjapp/direct_ssh}
-  spec.license       = "MIT"
+    spec.name          = "direct_ssh"
+    spec.version       = DirectSsh::VERSION
+    spec.authors       = ["Xia Xiongjun"]
+    spec.email         = ["xxjapp@gmail.com"]
+    spec.description   = %q{In order to use SSH or SCP without the need to enter password every time, this gem will create public/private ssh rsa keys if they do not exist and send public key to remote server automatically only if necessary.}
+    spec.summary       = %q{Use SSH or SCP directly without the need to enter password every time}
+    spec.homepage      = %q{https://github.com/xxjapp/direct_ssh}
+    spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+    spec.files         = `git ls-files`.split($/)
+    spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+    spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+    spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "net-ssh", "~> 2.6"
-  spec.add_runtime_dependency "net-scp", "~> 1.1"
-  spec.add_runtime_dependency "highline"
+    spec.add_runtime_dependency "net-ssh", "~> 5.2"
+    spec.add_runtime_dependency "net-scp", "~> 2.0"
+    spec.add_runtime_dependency "highline", "~> 2.0"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+    spec.add_development_dependency "bundler", "~> 2.1"
+    spec.add_development_dependency "rake", "~> 13.0"
 end

data/lib/direct_ssh/key_handler.rb

@@ -6,7 +6,7 @@ require 'base64'
 
 module KeyHandler
     def self.send_key_to_remote(ssh)
-        ssh_public_key = get_ssh_public_key
+        ssh_public_key = get_ssh_public_key.chomp
         send_ssh_public_key_to_remote(ssh, ssh_public_key)
     end
 
@@ -33,10 +33,10 @@ module KeyHandler
 
     def self.create_ssh_files
         FileUtils.mkdir_p Dir.home + '/.ssh'
-        FileUtils.touch   Dir.home + '/.ssh/id_rsa'
-        FileUtils.touch   Dir.home + '/.ssh/id_rsa.pub'
-        FileUtils.touch   Dir.home + '/.ssh/authorized_keys'
-        FileUtils.touch   Dir.home + '/.ssh/known_hosts'
+        FileUtils.touch Dir.home + '/.ssh/id_rsa'
+        FileUtils.touch Dir.home + '/.ssh/id_rsa.pub'
+        FileUtils.touch Dir.home + '/.ssh/authorized_keys'
+        FileUtils.touch Dir.home + '/.ssh/known_hosts'
     end
 
     # see: http://www.noah.org/wiki/SSH_public_keys
@@ -61,34 +61,73 @@ module KeyHandler
     ################################################################
     # remote ssh key process
 
+    def self.is_windows?(ssh)
+        ssh.exec!("echo %os%").chomp != "%os%"
+    end
+
     def self.send_ssh_public_key_to_remote(ssh, key)
+        is_win = is_windows?(ssh)
+
         if !remote_file_exists?(ssh, '~/.ssh/authorized_keys')
-            remote_create_ssh_files(ssh)
-            remote_chmod_ssh_files(ssh)
+            remote_create_ssh_files(ssh, is_win)
+            remote_chmod_ssh_files(ssh, is_win)
         end
 
-        # append public_key to remote '~/.ssh/authorized_keys'
-        ssh.exec!("echo '#{key}' >> ~/.ssh/authorized_keys")
+        remote_append_key(ssh, key, is_win)
     end
 
     def self.remote_file_exists?(ssh, path)
-        ssh.exec!("[ ! -f #{path} ] && echo NOT_EXIST") == nil
+        # windows & linux       OK
+        # path including '~/'   OK
+        ssh.exec!("[ ! -f #{path} ] && echo NOT_EXIST").empty?
     end
 
-    def self.remote_create_ssh_files(ssh)
-        ssh.exec!('mkdir -p ~/.ssh')
-        ssh.exec!('touch    ~/.ssh/id_rsa')
-        ssh.exec!('touch    ~/.ssh/id_rsa.pub')
-        ssh.exec!('touch    ~/.ssh/authorized_keys')
-        ssh.exec!('touch    ~/.ssh/known_hosts')
+    def self.remote_create_ssh_files(ssh, is_win)
+        if is_win
+            ssh_exec!(ssh, 'mkdir .ssh')
+            ssh_exec!(ssh, 'touch .ssh\id_rsa')
+            ssh_exec!(ssh, 'touch .ssh\id_rsa.pub')
+            ssh_exec!(ssh, 'touch .ssh\authorized_keys')
+            ssh_exec!(ssh, 'touch .ssh\known_hosts')
+        else
+            ssh_exec!(ssh, 'mkdir ~/.ssh')
+            ssh_exec!(ssh, 'touch ~/.ssh/id_rsa')
+            ssh_exec!(ssh, 'touch ~/.ssh/id_rsa.pub')
+            ssh_exec!(ssh, 'touch ~/.ssh/authorized_keys')
+            ssh_exec!(ssh, 'touch ~/.ssh/known_hosts')
+        end
     end
 
     # see: http://www.noah.org/wiki/SSH_public_keys
-    def self.remote_chmod_ssh_files(ssh)
-        ssh.exec!('chmod 700 ~/.ssh')
-        ssh.exec!('chmod 600 ~/.ssh/id_rsa')
-        ssh.exec!('chmod 644 ~/.ssh/id_rsa.pub')
-        ssh.exec!('chmod 644 ~/.ssh/authorized_keys')
-        ssh.exec!('chmod 644 ~/.ssh/known_hosts')
+    def self.remote_chmod_ssh_files(ssh, is_win)
+        if is_win
+            # puts "NOTE 1: The default mode on windows should work"
+            # puts "NOTE 2: 'chmod' is not available or doesn't work on windows."
+            # puts "  If password asked, try to handle according to"
+            # puts "  https://social.technet.microsoft.com/Forums/Azure/en-US/e4c11aed-1d8b-4ff4-89ad-c90c62e13ce0/ssh-asking-for-password-even-i-have-private-key"
+            # puts "  and log file C:\\ProgramData\\ssh\\logs\\sshd.log"
+        else
+            ssh_exec!(ssh, 'chmod 700 ~/.ssh')
+            ssh_exec!(ssh, 'chmod 600 ~/.ssh/id_rsa')
+            ssh_exec!(ssh, 'chmod 644 ~/.ssh/id_rsa.pub')
+            ssh_exec!(ssh, 'chmod 644 ~/.ssh/authorized_keys')
+            ssh_exec!(ssh, 'chmod 644 ~/.ssh/known_hosts')
+        end
+    end
+
+    # append public_key to remote '~/.ssh/authorized_keys'
+    def self.remote_append_key(ssh, key, is_win)
+        if is_win
+            ssh_exec!(ssh, "echo #{key} >> .ssh\\authorized_keys")
+        else
+            ssh_exec!(ssh, "echo #{key} >> ~/.ssh/authorized_keys")
+        end
+    end
+
+    def self.ssh_exec!(ssh, cmd)
+        # puts "# #{cmd}"
+        res = ssh.exec! cmd
+        # puts res.force_encoding('SJIS').encode('UTF-8')
+        res
     end
 end

data/lib/direct_ssh/version.rb

@@ -1,3 +1,3 @@
 module DirectSsh
-  VERSION = "0.1.8"
+    VERSION = "2.1.1"
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: direct_ssh
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 2.1.1
 platform: ruby
 authors:
 - Xia Xiongjun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 description: In order to use SSH or SCP without the need to enter password every time,
   this gem will create public/private ssh rsa keys if they do not exist and send public
   key to remote server automatically only if necessary.
@@ -92,7 +92,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -115,17 +115,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Use SSH or SCP directly without the need to enter password every time