Merge pull request #13 from commit-live-admin/master

New Feature: Task List & Toolbar

Author: surajhell88

lib/auth.coffee

@@ -7,12 +7,13 @@ _token = require './token'
 localStorage = require './local-storage'
 {BrowserWindow} = require 'remote'
 {Notification} = require 'atom'
+{name} = require '../package.json'
 
 confirmOauthToken = (token,userId) ->
   headers = new Headers(
     {'Authorization': token }
   )
-  apiEndpoint = atom.config.get('greyatom-ide').apiEndpoint
+  apiEndpoint = atom.config.get(name).apiEndpoint
   AUTH_URL = "#{apiEndpoint}/users/#{userId}"
   fetch(AUTH_URL, {headers}).then (response) ->
     console.log 'Get User Response'
@@ -101,7 +102,7 @@ commitLiveSignIn = () ->
             atom.notifications.addSuccess 'Commit Live IDE: You have successfully logged in.'
             resolve()
 
-    apiEndpoint = atom.config.get('greyatom-ide').apiEndpoint
+    apiEndpoint = atom.config.get(name).apiEndpoint
     if not win.loadURL("#{apiEndpoint}/github/login")
       win.destroy()
 

lib/commit-live.coffee

@@ -16,6 +16,7 @@ remote = require 'remote'
 BrowserWindow = remote.BrowserWindow
 localStorage = require './local-storage'
 {$} = require 'atom-space-pen-views'
+{name} = require '../package.json'
 
 toolBar = null;
 
@@ -33,6 +34,15 @@ module.exports =
       @activateIDE(state)
 
     @authenticateUser()
+    @subscriptions.add atom.commands.add 'atom-workspace',
+      'commit-live:test-task': () =>
+        @testTask()
+    @subscriptions.add atom.commands.add 'atom-workspace',
+      'commit-live:submit-task': () =>
+        @submitTask()
+    @subscriptions.add atom.commands.add 'atom-workspace',
+      'commit-live:execute-task': () =>
+        @executeTask()
     @subscriptions.add atom.commands.add 'atom-workspace',
       'commit-live:toggle-dashboard': () =>
         @showDashboard()
@@ -42,6 +52,8 @@ module.exports =
     @subscriptions.add atom.commands.add 'atom-workspace',
       'commit-live:connect-to-project': () =>
         atom.commands.dispatch(atom.views.getView(atom.workspace), 'commit-live-welcome:hide')
+        atom.commands.dispatch(atom.views.getView(atom.workspace), 'commit-live:change-project-title')
+        atom.commands.dispatch(atom.views.getView(atom.workspace), 'commit-live:refill-tasks')
         preReqPopup = new Notification("info", "Fetching Prerequisites...", {dismissable: true})
         atom.notifications.addNotification(preReqPopup)
         auth().then =>
@@ -57,7 +69,7 @@ module.exports =
                 atom.notifications.addSuccess 'Your server is ready now!'
                 setTimeout =>
                   @studentServer = JSON.parse(localStorage.get('commit-live:user-info')).servers.student
-                  @connectToFileTreeInFiveSeconds()
+                  @waitAndConnectToServer()
                 , 0
               .catch =>
                 spinUpPopup.dismiss()
@@ -83,15 +95,12 @@ module.exports =
     if !dashboardView.length
       atom.commands.dispatch(atom.views.getView(atom.workspace), 'commit-live-welcome:show-dashboard')
       if atom.project.remoteftp.isConnected()
-        atom.commands.dispatch(atom.views.getView(atom.workspace), 'commit-live-tree-view:toggle')
-        atom.commands.dispatch(atom.views.getView(atom.workspace), 'commit-live:toggle-terminal')
+        atom.project['remoteftp-main'].treeView.detach()
+        @termView.panel.hide()
 
   showCodingScreen: () ->
-    treeView = $('.greyatom-tree-view-view')
-    terminalView = $('.commit-live-terminal-view')
-    atom.commands.dispatch(atom.views.getView(atom.workspace), 'commit-live-tree-view:toggle') if !treeView.length
-    if terminalView.length && terminalView.is(':hidden')
-      atom.commands.dispatch(atom.views.getView(atom.workspace), 'commit-live:toggle-terminal')
+    atom.project['remoteftp-main'].treeView.attach()
+    @termView.panel.show()
     lastProject = JSON.parse(localStorage.get('commit-live:last-opened-project'))
     if lastProject
       @termView?.openLab(lastProject.id)
