Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Merge in HW3 & HW4 support from richardxia/rag #2

Merged
merged 112 commits into from

4 participants

James Eady Armando Fox Jonathan Ko robertjmarks
James Eady

With this merge, saasbook/rag is capable of grading homeworks 1-4. Everything is working correctly as best as I can tell but please test it yourself.

I don't know what you (Richard) were trying to do with the whole misuse-FastReturn-as-goto whatever, but I have attempted to purge it because it was causing a merge conflict between richardxia/master and richardxia/feature-grader. I think I've merged it correctly (even if it is still ugly), but please take a look.

Additionally, I think we should either move hw3.yml, hw4.yml, and anything else that is relevant into the homework solutions repository or make this repository private.

Richard Xia and others added some commits
Richard Xia Added peek to ClassXController 23ca07f
Richard Xia Dirty commit. Please fix before merging with main repo. e66a17f
Richard Xia More dirty hacks 7a21454
Richard Xia Reverted back to non-heroku autograding for regrades f23ca28
Richard Xia Renamed class_x*.rb to coursera*.rb c16a5c1
Richard Xia Cleaned up autograders.yml format 0bb9e1d
Richard Xia Cleaned up run_autograder_subprocess. Added HerokuRspecGrader f002933
Richard Xia Fixed a few bugs.
Fixed relative paths for graders
Renamed run_class_x_client
Raise error on non-zero exit code for autograder subprocess
06cb1c2
Richard Xia Fixed heroku submission arguments f4a347e
Richard Xia Made grade_heroku executable 61a44b8
Richard Xia Formatted autograder text for web 1962d59
Richard Xia Added logger. 164f379
Richard Xia Fixed a couple of outdated names 8855bd6
Richard Xia Moved configuration files to config/ 43df9ee
Richard Xia Added specs for coursera_client ca8af71
Richard Xia Added run_local_autograder
Separated subprocess logic into separate file
1bc34a1
Jonathan Ko jonathank Hacky first version of HW3Grader 7a9778b
Richard Xia Factored out conf parsing into coursera client bfd6be4
Richard Xia Fixed @halt 934d154
Richard Xia Actually fixed it 4c994aa
Jonathan Ko jonathank Tighter Cucumber integration
Can theoretically differentiate between RuntimeError and failure
Pass/fail detection is incorrect
271ec3a
Richard Xia Fixed unmatched parens d2c6af6
Richard Xia Downcased Base64 in requires 875b95a
Jonathan Ko jonathank Works for first scenario only db175ee
Jonathan Ko jonathank HW3 grader working on sample app 1f40c29
Richard Xia Fixed configuration loading ded814a
Richard Xia Fixed scoping problem fde9227
Richard Xia Added sleep time for coursera_client 9e0a739
Richard Xia Added logger info for sleep time, default sleep time 40910b0
Richard Xia Fixed default sleep time 2fc87e0
Richard Xia Fixed boolean value testing 71320ec
Richard Xia Fixed while true loop 669e2d8
Richard Xia Fixed queue_length with bad status code e6cb36e
Jonathan Ko jonathank FeatureGrader greps cucumber output
And new format for FeatureGrader description yml
61b4edf
Richard Xia Added better logging ae4274a
Richard Xia Added proper subprocess exit status checking 7fb53a9
Richard Xia Fixed scope 5437c39
Richard Xia Fixed error logging for subprocess 02ce3eb
Richard Xia fixed bug 2f9f821
Richard Xia Submit score of 0 and feedback when subprocess crashes 9b3249c
Richard Xia Captured parsing errors in auto_grader_subprocess.rb 2b9ff90
Jonathan Ko jonathank Added multithreading f1dc865
Jonathan Ko jonathank Untar to /tmp 9199b41
Jonathan Ko jonathank rake -> Cucumber::Runtime
Approx. 30% speed increase by using Cucumber::Runtime directly
fd29c5c
Richard Xia Added more exception catching 13f01cb
Richard Xia Added log rotation e46f63d
Richard Xia Added timeout of 3 minutes for Heroku grader af953d4
Richard Xia Added mechanize to Gemfile 9083d07
Jonathan Ko jonathank hw3 sort 94a5eb8
Jonathan Ko jonathank Merge remote-tracking branch 'origin/richard-dirty' into feature-grader 8d573e7
Richard Xia Captured incorrect submission file format errors a04bd42
Jonathan Ko jonathank Compatibility with AutoGraderSubprocess in grade3_autograder 5d20b8d
Jonathan Ko jonathank Synchronized output from Feature to FeatureGrader ab75e33
Richard Xia Added PID to log file name 6ef305e
Jonathan Ko jonathank HW3Grader works locally c01f15f
Jonathan Ko jonathank Catch all errors in grade3 to avoid backtrace in output 7cb0f6b
Jonathan Ko jonathank Version on the ec2 graders 2d37f41
Jonathan Ko jonathank Merge remote-tracking branch 'origin/richard-dirty' into feature-grader f103d95
Jonathan Ko jonathank Simplify hw3 grading rules a8e2ce5
Jonathan Ko jonathank Fix for fatal EOFError in coursera_controller a039fab
Jonathan Ko jonathank Fix for "-@" instead of error message
Still not sure why this happens..
1f7736e
Jonathan Ko jonathank Error message when required scenarios aren't found a328c7f
Richard Xia Started working on hw4 grader 20c48b3
Richard Xia Removed thing fcca3c3
Richard Xia Properly added stuff 35284b7
Jonathan Ko jonathank Coverage parser ce3ecad
Richard Xia Cleaned up hw4 grader stuff 40ac757
Jonathan Ko jonathank Merge remote-tracking branch 'rxia/hw4-grader' into hw4-grader
Conflicts:
	lib/graders/hw4_grader.rb
