From a5188b41b861fb309857f9aabc8223a031070701 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Thu, 5 Oct 2017 00:29:10 +0200
Subject: [PATCH] make binder directory visible

---
 repo2docker/detectors.py                                   | 4 ++--
 tests/conda/binder-dir/Dockerfile                          | 2 +-
 tests/conda/binder-dir/README.rst                          | 2 +-
 tests/conda/binder-dir/{.binder => binder}/environment.yml | 0
 tests/dockerfile/binder-dir/README.rst                     | 2 +-
 tests/dockerfile/binder-dir/{.binder => binder}/Dockerfile | 0
 tests/venv/binder-dir/README.rst                           | 2 +-
 tests/venv/binder-dir/{.binder => binder}/postBuild        | 0
 tests/venv/binder-dir/{.binder => binder}/requirements.txt | 0
 9 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/conda/binder-dir/{.binder => binder}/environment.yml (100%)
 rename tests/dockerfile/binder-dir/{.binder => binder}/Dockerfile (100%)
 rename tests/venv/binder-dir/{.binder => binder}/postBuild (100%)
 rename tests/venv/binder-dir/{.binder => binder}/requirements.txt (100%)

diff --git a/repo2docker/detectors.py b/repo2docker/detectors.py
index 53877ae3..a0d08ae4 100644
--- a/repo2docker/detectors.py
+++ b/repo2docker/detectors.py
@@ -332,8 +332,8 @@ class BuildPack(LoggingConfigurable):
 
     def binder_path(self, path):
         """Locate a file"""
-        if os.path.exists('.binder'):
-            return os.path.join('.binder', path)
+        if os.path.exists('binder'):
+            return os.path.join('binder', path)
         else:
             return path
 
diff --git a/tests/conda/binder-dir/Dockerfile b/tests/conda/binder-dir/Dockerfile
index 60a578b0..a742a181 100644
--- a/tests/conda/binder-dir/Dockerfile
+++ b/tests/conda/binder-dir/Dockerfile
@@ -1,2 +1,2 @@
 FROM doesntmatter
-# this file should be ignored because there's a .binder dir
\ No newline at end of file
+# this file should be ignored because there's a binder dir
diff --git a/tests/conda/binder-dir/README.rst b/tests/conda/binder-dir/README.rst
index 9c36fd54..a2ef2871 100644
--- a/tests/conda/binder-dir/README.rst
+++ b/tests/conda/binder-dir/README.rst
@@ -1,4 +1,4 @@
 Binder Directory
 ----------------
 
-top-level Dockerfile will be ignored if .binder/environment.yml exists.
+top-level Dockerfile will be ignored if binder directory exists.
diff --git a/tests/conda/binder-dir/.binder/environment.yml b/tests/conda/binder-dir/binder/environment.yml
similarity index 100%
rename from tests/conda/binder-dir/.binder/environment.yml
rename to tests/conda/binder-dir/binder/environment.yml
diff --git a/tests/dockerfile/binder-dir/README.rst b/tests/dockerfile/binder-dir/README.rst
index 6f44e27e..a2ef2871 100644
--- a/tests/dockerfile/binder-dir/README.rst
+++ b/tests/dockerfile/binder-dir/README.rst
@@ -1,4 +1,4 @@
 Binder Directory
 ----------------
 
-top-level Dockerfile will be ignored if .binder/Dockerfile exists.
+top-level Dockerfile will be ignored if binder directory exists.
diff --git a/tests/dockerfile/binder-dir/.binder/Dockerfile b/tests/dockerfile/binder-dir/binder/Dockerfile
similarity index 100%
rename from tests/dockerfile/binder-dir/.binder/Dockerfile
rename to tests/dockerfile/binder-dir/binder/Dockerfile
diff --git a/tests/venv/binder-dir/README.rst b/tests/venv/binder-dir/README.rst
index 50be8abd..618a6692 100644
--- a/tests/venv/binder-dir/README.rst
+++ b/tests/venv/binder-dir/README.rst
@@ -1,4 +1,4 @@
 Binder Directory
 ----------------
 
-top-level environment.yml will be ignored if .binder/requiremets.txt exists.
+top-level environment.yml will be ignored if binder directory exists.
diff --git a/tests/venv/binder-dir/.binder/postBuild b/tests/venv/binder-dir/binder/postBuild
similarity index 100%
rename from tests/venv/binder-dir/.binder/postBuild
rename to tests/venv/binder-dir/binder/postBuild
diff --git a/tests/venv/binder-dir/.binder/requirements.txt b/tests/venv/binder-dir/binder/requirements.txt
similarity index 100%
rename from tests/venv/binder-dir/.binder/requirements.txt
rename to tests/venv/binder-dir/binder/requirements.txt