grade_runner 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8287f06bead27eb7200e42fd3e95c5b59a3d6b20a2ec243ec0208a3833fa5b2
-  data.tar.gz: c37414bdcf6726a2c0cc4303d8a03de1b6d96f5d9fb6c8cc114f5d5dd1ddd8b6
+  metadata.gz: 126dec678889c8e49764337f85a40e87a389e960ad813a4cb04e297446bbf74e
+  data.tar.gz: f4f36124eca6fecf133c6f2fe42ab1d3fa03cf8e1e26f3cf5f94bd6d88ca737f
 SHA512:
-  metadata.gz: 2249bf710cf8ee1dd932784084dd95f9468a0b5bc878a8bc097424c4ecfdfbda7857212941b7ffc4644b3abd889890bec073f3a73ed7e952a91f43043e417108
-  data.tar.gz: 6ab0d79a82276c71709f6903207d12cddf3130eedc96ea5816efbeeefda54f21a9c7440333a3c5494d84e66da00cde91b30d407e6c74615c007c17141c48e881
+  metadata.gz: 6c3eb6813b2d0babbb39974430b7b7ba36e658f4970cc77a102f2ee0522feab2de89b2f7c42ecbed63acdfaed6c98544f64a4d8a9572c4e3fe462e574fc1fcfc
+  data.tar.gz: 28d9326401af07677e5f6358b708695aa717571056ba0c0842cd71126b9f90594b12764cdca0790ab530c94e7fda818a67b2d9faef04bfab082a241a3069a6ef

data/Gemfile

@@ -10,7 +10,7 @@ gem "rake", "~> 13"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 3.5.0"
-  gem "rdoc", "~> 3.12"
+  gem "rdoc", "~> 6.1"
   gem "bundler", "~> 2.1.4"
   gem "juwelier", "~> 2.1.0"
   gem "simplecov", ">= 0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.3)
+    activesupport (7.0.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -53,10 +53,9 @@ GEM
       oauth2 (~> 1.0)
     hashie (3.6.0)
     highline (2.1.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     interception (0.5)
-    json (1.8.6)
     juwelier (2.1.3)
       builder
       bundler (>= 1.13)
@@ -70,7 +69,7 @@ GEM
     jwt (2.7.0)
     method_source (1.0.0)
     mini_portile2 (2.8.1)
-    minitest (5.18.0)
+    minitest (5.19.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
@@ -105,13 +104,15 @@ GEM
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
+    psych (5.1.1.1)
+      stringio
     public_suffix (5.0.1)
     racc (1.6.2)
     rack (3.0.7)
     rake (13.0.6)
     rchardet (1.8.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
+    rdoc (6.6.0)
+      psych (>= 4.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -137,6 +138,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     slop (3.6.0)
+    stringio (3.0.9)
     thread_safe (0.3.6)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -161,7 +163,7 @@ DEPENDENCIES
   pry-rescue (~> 1)
   pry-stack_explorer (~> 0)
   rake (~> 13)
-  rdoc (~> 3.12)
+  rdoc (~> 6.1)
   rspec (~> 3.5.0)
   simplecov
 

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.9

data/grade_runner.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: grade_runner 0.0.7 ruby lib
+# stub: grade_runner 0.0.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "grade_runner".freeze
-  s.version = "0.0.7"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Raghu Betina".freeze, "Jelani Woods".freeze]
-  s.date = "2023-04-19"
+  s.date = "2023-11-20"
   s.description = "This gem runs your RSpec test suite and posts the JSON output to grades.firstdraft.com.".freeze
   s.email = ["raghu@firstdraft.com".freeze, "jelani@firstdraft.com".freeze]
   s.extra_rdoc_files = [
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<faraday-retry>.freeze, ["~> 1.0.3"])
     s.add_runtime_dependency(%q<rake>.freeze, ["~> 13"])
     s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-    s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.1"])
     s.add_development_dependency(%q<bundler>.freeze, ["~> 2.1.4"])
     s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<faraday-retry>.freeze, ["~> 1.0.3"])
     s.add_dependency(%q<rake>.freeze, ["~> 13"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 6.1"])
     s.add_dependency(%q<bundler>.freeze, ["~> 2.1.4"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])

data/lib/tasks/grade.rake

@@ -14,8 +14,6 @@ namespace :grade do
     input_token = ARGV[1]
     file_token = nil
 
-    sync_specs_with_source
-
     config_dir_name = find_or_create_config_dif
     config_file_name = "#{config_dir_name}/.ltici_apitoken.yml"
     student_config = {}
@@ -70,6 +68,10 @@ namespace :grade do
         update_config_file(config_file_name, student_config)
         puts "Your access token looked invalid, so we've reset it to be blank. Please re-run rails grade and, when asked, copy-paste your token carefully from the assignment page."
       else
+        full_reponame = upstream_repo(submission_url, token)
+        set_upstream_remote(full_reponame)
+        sync_specs_with_source(full_reponame)
+
         path = File.join(project_root, "/tmp/output/#{Time.now.to_i}.json")
         `bin/rails db:migrate RAILS_ENV=test` if defined?(Rails)
         `RAILS_ENV=test bundle exec rspec --order default --format JsonOutputFormatter --out #{path}`
@@ -129,10 +131,7 @@ namespace :grade do
 
 end
 
-def sync_specs_with_source
-  reponame = `basename -s .git \`git config --get remote.origin.url\``.chomp
-  full_reponame = "appdev-projects/#{reponame}"
-
+def sync_specs_with_source(full_reponame)
   if Octokit.repository?(full_reponame)
     repo_contents = Octokit.contents(full_reponame)
     remote_spec_folder = repo_contents.find { |git_object| git_object[:name] == 'spec' }
@@ -146,7 +145,7 @@ def sync_specs_with_source
     local_sha = `git ls-tree HEAD #{project_root.join('spec')}`.chomp.split[2]
 
     unless remote_sha == local_sha
-      `git fetch upstream`
+      `git fetch upstream -q`
       # Remove local contents of spec folder
       `rm -rf spec/*`
       default_branch = `git remote show upstream | grep 'HEAD branch' | cut -d' ' -f5`.chomp
@@ -158,6 +157,15 @@ def sync_specs_with_source
   end
 end
 
+def set_upstream_remote(repo_slug)
+  upstream = `git remote -v | grep -w upstream`.chomp
+  if upstream.blank?
+    `git remote add upstream https://github.com/#{repo_slug}`
+  else
+    `git remote set-url upstream https://github.com/#{repo_slug}`
+  end
+end
+
 def update_config_file(config_file_name, config)
   File.write(config_file_name, YAML.dump(config))
 end
@@ -182,7 +190,22 @@ rescue => e
   return false
 end
 
+def upstream_repo(root_url, token)
+  return false unless token.is_a?(String) && token =~ /^[1-9A-Za-z][^OIl]{23}$/
+  url = "#{root_url}/submissions/resource?token=#{token}"
+  uri = URI.parse(url)
+  req = Net::HTTP::Get.new(uri, 'Content-Type' => 'application/json')
+  res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
+    http.request(req)
+  end
+  result = Oj.load(res.body)
+  result["repo_slug"]
+rescue => e
+  return false
+end
+
 def github_username(primary_email)
+  return "" if primary_email.blank?
   username = `git config user.name`.chomp
   search_results = Octokit.search_users("#{primary_email} in:email").fetch(:items)
   if search_results.present?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grade_runner
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Raghu Betina
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement