direct_ssh 0.0.2 → 0.1.0

data/README.md

@@ -47,7 +47,6 @@ b. scripts which expose password directly
 # encoding: UTF-8
 
 require 'net/ssh'
-require 'highline/import'
 
 Net::SSH.start('127.0.0.1', 'user', {:password => 'password'}) { |ssh|
     puts ssh.exec!('cat /etc/*-release')
@@ -86,7 +85,7 @@ ssh.close
 
 ## Shell
 
-The direct_ssh shell command checks status of ssh connection to the remote server. It will ask password and send public key to remote server if neccessary.
+The `direct_ssh` shell command checks status of ssh connection to the remote server. It will ask password and send public key to remote server if neccessary.
 
 After ssh connection created successfully, The `cat /etc/*-release` command will be executed.
 
@@ -95,6 +94,20 @@ Usage: direct_ssh user@host [-p port]
  - default port 22 will be used if you leave it off
 ```
 
+The `direct_scp` shell command uses direct_ssh to upload or download files.
+
+```text
+Usage:
+1) upload file to remote server
+ # direct_scp [-r] [-p port] local_file user@host:remote_file
+2) download file from remote server
+ # direct_scp [-r] [-p port] user@host:remote_file local_file
+3) print this message
+ # direct_scp -h
+
+default port 22 will be used if you leave it off
+```
+
 ## Contributing
 
 1. Fork it
@@ -102,3 +115,9 @@ Usage: direct_ssh user@host [-p port]
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Links
+
+1. ruby gem [net-ssh](https://rubygems.org/gems/net-ssh)
+2. ruby gem [highline](https://rubygems.org/gems/highline)
+3. ruby gem [direct_ssh](https://rubygems.org/gems/direct_ssh)

data/bin/direct_scp

@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require 'direct_ssh'
+require 'net/ssh'
+require 'net/scp'
+
+def usage
+    puts 'Usage:'
+    puts '1) upload file to remote server'
+    puts ' # direct_scp [-r] [-p port] local_file user@host:remote_file'
+    puts '2) download file from remote server'
+    puts ' # direct_scp [-r] [-p port] user@host:remote_file local_file'
+    puts '3) print this message'
+    puts ' # direct_scp -h'
+    puts
+    puts 'default port 22 will be used if you leave it off'
+end
+
+def parse_args(argv)
+    if argv[0] == '-h'
+        usage; exit
+    end
+
+    @recursive = false
+    @port      = 22
+
+    0.upto(argv.length - 3) { |i|
+        @recursive = true        if argv[i] == '-r'
+        @port      = argv[i + 1] if argv[i] == '-p'
+    }
+
+    argv[-2] =~ /((.*)@(.*):)?(.*)/
+    @user = $2 if $2 != nil
+    @host = $3 if $3 != nil
+    @download = ($2 != nil && $3 != nil)
+    @src_file = $4
+
+    argv[-1] =~ /((.*)@(.*):)?(.*)/
+    @user = $2 if $2 != nil
+    @host = $3 if $3 != nil
+    @upload = ($2 != nil && $3 != nil)
+    @dst_file = $4
+
+    raise ArgumentError, 'Invalid argument' if !@user || !@host || !@src_file || !@dst_file || !@download && !@upload
+end
+
+def terminal_width
+    HighLine::SystemExtensions.terminal_size[0]
+end
+
+def limit_string(str, max_length)
+    if max_length >= str.length
+        return str
+    elsif max_length > 2
+        return '..' + str[str.length - max_length + 2, max_length - 2]
+    else
+        return '..'
+    end
+end
+
+MIN_MAX_DOT_LENGTH = 5
+
+def scp_progress_info(file, sent, total)
+    if total != 0
+        percent = sent.to_f / total.to_f
+    else
+        percent = 1
+    end
+
+    if @upload
+        string1 = " upload - #{file} "
+    else
+        string1 = " download - #{file} "
+    end
+
+    string3 = sprintf("%4d%%", percent * 100)
+
+    max_dot_length = terminal_width - 2 - (string1 + string3).length
+
+    if max_dot_length < MIN_MAX_DOT_LENGTH
+        limit_file = limit_string(file, file.length - MIN_MAX_DOT_LENGTH + max_dot_length)
+        return scp_progress_info(limit_file, sent, total)
+    end
+
+    dot_string = '-' * (percent * max_dot_length).ceil + '>' + ' ' * ((1 - percent) * max_dot_length).floor
+    return string1 + dot_string + string3
+end
+
+def show_transfer_progress(old_file, file, sent, total)
+    puts if file != old_file && old_file != nil
+    print "\r" + scp_progress_info(file, sent, total)
+    return file
+end
+
+def main(argv)
+    parse_args(argv)
+
+    DirectSsh.start(@host, @user, {:port => @port}) { |ssh|
+        old_file = nil
+
+        if @upload
+            ssh.scp.upload!(@src_file, @dst_file, {:recursive => @recursive}) { |ch, file, sent, total|
+                old_file = show_transfer_progress(old_file, file, sent, total)
+            }
+        else
+            ssh.scp.download!(@src_file, @dst_file, {:recursive => @recursive}) { |ch, file, sent, total|
+                old_file = show_transfer_progress(old_file, file, sent, total)
+            }
+        end
+    }
+rescue ArgumentError => e
+    $stderr.puts e.message
+    puts
+    usage
+rescue Net::SSH::AuthenticationFailed => e
+    $stderr.puts e.message
+rescue Net::SCP::Error => e
+    $stderr.puts e.message
+end
+
+main(ARGV)

data/bin/direct_ssh

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
-#
 
 require 'direct_ssh'
 require 'net/ssh'

data/bin/simple_ssh

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require 'direct_ssh'
+require 'net/ssh'
+
+def usage
+    puts 'Usage: simple_ssh user@host [-p port]'
+    puts ' - default port 22 will be used if you leave it off'
+end
+
+def parse_args(argv)
+    raise ArgumentError, 'Invalid argument' unless argv.join(' ') =~ /^([^ ]+)@([^ ]+)( -p ([^ ]+))?$/
+    user = $1
+    host = $2
+    port = ($4 == nil) ? '22' : $4
+    [host, user, port]
+end
+
+def ssh_exec!(ssh, cmd)
+    ssh.exec!(cmd) { |channel, stream, data|
+        $stdout.print data.force_encoding("UTF-8") if stream == :stdout
+        $stderr.print data.force_encoding("UTF-8") if stream == :stderr
+    }
+end
+
+def main(argv)
+    host, user, port = parse_args(argv)
+
+    DirectSsh.start(host, user, {:port => port}) { |ssh|
+        puts host + ' - ' + ssh.exec!('cat /etc/*-release')
+
+        input = ''
+        until input == 'exit0'
+            print '# '
+            input = $stdin.gets.chomp
+            ssh_exec!(ssh, input) if input != 'exit0'
+        end
+    }
+rescue ArgumentError => e
+    $stderr.puts e.message
+    usage
+rescue Net::SSH::AuthenticationFailed => e
+    $stderr.puts e.message
+end
+
+main(ARGV)

data/direct_ssh.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "net-ssh"
+  spec.add_runtime_dependency "net-scp"
   spec.add_runtime_dependency "highline"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/direct_ssh/version.rb

@@ -1,3 +1,3 @@
 module DirectSsh
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: direct_ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +96,9 @@ description: Create public/private rsa keys if they do not exist and send public
 email:
 - xxjapp@gmail.com
 executables:
+- direct_scp
 - direct_ssh
+- simple_ssh
 extensions: []
 extra_rdoc_files: []
 files:
@@ -89,7 +107,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/direct_scp
 - bin/direct_ssh
+- bin/simple_ssh
 - direct_ssh.gemspec
 - lib/direct_ssh.rb
 - lib/direct_ssh/key_handler.rb