24ed706
Richard Xia Fixed nesting, raketask name 4128225
Jonathan Ko jonathank Merge remote-tracking branch 'rxia/hw4-grader' into hw4-grader 22be940
Jonathan Ko jonathank Add reference cucumber grading 40b518d
Richard Xia Added scoring for user rspec cucumber tests 97710bf
Richard Xia Merge remote branch 'jonko/hw4-grader' into hw4-grader a558170
Richard Xia Working, but slow 6019ae7
Richard Xia Fixed up autograders.yml d110648
Richard Xia Cleaned up output formatting. Should parse correct score now 7d52d8a
Richard Xia Added Ruby Debug to Gemfile 62837aa
Richard Xia Fixed a few errors with hw4 grading 298bf03
Richard Xia Fixed parsing in the Feature grading for when "n passed" is not present 1382ac3
Jonathan Ko jonathank rake:saas prints errors instead of raising
Ensures correct scoring when tasks fail with fatal errors
f1eb67e
richardxia Merge pull request #1 from jonathank/hw4-grader
rake:saas prints errors instead of raising
561cf85
Richard Xia Fixed path for graders in hw4_grader 595656a
Richard Xia If there were a Ruby God, He would smite me for this.
Fixed run reference cucumber code for hw4_grader
ca98055
Richard Xia Fixed director feature to use the correct name for home page b033e3b
Richard Xia Fixed typo in hw4_grader 357a5fa
Richard Xia Added more error information on setup failure 110e27c
Richard Xia Added undefined scenarios to feature output parser 948cdc2
Richard Xia Added a rake db:test:prepare to clear up old state 931b252
Richard Xia Changed env to use Rails test env c2d3c18
Richard Xia Added more lenient redirect expectation 8327d62
Richard Xia Made feature safer c40b53d
Richard Xia Fix 60236db
Richard Xia Installed cucumber raketask on default repo. Fixed saas_web_steps.rb 10d44a9
Richard Xia Made step better 036f65e
Richard Xia Reverted ./grade to work with RSpecGrader 87b8e61
Richard Xia Removed grade3_autograder a76ad99
Richard Xia Fixed bundler error, tar error 83c5b15
Richard Xia Merge branch 'feature-grader' of github.com:richardxia/rag into featu…
…re-grader
0c2b305
Richard Xia Temporarily removing multithreading to avoid possibility of hanging e85d336
James Eady jeady Merging in richardxia/feature-grader. 3997379
James Eady jeady Adding missing tempfile dependency. a2eea2a
James Eady jeady Moving new graders from richardxia/feature-grader into the subdirecto…
…ries used by rag/master
b18ed57
James Eady jeady Updated grade3 to work with the placement of the autograder classes i…
…n rag/master.
8e55529
James Eady jeady Merging in richardxia/master for HW4 compatibility. 75ab4cd
James Eady jeady Continuing last commit, apparently I forgot a file. c51bec4
James Eady jeady Adding autograding script for hw5 7060c97
James Eady jeady Increasing autograder timeout for hw5 c39dd2d
James Eady jeady Fix crash bug from corrupted character encodings 494c029
James Eady jeady Fix autograder timeout to work correctly. cbdd6bd
robertjmarks robertjmarks added in the connection info for edX 71058f6
robertjmarks robertjmarks updated conf.yml.example and autograder.yml.example 0f88b6b
James Eady jeady Merge pull request #1 from jeady/connections
Connections
6ba4d23
Armando Fox armandofox merged commit 4b7d069 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 31, 2012
  1. Added peek to ClassXController

    Richard Xia authored
