ghost 0.2.5 → 0.2.6

data/bin/ghost

@@ -8,12 +8,12 @@ begin
 rescue LoadError
   # no rubygems to load, so we fail silently
 end
-require 'ghost'
+require 'lib/ghost'
 
 def help_text(exit_code = 0)
   script_name = File.basename $0
   puts """USAGE: #{script_name} add <hostname> [<ip=127.0.1.1>]
-       #{script_name} modify <hostname> <ip>
+       #{script_name} modify <hostname> <ip> OR <hostname> (will lookup ip)
        #{script_name} delete <hostname>
        #{script_name} delete_matching <pattern>
        #{script_name} list
@@ -35,7 +35,10 @@ else
         host = Host.add(*ARGV)
         puts "  [Adding] #{host.name} -> #{host.ip}"
         exit 0
-      rescue
+      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
       end

data/lib/ghost/linux-host.rb

@@ -37,6 +37,11 @@ class Host
     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('.')
+        end
+        
         new_host = Host.new(host, ip)
         
         hosts = list

data/lib/ghost/mac-host.rb

@@ -1,3 +1,5 @@
+require 'socket'
+
 class Host
   ListCmd = "dscl localhost -list /Local/Default/Hosts 2>&1"
   ReadCmd = "dscl localhost -read /Local/Default/Hosts/%s 2>&1"
@@ -15,6 +17,10 @@ class 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('.')
+        end
+        
         `#{CreateCmd % [host, ip]}`
         flush!
         find_by_host(host)

data/spec/etc_hosts_spec.rb

@@ -114,6 +114,23 @@ describe Host do
 
       Host.list.should have(1).thing
     end
+    
+    it "should add a hostname using second hostname's ip" do
+      hostname = 'ghost-test-hostname.local'
+      alias_hostname = 'ghost-test-alias-hostname.local'
+
+      Host.empty!
+
+      Host.add(hostname)
+      Host.add(alias_hostname, hostname)
+
+      Host.list.last.ip.should eql(Host.list.first.ip)
+    end
+
+    it "should raise SocketError if it can't find hostname's ip" do
+      Host.empty!
+      lambda { Host.add('ghost-test-alias-hostname.google', 'google') }.should raise_error(SocketError)
+    end
   end
 
   describe ".empty!" do

data/spec/ghost_spec.rb

@@ -105,6 +105,23 @@ describe Host, ".add" do
     
     Host.list.should have(1).thing
   end
+  
+  it "should add a hostname using second hostname's ip" do
+    hostname = 'ghost-test-hostname.local'
+    alias_hostname = 'ghost-test-alias-hostname.local'
+    
+    Host.empty!
+    
+    Host.add(hostname)
+    Host.add(alias_hostname, hostname)
+    
+    Host.list.last.ip.should eql(Host.list.first.ip)
+  end
+  
+  it "should raise SocketError if it can't find hostname's ip" do
+    Host.empty!
+    lambda { Host.add('ghost-test-alias-hostname.google', 'google') }.should raise_error(SocketError)
+  end
 end
 
 describe Host, ".empty!" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ghost
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Bodaniel Jeanes
@@ -9,7 +14,7 @@ autorequire: ghost
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 +10:00
+date: 2010-04-04 01:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -49,18 +54,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ghost
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Allows you to create, list, and modify local hostnames