Rename letsencrypt_auto dir to match other dirs.

Originally, I had it in mind to move letsencrypt-auto inside this dir. However, now we'd like to copy it or link it to the root level, where people are used to finding it (at least for awhile). Since it would be confusing to have a letsencrypt-auto and a letsencrypt_auto right next to each other, we rename this folder.

Dockerfile

@@ -22,7 +22,7 @@ WORKDIR /opt/letsencrypt
 # directories in its path.
 
 
-COPY letsencrypt_auto/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto
+COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto
 RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \

Dockerfile-dev

@@ -22,7 +22,7 @@ WORKDIR /opt/letsencrypt
 
 # TODO: Install non-default Python versions for tox.
 # TODO: Install Apache/Nginx for plugin development.
-COPY letsencrypt_auto/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto
+COPY letsencrypt-auto-source/letsencrypt-auto /opt/letsencrypt/src/letsencrypt-auto
 RUN /opt/letsencrypt/src/letsencrypt-auto --os-packages-only && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* \

letsencrypt-auto-source/Dockerfile

@@ -25,9 +25,9 @@ COPY ./tests/certs/ca/my-root-ca.crt.pem /usr/local/share/ca-certificates/
 RUN update-ca-certificates
 
 # Copy code:
-COPY . /home/lea/letsencrypt/letsencrypt_auto
+COPY . /home/lea/letsencrypt/letsencrypt-auto-source
 
 USER lea
 WORKDIR /home/lea
 
-CMD ["nosetests", "-s", "letsencrypt/letsencrypt_auto/tests"]
+CMD ["nosetests", "-s", "letsencrypt/letsencrypt-auto-source/tests"]

letsencrypt-auto-source/letsencrypt-auto

@@ -1731,7 +1731,7 @@ def verified_new_le_auto(get, tag, temp_dir):
     le_auto_dir = environ.get(
         'LE_AUTO_DIR_TEMPLATE',
         'https://raw.githubusercontent.com/letsencrypt/letsencrypt/%s/'
-        'letsencrypt_auto/') % tag
+        'letsencrypt-auto-source/') % tag
     write(get(le_auto_dir + 'letsencrypt-auto'), temp_dir, 'letsencrypt-auto')
     write(get(le_auto_dir + 'letsencrypt-auto.sig'), temp_dir, 'letsencrypt-auto.sig')
     write(PUBLIC_KEY, temp_dir, 'public_key.pem')

letsencrypt-auto-source/pieces/fetch.py

@@ -95,7 +95,7 @@ def verified_new_le_auto(get, tag, temp_dir):
     le_auto_dir = environ.get(
         'LE_AUTO_DIR_TEMPLATE',
         'https://raw.githubusercontent.com/letsencrypt/letsencrypt/%s/'
-        'letsencrypt_auto/') % tag
+        'letsencrypt-auto-source/') % tag
     write(get(le_auto_dir + 'letsencrypt-auto'), temp_dir, 'letsencrypt-auto')
     write(get(le_auto_dir + 'letsencrypt-auto.sig'), temp_dir, 'letsencrypt-auto.sig')
     write(PUBLIC_KEY, temp_dir, 'public_key.pem')

letsencrypt-auto-source/tests/auto_test.py

@@ -12,13 +12,22 @@ import socket
 import ssl
 from stat import S_IRUSR, S_IXUSR
 from subprocess import CalledProcessError, check_output, Popen, PIPE
+import sys
 from tempfile import mkdtemp
 from threading import Thread
 from unittest import TestCase
 
 from nose.tools import eq_, nottest, ok_
 
-from ..build import build as build_le_auto
+
+@nottest
+def tests_dir():
+    """Return a path to the "tests" directory."""
+    return dirname(abspath(__file__))
+
+
+sys.path.insert(0, dirname(tests_dir()))
+from build import build as build_le_auto
 
 
 class RequestHandler(BaseHTTPRequestHandler):
@@ -105,14 +114,9 @@ def serving(resources):
         thread.join()
 
 
-@nottest
-def tests_dir():
-    """Return a path to the "tests" directory."""
-    return dirname(abspath(__file__))
-
-
 LE_AUTO_PATH = join(dirname(tests_dir()), 'letsencrypt-auto')
 
+
 @contextmanager
 def ephemeral_dir():
     dir = mkdtemp(prefix='le-test-')