Added test for creating a new working files

Author: migurski

app.py

@@ -184,25 +184,7 @@ def branch_edit_add(branch, path=None):
     b.checkout()
     c = r.commit()
 
-    file_path = join((path or '').rstrip('/'), request.form['path'])
-    full_path = join(r.working_dir, file_path)
-    
-    head, dirs = split(file_path)[0], []
-    
-    while head:
-        head, dir = split(head)
-        dirs.insert(0, dir)
-    
-    if '..' in dirs:
-        raise Exception('None of that now')
-        
-    stuff = []
-    
-    for i in range(len(dirs)):
-        dir_path = join(r.working_dir, '/'.join(dirs[:i+1]))
-        
-        if not isdir(dir_path):
-            mkdir(dir_path)
+    file_path, full_path = bizarro.repo.make_working_file(r, path, request.form['path'])
 
     if not exists(full_path):
         with open(full_path, 'w') as file:

bizarro/repo.py

@@ -1,18 +1,53 @@
+import os, logging
+from os.path import join, split
+
 def start_branch(clone, default_branch_name, new_branch_name):
     ''' Start a new repository branch, push it to origin and return it.
     '''
     clone.remotes.origin.fetch()
 
     if 'origin/' + new_branch_name in clone.refs:
-        start_point = clone.refs['origin/' + new_branch_name]
+        start_point = clone.refs['origin/' + new_branch_name].commit
     else:
-        start_point = clone.branches[default_branch_name]
+        start_point = clone.branches[default_branch_name].commit
 
+    logging.debug('start_branch() start_point is %s' % repr(start_point))
     branch = clone.create_head(new_branch_name, commit=start_point)
     clone.remotes.origin.push(new_branch_name)
 
     return branch
 
+def make_working_file(clone, dir, path):
+    ''' Create a new working file, return its local git and real absolute paths.
+    '''
+    repo_path = join((dir or '').rstrip('/'), path)
+    real_path = join(clone.working_dir, repo_path)
+    
+    #
+    # Build a full directory path.
+    #
+    head, dirs = split(repo_path)[0], []
+    
+    while head:
+        head, dir = split(head)
+        dirs.insert(0, dir)
+    
+    if '..' in dirs:
+        raise Exception('None of that now')
+        
+    #
+    # Create directory tree.
+    #
+    stuff = []
+    
+    for i in range(len(dirs)):
+        dir_path = join(clone.working_dir, os.sep.join(dirs[:i+1]))
+        
+        if not isdir(dir_path):
+            mkdir(dir_path)
+    
+    return repo_path, real_path
+
 def save_working_file(clone, path, message, base_sha):
     ''' Save a file in the working dir and push it to origin.
     '''

test.py

@@ -6,7 +6,7 @@
 from uuid import uuid4
 
 from git import Repo
-import bizarro
+import bizarro, jekyll
 
 #
 # Tarball of a single-commit Git repo with files index.md and sub/index.md
@@ -35,10 +35,11 @@ def test_repo_features(self):
         self.assertEqual(set(branch_names), set(['master', 'title', 'body']))
 
     def test_start_branch(self):
-        branch1 = bizarro.repo.start_branch(self.clone1, 'master', 'hello')
+        name = str(uuid4())
+        branch1 = bizarro.repo.start_branch(self.clone1, 'master', name)
 
-        self.assertTrue('hello' in self.clone1.branches)
-        self.assertTrue('hello' in self.origin.branches)
+        self.assertTrue(name in self.clone1.branches)
+        self.assertTrue(name in self.origin.branches)
 
         #
         # Make a change to the branch and push it.
@@ -54,12 +55,49 @@ def test_start_branch(self):
         #
         # See if the branch made it to clone 2
         #
-        branch2 = bizarro.repo.start_branch(self.clone2, 'master', 'hello')
+        branch2 = bizarro.repo.start_branch(self.clone2, 'master', name)
 
-        self.assertTrue('hello' in self.clone2.branches)
+        self.assertTrue(name in self.clone2.branches)
         self.assertEquals(branch2.commit.hexsha, branch1.commit.hexsha)
         self.assertEquals(branch2.commit.message, message)
 
+    def test_new_file(self):
+        name = str(uuid4())
+        branch1 = bizarro.repo.start_branch(self.clone1, 'master', name)
+        
+        self.assertTrue(name in self.clone1.branches)
+        self.assertTrue(name in self.origin.branches)
+        
+        #
+        # Make a new file in the branch and push it.
+        #
+        branch1.checkout()
+        message = str(uuid4())
+        
+        repo_path, real_path = bizarro.repo.make_working_file(self.clone1, '', 'hello.md')
+        
+        with open(real_path, 'w') as file:
+            jekyll.dump_jekyll_doc(dict(title='Hello'), 'Hello hello.', file)
+        
+        bizarro.repo.save_working_file(self.clone1, 'hello.md', message, branch1.commit.hexsha)
+        
+        #
+        # See if the branch made it to clone 2
+        #
+        branch2 = bizarro.repo.start_branch(self.clone2, 'master', name)
+
+        self.assertTrue(name in self.clone2.branches)
+        self.assertEquals(branch2.commit.hexsha, branch1.commit.hexsha)
+        self.assertEquals(branch2.commit.message, message)
+        
+        branch2.checkout()
+        
+        with open(join(self.clone2.working_dir, 'hello.md')) as file:
+            front, body = jekyll.load_jekyll_doc(file)
+            
+            self.assertEquals(front['title'], 'Hello')
+            self.assertEquals(body, 'Hello hello.')
+    
     def tearDown(self):
         rmtree(self.origin.git_dir)
         rmtree(self.clone1.working_dir)