Merge pull request #477 from autolab/develop

Develop

.rubocop.yml

@@ -3,7 +3,11 @@ AllCops:
     - '**/Rakefile'
     - '**/config.ru'
   Exclude:
+    - 'assessmentConfig/**/*'
+    - 'attachments/**/*'
     - 'config/**/*'
+    - 'courseConfig/**/*'
+    - 'courses/**/*'
     - 'db/**/*'
     - 'script/**/*'
     - 'tmp/**/*'

.rubocop_todo.yml

@@ -1,16 +1,12 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-03-24 00:12:45 -0400 using RuboCop version 0.29.1.
+# on 2015-04-27 18:37:36 -0400 using RuboCop version 0.30.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 4
-Lint/AmbiguousOperator:
-  Enabled: false
-
 # Offense count: 1
-Lint/AmbiguousRegexpLiteral:
+Lint/AmbiguousOperator:
   Enabled: false
 
 # Offense count: 6
@@ -23,23 +19,27 @@ Lint/AssignmentInCondition:
 Lint/EndAlignment:
   Enabled: false
 
-# Offense count: 6
+# Offense count: 5
 Lint/Eval:
   Enabled: false
 
-# Offense count: 4
+# Offense count: 3
 Lint/HandleExceptions:
   Enabled: false
 
+# Offense count: 7
+Lint/NonLocalExitFromIterator:
+  Enabled: false
+
 # Offense count: 6
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
 
-# Offense count: 33
+# Offense count: 8
 Lint/RescueException:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 1
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 
@@ -51,99 +51,105 @@ Lint/UnderscorePrefixedVariableName:
 Lint/UnreachableCode:
   Enabled: false
 
-# Offense count: 25
+# Offense count: 21
 Lint/UselessAssignment:
   Enabled: false
 
-# Offense count: 144
+# Offense count: 133
 Metrics/AbcSize:
-  Max: 196
+  Max: 197
 
-# Offense count: 8
+# Offense count: 6
 Metrics/BlockNesting:
-  Max: 6
+  Max: 5
 
-# Offense count: 15
+# Offense count: 16
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 1152
+  Max: 572
 
-# Offense count: 72
+# Offense count: 66
 Metrics/CyclomaticComplexity:
   Max: 44
 
-# Offense count: 90
+# Offense count: 74
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 222
+  Max: 193
 
-# Offense count: 67
+# Offense count: 62
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 143
+  Max: 82
 
 # Offense count: 3
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 67
+# Offense count: 61
 Metrics/PerceivedComplexity:
-  Max: 37
+  Max: 28
 
-# Offense count: 9
-# Configuration parameters: Include.
-Rails/Output:
+# Offense count: 4
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Rails/Date:
+  Enabled: false
+
+# Offense count: 51
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Rails/TimeZone:
   Enabled: false
 
-# Offense count: 30
+# Offense count: 21
 # Configuration parameters: Include.
 Rails/Validation:
   Enabled: false
 
-# Offense count: 8
+# Offense count: 6
 Style/AccessorMethodName:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/AndOr:
   Enabled: false
 
-# Offense count: 13
+# Offense count: 5
 # Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
 Style/CaseIndentation:
   Enabled: false
 
-# Offense count: 5
+# Offense count: 1
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/ClassAndModuleChildren:
   Enabled: false
 
-# Offense count: 6
+# Offense count: 2
 Style/ClassVars:
   Enabled: false
 
-# Offense count: 2
+# Offense count: 1
 # Configuration parameters: Keywords.
 Style/CommentAnnotation:
   Enabled: false
 
-# Offense count: 181
+# Offense count: 52
 Style/Documentation:
   Enabled: false
 
-# Offense count: 7
+# Offense count: 3
+# Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/EmptyElse:
   Enabled: false
 
-# Offense count: 74
+# Offense count: 8
 # Configuration parameters: Exclude.
 Style/FileName:
   Enabled: false
 
-# Offense count: 42
+# Offense count: 24
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/For:
   Enabled: false
@@ -153,17 +159,12 @@ Style/For:
 Style/FormatString:
   Enabled: false
 
-# Offense count: 25
+# Offense count: 16
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 55
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Enabled: false
-
-# Offense count: 206
+# Offense count: 73
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/MethodName:
   Enabled: false
@@ -172,12 +173,12 @@ Style/MethodName:
 Style/MultilineTernaryOperator:
   Enabled: false
 