@@ -103,22 +112,16 @@ module.exports =
     });
     atom.notifications.addNotification(sessionExpiredNotify)
 
-  connectToFileTreeInFiveSeconds: () ->
+  waitAndConnectToServer: () ->
     waitTime = 10 # seconds
     launchPopup = null
-    intervalVar = setInterval ->
-      if launchPopup
-        launchPopup.dismiss()
-        launchPopup = null
-      if waitTime == 0
-        if atom.project and atom.project.remoteftp
-          atom.project.remoteftp.connectToStudentFTP()
-        clearInterval(intervalVar)
-        return
-      launchPopup = new Notification("info", "Connecting in #{waitTime}...", {dismissable: true})
-      atom.notifications.addNotification(launchPopup)
-      waitTime = waitTime - 1
-    , 1000
+    launchPopup = new Notification("info", "Launching our services...", {dismissable: true})
+    atom.notifications.addNotification(launchPopup)
+    setTimeout ->
+      launchPopup.dismiss()
+      if atom.project and atom.project.remoteftp
+        atom.project.remoteftp.connectToStudentFTP()
+    , 1000 * waitTime
 
   authenticateUser: () ->
     authPopup = new Notification("info", "Commit Live IDE: Authenticating...", {dismissable: true})
@@ -198,7 +201,7 @@ module.exports =
       'commit-live:reset': => @term.reset()
       # 'application:update-ile': -> (new Updater).checkForUpdate()
 
-    atom.config.onDidChange 'greyatom-ide.notifier', ({newValue}) =>
+    atom.config.onDidChange "#{name}.notifier", ({newValue}) =>
       if newValue then @activateNotifier() else @notifier.deactivate()
 
     openPath = localStorage.get('commitLiveOpenLabOnActivation')
@@ -207,7 +210,7 @@ module.exports =
       @termView.openLab(openPath)
 
   activateNotifier: ->
-    if atom.config.get('greyatom-ide.notifier')
+    if atom.config.get("#{name}.notifier")
       @notifier = new Notifier(@token.get())
       @notifier.activate()
 
@@ -222,9 +225,6 @@ module.exports =
     @statusView = null
     @subscriptions.dispose()
     @projectSearch.destroy()
-    # if toolBar
-    #   toolBar.removeItems();
-    #   toolBar = null;
 
   subscribeToLogin: ->
     @subscriptions.add atom.commands.add 'atom-workspace',
@@ -233,26 +233,32 @@ module.exports =
   cleanup: ->
     atomHelper.cleanup()
 
-  consumeToolBar: (getToolBar) ->
-    # toolBar = getToolBar('greyatom-ide');
-    # toolBar.addButton({
-    #   icon: 'play',
-    #   callback: 'application:about',
-    #   tooltip: 'Test',
-    #   iconset: 'fa'
-    # })
-    # toolBar.addButton({
-    #   icon: 'eject',
-    #   callback: 'application:about',
-    #   tooltip: 'Submit',
-    #   iconset: 'fa'
-    # })
-    # toolBar.addButton({
-    #   icon: 'exchange',
-    #   callback: 'commit-live:get-all-projects',
-    #   tooltip: 'Switch Project',
-    #   iconset: 'fa'
-    # })
+  testTask: ->
+    @termView.showAndFocus()
+    blob = localStorage.get('commit-live:current-track')
+    if blob
+      {titleSlug, titleSlugTestCase} = JSON.parse(blob)
+      path = atom.project.remoteftp.getPathForTrack(titleSlug)
+      command = "cd #{path} \r clear \rclive test #{titleSlugTestCase}"
+      @termView.executeCommand(command)
+
+  submitTask: ->
+    @termView.showAndFocus()
+    blob = localStorage.get('commit-live:current-track')
+    if blob
+      {titleSlug, titleSlugTestCase} = JSON.parse(blob)
+      path = atom.project.remoteftp.getPathForTrack(titleSlug)
+      command = "cd #{path} \r clear \rclive submit #{titleSlugTestCase}"
+      @termView.executeCommand(command)
+
+  executeTask: ->
+    @termView.showAndFocus()
+    blob = localStorage.get('commit-live:current-track')
+    if blob
+      {titleSlug, testCase} = JSON.parse(blob)
+      path = atom.project.remoteftp.getPathForTrack(titleSlug)
+      command = "cd #{path} \r clear \rpython #{testCase}/build.py"
+      @termView.executeCommand(command)
 
   consumeStatusBar: (statusBar) ->
     @addStatusBar = statusBar.addRightTile
