ghost 0.2.4 → 0.2.5

data/lib/ghost/linux-host.rb

@@ -24,13 +24,13 @@ class Host
       entries = []
       File.open(@@hosts_file).each do |line|
         next if line =~ /^#/
-        if line =~ /^(\d+\.\d+\.\d+\.\d+) (.*)/
+        if line =~ /^(\d+\.\d+\.\d+\.\d+)\s+(.*)$/
           ip = $1
-          hosts = $2.split(' ')
-          hosts.each {|host| entries << Host.new(host, ip) }
+          hosts = $2.split(/\s+/)
+          hosts.each { |host| entries << Host.new(host, ip) }
         end
       end
-      entries.delete_if {|host| @@permanent_hosts.include? host }
+      entries.delete_if { |host| @@permanent_hosts.include? host }
       entries
     end
 
@@ -50,11 +50,11 @@ class Host
     end
     
     def find_by_host(hostname)
-      list.find{|host| host.hostname == hostname }
+      list.find{ |host| host.hostname == hostname }
     end
     
     def find_by_ip(ip)
-      list.find_all{|host| host.ip == ip }
+      list.find_all{ |host| host.ip == ip }
     end
     
     def empty!
@@ -63,16 +63,14 @@ class Host
     
     def delete(name)
       hosts = list
-      hosts = hosts.delete_if {|host| host.name == name }
+      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 do |host|
-        delete(host.name)
-      end
+      hosts.each { |host| delete(host.name) }
       hosts
     end
 
@@ -80,7 +78,6 @@ class Host
 
     def write_out!(hosts)
       hosts += @@permanent_hosts
-      # Har har! inject!
       output = hosts.inject("") {|s, h| s + "#{h.ip} #{h.hostname}\n" }
       File.open(@@hosts_file, 'w') {|f| f.print output }
     end

data/spec/etc_hosts_spec.rb

@@ -0,0 +1,138 @@
+require 'ghost/linux-host'
+
+$hosts_file   = File.expand_path(File.join(File.dirname(__FILE__), "etc_hosts"))
+
+describe Host do
+  before(:all) do
+    class Host
+      @@hosts_file = $hosts_file
+    end
+  end
+  before { `touch #{$hosts_file.inspect}` }
+  after  { `rm -f #{$hosts_file.inspect}` }
+  
+  it "has an IP" do
+    hostname = 'ghost-test-hostname.local'
+
+    Host.add(hostname)
+    host = Host.list.first
+    host.ip.should eql('127.0.0.1')
+
+    Host.empty!
+
+    ip = '169.254.23.121'
+    host = Host.add(hostname, ip)
+    host.ip.should eql(ip)
+  end
+
+  it "has a hostname" do
+    hostname = 'ghost-test-hostname.local'
+
+    Host.add(hostname)
+    host = Host.list.first
+    host.hostname.should eql(hostname)
+
+    Host.empty!
+
+    ip = '169.254.23.121'
+    Host.add(hostname, ip)
+    host.hostname.should eql(hostname)
+  end
+  
+  describe ".list" do
+    it "returns an array" do
+      Host.list.should be_instance_of(Array)
+    end
+
+    it "contains instances of Host" do
+      Host.add('ghost-test-hostname.local')
+      Host.list.first.should be_instance_of(Host)
+    end
+    
+    it "gets all hosts on a single /etc/hosts line" do
+      example = "127.0.0.1\tproject_a.local\t\t\tproject_b.local   project_c.local"
+      File.open($hosts_file, 'w') {|f| f << example}
+      hosts = Host.list
+      hosts.should have(3).items
+      hosts.map{|h|h.ip}.uniq.should == ['127.0.0.1']
+      hosts.map{|h|h.host}.sort.should == %w[project_a.local project_b.local project_c.local]
+      Host.add("project_d.local")
+      Host.list.should have(4).items
+    end
+  end
+  
+  describe "#to_s" do
+    it "returns hostname" do
+      hostname = 'ghost-test-hostname.local'
+
+      Host.add(hostname)
+      host = Host.list.first
+      host.to_s.should eql(hostname)
+    end
+  end
+
+  describe "finder methods" do
+    before do
+      Host.add('abc.local')
+      Host.add('def.local')
+      Host.add('efg.local', '10.2.2.4')
+    end
+
+    it "returns valid Host when searching for host name" do
+      Host.find_by_host('abc.local').should be_instance_of(Host)
+    end
+  end
+
+  describe ".add" do
+    it "returns Host object when passed hostname" do
+      Host.add('ghost-test-hostname.local').should be_instance_of(Host)
+    end
+
+    it "returns Host object when passed hostname" do
+      Host.add('ghost-test-hostname.local', '10.0.0.2').should be_instance_of(Host)
+    end
+
+    it "raises error if hostname already exists and not add a duplicate" do
+      Host.empty!
+      Host.add('ghost-test-hostname.local')
+      lambda { Host.add('ghost-test-hostname.local') }.should raise_error
+      Host.list.should have(1).thing
+    end
+
+    it "overwrites existing hostname if forced" do
+      hostname = 'ghost-test-hostname.local'
+
+      Host.empty!
+      Host.add(hostname)
+
+      Host.list.first.hostname.should eql(hostname)
+      Host.list.first.ip.should eql('127.0.0.1')
+
+      Host.add(hostname, '10.0.0.1', true)
+      Host.list.first.hostname.should eql(hostname)
+      Host.list.first.ip.should eql('10.0.0.1')
+
+      Host.list.should have(1).thing
+    end
+  end
+
+  describe ".empty!" do
+    it "empties the hostnames" do
+      Host.add('ghost-test-hostname.local') # add a hostname to be sure
+      Host.empty!
+      Host.list.should have(0).things
+    end
+  end
+
+  describe ".delete_matching" do
+    it "deletes matching hostnames" do
+      keep = 'ghost-test-hostname-keep.local'
+      Host.add(keep)
+      Host.add('ghost-test-hostname-match1.local')
+      Host.add('ghost-test-hostname-match2.local')
+      Host.delete_matching('match')
+      Host.list.should have(1).thing
+      Host.list.first.hostname.should eql(keep)
+    end
+  end
+end

data/spec/ghost_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'ghost'
 
 # Warning: these tests will delete all hostnames in the system. Please back them up first
 

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 $TESTING=true
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'rubygems'
-require 'spec'
-require 'ghost'
+require 'spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ghost
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Bodaniel Jeanes
@@ -9,7 +9,7 @@ autorequire: ghost
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +10:00
+date: 2010-03-11 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/ghost/linux-host.rb
 - lib/ghost/mac-host.rb
 - lib/ghost.rb
+- spec/etc_hosts_spec.rb
 - spec/ghost_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb