Rename command to entry.

handroll/tests/test_command.py → handroll/tests/test_entry.py

@@ -6,7 +6,7 @@
 
 import mock
 
-from handroll import command, logger, scaffolder
+from handroll import entry, logger, scaffolder
 from handroll.tests import TestCase
 
 
@@ -17,112 +17,112 @@ def setUp(self):
         self.arguments = ['/fake/bin/handroll']
 
     def test_verbose_argument(self):
-        args = command.parse_args(self.arguments)
+        args = entry.parse_args(self.arguments)
         self.assertFalse(args.verbose)
 
         argv = list(self.arguments)
         argv.append('-v')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.verbose)
 
         argv = list(self.arguments)
         argv.append('--verbose')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.verbose)
 
     def test_debug_argument(self):
-        args = command.parse_args(self.arguments)
+        args = entry.parse_args(self.arguments)
         self.assertFalse(args.debug)
 
         argv = list(self.arguments)
         argv.append('-d')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.debug)
 
         argv = list(self.arguments)
         argv.append('--debug')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.debug)
 
     def test_timing_argument(self):
-        args = command.parse_args(self.arguments)
+        args = entry.parse_args(self.arguments)
         self.assertFalse(args.timing)
 
         argv = list(self.arguments)
         argv.append('-t')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.timing)
 
         argv = list(self.arguments)
         argv.append('--timing')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.timing)
 
     def test_watch_argument(self):
-        args = command.parse_args(self.arguments)
+        args = entry.parse_args(self.arguments)
         self.assertFalse(args.watch)
 
         argv = list(self.arguments)
         argv.append('-w')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.watch)
 
         argv = list(self.arguments)
         argv.append('--watch')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.watch)
 
     def test_site_argument(self):
         site = 'fake_site'
         self.arguments.append(site)
-        args = command.parse_args(self.arguments)
+        args = entry.parse_args(self.arguments)
         self.assertEqual(site, args.site)
 
     def test_site_argument_is_normalized(self):
         """Test that trailing path separator is removed so that a site is
         consistently handled."""
         site = 'fake_site' + os.sep
         self.arguments.append(site)
-        args = command.parse_args(self.arguments)
+        args = entry.parse_args(self.arguments)
         self.assertEqual('fake_site', args.site)
 
     def test_outdir_argument(self):
         outdir = 'fake_outdir'
         self.arguments.extend(['fake_site', outdir])
-        args = command.parse_args(self.arguments)
+        args = entry.parse_args(self.arguments)
         self.assertEqual(outdir, args.outdir)
 
     def test_force_argument(self):
-        args = command.parse_args(self.arguments)
+        args = entry.parse_args(self.arguments)
         self.assertFalse(args.force)
 
         argv = list(self.arguments)
         argv.append('-f')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.force)
 
         argv = list(self.arguments)
         argv.append('--force')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertTrue(args.force)
 
     def test_scaffold_argument(self):
-        args = command.parse_args(self.arguments)
+        args = entry.parse_args(self.arguments)
         self.assertIsNone(args.scaffold)
 
         argv = list(self.arguments)
         argv.append('-s')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertEqual(scaffolder.LIST_SCAFFOLDS, args.scaffold)
 
         argv = list(self.arguments)
         argv.append('--scaffold')
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertEqual(scaffolder.LIST_SCAFFOLDS, args.scaffold)
 
         argv = list(self.arguments)
         argv.extend(['--scaffold', 'default'])
-        args = command.parse_args(argv)
+        args = entry.parse_args(argv)
         self.assertEqual('default', args.scaffold)
 
 
@@ -134,43 +134,43 @@ def setUp(self):
     def test_verbose_sets_logging(self):
         logger.setLevel(logging.CRITICAL)
         self.arguments.append('-v')
-        self.assertRaises(SystemExit, command.main, self.arguments)
+        self.assertRaises(SystemExit, entry.main, self.arguments)
         self.assertEqual(logging.INFO, logger.getEffectiveLevel())
 
     def test_debug_sets_logging(self):
         logger.setLevel(logging.CRITICAL)
         self.arguments.append('-d')
-        self.assertRaises(SystemExit, command.main, self.arguments)
+        self.assertRaises(SystemExit, entry.main, self.arguments)
         self.assertEqual(logging.DEBUG, logger.getEffectiveLevel())
 
     def test_site_directory_is_file(self):
         site = tempfile.mkdtemp()
         file_site = os.path.join(site, 'fake')
         self.arguments.append(file_site)
-        self.assertRaises(SystemExit, command.main, self.arguments)
+        self.assertRaises(SystemExit, entry.main, self.arguments)
 
-    @mock.patch('handroll.command.finish')
+    @mock.patch('handroll.entry.finish')
     def test_complete_site_generation(self, finish):
         site = self.factory.make_site()
         self.arguments.append(site.path)
-        command.main(self.arguments)
+        entry.main(self.arguments)
         self.assertTrue(finish.called)
 
-    @mock.patch('handroll.command.serve')
+    @mock.patch('handroll.entry.serve')
     def test_development_server_served(self, serve):
         site = self.factory.make_site()
         self.arguments.extend(['-w', site.path])
 
-        command.main(self.arguments)
+        entry.main(self.arguments)
 
         self.assertTrue(serve.called)
 
-    @mock.patch('handroll.command.scaffolder')
+    @mock.patch('handroll.entry.scaffolder')
     def test_makes_from_scaffolder(self, mock_scaffolder):
         self.arguments.extend(['-s', 'default', 'site'])
 
         try:
-            command.main(self.arguments)
+            entry.main(self.arguments)
             self.fail()
         except SystemExit:
             mock_scaffolder.make.assert_called_once_with(

setup.py

@@ -81,7 +81,7 @@ def run(self):
         long_description=long_description,
         packages=find_packages(),
         entry_points={
-            'console_scripts': ['handroll = handroll.command:main'],
+            'console_scripts': ['handroll = handroll.entry:main'],
             'handroll.composers': [
                 '.atom = handroll.composers.atom:AtomComposer',
                 '.md = handroll.composers.md:MarkdownComposer',