ghost 0.2.8 → 0.3.0

data/LICENSE

@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README → README.md}

@@ -15,7 +15,7 @@ Intended Usage
 This gem is designed primarily for web developers who need to add
 and modify hostnames to their system for virtual hosts on their
 local/remote web server. However, it could be of use to other people
-who would otherwise modify their `/etc/hosts` file manually and 
+who would otherwise modify their `/etc/hosts` file manually and
 flush the cache.
 
 Command
@@ -68,28 +68,37 @@ Command
 Library
 -------
 
-There is also a library that can be used in Ruby scripts. The `ghost` 
-command is a wrapper for the library. View the source of `bin/ghost` 
+There is also a library that can be used in Ruby scripts. The `ghost`
+command is a wrapper for the library. View the source of `bin/ghost`
 to see how to use the library.
 
 Installation
 ============
 
     sudo gem install ghost
-    
+
 Contributors
 ============
 
-* [Bodaniel Jeanes](http://github.com/bjeanes)
-* [Ben Hoskings](http://github.com/benhoskings)
-* [Mitchell V Riley](http://github.com/mitchellvriley)
-* [Courtois Simon](http://github.com/simonc)
-* [Justin Mazzi](http://github.com/jmazzi)
+If this list is ever out of date, you can get full contributor list with `git log --format='%aN (%ae)' | sort -u`
+
+* [Alkesh Vaghmaria](https://github.com/alkesh)
+* [Andrei Serdeliuc](https://github.com/extraordinaire)
+* [Ben Hoskings](https://github.com/benhoskings)
+* [Bodaniel Jeanes](https://github.com/bjeanes)
+* [Courtois Simon](https://github.com/simonc)
+* [Felipe Coury](https://github.com/fcoury)
+* [Justin Mazzi](https://github.com/jmazzi)
+* [Lars Fronius](https://github.com/LarsFronius)
+* [Lee Jensen](https://github.com/outerim)
+* [Mitchell Riley](https://github.com/mitchellvriley)
+* [Ryan Bigg](https://github.com/radar)
+* [Sam Beam](https://github.com/sbeam)
 
 Legal Stuff
 ===========
 
-Copyright (c) 2008-2010 Bodaniel Jeanes
+Copyright (c) 2008-2012 Bodaniel Jeanes
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -108,4 +117,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -10,19 +10,19 @@ Dir['tasks/**/*.rake'].each { |rake| load rake }
 
 desc "list tasks"
 task :default do
-  puts `rake -T`.grep(/^[^(].*$/)
+  puts `rake -T`
 end
 
-desc "Outstanding TODO's"  
-task :todo do  
+desc "Outstanding TODO's"
+task :todo do
   files = ["**/*.{rb,rake}" "bin/*", "README.mkdn"]
-  
+
   File.open('TODO','w') do |f|
       FileList[*files].egrep(/TODO|FIXME/) do |file, line, text|
       output = "#{file}:#{line} - #{text.chomp.gsub(/^\s+|\s+$/ , "")}"
-    
+
       puts output
       f.puts output
     end
   end
-end
+end

data/bin/ghost

@@ -3,12 +3,8 @@
 #  Created by Bodaniel Jeanes on 2008-8-19.
 #  Copyright (c) 2008. All rights reserved.
 
-begin
-  require 'rubygems'
-rescue LoadError
-  # no rubygems to load, so we fail silently
-end
-require 'ghost'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/ghost')
+require 'open-uri'
 
 def help_text(exit_code = 0)
   script_name = File.basename $0
@@ -16,7 +12,7 @@ def help_text(exit_code = 0)
        #{script_name} modify <hostname> <ip> OR <hostname> (will lookup ip)
        #{script_name} delete <hostname>
        #{script_name} delete_matching <pattern>
-       #{script_name} list
+       #{script_name} list [<filter>]
        #{script_name} empty
        #{script_name} export
        #{script_name} import <file>
@@ -24,101 +20,114 @@ def help_text(exit_code = 0)
   exit(exit_code)
 end
 
-if ARGV.size.zero? || ['-h', '--help', 'help'].include?(ARGV.first)
-  help_text
-else  
-  case ARGV[0]
-  when 'add'
-    if [2,3].include?(ARGV.size)
-      begin
+begin
+  if ARGV.size.zero? || ['-h', '--help', 'help'].include?(ARGV.first)
+    help_text
+  else
+    case ARGV[0]
+    when 'add'
+      if [2,3].include?(ARGV.size)
+        begin
+          ARGV.shift
+          host = Ghost::Host.add(*ARGV)
+          puts "  [Adding] #{host.name} -> #{host.ip}"
+          exit 0
+        rescue SocketError
+          $stderr.puts "Cannot find IP for host"
+          exit 3
+        rescue Ghost::RecordExists
+          $stderr.puts "Cannot overwrite an existing entry. Use the modify subcommand"
+          exit 3
+        end
+      else
+        $stderr.puts "The add subcommand requires at least a hostname.\n\n"
+        help_text 2
+      end
+    when 'modify'
+      if ARGV.size == 3
         ARGV.shift
-        host = Host.add(*ARGV)
-        puts "  [Adding] #{host.name} -> #{host.ip}"
+        ARGV << true
+        host = Ghost::Host.add(*ARGV)
+        puts "  [Modifying] #{host.name} -> #{host.ip}"
+        exit 0
+      else
+        $stderr.puts "The modify subcommand requires a hostname and an IP.\n\n"
+        help_text 4
+      end
+    when 'delete', 'del', 'remove', 'rm'
+      if ARGV.size == 2
+        Ghost::Host.delete(ARGV[1])
+        puts "  [Deleting] #{ARGV[1]}"
         exit 0
-      rescue SocketError
-        $stderr.puts "Cannot find ip for host"
-        exit 3
-      rescue StandardError
-        $stderr.puts "Cannot overwrite an existing entry. Use the modify subcommand"
-        exit 3
+      else
+        $stderr.puts "The delete subcommand requires a hostname.\n\n"
+        help_text 2
+      end
+    when 'delete_matching'
+      if ARGV.size == 2
+        matched = Ghost::Host.delete_matching(ARGV[1])
+        if matched.empty?
+          puts "  No matching entries found"
+        else
+          matched.each { |h| puts "  [Deleting] #{h}" }
+        end
+        exit 0
+      else
+        $stderr.puts "The delete_matching subcommand requires a hostname pattern.\n\n"
+        help_text 2
+      end
+    when 'list'
+      filter = %r|#{ARGV[1]}| if ARGV.size == 2
+
+      hosts = Ghost::Host.list
+
+      if filter
+        hosts.reject! { |host| host.name !~ filter && host.ip !~ filter }
+      end
+
+      pad = hosts.max{|a,b| a.to_s.length <=> b.to_s.length }.to_s.length
+
+      puts "Listing #{hosts.size} host(s):"
+
+      hosts.each do |host|
+        puts "#{host.name.rjust(pad+2)} -> #{host.ip}"
       end
-    else
-      $stderr.puts "The add subcommand requires at least a hostname.\n\n"
-      help_text 2
-    end
-  when 'modify'
-    if ARGV.size == 3
-      ARGV.shift
-      ARGV << true
-      host = Host.add(*ARGV)
-      puts "  [Modifying] #{host.name} -> #{host.ip}"
       exit 0
-    else
-      $stderr.puts "The modify subcommand requires a hostname and an IP.\n\n"
-      help_text 4
-    end
-  when 'delete', 'del', 'remove', 'rm'
-    if ARGV.size == 2
-      Host.delete(ARGV[1])
-      puts "  [Deleting] #{ARGV[1]}"
+    when 'empty'
+      print "  [Emptying] "
+      Ghost::Host.empty!
+      puts "Done."
       exit 0
-    else  
-      $stderr.puts "The delete subcommand requires a hostname.\n\n"
-      help_text 2
-    end
-  when 'delete_matching'
-    if ARGV.size == 2
-      matched = Host.delete_matching(ARGV[1])
-      if matched.empty?
-        puts "  No matching entries found"
-      else
-        matched.each { |h| puts "  [Deleting] #{h}" }
+    when 'export'
+      hosts = Ghost::Host.list
+      hosts.each do |host|
+        puts "#{host.name} #{host.ip}"
       end
       exit 0
-    else  
-      $stderr.puts "The delete_matching subcommand requires a hostname pattern.\n\n"
-      help_text 2
-    end
-  when 'list'
-    hosts = Host.list
-    pad = hosts.max{|a,b| a.to_s.length <=> b.to_s.length }.to_s.length
-    
-    puts "Listing #{hosts.size} host(s):"
-    
-    hosts.each do |host|
-      puts "#{host.name.rjust(pad+2)} -> #{host.ip}"
-    end
-    exit 0
-  when 'empty'
-    print "  [Emptying] "
-    Host.empty!
-    puts "Done."
-    exit 0
-  when 'export'
-    hosts = Host.list
-    hosts.each do |host|
-      puts "#{host.name} #{host.ip}"
-    end
-    exit 0
-  when 'import'
-    if ARGV.size == 2
-      begin
-        File.foreach(ARGV[1]) do |line|
-          host_infos = line.strip.split(' ', 2)
-          host = Host.add(*host_infos)
-          puts "  [Adding] #{host.name} -> #{host.ip}"
+    when 'import'
+      if ARGV.size == 2
+        begin
+          import_file = open(ARGV[1])
+          import_file.each_line do |line|
+            host_infos = line.strip.split(' ', 2)
+            host = Ghost::Host.add(*host_infos)
+            puts "  [Adding] #{host.name} -> #{host.ip}"
+          end
+          exit 0
+        rescue
+          $stderr.puts "Cannot import. A problem occured while opening the import file."
+          exit 5
         end
-        exit 0
-      rescue
-        $stderr.puts "Cannot import. A problem occured while opening the import file."
-        exit 5
+      else
+        $stderr.puts "The import command requires an input file.\n\n"
+        help_text 6
       end
     else
-      $stderr.puts "The import command requires an input file.\n\n"
-      help_text 6
+      $stderr.puts "Invalid option: #{ARGV[0]}"
+      help_text 1
     end
-  else
-    $stderr.puts "Invalid option: #{ARGV[0]}"
-    help_text 1
   end
+rescue Errno::EACCES
+  $stderr.puts "Please re-run as root or using sudo"
+  exit 3
 end

data/bin/ghost-ssh

@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__) + '/../lib/ghost')
+
+def help_text(exit_code = 0)
+  script_name = File.basename $0
+  puts """USAGE: #{script_name} add <host> <hostname> [--user=<user>] [--port=<port>]
+       #{script_name} modify <host> <hostname> [--user=<user>] [--port=<port>]
+       #{script_name} delete <host>
+       #{script_name} list
+       #{script_name} empty
+       #{script_name} export
+       #{script_name} import <file>
+"""
+  exit(exit_code)
+end
+
+def parse(argv)
+  argv.shift
+
+  new_config = {
+    :host => argv.shift,
+    :hostname => argv.shift
+  }
+
+  if argv.size > 0
+    argv.each do |arg|
+      if arg =~ /--([a-z]+)=(.*)/
+        new_config[$1.to_sym] = $2
+      end
+    end
+  end
+
+  new_config
+end
+
+if ARGV.size.zero? || ['-h', '--help', 'help'].include?(ARGV.first)
+  help_text
+else
+  case ARGV[0]
+  when 'add'
+    if [3,4,5].include?(ARGV.size)
+      begin
+        new_config = parse(ARGV)
+
+        config = Ghost::SshConfig.add(new_config)
+        puts "  [Adding] #{config.host} -> #{config.hostname}"
+        exit 0
+      rescue Ghost::SshConfigDuplicateError
+        $stderr.puts $!
+        exit 3
+      end
+    else
+      $stderr.puts "The add subcommand requires at least a host and a hostname.\n\n"
+      help_text 2
+    end
+  when 'modify'
+    if [3,4,5].include?(ARGV.size)
+      new_config = parse(ARGV)
+      new_config[:force] = true
+      config = Ghost::SshConfig.add(new_config)
+      puts "  [Modifying] #{config.host} -> #{config.hostname}"
+      exit 0
+    else
+      $stderr.puts "The modify subcommand requires at least a host and a hostname.\n\n"
+      help_text 4
+    end
+  when 'delete', 'del', 'remove', 'rm'
+    if ARGV.size == 2
+      Ghost::SshConfig.delete(ARGV[1])
+      puts "  [Deleting] #{ARGV[1]}"
+      exit 0
+    else
+      $stderr.puts "The delete subcommand requires a hostname.\n\n"
+      help_text 2
+    end
+
+  when 'list'
+    configs = Ghost::SshConfig.list
+    pad = configs.max{|a,b| a.to_s.length <=> b.to_s.length }.to_s.length
+
+    puts "Listing #{configs.size} configs(s):"
+
+    configs.each do |c|
+      user = c.user ? "#{c.user}@" : ""
+      puts "#{c.host.rjust(pad+2)} -> #{user}#{c.hostname}:#{c.port||22}"
+    end
+    exit 0
+  when 'empty'
+    print "  [Emptying] "
+    Ghost::SshConfig.empty!
+    puts "Done."
+    exit 0
+  when 'export'
+    configs = Ghost::SshConfig.list
+    configs.each do |c|
+      puts "#{c.host},#{c.hostname},#{c.user},#{c.port}"
+    end
+    exit 0
+  when 'import'
+    if ARGV.size == 2
+      begin
+        File.foreach(ARGV[1]) do |line|
+          cfg_infos = line.strip.split(',')
+          hash = {
+            :host => cfg_infos[0],
+            :hostname => cfg_infos[1]
+          }
+
+          hash[:user] = cfg_infos[2] if cfg_infos.size > 2
+          hash[:port] = cfg_infos[3] if cfg_infos.size > 3
+          hash[:force] = true
+
+          config = Ghost::SshConfig.add(hash)
+
+          puts "  [Adding] #{config.host} -> #{config.hostname}"
+        end
+        exit 0
+      rescue
+        $stderr.puts "Cannot import. A problem occured while opening the import file (#{$!.message})."
+        exit 5
+      end
+    else
+      $stderr.puts "The import command requires an input file.\n\n"
+      help_text 6
+    end
+  else
+    $stderr.puts "Invalid option: #{ARGV[0]}"
+    help_text 1
+  end
+end
+