ssh-config 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7e2019230b1e51982769d29450d10d98ba7c0b92
+  data.tar.gz: 71cd2369a39509b6d623fd50e3ced45dbdc30d15
+SHA512:
+  metadata.gz: f71ad2cd574d6f86a97f7aad4ebf18833067d659c7a59613b0854ec8eecc58f0dafc6da2f611ea459487a6fed3cdc67b943f6d610df399afe20d09e058e61abf
+  data.tar.gz: 3902d9a8d5a979793b5fbd9d9cee7bda0c73bfc9a9b790c844ffa0c9ada72dc37df587539dea66a86fad5a7fb058a4116270926c1cd28490478d9a59a5258e3d

data/CHANGES

@@ -1,6 +1,16 @@
 CHANGES
 ----------------------------------------------------------------------
 
+2013-07-03:
+-----------
+
+- Version 0.1.3
+
+  - add 'alias' and 'unalias' commands, and generally support for aliases.
+    (changes by David Lindes.)
+  - fix compatibility by using FileUtils#copy instead of File#copy
+    (changes by Jason Lewis.)
+
 2010-03-29:
 -----------
 
@@ -16,4 +26,3 @@ CHANGES
 
   - Search strings are highlighted
   - Fixed usage/comments to say 'search' instead of 'find'
-

data/README.rdoc

@@ -56,14 +56,16 @@ rails-02.example.com User dbrady" would emit
     Hostname rails-02.example.com
     User dbrady
 
+Note: If you just want another short name for a host, use alias instead
 
 === dump
 
 Dumps the entire file.
 
-=== show <host>
+=== show <host> [<host> ...]
 
-Dumps one section. (Similar to ssh-what.)
+Dumps one section. (Similar to ssh-what.) <host> may be the main name
+for a host or an alias.
 
 === search <pattern>
 
@@ -74,3 +76,14 @@ pattern. (Similar to ssh-what.)
 
 Lists all section names (just the Host line)
 
+=== alias <host> <alias> [<alias> ...]
+
+Adds one or more aliases to a host definition (to show up on the Host line).
+
+=== unalias [<host>] <alias> [<alias> ...]
+
+With 2 or more arguments, looks up host by <host> (must be the first
+name on the Host line), and removes any <alias>es from the list of
+alternate names.  With only 1 argument, looks for an entry by that
+alias (must NOT be the first name on the Host line), and removes the
+alias from the entry, if found.

data/bin/ssh-config

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'ftools'
+require 'fileutils'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'ssh-config'))
 
 # ssh-config - Manipulate config values in the .ssh/config file.
@@ -12,7 +12,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'ssh-con
 # ssh-config set <host-nickname> <setting> <value> [<setting> <value> [...]]
 #     Note: "<setting> -" deletes a setting
 # ssh-config rm <host-nickname> # delete config settings for that host
-# ssh-config copy <host-nickname> <new-host-nickname> # copy settings from one to the other. 
+# ssh-config copy <host-nickname> <new-host-nickname> # copy settings from one to the other.
+# ssh-config alias <host-nickname> <alternate-host-nickname> # add an alias
+# ssh-config unalias [<host-nickname>] <alias-to-remove>
 
 config = ConfigFile.new
 argv = ARGV
@@ -49,10 +51,11 @@ when 'help'
 when 'list'
   puts config.list
 when 'show'
-  puts config.show(argv.shift)
+  puts config.show(*argv)
 when 'search'
   search = argv.shift
-  puts config.search(search).gsub(search, "\033[43m#{search}\033[0m")
+  result = config.search(search).gsub(search, "\033[43m#{search}\033[0m")
+  puts result unless result.empty?
 when 'cp', 'copy'
   config.copy! argv.shift, argv.shift, *argv
 when 'unset'
@@ -60,8 +63,14 @@ when 'unset'
 when 'set'
   config.set!(*argv)
 when 'rm', 'del', 'delete'
