From 96f784dc2d798b840da55d0d56ffa12cf8d47146 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sun, 21 Aug 2011 19:02:52 +0100
Subject: Replace project.meta with explicit settings.

No point in having two kinds of config files...
---
 unperish | 36 +++++-------------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)

diff --git a/unperish b/unperish
index 15e1f75..506c501 100755
--- a/unperish
+++ b/unperish
@@ -33,8 +33,6 @@ __version__ = '0.0'
 
 class Unperish(cliapp.Application):
 
-    metafilename = 'project.meta'
-    
     def add_settings(self):
         self.settings.boolean(['verbose', 'v'], 
                               'print commands that are executed')
@@ -72,11 +70,11 @@ class Unperish(cliapp.Application):
         self.settings.boolean(['binary-arch'], 
                               'build arch-specific packages only, '
                                 'not arch:all')
+        self.settings.string(['upstream-name'], 'upstream name for project')
+        self.settings.string(['upstream-version'], 
+                             'upstream version for project')
     
     def process_args(self, args):
-        self.meta = self.create_meta()
-        self.autofill_meta()
-        self.read_meta()
         self.create_build_area()
         
         self.already = set()
@@ -114,11 +112,11 @@ class Unperish(cliapp.Application):
 
     @property
     def upstream_name(self):
-        return self.meta.get('project', 'name')
+        return self.settings['upstream-name']
 
     @property
     def upstream_version(self):
-        return self.meta.get('project', 'version')
+        return self.settings['upstream-version']
 
     @property
     def upstream_tarball(self):
@@ -175,10 +173,6 @@ class Unperish(cliapp.Application):
             logging.debug('Does not already exist: %s' % filename)
             return False
 
-    def cmd_dump_meta(self, args):
-        '''Print out contents of project meta file (project.meta).'''
-        self.meta.write(self.output)
-
     def cmd_dget(self, args):
         '''Retrieve a Debian source package (.dsc and other files).
         
@@ -320,26 +314,6 @@ class Unperish(cliapp.Application):
                      'Build for %s.' % target],
                     cwd=self.join(self.dirname))
 
-    def create_meta(self):
-        cp = ConfigParser.RawConfigParser()
-        cp.add_section('project')
-        cp.set('project', 'name', '')
-        cp.set('project', 'version', '')
-        return cp
-
-    def autofill_meta(self):
-        if os.path.exists('setup.py'):
-            name = self.runcmd(['python', 'setup.py', '--name']).strip()
-            if name:
-                self.meta.set('project', 'name', name)
-
-            version = self.runcmd(['python', 'setup.py', '--version']).strip()
-            if version:
-                self.meta.set('project', 'version', version)
-
-    def read_meta(self):
-        self.meta.read([self.metafilename])
-
     def join(self, *components):
         components = (self.settings['build-area'],) + components
         return os.path.join(*components)
-- 
cgit v1.2.1