edit

demeter/core.py

@@ -59,10 +59,7 @@ class Demeter(object):
 		self.path = File.path()
 		self.root = File.cur_path()
 		if self.config == {}:
-			name = 'dev'
-			if 'DEMETER_CONF' in os.environ:
-				name = os.environ['DEMETER_CONF']
-			filename = self.path + 'conf/'+name+'.conf'
+			filename = self.path + 'conf/'+self.getConfigName()+'.conf'
 			if File.exists(filename):
 				config = self.getConfig()
 				config.read(filename)
@@ -74,6 +71,18 @@ class Demeter(object):
 				Demeter.echo(filename + ' is not exists')
 				sys.exit()
 
+	@classmethod
+	def getConfigName(self):
+		name = 'dev'
+		if 'DEMETER_CONF' in os.environ:
+			name = os.environ['DEMETER_CONF']
+		param = {}
+		param['config'] = 'c'
+		self.getopt(param)
+		if 'config' in self.option and self.option['config']:
+			name = self.option['config']
+		return name
+
 	@staticmethod
 	def readConfig(config, type):
 		value = config.options(type)

demeter/model.py

@@ -361,12 +361,52 @@ class Fields(object):
 		self.manage = manage
 
 
-	def assgin(self, value, exp='=', logic='and'):
+	# set value
+	def assign(self, value, exp='=', logic='and'):
 		self.add(value)
 		self.exp(exp)
 		self.logic(logic)
 		return self
 
+	def ins(self, value):
+		self.argv = value
+		self.exp('in')
+		return self
+
+	def nq(self, value):
+		self.argv = value
+		self.exp('!=')
+		return self
+
+	def like(self, value):
+		self.argv = '%' + value + '%'
+		self.exp('like')
+		return self
+
+	def mlike(self, value):
+		self.argv = value
+		self.exp('~')
+		self.logic('and')
+		return self
+
+	def time(self, value):
+		self.add(Demeter.mktime(value))
+		return self
+
+	def start(self, value):
+		self.time(value)
+		self.exp('>=')
+		self.logic('and')
+		return self
+
+	def end(self, value):
+		self.time(value)
+		self.exp('<=')
+		self.logic('and')
+		return self
+
+
+
 	def bind(self, value):
 		self.bindValue = value
 		return self
@@ -456,43 +496,6 @@ class Fields(object):
 		self.argv = value
 		return self
 
-	def ins(self, value):
-		self.argv = value
-		self.exp('in')
-		return self
-
-	def nq(self, value):
-		self.argv = value
-		self.exp('!=')
-		return self
-
-	def like(self, value):
-		self.argv = '%' + value + '%'
-		self.exp('like')
-		return self
-
-	def mlike(self, value):
-		self.argv = value
-		self.exp('~')
-		self.logic('and')
-		return self
-
-	def time(self, value):
-		self.add(Demeter.mktime(value))
-		return self
-
-	def start(self, value):
-		self.time(value)
-		self.exp('>=')
-		self.logic('and')
-		return self
-
-	def end(self, value):
-		self.time(value)
-		self.exp('<=')
-		self.logic('and')
-		return self
-
 class Counter(object):
 	num = 0
 	"""