Add Tests

S01.01-Exercise-CreateLayout/app/build.gradle

@@ -21,15 +21,15 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:appcompat-v7:25.0.1'
 
     // TODO (10) Remove this dependency as we won't be needing it for the project until later
     compile 'com.android.support.constraint:constraint-layout:1.0.0-beta3'
 
     // Instrumentation dependencies use androidTestCompile
     // (as opposed to testCompile for local unit tests run in the JVM)
     androidTestCompile 'junit:junit:4.12'
-    androidTestCompile 'com.android.support:support-annotations:25.0.0'
+    androidTestCompile 'com.android.support:support-annotations:25.0.1'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
 }

S01.01-Exercise-CreateLayout/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

S01.01-Exercise-CreateLayout/flatten.py

@@ -0,0 +1,181 @@
+#! /usr/local/bin/python
+
+import argparse
+import os
+import shutil
+import sys
+import tempfile
+
+import git
+
+IGNORE_PATTERNS = ('.git', ".DS_Store")
+SAFE_CHARS = ["-", "_", "."]
+MAX_LENGTH = 100
+
+STUDENT = "student"
+DEVELOP = "develop-"
+DEVELOP_DEFAULT = "all develop branches"
+
+DIFF_FORMAT = """
+
+You can download a zip of this exercise [here](https://github.com/udacity/ud843-QuakeReport/archive/{number}-Exercise-{name}.zip), \
+and a zip of the solution [here](https://github.com/udacity/ud843-QuakeReport/archive/{number}-Solution-{name}.zip). \
+Also, you can find a visual summary of the solution [here](https://github.com/udacity/ud843-QuakeReport/compare/\
+{number}-Exercise-{name}...{number}-Solution-{name}).
+
+"""
+
+
+def flatten(repo_dir, target_dir, student, develop_branches, remove_branches, links):
+    repo = git.Repo(repo_dir)
+
+    if develop_branches == DEVELOP_DEFAULT:
+        develop_branches = [branch for branch in repo.branches if DEVELOP in branch.name]
+
+    if remove_branches:
+        remove_local_branches(repo, student, develop_branches)
+
+    flat = len(develop_branches) == 1
+
+    # print develop_branches
+
+    try:
+        temp_dir = tempfile.mkdtemp()
+        try:
+            current_branch = repo.active_branch
+            print "Stashing"
+            repo.git.stash()
+
+            for develop in develop_branches:
+                to_temp_dir(repo, repo_dir, develop, temp_dir, flat, links)
+            if links:
+                insert_diff_links(temp_dir)
+
+            copy_snapshots(repo, student, temp_dir, target_dir)
+        finally:
+            if current_branch:
+                repo.git.checkout(current_branch)
+            print "Popping"
+            if repo.git.stash("list"):
+                repo.git.stash("pop")
+    finally:
+        if os.path.exists(temp_dir):
+            shutil.rmtree(temp_dir)
+
+    print "Done! Review and commit the", student, "branch at your leisure."
+    print "Then run $ git push --all --prune"
+
+
+def remove_local_branches(repo, student, develop_branches):
+    for branch in repo.branches:
+        if branch.name != student and branch not in develop_branches:
+            print "Removing local branch:", branch.name
+            repo.git.branch(branch.name, "-D")
+
+
+def to_temp_dir(repo, repo_dir, develop, temp_dir, flat, links):
+    for rev in repo.git.rev_list(develop).split("\n"):
+        commit = repo.commit(rev)
+        branch_name = clean_commit_message(commit.message)
+        if "Exercise" in branch_name or "Solution" in branch_name:
+            if branch_name in repo.branches:
+                repo.git.branch(branch_name, "-D")
+            new_branch = repo.create_head(branch_name)
+            new_branch.set_commit(rev)
+
+            repo.git.checkout(commit)
+            print "Saving snapshot of:", branch_name
+            repo.git.clean("-fdx")
+            if flat:
+                target_dir = os.path.join(temp_dir, branch_name)
+            else:
+                folder_name = develop.name.split("-",1)[1]
+                target_dir = os.path.join(temp_dir, folder_name, branch_name)
+
+            shutil.copytree(repo_dir, target_dir,
+                            ignore=shutil.ignore_patterns(*IGNORE_PATTERNS))
+
+            if links:
+                with open(os.path.join(target_dir, "README.md"), "a") as readme:
+                    print branch_name
+                    number, _, name = branch_name.split("-")
+                    readme.write(DIFF_FORMAT.format(number=number, name=name))
+
+
+def clean_commit_message(message):
+    first_line = message.split("\n")[0]
+    safe_message = "".join(
+        c for c in first_line if c.isalnum() or c in SAFE_CHARS).strip()
+    return safe_message[:MAX_LENGTH] if len(safe_message) > MAX_LENGTH else safe_message
+
+
+def insert_diff_links(temp_dir):
+    for item in os.listdir(temp_dir):
+        number, _, name = item.split("-")
+        with open(os.path.join(temp_dir, item, "README.md"), "a") as readme:
+            readme.write(DIFF_FORMAT.format(number=number, name=name))
+
+
+def copy_snapshots(repo, student, temp_dir, target_dir):
+    if target_dir == os.getcwd():
+        repo.git.checkout(student)
+    for item in os.listdir(temp_dir):
+        source_dir = os.path.join(temp_dir, item)
+        dest_dir = os.path.join(target_dir, item)
+
+        if os.path.exists(dest_dir):
+            shutil.rmtree(dest_dir)
+        print "Copying: ", item
+        shutil.copytree(source_dir, dest_dir)
+
+
+DESCRIPTION = "This script "
+
+EPILOG = " To make changes to "
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description=DESCRIPTION,
+        epilog=EPILOG,
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+
+    parser.add_argument('-b', '--remove',
+                        action='store_true',
+                        help='delete all local branches except the student and develop branches')
+
+    parser.add_argument('-d', '--directory',
+                        default=os.getcwd(),
+                        help="the directory of the source repository")
+
+    parser.add_argument('-t', '--target',
+                        default=os.getcwd(),
+                        help="target directory")
+
+    parser.add_argument('-s', '--student',
+                        default=STUDENT,
+                        help="branch where snapshots will be copied")
+
+    parser.add_argument('-l', '--links',
+                        action='store_true',
+                        help="Add links to branches and diff to README files")
+
+    parser.add_argument('develop_branches',
+                        nargs="*",
+                        default=DEVELOP_DEFAULT,
+                        help="the branches where snapshots will be copied from")
+
+    parsed = parser.parse_args()
+
+    flatten(
+        parsed.directory,
+        parsed.target,
+        parsed.student,
+        parsed.develop_branches,
+        parsed.remove,
+        parsed.links
+    )
+
+
+if __name__ == "__main__":
+    sys.exit(main())

S01.01-Solution-CreateLayout/app/build.gradle

@@ -21,14 +21,14 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:appcompat-v7:25.0.1'
 
     // COMPLETED (10) Remove this dependency as we won't be needing it for the project until later
 
     // Instrumentation dependencies use androidTestCompile
     // (as opposed to testCompile for local unit tests run in the JVM)
     androidTestCompile 'junit:junit:4.12'
-    androidTestCompile 'com.android.support:support-annotations:25.0.0'
+    androidTestCompile 'com.android.support:support-annotations:25.0.1'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
 }

S01.01-Solution-CreateLayout/app/src/main/res/layout/activity_forecast.xml

@@ -38,4 +38,4 @@
             android:padding="16dp"
             android:textSize="20sp" />
     </ScrollView>
-</FrameLayout>
+</FrameLayout>

S01.01-Solution-CreateLayout/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files