puke 1.1

- console.log(arg1, arg2, …)
- Require
- Yak
- few fixes

puke/Cache.py

@@ -0,0 +1,63 @@
+import urllib2
+import hashlib
+
+from puke.Console import *
+from puke.FileSystem import *
+
+class Cache:
+
+	@staticmethod
+	def fetchHttp(url):
+		id = hashlib.sha256(url).hexdigest()
+
+		if Cache.check(id):
+			return Cache.getPath(id)
+
+		try:
+			handler = urllib2.build_opener()
+			payload = handler.open(url).read()
+		except Exception as error:
+			console.error('HTTP fail %s (%s)' % (url, error))
+
+		return Cache.write(id, payload, url)
+
+
+	@staticmethod
+	def write(id, payload, info = None):
+		writefile(".pukecache/%s" % id, payload)
+
+		if info:
+			writefile(".pukecache/%s.meta" % id, info)
+
+		return Cache.getPath(id)
+
+	@staticmethod
+	def read(id):
+		if not Cache.check(id):
+			return None
+
+		return readfile(".pukecache/%s" % id)
+
+	@staticmethod
+	def check(id):
+		return fileexists(".pukecache/%s" % id)
+
+	@staticmethod
+	def getPath(id):
+		return ".pukecache/%s" % id
+
+	@staticmethod
+	def getInfo(id):
+		if not fileexists(".pukecache/%s.meta" % id):
+			return ""
+
+		return readfile(".pukecache/%s.meta" % id)
+
+
+	@staticmethod
+	def clean():
+		try:
+			rm(".pukecache/")
+			return True
+		except:
+			return False

puke/Console.py

@@ -1,54 +1,80 @@
-import logging, sys, os
+import logging, sys, os, json
 from colorama import *
 
 init(autoreset = True)
 
 class console:
 
 
+
 	@staticmethod
-	def log(msg):
+	def log(*messages):
+		color = Style.BRIGHT 
 		if os.environ.get("NOCOLOR"):
-			logging.info(  msg)
-		else:
-			logging.info( Style.BRIGHT + msg)
+			color = ""
+
+		for m in messages:
+			msg = console.stringify(m)
+			logging.info(color + msg)
 
 	@staticmethod
-	def info(msg):
-		logging.info(   msg)
+	def info(*messages):
+		for m in messages:
+			msg = console.stringify(m)
+			logging.info(   msg)
 
 	@staticmethod
-	def debug(msg):
+	def debug(*messages):
+		color = Back.BLUE
+
 		if os.environ.get("NOCOLOR"):
-			logging.debug( msg )
-		else:
-			logging.debug( Back.BLUE +  msg )
+			color = ""
+
+		if os.environ.get("NOCOLOR"):
+			color = ""
+
+		for m in messages:
+			msg = console.stringify(m)
+			logging.debug( color +  msg )
 
 	@staticmethod
-	def warn(msg):
-
-		msg = console.pukefactory(msg)
+	def warn(*messages):
+		color = Fore.YELLOW + Style.BRIGHT
+
 		if os.environ.get("NOCOLOR"):
-			logging.warning(  msg)
-		else:
-			logging.warning( Fore.YELLOW + Style.BRIGHT + msg)
+			color = ""
+
+		for m in messages:
+			msg = console.stringify(m)
+			msg = console.pukefactory(msg)
+
+			logging.warning( color + msg)
 
 	@staticmethod
-	def error(msg):
+	def error(*messages):
+		color = Back.RED + Style.BRIGHT
+
 		if os.environ.get("NOCOLOR"):
-			logging.error(  msg)
-		else:
-			logging.error( Back.RED + Style.BRIGHT + msg)
+			color = ""
+
+		for m in messages:
+			msg = console.stringify(m)
+			logging.error( color + msg)
 
 	@staticmethod
-	def confirm(msg):
+	def confirm(*messages):
+		color = Fore.GREEN + Style.BRIGHT
+
 		if os.environ.get("NOCOLOR"):
-			logging.info(msg )
-		else:
-			logging.info(Fore.GREEN + Style.BRIGHT + msg )
+			color = ""
+
+		for m in messages:
+			msg = console.stringify(m)
+			logging.info(color + msg )
 
 	@staticmethod
 	def header(msg, level = 2):
+		msg = console.stringify(msg)
 		logging.info("")
 		if level == 1:
 			color = Fore.MAGENTA
@@ -62,6 +88,7 @@ def header(msg, level = 2):
 
 	@staticmethod
 	def fail(msg):
+		msg = console.stringify(msg)
 		msg = console.pukefactory(msg)
 		console.error(" /!\\ BUILD FAIL : " + msg)
 		sys.exit(1)
@@ -81,4 +108,9 @@ def pukefactory(msg):
 		return msg
 
 
+	@staticmethod
+	def stringify(msg):
+		if isinstance(msg, str):
+			return msg
 
+		return json.JSONEncoder().encode(msg)

puke/FileList.py

@@ -1,10 +1,12 @@
 import os, logging
 import fnmatch, re
-import urllib2
 import hashlib
 
+
+
 from puke.Console import *
 from puke.FileSystem import *
+from puke.Cache import *
 
 
 
@@ -72,6 +74,17 @@ def get (self, full = False):
 
 		return self.__list
 
+
+	@staticmethod
+	def getSignature(list):
+		sig = ""
+		for (f,p) in list:
+			sig += "%s" % hashlib.sha256(f).hexdigest()
+
+		sig = hashlib.sha256(sig).hexdigest()
+
+		return sig
+
 	@staticmethod
 	def check(flist, full = False):
 		if isinstance(flist, FileList):
@@ -90,7 +103,7 @@ def check(flist, full = False):
 		for (f, p) in flist:
 			if f.startswith('http'):
 
-				f = PukeBuffer.fetchHttp(f)
+				f = Cache.fetchHttp(f)
 
 			if not full:
 				result.append(f)
@@ -119,54 +132,5 @@ def __explore(self, dir ):
 
 
 
-class PukeBuffer:
 
-	@staticmethod
-	def fetchHttp(url):
-		id = hashlib.sha256(url).hexdigest()
-
-		if PukeBuffer.check(id):
-			return PukeBuffer.getPath(id)
-
-		try:
-			handler = urllib2.build_opener()
-			payload = handler.open(url).read()
-		except Exception as error:
-			console.error('HTTP fail %s (%s)' % (url, error))
-
-		return PukeBuffer.write(id, payload, url)
-
-
-	@staticmethod
-	def write(id, payload, info = None):
-		writefile(".pukecache/%s" % id, payload)
-
-		if info:
-			writefile(".pukecache/%s.meta" % id, info)
-
-		return PukeBuffer.getPath(id)
-
-	@staticmethod
-	def check(id):
-		return fileexists(".pukecache/%s" % id)
-
-	@staticmethod
-	def getPath(id):
-		return ".pukecache/%s" % id
-
-	@staticmethod
-	def getInfo(id):
-		if not fileexists(".pukecache/%s.meta" % id):
-			return ""
-
-		return readfile(".pukecache/%s.meta" % id)
-
-
-	@staticmethod
-	def clean():
-		try:
-			rm(".pukecache/")
-			return True
-		except:
-			return False
 

puke/FileSystem.py

@@ -1,4 +1,4 @@
-import os
+import os, time
 import shutil
 from puke.Console import *