-  config.rm! argv.shift 
+  config.rm! argv.shift
 when 'dump'
   puts config.dump
+when 'alias'
+  config.alias!(*argv)
+when 'unalias'
+  config.unalias!(*argv)
+else
+  $stderr.puts "Sorry, don't know how to handle command '#{command}'"
 end
 

data/lib/config_file.rb

@@ -6,14 +6,14 @@ class ConfigFile
     @sections_by_name = {}
     read_config
   end
-  
+
   def add_section(name)
     section = ConfigSection.new(name)
     @sections << section
-    @sections_by_name[name] = section
+    @sections_by_name[section.name] = section
     section
   end
-  
+
   def read_config
     current_section = nil
     IO.readlines(File.expand_path("~/.ssh/config")).each_with_index do |line, i|
@@ -25,19 +25,23 @@ class ConfigFile
           current_section.lines << line
         else
           @header_lines << line
-        end        
+        end
       end
     end
   end
-  
-  def show(host_nick)
-    @sections_by_name[host_nick]
+
+  def show(*host_nicks)
+    items =  host_nicks.map {|nick|
+      sections = @sections.select {|section| section.matches_exactly?(nick)}
+      sections.empty? ? "# No entry found for: #{nick}" : sections
+    }
+    items.flatten.uniq * "\n"
   end
-  
+
   def list()
-    to_text(@sections_by_name.keys.sort.map {|name| "Host #{name}"})
+    to_text(@sections_by_name.keys.sort.map {|name| @sections_by_name[name].header})
   end
-  
+
   def search(text)
     to_text(@sections.find_all {|section| section.matches?(text)}.sort_by {|section| section.name})
   end
@@ -51,12 +55,12 @@ class ConfigFile
     save
     section
   end
-  
+
   def set(host_nick, key, value)
     section = @sections_by_name[host_nick] || add_section(host_nick)
     section[key] = value
   end
-  
+
   def unset!(host_nick, *keys)
     backup if @make_backups
     while keys.length > 0
@@ -65,13 +69,13 @@ class ConfigFile
     save
     section
   end
-  
+
   def unset(host_nick, key)
     if section = @sections_by_name[host_nick]
       section.unset(key)
     end
   end
-  
+
   def dump
     to_text([@header_lines, @sections].flatten)
   end
@@ -81,49 +85,81 @@ class ConfigFile
     rm(host_nick)
     save
   end
-  
+
   def rm(host_nick)
     if @sections_by_name.key?(host_nick)
       @sections_by_name.delete host_nick
       @sections.delete_at(@sections.index{|s| s.name == host_nick})
     end
   end
-  
+
   def copy!(old_host_nick, new_host_nick, *args)
     backup if @make_backups
     copy(old_host_nick, new_host_nick, *args)
     save
   end
-  
+
   def copy(old_host_nick, new_host_nick, *args)
     if @sections_by_name.key?(old_host_nick)
       old_section = @sections_by_name[old_host_nick]
       new_section = @sections_by_name[new_host_nick] || add_section(new_host_nick)
       new_section.lines = old_section.lines.dup
-      
+
       if old_section["Hostname"]
         new_section["Hostname"] = old_section["Hostname"].gsub(old_host_nick, new_host_nick)
       end
-      
+
       while args.length > 0
         key, value = args.shift, args.shift
         section = set(new_host_nick, key, value)
       end
     end
   end
-    
+
+  def alias!(host_nick, *args)
+    backup if @make_backups
+    while args.length > 0
+      new_alias = args.shift
+      section = add_alias(host_nick, new_alias)
+    end
+    save
+    section
+  end
+
+  def add_alias(host_nick, new_alias)
+    section = @sections_by_name[host_nick] || add_section(host_nick)
+    section.aliases.push(new_alias) unless section.aliases.member?(new_alias)
+  end
+
+  def unalias!(*args)
+    if(args.size >= 2)
+      name = args.shift
+      section = @sections_by_name[name]
+    else
+      section = @sections.select {|section| section.has_alias?(args[0])}.first
+    end
+
+    if(section) then
+      section.aliases -= args
+    else
+      $stderr.puts "Failed to find section named #{name || args[0]}"
+    end
+    save
+    section
+  end
+
   def save
     File.open(File.expand_path("~/.ssh/config"), "w") do |file|
       file.puts dump
     end
   end
