Rename --rpmdir to --destdir

When we add new package types, using rpmdir will make much less sense.

3 files changed, 7 insertions, 7 deletions

diff --git a/README b/README
index 206a258..070304e 100644
--- a/README
+++ b/README
@@ -35,8 +35,8 @@ ssldir = '/etc/puppet/ssl'
 # Overwrite existing certs, tarballs, and packages
 force = 'False'
 
-# Where to write rpm packages
-rpmdir = '/srv/repos/yum/puppet-hosts'
+# Where to write packages
+destdir = '/srv/repos/yum/puppet-hosts'
 
 # Template for rpm spec files
 template = '/etc/puppet/ssl/template.spec'
diff --git a/puppet-host-package b/puppet-host-package
index 9ad8b7e..60ef9d1 100755
--- a/puppet-host-package
+++ b/puppet-host-package
@@ -38,7 +38,7 @@ def _main():
                       action='store_true', help='Overwrite existing tarballs')
     parser.add_option('--force-package', dest='force_package',
                       action='store_true', help='Overwrite existing packages')
-    parser.add_option('-r', '--rpmdir', dest='rpmdir', metavar='dir',
+    parser.add_option('-D', '--destdir', dest='destdir', metavar='dir',
                       help='Directory where packages are stored [%default]')
     parser.add_option('--release', dest='release', metavar='num',
                       help='Package release number [%default]')
@@ -74,9 +74,9 @@ def _main():
     if not args:
         raise SystemExit(parser.print_usage())
 
-    opts.rpmdir = os.path.expanduser(os.path.abspath(opts.rpmdir))
+    opts.destdir = os.path.expanduser(os.path.abspath(opts.destdir))
     opts.ssldir = os.path.expanduser(os.path.abspath(opts.ssldir))
-    for d in [opts.rpmdir, opts.ssldir]:
+    for d in [opts.destdir, opts.ssldir]:
         if not os.path.isdir(d):
             raise SystemExit('%s does not exist (or is not a directory)' % d)
 
diff --git a/puppethost.py b/puppethost.py
index 3d4537b..793cd5f 100644
--- a/puppethost.py
+++ b/puppethost.py
@@ -28,6 +28,7 @@ import commands
 import tempfile
 
 defaults = {
+    'destdir': os.path.abspath(os.curdir),
     'destssldir': '',
     'domain': '',
     'force': False,
@@ -35,7 +36,6 @@ defaults = {
     'force_tarball': False,
     'force_package': False,
     'release': '1',
-    'rpmdir': os.path.abspath(os.curdir),
     'sign': True,
     'ssldir': '/etc/puppet/ssl',
     'template': '%(ssldir)s/template.spec',
@@ -190,7 +190,7 @@ class PuppetHost(object):
 
     def rpm(self):
         """Create a .rpm package."""
-        rpmdir = self.opts['rpmdir']
+        rpmdir = self.opts['destdir']
 
         if not self.tarball or not os.path.exists(self.tarball):
             self.tar()