simonmenke-hosts 0.0.3 → 0.0.4

data/History.txt

@@ -1,3 +1,8 @@
+== 0.0.4 2008-05-26
+
+* 1 major enhancement:
+  * Now has support for many to many relations
+
 == 0.0.1 2008-05-13
 
 * 1 major enhancement:

data/bin/hosts

@@ -2,38 +2,46 @@
 
 require "rubygems"
 require "thor"
+require "hosts"
 
-class Hosts < Thor
+class HostsCLI < Thor
   
   desc "list [SEARCH]", "List host names"
   def list(search="")
-    width = hosts(search).collect{|host| host.last.size}.max
-    hosts(search).each do |host|
-      puts "%s%s %s" % [host.last, " "*(width-host.last.size), host.first]
+    Hosts.read
+    results = Hosts.search(search)
+    width_col_1 = results.collect{|entry| entry[0].size}.max
+    width_col_2 = results.collect{|entry| entry[1].size}.max
+    results.each do |entry|
+      puts "%s%s %s%s %s" % [
+        entry[0], " "*(width_col_1-entry[0].size),
+        entry[1], " "*(width_col_2-entry[1].size),
+        (entry[2] ? "" : "(locked)")]
     end
   end
   
   desc "add HOSTNAME [ADDRESS]", "Add a hostname"
   def add(hostname, address="127.0.0.1")
-    unless (host = hosts(hostname).first).nil?
-      print "Do you want to overwrite #{host.last}(#{host.first}) [yN]: "
-      return if gets.downcase.strip != "y"
+    Hosts.read
+    if Hosts.editable?(hostname, address)
+      Hosts.add(hostname, address) 
+      Hosts.write
+      puts "Added: #{address} #{hostname}"
+    else
+      puts "#{address} #{hostname} is locked!"
     end
-    @lines.reject! { |line| line =~ Regexp.new("\s+#{hostname}$") }
-    @lines << [address, hostname].join(" ")
-    dump
-    puts "Added: #{hostname} - #{address}"
   end
   
-  desc "remove HOSTNAME", "Remove a hostname"
-  def remove(hostname)
-    if (host = hosts(hostname+"$").first).nil?
-      puts "There is no entry with this hostname! (#{hostname})"
-      exit(1)
+  desc "remove HOSTNAME [ADDRESS]", "Remove a hostname"
+  def remove(hostname, address="127.0.0.1")
+    Hosts.read
+    if Hosts.editable?(hostname, address)
+      Hosts.remove(hostname, address) 
+      Hosts.write
+      puts "Removed: #{address} #{hostname}"
+    else
+      puts "#{address} #{hostname} is locked!"
     end
-    @lines.reject! { |line| line =~ Regexp.new("\s+#{hostname}$") }
-    dump
-    puts "Removed: #{host.last} - #{host.first}"
   end
   
   alias_method :l, :list
@@ -41,26 +49,6 @@ class Hosts < Thor
   alias_method :r, :remove
   alias_method :h, :help
   
-protected
-  
-  def hosts(search="")
-    @lines ||= File.readlines('/etc/hosts').collect{ |line| line.strip }
-    hosts = @lines.reject do |line|
-      line =~ /^\s+|#.*$/
-    end.collect { |line| line.split(/\s+/) }
-    hosts.select { |host| host.last =~ Regexp.new("^#{search}") }.sort { |a,b| a.last <=> b.last}
-  end
-  
-  def dump
-    hosts # preload
-    begin
-      File.open('/etc/hosts', 'w+') { |f| @lines.each { |l| f.puts l } }
-    rescue => e
-      puts e
-      exit(1)
-    end
-  end
-  
 end
 
 begin
@@ -71,4 +59,4 @@ rescue
 end
 
 ARGV << "list" if ARGV.empty?
-Hosts.start
+HostsCLI.start

data/lib/hosts/version.rb

@@ -2,7 +2,7 @@ module Hosts #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/hosts.rb

@@ -3,4 +3,103 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 module Hosts
   
+  def self.search(pattern='')
+    regex = Regexp.new(pattern)
+    results = []
+    addresses.each do |address, entries|
+      if address =~ regex
+        entries.each do |hostname, editable|
+          results << [address, hostname, editable]
+        end
+      end
+    end
+    hostnames.each do |hostname, entries|
+      if hostname =~ regex
+        entries.each do |address, editable|
+          results << [address, hostname, editable]
+        end
+      end
+    end
+    results.uniq.sort do |a,b|
+      r = 0
+      r = a[0] <=> b[0] if r == 0
+      r = a[1] <=> b[1] if r == 0
+      r
+    end
+  end
+  
+  def self.hostnames
+    @hostnames ||= {}
+  end
+  
+  def self.addresses
+    @addresses ||= {}
+  end
+  
+  def self.hostname(hostname)
+    hostnames[hostname] ||= {}
+  end
+  
+  def self.address(address)
+    addresses[address] ||= {}
+  end
+  
+  def self.editable?(hostname, address)
+    return true if hostname(hostname).nil? or hostname(hostname)[address].nil?
+    return hostname(hostname)[address]
+  end
+  
+  def self.add(hostname, address, editable=true)
+    if editable?(hostname, address)
+      address(address)[hostname] = editable
+      hostname(hostname)[address] = editable
+    end
+  end
+  
+  def self.remove(hostname, address)
+    if editable?(hostname, address)
+      hostname(hostname).delete(address)
+      address(address).delete(hostname)
+    end
+  end
+  
+  def self.lines
+    @lines ||= []
+  end
+  
+  def self.read
+    editable = false
+    lines.clear
+    File.readlines('/etc/hosts').collect{ |line| line.strip }.each do |line|
+      lines << line unless editable
+      editable = true if line == '### AUTOGENERATED HOST ENTRIES ###'
+      next if line =~ /^\s+|#.*$/
+      
+      segements = line.split(/\s+/)
+      address = segements.shift
+      segements.each do |segement|
+        add(segement, address, editable)
+      end
+    end
+    lines << '### AUTOGENERATED HOST ENTRIES ###' unless editable
+  end
+  
+  def self.write
+    begin
+      File.open('/etc/hosts', 'w+') do |f|
+        lines.each { |l| f.puts l }
+        addresses.each do |address, hostnames|
+          editable_hostnames = []
+          hostnames.each do |hostname, editable|
+            editable_hostnames << hostname if editable
+          end
+          f.puts "#{address} #{editable_hostnames.join(' ')}" unless editable_hostnames.empty?
+        end
+      end
+    rescue => e
+      puts e
+      exit(1)
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-hosts
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Simon Menke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-15 00:00:00 -07:00
+date: 2008-05-26 00:00:00 -07:00
 default_executable: hosts
 dependencies: []