-  
+
   def backup
-    File.copy(File.expand_path("~/.ssh/config"), File.expand_path("~/.ssh/config~"))
+    FileUtils.copy(File.expand_path("~/.ssh/config"), File.expand_path("~/.ssh/config~"))
   end
-    
+
   private
-  
+
   def to_text(ray)
     ray.map {|s| s.to_s } * "\n"
   end

data/lib/config_section.rb

@@ -1,12 +1,14 @@
 class ConfigSection
-  attr_accessor :name, :lines, :settings
+  attr_accessor :name, :aliases, :lines, :settings
 
   def initialize(name)
-    @name = name
+    all_names = name.split(/\s+/)
+    @name = all_names.shift
+    @aliases = all_names
     @settings = {}
     @lines = []
   end
-  
+
   def [](setting)
     unless @settings.key? setting
       if line = lines[setting_index(setting)]
@@ -16,18 +18,23 @@ class ConfigSection
     end
     @settings[setting]
   end
-  
+
   def unset(setting)
     if line_num = setting_index(setting)
       @settings.delete setting
       @lines.delete_at line_num
     end
   end
-  
+
+  def header
+    name_with_aliases = [@name, *aliases].join(" ")
+    "Host #{name_with_aliases}"
+  end
+
   def to_s
-    ["Host #{name}", *lines] * "\n"
+    [header, *lines] * "\n"
   end
-  
+
   def []=(setting, value)
     if value != '-'
       line_num = setting_index(setting) || lines.length
@@ -37,21 +44,28 @@ class ConfigSection
       @lines.delete_at(setting_index(setting))
     end
   end
-  
+
   def matches?(text)
     r = Regexp.new text
-    name =~ r || lines.any? {|line| line =~ r}
+    name =~ r || aliases.any? {|a| a =~ r} || lines.any? {|line| line =~ r}
   end
-  
+
+  def matches_exactly?(text)
+    name == text || has_alias?(text)
+  end
+
+  def has_alias?(text)
+    aliases.member?(text)
+  end
+
   protected
-  
+
   def format_line(setting, value)
     "    #{setting} #{value}"
   end
-  
+
   def setting_index(setting)
     r = Regexp.new(setting)
     lines.index {|line| line =~ r}
   end
 end
-

data/lib/ssh-config.rb

@@ -1,3 +1,2 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'config_file'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'config_section'))
-

metadata

@@ -1,34 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ssh-config
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - David Brady
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-29 00:00:00 -06:00
-default_executable: 
+date: 2011-02-09 00:00:00.000000000 Z
 dependencies: []
-
-description: Ssh-Config, a tool that lets you quickly add, update, remove, and copy ssh config file entries.
+description: Ssh-Config, a tool that lets you quickly add, update, remove, and copy
+  ssh config file entries.
 email: github@shinybit.com
-executables: 
+executables:
 - ssh-config
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - MIT-LICENSE
 - CHANGES
-files: 
+files:
 - CHANGES
 - MIT-LICENSE
 - README.rdoc
@@ -36,40 +28,33 @@ files:
 - lib/config_file.rb
 - lib/config_section.rb
 - lib/ssh-config.rb
-has_rdoc: true
 homepage: http://github.com/dbrady/ssh-config/
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --main
 - README.rdoc
 - --title
 - Ssh-Config - A Tool for ssh config files
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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: 1.3.6
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ssh-Config - tool for managing your .ssh/config file
 test_files: []
-