Commits on Feb 2, 2012
Commits on Feb 4, 2012
  1. More dirty hacks

    Richard Xia authored
Commits on Feb 14, 2012
  1. Reverted back to non-heroku autograding for regrades

    Richard Xia authored
Commits on Feb 20, 2012
  1. Renamed class_x*.rb to coursera*.rb

    Richard Xia authored
  2. Cleaned up autograders.yml format

    Richard Xia authored
  3. Fixed a few bugs.

    Richard Xia authored
    Fixed relative paths for graders
    Renamed run_class_x_client
    Raise error on non-zero exit code for autograder subprocess
  4. Fixed heroku submission arguments

    Richard Xia authored
  5. Made grade_heroku executable

    Richard Xia authored
  6. Formatted autograder text for web

    Richard Xia authored
  7. Added logger.

    Richard Xia authored
  8. Fixed a couple of outdated names

    Richard Xia authored
Commits on Feb 21, 2012
  1. Moved configuration files to config/

    Richard Xia authored
Commits on Feb 22, 2012
  1. Added specs for coursera_client

    Richard Xia authored
  2. Added run_local_autograder

    Richard Xia authored
    Separated subprocess logic into separate file
Commits on Feb 23, 2012
  1. Jonathan Ko
  2. Factored out conf parsing into coursera client

    Richard Xia authored
  3. Fixed @halt

    Richard Xia authored
  4. Actually fixed it

    Richard Xia authored
  5. Jonathan Ko

    Tighter Cucumber integration

    jonathank authored
    Can theoretically differentiate between RuntimeError and failure
    Pass/fail detection is incorrect
  6. Fixed unmatched parens

    Richard Xia authored
  7. Downcased Base64 in requires

    Richard Xia authored
Commits on Feb 25, 2012
  1. Jonathan Ko
  2. Jonathan Ko
Commits on Feb 27, 2012
  1. Fixed configuration loading

    Richard Xia authored
  2. Fixed scoping problem

    Richard Xia authored
  3. Added sleep time for coursera_client

    Richard Xia authored
  4. Added logger info for sleep time, default sleep time

    Richard Xia authored
  5. Fixed default sleep time

    Richard Xia authored
  6. Fixed boolean value testing

    Richard Xia authored
  7. Fixed while true loop

    Richard Xia authored
  8. Fixed queue_length with bad status code

    Richard Xia authored
  9. Jonathan Ko

    FeatureGrader greps cucumber output

    jonathank authored
    And new format for FeatureGrader description yml
  10. Added better logging

    Richard Xia authored
  11. Added proper subprocess exit status checking

    Richard Xia authored
  12. Fixed scope

    Richard Xia authored
  13. Fixed error logging for subprocess

    Richard Xia authored
  14. fixed bug

    Richard Xia authored
  15. Submit score of 0 and feedback when subprocess crashes

    Richard Xia authored
Commits on Feb 28, 2012
  1. Captured parsing errors in auto_grader_subprocess.rb

    Richard Xia authored
  2. Jonathan Ko

    Added multithreading

    jonathank authored
Commits on Feb 29, 2012
  1. Jonathan Ko

    Untar to /tmp

    jonathank authored
  2. Jonathan Ko

    rake -> Cucumber::Runtime

    jonathank authored
    Approx. 30% speed increase by using Cucumber::Runtime directly
Commits on Mar 2, 2012
  1. Added more exception catching

    Richard Xia authored
Commits on Mar 3, 2012
  1. Added log rotation

    Richard Xia authored
Commits on Mar 4, 2012
  1. Added timeout of 3 minutes for Heroku grader

    Richard Xia authored
  2. Added mechanize to Gemfile

    Richard Xia authored
