From 51a4f97184deea8e2cfc10bf7aeb6459d7c9ddce Mon Sep 17 00:00:00 2001
From: Michael O'Connell <mike@ultra-magnus.home>
Date: Mon, 6 Sep 2010 10:45:14 +0800
Subject: [PATCH] Made small changes to incorporate the new notify feature.

---
 macspoof/__init__.py   |  3 ++-
 macspoof/cli.py        | 18 ++++++++++--------
 macspoof/core.py       |  2 +-
 macspoof/interfaces.py |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/macspoof/__init__.py b/macspoof/__init__.py
index 5f243d2..2351c42 100644
--- a/macspoof/__init__.py
+++ b/macspoof/__init__.py
@@ -3,4 +3,5 @@
 import cli
 import core
 import interfaces
-import generator
\ No newline at end of file
+import generator
+import log
\ No newline at end of file
diff --git a/macspoof/cli.py b/macspoof/cli.py
index 103a4ba..153a7e7 100644
--- a/macspoof/cli.py
+++ b/macspoof/cli.py
@@ -5,30 +5,32 @@ import opster
 import macspoof
 
 
+
+
 spoof_options = [
 	('a', 'airport', False, 'treat interface as airport card'),
 ]
-	
-@opster.command(usage='INTERFACE <mac>', options=spoof_options)	
+
+@opster.command(usage='INTERFACE <mac>', options=spoof_options)
 def spoof(interface, mac=None, **opts):
 	"""spoofs mac address of given interface
-	
+
 	"""
 
 	if interface in macspoof.interfaces.list():
 		message = macspoof.core.spoof(interface, mac)
-		print message
-		
+
+
 	else:
 		print('Please specify a valid interface.')
 
-	
-@opster.command(name='list|l|ls', usage='fukit')		
+
+@opster.command(name='list|l|ls', usage='fukit')
 def list(**opts):
 	"""lists avaiable network interfaces"""
 	_interfaces = macspoof.interfaces.fetch()
 	for iface in _interfaces:
 		print '%s (%s)' % (iface.id, iface.mac)
-	
+
 def start():
 	opster.dispatch()
\ No newline at end of file
diff --git a/macspoof/core.py b/macspoof/core.py
index 1fc6cca..3f2024b 100644
--- a/macspoof/core.py
+++ b/macspoof/core.py
@@ -14,4 +14,4 @@ def spoof(interface, mac_address=None):
 		interface = macspoof.interfaces.Interface(interface)
 		
 	
-	interface.spoof(mac_address)
+	macspoof.log.notify(interface.spoof(mac_address))
diff --git a/macspoof/interfaces.py b/macspoof/interfaces.py
index 9edc3d8..f1ea4cc 100644
--- a/macspoof/interfaces.py
+++ b/macspoof/interfaces.py
@@ -49,7 +49,7 @@ class Interface(object):
 		
 		_status = os.system('sudo ifconfig %s ether %s' % (self.id, mac))
 		
-		print 'Interface %s (%s) => (%s)' % (self.id, self.mac, mac)
+		return 'Interface %s (%s) => (%s)' % (self.id, self.mac, mac)