ssh-forever 0.2.1 → 0.2.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.2 2009-09-27
+
+=== New Features
+* Ability to specify an identity file other than id_rsa.pub (Matt Johnson)_
+
 == 0.2.1 2009-09-03
 
 === New Features

data/README.markdown

@@ -2,8 +2,8 @@
 
 Simple command to give you password-less SSH login on remote servers:
 
-    ssh-forever username@yourserver.com [-p port]
-    
+    ssh-forever username@yourserver.com [-p port] [-i identity_file]
+
 ## Installation
 
     gem sources --add http://gemcutter.org
@@ -15,21 +15,21 @@ Simple command to give you password-less SSH login on remote servers:
     You do not appear to have a public key. I expected to find one at /Users/matt/.ssh/id_rsa.pub
     Would you like me to generate one? [Y/n]y
     Copying your public key to the remote server. Prepare to enter your password for the last time.
-    mattwynne@mattwynne.net's password: 
+    mattwynne@mattwynne.net's password:
     Success. From now on you can just use plain old 'ssh'. Logging you in...
     Linux broncos 2.6.29-xeon-aufs2.29-ipv6-qos-grsec #1 SMP Thu Jul 9 16:42:58 PDT 2009 x86_64
-      _                           
+      _
      | |__ _ _ ___ _ _  __ ___ ___
      | '_ \ '_/ _ \ ' \/ _/ _ (_-<
      |_.__/_| \___/_||_\__\___/__/
-                              
+
      Welcome to broncos.dreamhost.com
 
     Any malicious and/or unauthorized activity is strictly forbidden.
     All activity may be logged by DreamHost Web Hosting.
 
     Last login: Sat Aug 15 17:24:17 2009
-    [broncos]$ 
+    [broncos]$
 
 ## Why
 

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bin/ssh-forever

@@ -4,22 +4,26 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'ssh-forever'
 require 'optparse'
 
-help = 'Usage: ssh-forever username@yourserver.com [-p port]'
+help = 'Usage: ssh-forever username@yourserver.com [-p port] [-i identity_file]'
 
 options = {}
 OptionParser.new do |opts|
   opts.banner = help
-  
+
   opts.on('-p', '--port [PORT]', 'port') do |port|
     options[:port] = port
   end
+
+  opts.on('-i', '--identity_file [IDENTITY_FILE]', 'identity_file') do |identity_file|
+    options[:identity_file] = identity_file
+  end
 end.parse!
 
 login = ARGV[0]
 
 if login.nil?
-  puts help 
+  puts help
   exit 1
 end
 
-SecureShellForever.run(login, options)
+SshForever::SecureShellForever.new(login, options).run

data/lib/ssh-forever.rb

@@ -1,6 +1,13 @@
-module SecureShellForever
-  class << self
-    def run(login, options = {})
+module SshForever
+  VERSION = '0.2.1'
+
+  class SecureShellForever
+    def initialize(login, options = {})
+      @login   = login
+      @options = options
+    end
+
+    def run
       unless File.exists?(public_key_path)
         STDERR.puts "You do not appear to have a public key. I expected to find one at #{public_key_path}\n"
         STDERR.print "Would you like me to generate one? [Y/n]"
@@ -10,20 +17,22 @@ module SecureShellForever
         end
         generate_public_key
       end
-      
+
       args = [
           ' ',
-          ("-p #{options[:port]}" if options[:port] =~ /^\d+$/)
+          ("-p #{@options[:port]}" if @options[:port] =~ /^\d+$/)
         ].compact.join(' ')
-        
+
       puts "Copying your public key to the remote server. Prepare to enter your password for the last time."
-      `ssh #{login}#{args} "#{remote_command}"`
+      `ssh #{@login}#{args} "#{remote_command}"`
       exit 1 unless $?.exitstatus == 0
-      
+
       puts "Success. From now on you can just use plain old 'ssh'. Logging you in..."
-      exec "ssh #{login}#{args}"
+      exec "ssh #{@login}#{args}"
     end
 
+  private
+
     def remote_command
       commands = []
       commands << 'mkdir -p ~/.ssh'
@@ -37,7 +46,7 @@ module SecureShellForever
     def key
       `cat #{public_key_path}`.strip
     end
-    
+
     def generate_public_key
       silence_stream(STDOUT) do
         silence_stream(STDERR) do
@@ -50,16 +59,16 @@ module SecureShellForever
       Process.wait
       flunk("Oh dear. I was unable to generate your public key. Run the command 'ssh-keygen -t rsa' manually to find out why.") unless $? == 0
     end
-    
+
     def flunk(message)
       STDERR.puts message
       exit 1
     end
-    
+
     def public_key_path
-      File.expand_path('~/.ssh/id_rsa.pub')
+      File.expand_path(@options[:identity_file] || '~/.ssh/id_rsa.pub')
     end
-    
+
     def silence_stream(stream)
       old_stream = stream.dup
       stream.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null')
@@ -69,4 +78,4 @@ module SecureShellForever
       stream.reopen(old_stream)
     end
   end
-end
+end

data/ssh-forever.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ssh-forever}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Wynne"]
-  s.date = %q{2009-09-03}
+  s.date = %q{2009-09-27}
   s.default_executable = %q{ssh-forever}
   s.description = %q{Provides a replacement for the SSH command which automatically copies your public key while logging in}
   s.email = %q{matt@mattwynne.net}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ssh-forever
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Matt Wynne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 +01:00
+date: 2009-09-27 00:00:00 +01:00
 default_executable: ssh-forever
 dependencies: []