Merge pull request #10 from iaoiui/master

Add a feature to commit only source code(.py)

Author: sat28

env.sh

@@ -1,5 +1,5 @@
 ####################### SSH KEY FOR GIT ###################################
-ssh-keygen -t rsa && ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub && eval `ssh-agent -s` && ssh-add -k
+eval `ssh-agent -s` && ssh-add -k
 ####################### To be added to git account settings ################
 
 

githubcommit/handlers.py

@@ -3,6 +3,7 @@
 import os, json, git, urllib, requests
 from git import Repo, GitCommandError
 from subprocess import check_output
+import subprocess
 
 class GitCommitHandler(IPythonHandler):
 
@@ -32,6 +33,8 @@ def put(self):
         data = json.loads(self.request.body.decode('utf-8'))
         filename = urllib.parse.unquote(data['filename'])
         msg = data['msg']
+        commit_only_source = data['commit_only_source']
+
 
         # get current directory (to return later)
         cwd = os.getcwd()
@@ -54,8 +57,13 @@ def put(self):
         # commit current notebook
         # client will sent pathname containing git directory; append to git directory's parent
         try:
+            if commit_only_source :
+                subprocess.run(['jupyter', 'nbconvert', '--to', 'script', str(os.environ.get('GIT_PARENT_DIR') + "/" + os.environ.get('GIT_REPO_NAME') + filename)])
+                filename = str(os.environ.get('GIT_PARENT_DIR') + "/" + os.environ.get('GIT_REPO_NAME') + filename.replace('ipynb', 'py'))
+            
             print(repo.git.add(str(os.environ.get('GIT_PARENT_DIR') + "/" + os.environ.get('GIT_REPO_NAME') + filename)))
-            print(repo.git.commit( a=True, m="{}\n\nUpdated {}".format(msg, filename) ))
+            print(repo.git.commit( a=False, m="{}\n\nUpdated {}".format(msg, filename) ))
+
         except GitCommandError as e:
             print(e)
             self.error_and_return(cwd, "Could not commit changes to notebook: {}".format(git_dir_parent + filename))

githubcommit/static/main.js

@@ -13,6 +13,9 @@ define(['base/js/namespace','base/js/dialog','jquery'],function(IPython, dialog,
             var input = $('<textarea rows="4" cols="72"></textarea>')
             var div = $('<div/>')
 
+            var checkbox = '<input type="checkbox" id="commit_only_source" name="feature" value="scales" checked /><label>commit only source code</label>'
+    
+            div.append(checkbox)
             div.append(p)
                .append(input)
 
@@ -24,7 +27,8 @@ define(['base/js/namespace','base/js/dialog','jquery'],function(IPython, dialog,
                 var filepath = window.location.pathname.match(re)[1];
                 var payload = {
                              'filename': filepath,
-                             'msg': input.val()
+                             'msg': input.val(),
+                             'commit_only_source': $("#commit_only_source").prop('checked')
                            };
                 var settings = {
                     url : '/git/commit',
@@ -83,6 +87,7 @@ define(['base/js/namespace','base/js/dialog','jquery'],function(IPython, dialog,
                 notebook:env.notebook,
                 keyboard_manager: env.notebook.keyboard_manager,
             })
+
         }
     }