Merge pull request #109 from Freso/fix-morituri-references

Fix references to morituri.

HACKING

@@ -44,7 +44,7 @@ unicode
 - Use asserts liberally to ensure this so we catch problems earlier.
 - All gst.parse_launch() pipelines should be passed as utf-8; use
   encode('utf-8')
-- morituri.extern.log.log is not unicode-safe; don't pass it unicode objects;
+- whipper.extern.log.log is not unicode-safe; don't pass it unicode objects;
   for example, always use %r to log paths
 - run with RIP_DEBUG=5 once in a while to catch unicode/logging errors.
 - Also use unicode prefix/suffix in tempfile.* methods; to force unicode.

doc/.gitignore

@@ -1,4 +1,4 @@
-morituri.ics
-morituri.rss2
+whipper.ics
+whipper.rss2
 reference
 rip.1

doc/Makefile.am

@@ -1,30 +1,30 @@
-EXTRA_DIST = morituri.rss2 morituri.ics $(man_MANS)
+EXTRA_DIST = whipper.rss2 whipper.ics $(man_MANS)
 DISTCLEANFILES = $(man_MANS)
 
 all-local: feeds reference
 
 if HAVE_EPYDOC
-reference: $(top_srcdir)/morituri/*.py feeds
-	epydoc -o reference $(top_srcdir)/morituri
+reference: $(top_srcdir)/whipper/*.py feeds
+	epydoc -o reference $(top_srcdir)/whipper
 else
 reference:
 	@true
 endif
 
 # generate feeds
-feeds: morituri.rss2 morituri.ics
+feeds: whipper.rss2 whipper.ics
 
 # don't fail fatally if user does not have RDF
-morituri.rss2: $(top_srcdir)/morituri.doap
-	-moap doap -f $(top_srcdir)/morituri.doap rss > morituri.rss2
+whipper.rss2: $(top_srcdir)/whipper.doap
+	-moap doap -f $(top_srcdir)/whipper.doap rss > whipper.rss2
 
-morituri.ics: $(top_srcdir)/morituri.doap
-	-moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics
+whipper.ics: $(top_srcdir)/whipper.doap
+	-moap doap -f $(top_srcdir)/whipper.doap ical > whipper.ics
 
 man_MANS = rip.1
 
-rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
-	PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
+rip.1: $(top_srcdir)/whipper/extern/python-command/scripts/help2man $(top_srcdir)/whipper
+	PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/whipper/extern/python-command/scripts/help2man whipper.rip.main.Rip rip > rip.1
 
 clean-local:
 	@rm -rf reference

misc/header.py

@@ -1,21 +1,19 @@
-# -*- Mode: Python; test-case-name: morituri.test.test_header -*-
+# -*- Mode: Python; test-case-name: whipper.test.test_header -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 # 
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 # 
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.

misc/pycheckerrc

@@ -182,7 +182,7 @@ blacklist = [
 #warning: couldn't find real module for class xml.parsers.expat.ExpatError (module name: xml.parsers.expat)
     'xml.parsers.expat',
     'unittest',
-    'morituri.extern.log.log',
+    'whipper.extern.log.log',
 ]
 
 # ignore global variables not used if name is one of these values

setup.py

@@ -1,9 +1,9 @@
 from setuptools import setup, find_packages
-from morituri import __version__ as morituri_version
+from whipper import __version__ as whipper_version
 
 setup(
     name="whipper",
-    version=morituri_version,
+    version=whipper_version,
     description="a secure cd ripper preferring accuracy over speed",
     author=['Thomas Vander Stichele', 'Joe Lametta', 'Samantha Baldwin'],
     maintainer=['Joe Lametta', 'Samantha Baldwin'],
@@ -12,7 +12,7 @@
     packages=find_packages(),
     entry_points={
         'console_scripts': [
-            'whipper = morituri.command.main:main'
+            'whipper = whipper.command.main:main'
          ]
     }
 )

morituri/command/accurip.py → whipper/command/accurip.py

@@ -1,29 +1,27 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 
-from morituri.command.basecommand import BaseCommand
-from morituri.common import accurip
+from whipper.command.basecommand import BaseCommand
+from whipper.common import accurip
 
 import logging
 logger = logging.getLogger(__name__)

morituri/command/basecommand.py → whipper/command/basecommand.py

@@ -5,7 +5,7 @@
 import os
 import sys
 
-from morituri.common import drive
+from whipper.common import drive
 
 import logging
 logger = logging.getLogger(__name__)
@@ -67,7 +67,7 @@ def __init__(self, argv, prog_name, opts):
             if not drives:
                 msg = 'No CD-DA drives found!'
                 logger.critical(msg)
-                # morituri exited with return code 3 here
+                # whipper exited with return code 3 here
                 raise IOError(msg)
             self.parser.add_argument('-d', '--device',
                                      action="store",

morituri/command/cd.py → whipper/command/cd.py

@@ -1,24 +1,22 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
 import os
@@ -30,12 +28,12 @@
 import gobject
 gobject.threads_init()
 
-from morituri.command.basecommand import BaseCommand
-from morituri.common import (
+from whipper.command.basecommand import BaseCommand
+from whipper.common import (
     accurip, common, config, drive, program, task
 )
-from morituri.program import cdrdao, cdparanoia, utils
-from morituri.result import result
+from whipper.program import cdrdao, cdparanoia, utils
+from whipper.result import result
 
 import logging
 logger = logging.getLogger(__name__)
@@ -225,7 +223,7 @@ def add_arguments(self):
 
 class Rip(_CD):
     summary = "rip CD"
-    # see morituri.common.program.Program.getPath for expansion
+    # see whipper.common.program.Program.getPath for expansion
     description = """
 Rips a CD.
 
@@ -257,7 +255,7 @@ def add_arguments(self):
         _CD.add_arguments(self.parser)
 
         self.parser.add_argument('-L', '--logger',
-            action="store", dest="logger", default='morituri',
+            action="store", dest="logger", default='whipper',
             help="logger to use (choose from '" + "', '".join(loggers) + "')")
         # FIXME: get from config
         self.parser.add_argument('-o', '--offset',
@@ -274,7 +272,7 @@ def add_arguments(self):
             help="output directory; will be included in file paths in log")
         self.parser.add_argument('-W', '--working-directory',
             action="store", dest="working_directory",
-            help="working directory; morituri will change to this directory "
+            help="working directory; whipper will change to this directory "
                 "and files will be created relative to it when not absolute")
         self.parser.add_argument('--track-template',
             action="store", dest="track_template",

morituri/command/debug.py → whipper/command/debug.py

@@ -1,31 +1,29 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
 import sys
 
-from morituri.command.basecommand import BaseCommand
-from morituri.common import cache, task
-from morituri.result import result
+from whipper.command.basecommand import BaseCommand
+from whipper.common import cache, task
+from whipper.result import result
 
 import logging
 logger = logging.getLogger(__name__)
@@ -89,7 +87,7 @@ def add_arguments(self):
         self.parser.add_argument(
             '-L', '--logger',
             action="store", dest="logger",
-            default='morituri',
+            default='whipper',
             help="logger to use (choose from '" + "', '".join(loggers) + "')"
         )
 
@@ -136,7 +134,7 @@ def add_arguments(self):
     def do(self):
         runner = task.SyncRunner()
         # here to avoid import gst eating our options
-        from morituri.common import checksum
+        from whipper.common import checksum
 
         for f in self.options.files:
             fromPath = unicode(f)
@@ -151,15 +149,15 @@ class Encode(BaseCommand):
 
     def add_arguments(self):
         # here to avoid import gst eating our options
-        from morituri.common import encode
+        from whipper.common import encode
 
         self.parser.add_argument('input', action='store',
                                  help="audio file to encode")
         self.parser.add_argument('output', nargs='?', action='store',
                                  help="output path")
 
     def do(self):
-        from morituri.common import encode
+        from whipper.common import encode
 
         try:
             fromPath = unicode(self.options.input)
@@ -209,7 +207,7 @@ def do(self):
 
         runner = task.SyncRunner()
 
-        from morituri.common import encode
+        from whipper.common import encode
         logger.debug('Reading tags from %s' % path.encode('utf-8'))
         tagtask = encode.TagReadTask(path)
 
@@ -238,7 +236,7 @@ def do(self):
             sys.stdout.write('Please specify a MusicBrainz disc id.\n')
             return 3
 
-        from morituri.common import mbngs
+        from whipper.common import mbngs
         metadatas = mbngs.musicbrainz(discId, record=self.options.record)
 
         sys.stdout.write('%d releases\n' % len(metadatas))
@@ -265,7 +263,7 @@ class CDParanoia(BaseCommand):
     description = summary
 
     def do(self):
-        from morituri.program import cdparanoia
+        from whipper.program import cdparanoia
         version = cdparanoia.getCdParanoiaVersion()
         sys.stdout.write("cdparanoia version: %s\n" % version)
 
@@ -275,7 +273,7 @@ class CDRDAO(BaseCommand):
     description = summary
 
     def do(self):
-        from morituri.program import cdrdao
+        from whipper.program import cdrdao
         version = cdrdao.getCDRDAOVersion()
         sys.stdout.write("cdrdao version: %s\n" % version)
 

morituri/command/drive.py → whipper/command/drive.py

@@ -1,31 +1,29 @@
 # -*- Mode: Python -*-
 # vi:si:et:sw=4:sts=4:ts=4
 
-# Morituri - for those about to RIP
-
 # Copyright (C) 2009 Thomas Vander Stichele
 
-# This file is part of morituri.
+# This file is part of whipper.
 #
-# morituri is free software: you can redistribute it and/or modify
+# whipper is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# morituri is distributed in the hope that it will be useful,
+# whipper is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+# along with whipper.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 
-from morituri.command.basecommand import BaseCommand
-from morituri.common import config, drive
-from morituri.extern.task import task
-from morituri.program import cdparanoia
+from whipper.command.basecommand import BaseCommand
+from whipper.common import config, drive
+from whipper.extern.task import task
+from whipper.program import cdparanoia
 
 import logging
 logger = logging.getLogger(__name__)