ghost 0.2.8 → 0.3.0

data/lib/ghost.rb

@@ -1,8 +1,22 @@
 $: << File.dirname(__FILE__)
 
-case RUBY_PLATFORM
+module Ghost
+  class RecordExists < StandardError
+  end
+end
+
+require 'rbconfig'
+
+case RbConfig::CONFIG['host_os']
 when /darwin/
-  require 'ghost/mac-host'
+  productVersion = `/usr/bin/sw_vers -productVersion`.strip
+  if productVersion =~ /^10\.7\.[2-9]{1}$/
+    require 'ghost/linux-host'
+  else
+    require 'ghost/mac-host'
+  end
 when /linux/
   require 'ghost/linux-host'
 end
+
+require 'ghost/ssh_config'

data/lib/ghost/linux-host.rb

@@ -1,92 +1,158 @@
 require 'socket'
 
-class Host
-  attr_reader :host, :ip
+module Ghost
+  class Host
 
-  def initialize(host, ip)
-    @host = host
-    @ip = ip
-  end
-  
-  def ==(other)
-    @host == other.host && @ip = other.ip
-  end
-  
-  alias :to_s :host
-  alias :name :host
-  alias :hostname :host
-  
-  @@hosts_file = '/etc/hosts'
-  @@permanent_hosts = [Host.new("localhost",      "127.0.0.1"),
-                       Host.new(`hostname`.chomp, "127.0.0.1")]
-  class << self
-    protected :new
-    
-    def list
-      entries = []
-      File.open(@@hosts_file).each do |line|
-        next if line =~ /^#/
-        if line =~ /^(\d+\.\d+\.\d+\.\d+)\s+(.*)$/
-          ip = $1
-          hosts = $2.split(/\s+/)
-          hosts.each { |host| entries << Host.new(host, ip) }
+    attr_reader :host, :ip
+
+    def initialize(host, ip)
+      @host = host
+      @ip = ip
+    end
+
+    def ==(other)
+      @host == other.host && @ip = other.ip
+    end
+
+    alias :to_s :host
+    alias :name :host
+    alias :hostname :host
+
+    @@hosts_file = '/etc/hosts'
+    @@start_token, @@end_token = '# ghost start', '# ghost end'
+
+    class << self
+      protected :new
+
+      def list
+        with_exclusive_file_access(true) do |file|
+          entries = []
+          in_ghost_area = false
+          file.pos = 0
+
+          file.each do |line|
+            if !in_ghost_area and line =~ /^#{@@start_token}/
+              in_ghost_area = true
+            elsif in_ghost_area
+              if line =~ /^#{@@end_token}/o
+                in_ghost_area = false
+              elsif line =~ /^(\d+\.\d+\.\d+\.\d+)\s+(.*)$/
+                ip = $1
+                hosts = $2.split(/\s+/)
+                hosts.each { |host| entries << Host.new(host, ip) }
+              end
+            end
+          end
+
+          entries
         end
       end
-      entries.delete_if { |host| @@permanent_hosts.include? host }
-      entries
-    end
 
-    def add(host, ip = "127.0.0.1", force = false)
-      if find_by_host(host).nil? || force
-        delete(host)
-        
-        unless ip[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/]
-          ip = Socket.gethostbyname(ip)[3].bytes.to_a.join('.')
+      def add(host, ip = "127.0.0.1", force = false)
+        with_exclusive_file_access do
+          if find_by_host(host).nil? || force
+            hosts = list
+            hosts = hosts.delete_if { |h| h.name == host }
+
+            unless ip[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/]
+              ip = Socket.gethostbyname(ip)[3].bytes.to_a.join('.')
+            end
+
+            new_host = Host.new(host, ip)
+
+            hosts << new_host
+            write_out!(hosts)
+
+            new_host
+          else
+            raise Ghost::RecordExists, "Can not overwrite existing record"
+          end
         end