Commits on Mar 6, 2012
  1. Jonathan Ko

    hw3 sort

    jonathank authored
  2. Jonathan Ko
Commits on Mar 8, 2012
  1. Captured incorrect submission file format errors

    Richard Xia authored
  2. Jonathan Ko
Commits on Mar 10, 2012
  1. Jonathan Ko
  2. Added PID to log file name

    Richard Xia authored
Commits on Mar 11, 2012
  1. Jonathan Ko

    HW3Grader works locally

    jonathank authored
  2. Jonathan Ko
Commits on Mar 15, 2012
  1. Jonathan Ko

    Version on the ec2 graders

    jonathank authored
  2. Jonathan Ko
  3. Jonathan Ko

    Simplify hw3 grading rules

    jonathank authored
Commits on Mar 17, 2012
  1. Jonathan Ko
Commits on Mar 18, 2012
  1. Jonathan Ko

    Fix for "-@" instead of error message

    jonathank authored
    Still not sure why this happens..
Commits on Mar 19, 2012
  1. Jonathan Ko
  2. Started working on hw4 grader

    Richard Xia authored
  3. Removed thing

    Richard Xia authored
  4. Properly added stuff

    Richard Xia authored
  5. Jonathan Ko

    Coverage parser

    jonathank authored
  6. Cleaned up hw4 grader stuff

    Richard Xia authored
  7. Jonathan Ko

    Merge remote-tracking branch 'rxia/hw4-grader' into hw4-grader

    jonathank authored
    Conflicts:
    	lib/graders/hw4_grader.rb
  8. Fixed nesting, raketask name

    Richard Xia authored
  9. Jonathan Ko
  10. Jonathan Ko
  11. Added scoring for user rspec cucumber tests

    Richard Xia authored
Commits on Mar 20, 2012
  1. Merge remote branch 'jonko/hw4-grader' into hw4-grader

    Richard Xia authored
  2. Working, but slow

    Richard Xia authored
  3. Fixed up autograders.yml

    Richard Xia authored
  4. Added Ruby Debug to Gemfile

    Richard Xia authored
  5. Fixed a few errors with hw4 grading

    Richard Xia authored
Commits on Mar 21, 2012
Commits on Mar 23, 2012
  1. Jonathan Ko

    rake:saas prints errors instead of raising

    jonathank authored
    Ensures correct scoring when tasks fail with fatal errors
  2. Merge pull request #1 from jonathank/hw4-grader

    richardxia authored
    rake:saas prints errors instead of raising
  3. Fixed path for graders in hw4_grader

    Richard Xia authored
Commits on Mar 24, 2012
  1. If there were a Ruby God, He would smite me for this.

    Richard Xia authored
    Fixed run reference cucumber code for hw4_grader
  2. Fixed typo in hw4_grader

    Richard Xia authored
  3. Added more error information on setup failure

    Richard Xia authored
  4. Added undefined scenarios to feature output parser

    Richard Xia authored
Commits on Mar 28, 2012
  1. Added a rake db:test:prepare to clear up old state

    Richard Xia authored
  2. Changed env to use Rails test env

    Richard Xia authored
Commits on Apr 3, 2012
  1. Added more lenient redirect expectation

    Richard Xia authored
  2. Made feature safer

    Richard Xia authored
  3. Fix

    Richard Xia authored
Commits on Apr 5, 2012
Commits on Apr 6, 2012
  1. Made step better

    Richard Xia authored
Commits on Apr 10, 2012
  1. Reverted ./grade to work with RSpecGrader

    Richard Xia authored
  2. Removed grade3_autograder

    Richard Xia authored
  3. Fixed bundler error, tar error

    Richard Xia authored
Commits on Apr 11, 2012
Commits on Sep 20, 2012
  1. James Eady
  2. James Eady
  3. James Eady
  4. James Eady
Commits on Sep 21, 2012
  1. James Eady
  2. James Eady
Commits on Sep 23, 2012
  1. James Eady
  2. James Eady
Commits on Oct 4, 2012
  1. James Eady
Commits on Dec 2, 2012
  1. James Eady
Commits on Jun 18, 2013
  1. robertjmarks
  2. robertjmarks
Commits on Jun 19, 2013
  1. James Eady

    Merge pull request #1 from jeady/connections

    jeady authored
    Connections
Something went wrong with that request. Please try again.