-# Offense count: 13
+# Offense count: 7
 # Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
 Style/Next:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 1
 Style/OneLineConditional:
   Enabled: false
 
@@ -191,6 +192,12 @@ Style/PredicateName:
 Style/RaiseArgs:
   Enabled: false
 
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+Style/RegexpLiteral:
+  Enabled: false
+
 # Offense count: 4
 Style/RescueModifier:
   Enabled: false
@@ -206,7 +213,7 @@ Style/Semicolon:
 Style/SingleLineBlockParams:
   Enabled: false
 
-# Offense count: 121
+# Offense count: 98
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/VariableName:
   Enabled: false

.travis.yml

@@ -1,9 +1,24 @@
 language: ruby
 rvm:
 - 2.2.0
+env:
+  global:
+    - secure: HMIuu9EFHDQEfQRX/0sDzu6QhINF3qe/LAjqhEivEGLykbNF7WVwcg/OUAElVi9kM2FIoOvibzduP0T6oBG3dlnXj/X8XkiR/ROfg0Njyfb548MK9c88D8uMEGfjxnKvyyN34TPsT9oSVA8FziE+wyWo5smQ/4FjdVFSj4A2zfc=
+    - secure: Z6YE6NuDeuraasd5gFG+x7PU3rKxhLjL6VZ7HJfZJEVyxFucRz8Hv4xlxkQV3P61w6S0uyp/reXwKy8meYAQLzVZ4pBpK7sEeSZ5w00WRH8NCGeMJmwdQi2JLCYRZ/KdOc0o5l5bbND+JG1o/U9HtG2cHO2G8M6hVGbARn+ywLg=
 before_script:
+- AUTOLAB=`pwd`; echo $AUTOLAB;
+- cd ~
+- curl -L -o id_ci_github.enc "$CI_GITHUB_USER_PRIVATE_KEY_URL"
+- openssl aes-256-cbc -k "$CI_GITHUB_USER_PRIVATE_KEY_SECRET" -in id_ci_github.enc
+  -d -a -out id_ci_github
+- eval `ssh-agent`
+- ssh-add -D
+- chmod 600 id_ci_github
+- ssh-add ./id_ci_github
+- git clone [email protected]:autolab/cmu-prod.git
+- cp cmu-prod/frontend-configs/initializers/devise.rb $AUTOLAB/config/initializers/devise.rb
+- cd $AUTOLAB
 - cp config/database.travis.yml config/database.yml
-- cp config/initializers/devise.rb.template config/initializers/devise.rb
 - cp config/autogradeConfig.rb.template config/autogradeConfig.rb
 - mkdir attachments/ tmp/
 - bundle install --quiet
@@ -12,7 +27,8 @@ before_script:
 - RAILS_ENV=test bundle exec rake db:setup --trace
 - RAILS_ENV=test bundle exec rake autolab:populate
 script:
-- RAILS_ENV=test CODECLIMATE_REPO_TOKEN=d37a8b9e09642cb73cfcf4ecfb4115fc3d6a55a7714110187ac59856ae4ab5ad bundle exec rspec ./spec/features/ 
+- RAILS_ENV=test CODECLIMATE_REPO_TOKEN=d37a8b9e09642cb73cfcf4ecfb4115fc3d6a55a7714110187ac59856ae4ab5ad
+  bundle exec rspec ./spec/features/
 notifications:
   slack:
     secure: GXcycaSBFaOYI6Ge0vhqCYK1xxixwjASOMkV2bkfE6PNIGkDEEQdTpOkohPGoKuz2W9KCGrXC38sbu4npMtonz0/sISydG+g7V33XkLqPaW8oUcdYhwJyBUEB/Ds17U/FJ4IhT9oOrhl17Sm0rm92Mhu6O2eeZYAclGqJgZNLvg=

Gemfile

@@ -58,13 +58,17 @@ gem 'dynamic_form'
 # Supports zip file generation.
 gem 'rubyzip'
 
+# Helper gem for Ruby JSON API client
+gem 'httparty'
+
 # Enables RSpec testing framework with Capybara and Factory Girl.
 gem 'rspec-rails'
 gem 'rack-test'
 gem 'capybara', group: [:development, :test]
 gem 'factory_girl_rails', group: [:development, :test]
 gem 'database_cleaner', group: [:development, :test]
-gem "codeclimate-test-reporter", group: :test, require: nil
+gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'newrelic_rpm'
 
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'