scrapyd: populate SCRAPY_SPIDER and SCRAPY_JOB environment variables

Author: pablohoffman

scrapyd/environ.py

@@ -23,6 +23,8 @@ def get_environment(self, message, slot, eggpath):
         env = self.initenv.copy()
         env['SCRAPY_SLOT'] = str(slot)
         env['SCRAPY_PROJECT'] = project
+        env['SCRAPY_SPIDER'] = message['_spider']
+        env['SCRAPY_JOB'] = message['_job']
         if eggpath:
             env['SCRAPY_EGGFILE'] = eggpath
         elif project in self.settings:

scrapyd/tests/test_environ.py

@@ -27,6 +27,8 @@ def test_get_environment_with_eggfile(self):
         env = self.environ.get_environment(msg, slot, '/path/to/file.egg')
         self.assertEqual(env['SCRAPY_PROJECT'], 'mybot')
         self.assertEqual(env['SCRAPY_SLOT'], '3')
+        self.assertEqual(env['SCRAPY_SPIDER'], 'myspider')
+        self.assertEqual(env['SCRAPY_JOB'], 'ID')
         self.assert_(env['SCRAPY_SQLITE_DB'].endswith('mybot.db'))
         self.assert_(env['SCRAPY_LOG_FILE'].endswith('/mybot/myspider/ID.log'))
         self.assert_(env['SCRAPY_EGGFILE'].endswith('/path/to/file.egg'))
@@ -38,6 +40,8 @@ def test_get_environment_without_eggfile(self):
         env = self.environ.get_environment(msg, slot, None)
         self.assertEqual(env['SCRAPY_PROJECT'], 'newbot')
         self.assertEqual(env['SCRAPY_SLOT'], '3')
+        self.assertEqual(env['SCRAPY_SPIDER'], 'myspider')
+        self.assertEqual(env['SCRAPY_JOB'], 'ID')
         self.assert_(env['SCRAPY_SQLITE_DB'].endswith('newbot.db'))
         self.assert_(env['SCRAPY_LOG_FILE'].endswith('/newbot/myspider/ID.log'))
         self.assertEqual(env['SCRAPY_SETTINGS_MODULE'], 'newbot.settings')