@@ -268,7 +274,7 @@ module.exports =
     localStorage.delete('commit-live:last-opened-project')
     @token.unset()
     @token.unsetID()
-    atom.reload()
+    atom.restartApplication()
 
   checkForV1WindowsInstall: ->
     require('./windows')

lib/instance.coffee

@@ -1,12 +1,13 @@
 fetch = require './fetch'
 _token = require './token'
 localStorage = require './local-storage'
+{name} = require '../package.json'
 
 callStart = (token, instanceId) ->
   headers = new Headers(
     {'Authorization': token }
   )
-  apiEndpoint = atom.config.get('greyatom-ide').apiEndpoint
+  apiEndpoint = atom.config.get(name).apiEndpoint
   AUTH_URL = "#{apiEndpoint}/aws/toggleServer/#{instanceId}?action=start"
   fetch(AUTH_URL, {method:'PUT',headers}).then (response) ->
     console.log 'Start Instance Response'

lib/project-search.js

@@ -9,6 +9,7 @@ import fuzzaldrinPlus from 'fuzzaldrin-plus'
 import _token from './token'
 import localStorage from './local-storage'
 import fetch from './fetch'
+import {name} from '../package.json'
 
 function highlight (path, matches, offsetIndex) {
   let lastIndex = 0
@@ -159,7 +160,7 @@ export default class RemoteFileSearchView {
       Authorization: token,
     });
     const courseId = JSON.parse(localStorage.get('commit-live:user-info')).courseId;
-    const apiEndpoint = atom.config.get('greyatom-ide').apiEndpoint
+    const apiEndpoint = atom.config.get(name).apiEndpoint
     const getAllProjectApi = `${apiEndpoint}/user/course/${courseId}/program`;
     fetch(getAllProjectApi, {
       headers,

lib/views/terminal.coffee

@@ -109,7 +109,7 @@ class TerminalView extends View
       'commit-live:reset-font-size': => @resetFontSize()
 
   sendClear: ->
-    console.log 'm at sendClear'
+    # console.log 'm at sendClear'
     if !@isOpenLabActive
       @terminal.send('clear \r')
 
@@ -120,10 +120,14 @@ class TerminalView extends View
     if path
       @isOpenLabActive = true
       setTimeout (=>
-        @terminal.send('clive open ' + path.toString() + '\r')
+        @terminal.send('clear \rclive open ' + path.toString() + '\r')
       ), 2000
       @openPath = null
 
+  executeCommand: (command)->
+    # console.log command
+    @terminal.send(command + '\r')
+
   onBlur: (e) ->
     {relatedTarget} = e
     @unfocus() if relatedTarget? and relatedTarget isnt @terminalWrapper.element

package.json

@@ -23,11 +23,6 @@
       "versions": {
         "^1.0.0": "consumeStatusBar"
       }
-    },
-    "tool-bar": {
-      "versions": {
-        "^0 || ^1": "consumeToolBar"
-      }
     }
   },
   "dependencies": {
@@ -46,10 +41,10 @@
     "utf8": "2.1.1"
   },
   "packageDependencies": {
-    "greyatom-tree-view": "1.3.13",
+    "greyatom-tree-view": "1.3.24",
     "tablr": "1.8.3",
-    "tool-bar": "1.1.0",
-    "greyatom-ide-welcome": "0.0.7",
+    "tool-bar": "1.1.1",
+    "greyatom-ide-welcome": "0.0.9",
     "greyatom-ide-background-tips": "0.0.3"
   },
   "configSchema": {