Merge pull request #2420 from fishtown-analytics/fix/dbt-init-v2-project

Fix dbt init to clone a v2 project (#2404)

core/dbt/clients/git.py

@@ -6,8 +6,13 @@
 import dbt.exceptions
 
 
-def clone(repo, cwd, dirname=None, remove_git_dir=False):
-    clone_cmd = ['git', 'clone', '--depth', '1', repo]
+def clone(repo, cwd, dirname=None, remove_git_dir=False, branch=None):
+    clone_cmd = ['git', 'clone', '--depth', '1']
+
+    if branch is not None:
+        clone_cmd.extend(['--branch', branch])
+
+    clone_cmd.append(repo)
 
     if dirname is not None:
         clone_cmd.append(dirname)

core/dbt/task/init.py

@@ -9,6 +9,7 @@
 from dbt.task.base import BaseTask
 
 STARTER_REPO = 'https://github.com/fishtown-analytics/dbt-starter-project.git'
+STARTER_BRANCH = 'dbt-yml-config-version-2'
 DOCS_URL = 'https://docs.getdbt.com/docs/configure-your-profile'
 SAMPLE_PROFILES_YML_FILE = 'https://docs.getdbt.com/docs/profile'  # noqa
 
@@ -62,8 +63,12 @@
 class InitTask(BaseTask):
     def clone_starter_repo(self, project_name):
         dbt.clients.git.clone(
-            STARTER_REPO, '.', project_name,
-            remove_git_dir=True)
+            STARTER_REPO,
+            cwd='.',
+            dirname=project_name,
+            remove_git_dir=True,
+            branch=STARTER_BRANCH,
+        )
 
     def create_profiles_dir(self, profiles_dir):
         if not os.path.exists(profiles_dir):

test/integration/040_init_test/test_init.py

@@ -2,6 +2,7 @@
 from test.integration.base import DBTIntegrationTest, use_profile
 import os
 import shutil
+import yaml
 
 
 class TestInit(DBTIntegrationTest):
@@ -29,13 +30,14 @@ def test_postgres_init_task(self):
         project_name = self.get_project_name()
         self.run_dbt(['init', project_name])
 
-        dir_exists = os.path.exists(project_name)
+        assert os.path.exists(project_name)
         project_file = os.path.join(project_name, 'dbt_project.yml')
-        project_file_exists = os.path.exists(project_file)
+        assert os.path.exists(project_file)
+        with open(project_file) as fp:
+            project_data = yaml.safe_load(fp.read())
 
-        git_dir = os.path.join(project_name, '.git')
-        git_dir_exists = os.path.exists(git_dir)
+        assert 'config-version' in project_data
+        assert project_data['config-version'] == 2
 
-        self.assertTrue(dir_exists)
-        self.assertTrue(project_file_exists)
-        self.assertFalse(git_dir_exists)
+        git_dir = os.path.join(project_name, '.git')
+        assert not os.path.exists(git_dir)