-        
-        new_host = Host.new(host, ip)
-        
-        hosts = list
-        hosts << new_host
-        write_out!(hosts)
-        
-        new_host
-      else
-        raise "Can not overwrite existing record"
-      end      
-    end
-    
-    def find_by_host(hostname)
-      list.find{ |host| host.hostname == hostname }
-    end
-    
-    def find_by_ip(ip)
-      list.find_all{ |host| host.ip == ip }
-    end
-    
-    def empty!
-      write_out!([])
-    end
-    
-    def delete(name)
-      hosts = list
-      hosts = hosts.delete_if { |host| host.name == name }
-      write_out!(hosts)
-    end
-    
-    def delete_matching(pattern)
-      pattern = Regexp.escape(pattern)
-      hosts = list.select { |host| host.name.match(/#{pattern}/) }
-      hosts.each { |host| delete(host.name) }
-      hosts
-    end
+      end
 
-    protected
+      def find_by_host(hostname)
+        list.find { |host| host.hostname == hostname }
+      end
 
-    def write_out!(hosts)
-      hosts += @@permanent_hosts
-      output = hosts.inject("") {|s, h| s + "#{h.ip} #{h.hostname}\n" }
-      File.open(@@hosts_file, 'w') {|f| f.print output }
+      def find_by_ip(ip)
+        list.find_all{ |host| host.ip == ip }
+      end
+
+      def empty!
+        write_out!([])
+      end
+
+      def delete(name)
+        with_exclusive_file_access do
+          hosts = list
+          hosts = hosts.delete_if { |host| host.name == name }
+          write_out!(hosts)
+        end
+      end
+
+      def delete_matching(pattern)
+        with_exclusive_file_access do
+          pattern = Regexp.escape(pattern)
+          hosts = list.select { |host| host.name.match(/#{pattern}/) }
+          hosts.each { |host| delete(host.name) }
+          hosts
+        end
+      end
+
+      protected
+
+      def with_exclusive_file_access(read_only = false)
+        return_val = nil
+        flag = read_only ? 'r' : 'r+'
+
+        if @_file
+          return_val = yield @_file
+        else
+          File.open(@@hosts_file, flag) do |f|
+            f.flock File::LOCK_EX
+            begin
+              @_file = f
+              return_val = yield f
+            ensure
+              @_file = nil
+            end
+          end
+        end
+
+        return_val
+      end
+
+      def write_out!(hosts)
+        with_exclusive_file_access do |f|
+          new_ghosts = hosts.inject("") {|s, h| s + "#{h.ip} #{h.hostname}\n" }
+
+          output = ""
+          in_ghost_area, seen_tokens = false,false
+          f.pos = 0
+
+          f.each do |line|
+            if line =~ /^#{@@start_token}/o
+              in_ghost_area, seen_tokens = true,true
+              output << line << new_ghosts
+            elsif line =~ /^#{@@end_token}/o
+              in_ghost_area = false
+            end
+            output << line unless in_ghost_area
+          end
+          if !seen_tokens
+            output << surround_with_tokens( new_ghosts )
+          end
+
+          f.pos = 0
+          f.print output
+          f.truncate(f.pos)
+        end
+      end
+
+
+      def surround_with_tokens(str)
+        "\n#{@@start_token}\n#{str}#{@@end_token}\n"
+      end
     end
   end
 end

data/lib/ghost/mac-host.rb

@@ -1,114 +1,116 @@
 require 'socket'
 
-class Host
-  ListCmd = "dscl localhost -list /Local/Default/Hosts 2>&1"
-  ReadCmd = "dscl localhost -read /Local/Default/Hosts/%s 2>&1"
-  CreateCmd = "sudo dscl localhost -create /Local/Default/Hosts/%s IPAddress %s 2>&1"
-  DeleteCmd = "sudo dscl localhost -delete /Local/Default/Hosts/%s 2>&1"
-  
-  class << self
-    protected :new
-    
-    def list
-      list = `#{ListCmd}`
-      list = list.split("\n")
-      list.collect { |host| Host.new(host.chomp) }
-    end
+module Ghost
+  class Host
+    ListCmd   = "dscl localhost -list /Local/Default/Hosts 2>&1"
+    ReadCmd   = "dscl localhost -read /Local/Default/Hosts/%s 2>&1"
+    CreateCmd = "dscl localhost -create /Local/Default/Hosts/%s IPAddress %s 2>&1"
+    DeleteCmd = "dscl localhost -delete /Local/Default/Hosts/%s 2>&1"
+
+    class << self
+      protected :new
+
+      def list
+        list = `#{ListCmd}`
+        list = list.split("\n")
+        list.collect { |host| Host.new(host.chomp) }
+      end
+
+      def add(host, ip = "127.0.0.1", force = false)
+        if find_by_host(host).nil? || force
+          unless ip[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/]
+            ip = Socket.gethostbyname(ip)[3].bytes.to_a.join('.')
+          end
+
+          `#{CreateCmd % [host, ip]}`
+          flush!
+          find_by_host(host)
+        else
+          raise Ghost::RecordExists, "Can not overwrite existing record"
+        end
+      end
+
+      def find_by_host(host)
+        @hosts ||= {}
+        @hosts[host] ||= begin
+          output = `#{ReadCmd % host}`
 
-    def add(host, ip = "127.0.0.1", force = false)
-      if find_by_host(host).nil? || force
-        unless ip[/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?$/]
-          ip = Socket.gethostbyname(ip)[3].bytes.to_a.join('.')
+          if output =~ /eDSRecordNotFound/
+            nil
+          else
+            host = parse_host(output)
+            ip = parse_ip(output)
+
+            Host.new(host, ip)
+          end
         end
-        
-        `#{CreateCmd % [host, ip]}`
+      end
+
+      def find_by_ip(ip)
+        nil
+      end
+
+      def empty!
+        list.each { |h| delete(h) }
+        nil
+      end
+
+      def delete(host)
+        `#{DeleteCmd % host.to_s}`
         flush!
-        find_by_host(host)
-      else
-        raise "Can not overwrite existing record"
-      end      
-    end
-    
-    def find_by_host(host)
-      @hosts ||= {}
-      @hosts[host] ||= begin
-        output = `#{ReadCmd % host}`
-      
-        if output =~ /eDSRecordNotFound/
-          nil
-        else
-          host = parse_host(output)
-          ip = parse_ip(output)
-        
-          Host.new(host, ip)
+      end
+
+      def delete_matching(pattern)
+        pattern = Regexp.escape(pattern)
+        hosts = list.select { |h| h.to_s.match(/#{pattern}/) }
+        hosts.each do |h|
+          delete(h)
         end
+        flush! unless hosts.empty?
+        hosts
       end
-    end
-    
-    def find_by_ip(ip)
-      nil
-    end
-    
-    def empty!
-      list.each { |h| delete(h) }
-      nil
-    end
-    
-    def delete(host)
-      `#{DeleteCmd % host.to_s}`
-      flush!
-    end
-    
-    def delete_matching(pattern)
-      pattern = Regexp.escape(pattern)
-      hosts = list.select { |h| h.to_s.match(/#{pattern}/) }
-      hosts.each do |h|
-        delete(h)
+
+      # Flushes the DNS Cache
+      def flush!
+        `dscacheutil -flushcache`
+        @hosts = {}
+        true
+      end
+
+      protected
+      def parse_host(output)
+        parse_value(output, 'RecordName')
+      end
+
+      def parse_ip(output)
+        parse_value(output, 'IPAddress')
+      end
+
+      def parse_value(output, key)
+        match = output.match(Regexp.new("^#{key}: (.*)$"))
+        match[1] unless match.nil?
       end
-      flush! unless hosts.empty?
-      hosts
     end
-    
-    # Flushes the DNS Cache
-    def flush!
-      `dscacheutil -flushcache`
-      @hosts = {}
-      true
+
+    def initialize(host, ip=nil)
+      @host = host
+      @ip = ip
     end
-    
-    protected
-    def parse_host(output)
-      parse_value(output, 'RecordName')
+
+    def hostname
+      @host
     end
-    
-    def parse_ip(output)
-      parse_value(output, 'IPAddress')
+    alias :to_s :hostname
+    alias :host :hostname
+    alias :name :hostname
+
+    def ip
+      @ip ||= self.class.send(:parse_ip, dump)
     end
-    
-    def parse_value(output, key)
-      match = output.match(Regexp.new("^#{key}: (.*)$"))
-      match[1] unless match.nil?
+
+    private
+    def dump
+      @dump ||= `#{ReadCmd % hostname}`
     end
   end
-  
-  def initialize(host, ip=nil)
-    @host = host
-    @ip = ip
-  end
-  
-  def hostname
-    @host
-  end
-  alias :to_s :hostname
-  alias :host :hostname
-  alias :name :hostname
-  
-  def ip
-    @ip ||= self.class.send(:parse_ip, dump)
-  end
-  
-  private
-  def dump
-    @dump ||= `#{ReadCmd % hostname}`
-  end
 end